Merge branch 'landingBackend' into arsh-final-edits

uclaacm · Sep 3, 2023 · b8e52a8 · b8e52a8
2 parents 25ac472 + 1df07c4
commit b8e52a8
Show file tree

Hide file tree

Showing 8 changed files with 666 additions and 6 deletions.
diff --git a/components/MainLayout.tsx b/components/MainLayout.tsx
@@ -1,8 +1,8 @@
 import Head from 'next/head';
 import React from 'react';
+import vars from '../styles/global_variables.module.scss';
 import Footer from './Footer';
 import Navbar from './Navbar';
-import vars from '../styles/global_variables.module.scss';
 
 interface LayoutProps {
   children: JSX.Element;

diff --git a/pages/index.tsx b/pages/index.tsx
@@ -2,7 +2,7 @@ import { GetStaticProps } from 'next';
 import MainLayout from '../components/MainLayout';
 import getCommitteeInfo from '../scripts/landing-page-generator.mjs';
 import vars from '../styles/global_variables.module.scss';
-import styles from '../styles/Landing.module.scss';
+import styles from '../styles/landing.module.scss';
 
 interface Committee {
   committee: string;

diff --git a/scripts/event-generator-sheets.mjs b/scripts/event-generator-sheets.mjs
@@ -152,7 +152,6 @@ async function getGoogleSheetData(range) {
   const sheets = google.sheets({ version: 'v4' });
 
   // Get JWT Token to access sheet
-  // console.log(SERVICE_ACCOUNT);
   const service_account = JSON.parse(SERVICE_ACCOUNT);
   const jwtClient = new google.auth.JWT(
     service_account.client_email,

diff --git a/scripts/landing-page-generator.mjs b/scripts/landing-page-generator.mjs
@@ -55,7 +55,6 @@ async function getGoogleSheetData(range) {
   const sheets = google.sheets({ version: 'v4' });
 
   // Get JWT Token to access sheet
-  // console.log(SERVICE_ACCOUNT);
   const service_account = JSON.parse(SERVICE_ACCOUNT);
   const jwtClient = new google.auth.JWT(
     service_account.client_email,

diff --git a/styles/Events.module.scss b/styles/Events.module.scss
@@ -3,7 +3,6 @@
 .main {
   min-height: 100vh;
   padding: 2rem 6rem;
-  margin-top: 30px;
   flex: 1;
   display: block;
   flex-direction: column;

diff --git a/styles/Teampage.module.scss b/styles/Teampage.module.scss
@@ -7,7 +7,6 @@
 .main {
   min-height: 100vh;
   padding: 2rem 6rem;
-  margin-top: 30px;
   flex: 1;
   display: block;
   flex-direction: column;

diff --git a/styles/globals.scss b/styles/globals.scss
@@ -26,3 +26,7 @@ a {
 description-list {
   font-size: 1.5rem;
 }
+
+main {
+  padding-top: 10vh;
+}