cornell-dti · michelleli01 · Jan 21, 2024 · Dec 26, 2023 · Dec 26, 2023 · Dec 27, 2023
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -25,6 +25,7 @@
     "@typescript-eslint/class-name-casing": "warn",
     "@typescript-eslint/explicit-function-return-type": "off",
     "@typescript-eslint/no-empty-function": "warn",
+    "import/prefer-default-export": "off",
     "consistent-return": "warn",
     "guard-for-in": "warn",
     "import/extensions": "off",

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -24,8 +24,9 @@ Before this PR (i.e. on the main branch), there are X linter warnings. After my
 
 <!--- List any important or subtle points, future considerations, or other items of note. -->
 
-### Breaking Changes  <!-- Optional -->
+### Breaking Changes <!-- Optional -->
 
 <!-- Keep items that apply: -->
+
 - Database schema change (anything that changes Firestore collection structure)
 - Other change that could cause problems (Detailed in notes)
diff --git a/.github/workflows/ci-policies.yml b/.github/workflows/ci-policies.yml
@@ -8,4 +8,4 @@ jobs:
       - uses: actions/checkout@master
       - uses: cornell-dti/big-diff-warning@master
         env:
-          BOT_TOKEN: '${{ secrets.BOT_TOKEN }}'
+          BOT_TOKEN: "${{ secrets.BOT_TOKEN }}"
diff --git a/.gitignore b/.gitignore
@@ -10,7 +10,6 @@ mongodb-binaries/
 .git
 .vscode
 .env
-db
 .meteor
 mongo/
 *error.log

