Backend Update

.github/workflows/backend_tests.yml

@@ -1,22 +1,22 @@
-name: Backend Tests
-
-on:
-  push:
-    paths:
-      - server/**
-  pull_request:
-    paths:
-      - server/**
-
-jobs:
-  test_backend:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3.5.3
-
-      - name: Start Docker
-        run: docker-compose -f docker-compose.test.yml up --build -d
-
-      - name: Run Tests
-        run: cd server && yarn install && yarn test:actions
+name: Backend Tests
+
+on:
+  push:
+    paths:
+      - server/**
+  pull_request:
+    paths:
+      - server/**
+
+jobs:
+  test_backend:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3.5.3
+
+      - name: Start Docker
+        run: docker-compose -f docker-compose.test.yml up --build -d
+
+      - name: Run Tests
+        run: cd server && yarn install && yarn test:actions

.github/workflows/frontend_tests.yml

@@ -1,19 +1,19 @@
-name: Frontend Tests
-
-on:
-  push:
-    paths:
-      - client/**
-  pull_request:
-    paths:
-      - client/**
-
-jobs:
-  build_frontend:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3.5.3
-
-      - name: Build client
-        run: cd client && yarn install && yarn build
+name: Frontend Tests
+
+on:
+  push:
+    paths:
+      - client/**
+  pull_request:
+    paths:
+      - client/**
+
+jobs:
+  build_frontend:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3.5.3
+
+      - name: Build client
+        run: cd client && yarn install && yarn build

README.md

@@ -1,6 +1,6 @@
 ![image](https://user-images.githubusercontent.com/50821962/195210327-87d8570e-d5c1-4704-be5b-eb2a609c0972.png)
 
-# Orientation Website
+# Orientation Website [![Backend Tests](https://github.com/UofT-Frosh-Orientation/orientation-website/actions/workflows/backend_tests.yml/badge.svg?event=push)](https://github.com/UofT-Frosh-Orientation/orientation-website/actions/workflows/backend_tests.yml) [![Frontend Tests](https://github.com/UofT-Frosh-Orientation/orientation-website/actions/workflows/frontend_tests.yml/badge.svg?event=push)](https://github.com/UofT-Frosh-Orientation/orientation-website/actions/workflows/frontend_tests.yml)
 
 Welcome to the University of Toronto's Frosh engineering orientation website, used by more than 1,000 incoming students each year. This website serves as the primary platform for registering and paying for orientation events, and offers a range of features including a main schedule, announcements, a personal profile page with the ability to edit, a Scunt (scavenger hunt) game, sign-up for the Frosh retreat, QR code scanning for automated registration on event day, and more.
 

client/src/App.jsx

@@ -39,6 +39,7 @@ const TransitionRoutes = () => {
   const loggedIn = useSelector(loggedInSelector);
   const registered = useSelector(registeredSelector);
   const initials = useSelector(initialsSelector);
+
   // const scuntSettings = useSelector(scuntSettingsSelector);
 
   return (

client/src/components/MakeSchedulePDF/MakeSchedulePDF.jsx

@@ -8,33 +8,33 @@ const styles = StyleSheet.create({
     backgroundColor: '#E4E4E4',
   },
   eventBubble: {
-    backgroundColor: '#58458f', 
-    borderRadius: '10px', 
-    padding: '10px', 
-    margin: '10px'
+    backgroundColor: '#58458f',
+    borderRadius: '10px',
+    padding: '10px',
+    margin: '10px',
   },
   eventName: {
-    fontSize: 12, 
+    fontSize: 12,
     fontWeight: 'bold',
-    padding: '10px 0', 
-    color: '#fff'
+    padding: '10px 0',
+    color: '#fff',
   },
   eventLoc: {
-    fontSize: 12, 
-    padding: '10px 0', 
-    color: '#fff'
+    fontSize: 12,
+    padding: '10px 0',
+    color: '#fff',
   },
   eventDate: {
     fontSize: 11,
     fontStyle: 'italic',
     color: '#fff',
-    padding: '5px 0'
+    padding: '5px 0',
   },
   eventDesc: {
-    fontSize: 12, 
+    fontSize: 12,
     color: '#fff',
-    padding: '10px 0'
-  }
+    padding: '10px 0',
+  },
 });
 
 const MakeSchedulePDF = (froshObject) => {
@@ -53,27 +53,27 @@ const MakeSchedulePDF = (froshObject) => {
           </Svg>
           {Object.keys(scheduleData).map((day) => (
             <div key={day}>
-              <Text style={{ fontSize: 14, padding: '20px 0', color: '#2c1370', fontWeight: 'bold' }}>
+              <Text
+                style={{ fontSize: 14, padding: '20px 0', color: '#2c1370', fontWeight: 'bold' }}
+              >
                 {day}
               </Text>
               {scheduleData[day].map((scheduleDay, index) => (
                 <div key={scheduleDay} style={styles.eventBubble}>
-                  <Text style={styles.eventName}>
-                    {scheduleDay['Event Name']}
-                  </Text>
+                  <Text style={styles.eventName}>{scheduleDay['Event Name']}</Text>
                   <Text style={styles.eventDate}>
                     {scheduleDay['Start Time']} - {scheduleDay['End Time']}
                   </Text>
-                  {scheduleDay['Event Location'] ? 
-                    <Text style={styles.eventLoc}>
-                      {scheduleDay['Event Location']}
-                    </Text> : <></>
-                  }
-                  {scheduleDay['Event Description'] ? 
-                    <Text style={styles.eventDesc}>
-                      {scheduleDay['Event Description']}
-                    </Text> : <></>
-                  }
+                  {scheduleDay['Event Location'] ? (
+                    <Text style={styles.eventLoc}>{scheduleDay['Event Location']}</Text>
+                  ) : (
+                    <></>
+                  )}
+                  {scheduleDay['Event Description'] ? (
+                    <Text style={styles.eventDesc}>{scheduleDay['Event Description']}</Text>
+                  ) : (
+                    <></>
+                  )}
                 </div>
               ))}
             </div>
@@ -84,4 +84,4 @@ const MakeSchedulePDF = (froshObject) => {
   );
 };
 
-export { MakeSchedulePDF };
+export { MakeSchedulePDF };

client/src/components/profile/ProfilePageResources/ProfilePageResources.jsx

@@ -4,7 +4,6 @@ import './ProfilePageResources.scss';
 import PropTypes from 'prop-types';
 
 export const ProfilePageResources = ({ froshObject }) => {
-
   return (
     <div className="profile-page-resources profile-page-side-section">
       <h2>Resources</h2>
@@ -25,24 +24,24 @@ export const ProfilePageResources = ({ froshObject }) => {
           </a>
         );
       })}
-      {froshObject ? ( 
-      <>
-        <a key={'5Download'} className="no-link-style">
-          <ButtonBubble
-            label={'Download Information PDF'}
-            onClick={async () => {
-              const MakeReceipt = (await import('../../MakeReceipt/MakeReceipt')).MakeReceipt;
-              const ReactPDF = await import('@react-pdf/renderer');
-              const blob = await ReactPDF.pdf(MakeReceipt(froshObject)).toBlob();
-              const fileURL = URL.createObjectURL(blob);
-              const pdfWindow = window.open(fileURL, '_blank');
-              pdfWindow && pdfWindow.focus();
-            }}
-            isSecondary
-            style={{ margin: 0, marginTop: '10px' }}
-          />
-        </a>
-      </>
+      {froshObject ? (
+        <>
+          <a key={'5Download'} className="no-link-style">
+            <ButtonBubble
+              label={'Download Information PDF'}
+              onClick={async () => {
+                const MakeReceipt = (await import('../../MakeReceipt/MakeReceipt')).MakeReceipt;
+                const ReactPDF = await import('@react-pdf/renderer');
+                const blob = await ReactPDF.pdf(MakeReceipt(froshObject)).toBlob();
+                const fileURL = URL.createObjectURL(blob);
+                const pdfWindow = window.open(fileURL, '_blank');
+                pdfWindow && pdfWindow.focus();
+              }}
+              isSecondary
+              style={{ margin: 0, marginTop: '10px' }}
+            />
+          </a>
+        </>
       ) : (
         <></>
       )}

client/src/pages/EmailConfirmed/EmailConfirmed.jsx

@@ -5,28 +5,19 @@ import { Link, useParams } from 'react-router-dom';
 import useAxios from '../../hooks/useAxios';
 
 const PageEmailConfirmed = () => {
-  const { email } = useParams();
-  const { emailToken } = useParams();
-  const [validEmailToken, setvalidEmailToken] = useState(false);
+  const { email, emailToken } = useParams();
+  const [validEmailToken, setValidEmailToken] = useState(false);
+  const { axios } = useAxios();
 
-  function verifyEmailToken(email, emailToken) {
-    const { axios } = useAxios();
-
-    try {
-      const emailAndEmailToken = {
-        email: email,
-        emailToken: emailToken,
-      };
-      axios.post('/user/verify-user-email', emailAndEmailToken);
-      setvalidEmailToken(true);
-    } catch (err) {
-      setvalidEmailToken(false);
+  useEffect(() => {
+    if (emailToken && email) {
+      setValidEmailToken(true);
     }
-  }
+  }, [emailToken, email]);
 
   useEffect(() => {
-    verifyEmailToken(email, emailToken);
-  }, []);
+    if (validEmailToken) axios.post('/user/verify-user-email', { emailToken, email });
+  }, [validEmailToken]);
 
   return (
     <div>
@@ -43,7 +34,7 @@ const PageEmailConfirmed = () => {
       ) : (
         <div className="email-confirmed-page">
           <div className="email-confirmed-container">
-            <h1>Oh no! :( </h1>
+            <h1>{'Oh no! :( '}</h1>
             <h2>An error occurred when trying to verify your email. Please try again later.</h2>
             <Link to={'/login'} style={{ textDecoration: 'none' }} className={'no-link-style'}>
               <Button label="Go back to login page" />