Merge branch 'dev' into dev

README.md

@@ -10,6 +10,12 @@ This repository holds the source code for UofT Engineering's Orientation Website
 split into two "packages". First, there is the frontend package, `client`, and second there is the backend
 package `server`.
 
+## The Frosh 2T4 Web Team
+### Team Leads
+* [Gaurika Mahajan](https://github.com/gaurikam2003), [Ashley Leal](https://github.com/ashleyleal)
+### Team members
+* [Asmita](https://github.com/asmita-chandra), [Alissa](https://github.com/kexinxiang), [William](https://github.com/WilliamJWen), [George](https://github.com/Wozunubi)
+
 ## The Frosh 2T3 Web Team
 ### Team Leads
 * [Farbod M](https://github.com/Freeassassin), [Natalie Chan](https://github.com/natapokie)

client/.gitignore

@@ -22,3 +22,4 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+.env

client/src/pages/Initial/AshLanding/AshLanding.jsx

@@ -6,9 +6,9 @@ import InstagramIcon from '../../../assets/social/instagram-brands-dark-purple.s
 const InstagramButton = ({ link, text }) => {
   return (
     <a href={link} target="_blank" rel="noreferrer" className="no-link-style">
-      <div className="button">
-        <img src={InstagramIcon} alt="Instagram Icon" className="button-icon" />
-        <span className="button-text">{text}</span>
+      <div className="ash-button">
+        <img src={InstagramIcon} alt="Instagram Icon" className="ash-button-icon" />
+        <span className="ash-button-text">{text}</span>
       </div>
     </a>
   );
@@ -22,18 +22,18 @@ InstagramButton.propTypes = {
 const AshLanding = () => {
   return (
     <>
-      <div className="initial-page">
-        <div className="container">
-          <div className="title">
-            <h1 className="title-text">COMING SOON!</h1>
-            <hr className="line"></hr>
-            <p className="subtitle">
+      <div className="ash-initial-page">
+        <div className="ash-container">
+          <div className="ash-title">
+            <h1 className="ash-title-text">COMING SOON!</h1>
+            <hr className="ash-line"></hr>
+            <p className="ash-subtitle">
               Hey F!rosh! Our website is currently under construction. Check back soon!
             </p>
           </div>
 
-          <div className="info">
-            <div className="button-container">
+          <div className="ash-info">
+            <div className="ash-button-container">
               <InstagramButton
                 link="https://www.instagram.com/froshweek/"
                 text="Follow @froshweek for updates"
@@ -45,8 +45,8 @@ const AshLanding = () => {
             </div>
           </div>
 
-          <div className="footer">
-            <h2 className="footer-text">Made with 💜 by the F!rosh Week 2T4 Tech Team</h2>
+          <div className="ash-footer">
+            <h2 className="ash-footer-text">Made with 💜 by the F!rosh Week 2T4 Tech Team</h2>
           </div>
         </div>
       </div>

client/src/pages/Initial/AshLanding/AshLanding.scss

@@ -1,4 +1,4 @@
-.initial-page {
+.ash-initial-page {
   width: 100vw;
   height: 100vh;
 
@@ -17,7 +17,7 @@
 }
 
 /* TITLE SECTION */
-.title {
+.ash-title {
   display: flex;
   flex-direction: column;
 
@@ -28,28 +28,28 @@
   text-align: center;
   padding-top: 20%;
 }
-.title-text {
+.ash-title-text {
   font-size: 64px;
   font-style: bold;
   letter-spacing: 0.1em;
   margin-bottom: 24px;
   text-shadow: 0px 7px 10px rgba(0, 0, 0, 0.25);
 }
-hr.line {
+hr.ash-line {
   top: 10px;
   width: 851px;
   height: 0px;
   border: 2px solid var(--yellow);
   border-radius: 100px;
   margin-bottom: 24px;
 }
-.subtitle {
+.ash-subtitle {
   font-size: 20px;
   letter-spacing: 0.05em;
 }
 
 /* LINKS SECTION */
-.info {
+.ash-info {
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -58,7 +58,7 @@ hr.line {
   margin: 0 auto;
   padding-top: 70px;
 }
-.button-container {
+.ash-button-container {
   display: grid;
   grid-template-columns: 1fr;
   gap: 20px;
@@ -69,39 +69,50 @@ hr.line {
     grid-template-columns: 1fr 1fr;
   }
 }
-.button {
+.ash-button {
   display: flex;
-  justify-content: center;
   align-items: center;
-  width: 420px;
+  width: 410px;
   margin: 0 auto;
   padding: 10px 20px;
-  border-radius: 100px;
   background: var(--white);
-  font-size: 18px;
+  border-radius: 100px;
+  font-size: 17px;
   font-weight: bold;
   letter-spacing: 0.05em;
   text-align: center;
   cursor: pointer;
-  transition: 0.3s;
-  box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
+  user-select: none;
+  box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25), var(--shadow);
+  transition: transform 200ms, background-color 200ms, box-shadow 0.3s;
+
+  &:hover {
+    transform: scale(1.02);
+  }
+  &:active,
+  &:focus {
+    transform: scale(0.97);
+    transition: transform 150ms;
+  }
 }
-.button:hover {
+
+.ash-button:hover {
   background: var(--yellow);
   color: var(--purple-shades-dark);
   transition: 0.3s;
 }
-.button-icon {
+.ash-button-icon {
   width: 30px;
   height: 30px;
 }
-.button-text {
+.ash-button-text {
   color: var(--purple-shades-dark);
   margin-left: 7px;
+  margin: auto;
 }
 
 /* FOOTER */
-.footer {
+.ash-footer {
   position: absolute;
   bottom: 10px;
   right: 0;
@@ -110,28 +121,21 @@ hr.line {
   align-items: center;
   color: var(--purple-shades-muted);
 }
-.footer-text {
+.ash-footer-text {
   text-align: center;
   font-size: 20px;
   font-style: normal;
   letter-spacing: 0.1em;
 }
 
-a:hover,
-a:visited,
-a:link,
-a:active {
-  text-decoration: none !important;
-}
-
 /***************** MOBILE VIEW *******************/
 
 @media screen and (max-width: 428px) {
   /*	CSS for screens that are 428 pixels or less 
 		i.e. the largest screen width is an iphone 13 pro max thing
 	*/
 
-  .title {
+  .ash-title {
     display: flex;
     flex-direction: column;
 
@@ -144,7 +148,7 @@ a:active {
     text-align: center;
     padding-top: 60%;
   }
-  .title-text {
+  .ash-title-text {
     font-style: bold;
     font-size: 20px;
     letter-spacing: 0.1em;
@@ -154,19 +158,19 @@ a:active {
 
     margin-bottom: 10px;
   }
-  hr.line {
+  hr.ash-line {
     width: 274px;
     border: 1px solid var(--yellow);
     border-radius: 100px;
     margin-bottom: 10px;
   }
-  .subtitle {
+  .ash-subtitle {
     font-size: 12px;
     max-width: 274px;
     letter-spacing: 0.03em;
   }
 
-  .info {
+  .ash-info {
     display: flex;
     justify-content: space-between;
     align-items: center;
@@ -178,28 +182,24 @@ a:active {
     padding-top: 10%;
   }
 
-  .info-text {
-    font-size: 12px;
-    max-width: 274px;
-    letter-spacing: 0.03em;
-    padding-top: 0;
-    padding-left: 10%;
-    text-align: left;
-    display: inline-block;
+  .ash-button {
+    width: 274px;
+    padding: 5px 10px;
+    border-radius: 100px;
+    font-size: 11px;
+    letter-spacing: 0.05em;
   }
 
-  .button-container {
+  .ash-ash-button-container {
     grid-template-columns: 1fr;
   }
 
-  .footer-text {
+  .ash-ash-button-text {
+    font-size: 10px;
+  }
+
+  .ash-footer-text {
     font-size: 8px;
     letter-spacing: 0.1em;
   }
 }
-a:hover,
-a:visited,
-a:link,
-a:active {
-  text-decoration: none !important;
-}