diff --git a/app.json b/app.json
@@ -1,7 +1,6 @@
 {
   "name": "course-reviews-react-2.0",
-  "scripts": {
-  },
+  "scripts": {},
   "env": {
     "MONGO_URL": {
       "required": true
@@ -16,9 +15,7 @@
       "quantity": 1
     }
   },
-  "addons": [
-    "papertrail"
-  ],
+  "addons": ["papertrail"],
   "buildpacks": [
     {
       "url": "heroku/nodejs"

diff --git a/client/.prettierrc.json b/client/.prettierrc.json
@@ -3,4 +3,4 @@
   "tabWidth": 2,
   "semi": false,
   "singleQuote": true
-}
+}
diff --git a/client/public/index.html b/client/public/index.html
@@ -1,56 +1,68 @@
 <!DOCTYPE html>
 <html>
+  <head>
+    <!-- Global site tag (gtag.js) - Google Analytics -->
+    <script
+      async
+      src="https://www.googletagmanager.com/gtag/js?id=UA-111004890-1"
+    ></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>
+    <script>
+      // before React is loaded
+      // if (typeof window.__REACT_DEVTOOLS_GLOBAL_HOOK__ === 'object') {
+      //     __REACT_DEVTOOLS_GLOBAL_HOOK__.inject = function() {};
+      // }
+    </script>
+    <script>
+      window.dataLayer = window.dataLayer || []
 
-<head>
-  <!-- Global site tag (gtag.js) - Google Analytics -->
-  <script async src="https://www.googletagmanager.com/gtag/js?id=UA-111004890-1"></script>
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
-  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"></script>
-  <script>
-    // before React is loaded
-    // if (typeof window.__REACT_DEVTOOLS_GLOBAL_HOOK__ === 'object') {
-    //     __REACT_DEVTOOLS_GLOBAL_HOOK__.inject = function() {};
-    // }
-  </script>
-  <script>
-    window.dataLayer = window.dataLayer || [];
-
-    function gtag() {
-      dataLayer.push(arguments);
-    }
-    gtag('js', new Date());
-
-    gtag('config', 'UA-111004890-1');
-  </script>
-
-  <!--Graph search for facebook advertising-->
-
-  <meta property="og:image" content="http://image.ibb.co/jzN2cS/CUReviews_Ad.png" />
-  <meta property="og:image:alt" content="What will you find at CU Reviews? CUreviews.org" />
-  <meta property="og:description"
-    content="Help your friends and future Cornellians pick the best classes by providing honest and anonymous feedback about your experience." />
-  <meta property="og:title" content="CU Reviews" />
-  <meta property="og:url" content="https://www.cureviews.org" />
-  <meta property="og:type" content="website" />
-
-  <!-- Favicon support -->
-  <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
-  <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
-  <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
-  <link rel="manifest" href="/site.webmanifest">
-  <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
-  <meta name="msapplication-TileColor" content="#da532c">
-  <meta name="theme-color" content="#ffffff">
-  <meta name="viewport" content="width=device-width,initial-scale=1.0">
-
-  <!-- Font Support -->
-  <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,500,600&display=swap" rel="stylesheet">
-
-  <title>CU Reviews</title>
-</head>
-
-<body>
-  <div id="render-target" class="full-height"></div>
-</body>
+      function gtag() {
+        dataLayer.push(arguments)
+      }
+      gtag('js', new Date())
 
+      gtag('config', 'UA-111004890-1')
+    </script>
+
+    <!--Graph search for facebook advertising-->
+
+    <meta
+      property="og:image"
+      content="http://image.ibb.co/jzN2cS/CUReviews_Ad.png"
+    />
+    <meta
+      property="og:image:alt"
+      content="What will you find at CU Reviews? CUreviews.org"
+    />
+    <meta
+      property="og:description"
+      content="Help your friends and future Cornellians pick the best classes by providing honest and anonymous feedback about your experience."
+    />
+    <meta property="og:title" content="CU Reviews" />
+    <meta property="og:url" content="https://www.cureviews.org" />
+    <meta property="og:type" content="website" />
+
+    <!-- Favicon support -->
+    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
+    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
+    <link rel="manifest" href="/site.webmanifest" />
+    <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5" />
+    <meta name="msapplication-TileColor" content="#da532c" />
+    <meta name="theme-color" content="#ffffff" />
+    <meta name="viewport" content="width=device-width,initial-scale=1.0" />
+
+    <!-- Font Support -->
+    <link
+      href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,500,600&display=swap"
+      rel="stylesheet"
+    />
+
+    <title>CU Reviews</title>
+  </head>
+
+  <body>
+    <div id="render-target"></div>
+  </body>
 </html>
diff --git a/client/public/site.webmanifest b/client/public/site.webmanifest
@@ -1,19 +1,19 @@
 {
-    "name": "",
-    "short_name": "",
-    "icons": [
-        {
-            "src": "/android-chrome-192x192.png",
-            "sizes": "192x192",
-            "type": "image/png"
-        },
-        {
-            "src": "/android-chrome-512x512.png",
-            "sizes": "512x512",
-            "type": "image/png"
-        }
-    ],
-    "theme_color": "#ffffff",
-    "background_color": "#ffffff",
-    "display": "standalone"
+  "name": "",
+  "short_name": "",
+  "icons": [
+    {
+      "src": "/android-chrome-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "/android-chrome-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ],
+  "theme_color": "#ffffff",
+  "background_color": "#ffffff",
+  "display": "standalone"
 }
diff --git a/client/src/App.tsx b/client/src/App.tsx
@@ -1,7 +1,6 @@
 import { BrowserRouter as Router, Route, Switch } from 'react-router-dom'
 import React from 'react'
 
-
 /* Importing Pages */
 import { Home } from './modules/Home'
 import { Course } from './modules/Course'
@@ -18,16 +17,16 @@ import { AuthRedirect } from './modules/AuthRedirect'
 import 'bootstrap/dist/css/bootstrap.min.css'
 import './index.css'
 
-/** 
-  A router is generated using the react-router-dom library. 
-  This determines which component 
+/**
+  A router is generated using the react-router-dom library.
+  This determines which component
   the user should see based on the URL they enter.
 
 */
 const App = () => {
   return (
     <Router>
-      <div className="container-fluid full-height">
+      <div>
         <Switch>
           <Route exact path="/" component={Home} />
           <Route exact path="/admin" component={Admin} />

diff --git a/client/src/PrivateRoute.tsx b/client/src/PrivateRoute.tsx
@@ -1,19 +1,19 @@
-import * as React from "react";
-import { Redirect, Route, RouteProps } from "react-router";
+import * as React from 'react'
+import { Redirect, Route, RouteProps } from 'react-router'
 
 export type ProtectedRouteProps = {
-  isAuthenticated: boolean;
-  authenticationPath: string;
-} & RouteProps;
+  isAuthenticated: boolean
+  authenticationPath: string
+} & RouteProps
 
 export default function ProtectedRoute({
   isAuthenticated,
   authenticationPath,
   ...routeProps
 }: ProtectedRouteProps) {
   if (isAuthenticated) {
-    return <Route {...routeProps} />;
+    return <Route {...routeProps} />
   } else {
-    return <Redirect to={{ pathname: authenticationPath }} />;
+    return <Redirect to={{ pathname: authenticationPath }} />
   }
 }
diff --git a/client/src/auth/auth_utils.ts b/client/src/auth/auth_utils.ts
@@ -48,25 +48,24 @@ export function useAuthMandatoryLogin(
 
     if (!token || token === '') {
       signIn(redirectFrom)
+    } else {
+      axios
+        .post('/api/getStudentEmailByToken', {
+          token: token,
+        })
+        .then((response) => {
+          const res = response.data
+          let verifiedEmail = ''
+
+          if (response.status === 200) {
+            verifiedEmail = res.result
+          }
+
+          setNetId(verifiedEmail.substring(0, verifiedEmail.lastIndexOf('@')))
+        })
+        .catch((e) => console.log(e.response))
     }
 
-    axios
-      .post('/v2/getStudentEmailByToken', {
-        token: token,
-      })
-      .then((response) => {
-        const res = response.data.result
-        var verifiedEmail = ''
-
-        if (res.code === 200) {
-          console.log(res.message)
-          verifiedEmail = res.message
-        }
-
-        setNetId(verifiedEmail.substring(0, verifiedEmail.lastIndexOf('@')))
-      })
-      .catch((e) => console.log(e.response))
-
     setToken(token)
     setIsAuthenticating(false)
     setIsLoggedIn(true)
@@ -92,26 +91,29 @@ export function useAuthOptionalLogin(): [
     const token = getAuthToken()
 
     if (token && token !== '') {
+      axios
+        .post('/api/getStudentEmailByToken', {
+          token: token,
+        })
+        .then((response) => {
+          const data = response.data
+          var verifiedEmail = ''
+
+          if (response.status === 200) {
+            verifiedEmail = data.result
+          }
+
+          const netId = verifiedEmail.substring(
+            0,
+            verifiedEmail.lastIndexOf('@')
+          )
+          setNetId(netId)
+        })
+        .catch((e) => console.log(e.response))
+
       setToken(token)
       setIsLoggedIn(true)
     }
-
-    axios
-      .post('/v2/getStudentEmailByToken', {
-        token: token,
-      })
-      .then((response) => {
-        const res = response.data.result
-        var verifiedEmail = ''
-
-        if (res.code === 200) {
-          console.log(res.message)
-          verifiedEmail = res.message
-        }
-
-        setNetId(verifiedEmail.substring(0, verifiedEmail.lastIndexOf('@')))
-      })
-      .catch((e) => console.log(e.response))
   }, [])
 
   const signIn = (redirectFrom: string) => {
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,6 @@ mongodb-binaries/ @@
     .git
     .vscode
     .env
-    db
     .meteor
     mongo/
     *error.log
@@ Expand Down @@