Merge branch 'dev' into prod

nrakhshan · nrakhshan · commit b6aa9e5010bb · 2025-06-08T00:47:28.000-04:00
diff --git a/.github/workflows/beta_deployment.yml b/.github/workflows/beta_deployment.yml
@@ -19,7 +19,7 @@ env:
 
 jobs:
   build_server:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v3.5.3
@@ -51,13 +51,13 @@ jobs:
         run: docker push registry.digitalocean.com/uoft-orientation/orientation-server:beta
 
   build_client:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs:
       - build_server
     steps:
       - name: Checkout code
         uses: actions/checkout@v3.5.3
-      
+
       - name: Clean up Docker to free up space (before build)
         run: |
           docker system prune -f
@@ -90,7 +90,7 @@ jobs:
 
       - name: Push client image to container registry
         run: docker push registry.digitalocean.com/uoft-orientation/orientation-client:beta
-      
+
       - name: Clean up Docker to free up space (after build)
         run: |
           docker system prune -f
@@ -101,7 +101,7 @@ jobs:
       #   run: doctl registry garbage-collection start --include-untagged-manifests --force uoft-orientation
 
   deploy_beta:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs:
       - build_client
       - build_server
diff --git a/.github/workflows/prod_deploy.yml b/.github/workflows/prod_deploy.yml
@@ -18,7 +18,7 @@ env:
 
 jobs:
   build_server:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v3.5.3
@@ -44,7 +44,7 @@ jobs:
         run: docker push registry.digitalocean.com/uoft-orientation/orientation-server:prod
 
   build_client:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v3.5.3
diff --git a/client/assets/cursor/cursor.png b/client/assets/cursor/cursor.png
diff --git a/client/package.json b/client/package.json
@@ -20,6 +20,8 @@
   "dependencies": {
     "@react-pdf/renderer": "^3.1.12",
     "@reduxjs/toolkit": "^1.9.5",
+    "@splinetool/react-spline": "^4.0.0",
+    "@splinetool/runtime": "^1.10.2",
     "@tanstack/react-table": "^8.9.3",
     "axios": "^1.4.0",
     "email-validator": "^2.0.4",
@@ -65,4 +67,4 @@
     "vite": "^4.3.9",
     "vite-plugin-rewrite-all": "^1.0.1"
   }
-}
+}
diff --git a/client/src/App.jsx b/client/src/App.jsx
@@ -17,7 +17,7 @@ import { getUserInfo } from './state/user/saga';
 
 import { LandingPage } from './pages/Initial/LandingPage';
 
-const readyForFrosh = true;
+const readyForFrosh = false;
 
 export default function App() {
   const dispatch = useDispatch();
diff --git a/client/src/App.scss b/client/src/App.scss
@@ -9,7 +9,7 @@
   @include devices(tablet) {
     user-select: none;
   }
-  cursor: url('../assets/cursor/cursor-2t4.png'), auto;
+  cursor: url('../assets/cursor/cursor.png'), auto;
 }
 
 :root {
diff --git a/client/src/assets/cursor/cursor.png b/client/src/assets/cursor/cursor.png
diff --git a/client/src/assets/logo/main-logo-2t4.png b/client/src/assets/logo/main-logo-2t4.png
diff --git a/client/src/assets/logo/main-logo.png b/client/src/assets/logo/main-logo.png
diff --git a/client/src/components/ImageCarousel/ImageCarousel.scss b/client/src/components/ImageCarousel/ImageCarousel.scss
@@ -13,7 +13,7 @@
   padding: 15px;
   border-radius: 15px;
   margin-bottom: 55px;
-  cursor: url('../../../assets/cursor/cursor-2t4.png'), auto; // Apply custom cursor here
+  cursor: url('../../../assets/cursor/cursor.png'), auto; // Apply custom cursor here
   height: calc(350px - 50px);
 
   @include devices(tablet) {
diff --git a/client/src/components/Navbar/Navbar.scss b/client/src/components/Navbar/Navbar.scss
@@ -151,7 +151,7 @@ li {
   margin-left: auto;
   margin-right: 15px;
   margin-top: 4px;
-  cursor: url('../../../assets/cursor/cursor-2t4.png'), auto; // Apply custom cursor here;
+  cursor: url('../../../assets/cursor/cursor.png'), auto; // Apply custom cursor here;
 
   @include devices(tablet) {
     margin-right: 10px;
diff --git a/client/src/components/ProfileDropdown/ProfileDropdown.scss b/client/src/components/ProfileDropdown/ProfileDropdown.scss
@@ -61,7 +61,7 @@
   width: 230px;
   height: 40px;
 
-  cursor: url('../../../assets/cursor/cursor-2t4.png'), auto;
+  cursor: url('../../../assets/cursor/cursor.png'), auto;
 
   transition: background-color 400ms, opacity 400ms, font-weight 400ms;
 
diff --git a/client/src/components/button/Button/Button.scss b/client/src/components/button/Button/Button.scss
@@ -21,7 +21,7 @@
   text-align: center;
   font-size: 17px;
   font-weight: 600;
-  cursor: url('../../../../assets/cursor/cursor-2t4.png'), auto;
+  cursor: url('../../../../assets/cursor/cursor.png'), auto;
   transition: transform 200ms, background-color 200ms;
   user-select: none;
   position: relative;
diff --git a/client/src/components/button/ButtonBubble/ButtonBubble.scss b/client/src/components/button/ButtonBubble/ButtonBubble.scss
@@ -9,7 +9,7 @@
   box-shadow: var(--shadow);
   font-size: 20px;
   font-weight: 600;
-  cursor: url('../../../../assets/cursor/cursor-2t4.png'), auto; // Apply custom cursor here
+  cursor: url('../../../../assets/cursor/cursor.png'), auto; // Apply custom cursor here
   transition: transform 200ms;
   user-select: none;
   border-width: 4px;
diff --git a/client/src/components/button/ButtonOutlined/ButtonOutlined.scss b/client/src/components/button/ButtonOutlined/ButtonOutlined.scss
@@ -21,7 +21,7 @@
   text-align: center;
   font-size: 17px;
   font-weight: 600;
-  cursor: url('../../../../assets/cursor/cursor-2t4.png'), auto; // Apply custom cursor here
+  cursor: url('../../../../assets/cursor/cursor.png'), auto; // Apply custom cursor here
   transition: transform 200ms;
   user-select: none;
   border-width: 4px;
diff --git a/client/src/components/input/TextInput/TextInput.scss b/client/src/components/input/TextInput/TextInput.scss
@@ -109,7 +109,7 @@
 
   &:hover {
     transform: scale(1.2);
-    cursor: url('../../../../assets/cursor/cursor-2t4.png'), auto; // Apply custom cursor here
+    cursor: url('../../../../assets/cursor/cursor.png'), auto; // Apply custom cursor here
   }
 }
 
diff --git a/client/src/components/popup/PopupModal.scss b/client/src/components/popup/PopupModal.scss
@@ -118,7 +118,7 @@
   padding: 15px;
 
   pointer-events: all;
-  cursor: url('../../../assets/cursor/cursor-2t4.png'), auto; // Apply custom cursor here
+  cursor: url('../../../assets/cursor/cursor.png'), auto; // Apply custom cursor here
   transition: transform 200ms;
 
   &:hover {
diff --git a/client/src/components/schedule/ScheduleHome/ScheduleHome.scss b/client/src/components/schedule/ScheduleHome/ScheduleHome.scss
@@ -99,7 +99,7 @@
   transition: transform 200ms, opacity 500ms;
   &:hover {
     transform: scale(1.03);
-    cursor: url('../../../../assets/cursor/cursor-2t4.png'), auto; // Apply custom cursor here
+    cursor: url('../../../../assets/cursor/cursor.png'), auto; // Apply custom cursor here
   }
   h1 {
     font-size: 28px;
diff --git a/client/src/components/schedule/ScheduleOlympiks/ScheduleOlympiks.scss b/client/src/components/schedule/ScheduleOlympiks/ScheduleOlympiks.scss
@@ -102,7 +102,7 @@
 
   &:hover {
     transform: scale(1.03);
-    cursor: url('../../../../assets/cursor/cursor-2t4.png'), auto; // Apply custom cursor here
+    cursor: url('../../../../assets/cursor/cursor.png'), auto; // Apply custom cursor here
   }
 
   h1 {
diff --git a/client/src/pages/Initial/LandingPage.jsx b/client/src/pages/Initial/LandingPage.jsx
@@ -4,69 +4,14 @@ import React, { useEffect, useState } from 'react';
 import { AshLanding } from './AshLanding/AshLanding';
 import { WilliamLanding } from './WilliamLanding/WilliamLanding';
 import { AlissaLanding } from './AlissaLanding/AlissaLanding';
-import { AsmitaLanding } from './AsmitaLanding/AsmitaLanding';
+import { SplineLanding } from './SplineLanding/SplineLanding';
 
-const currentYear = '2T4';
-
-const landingPages = [
-  {
-    key: 0,
-    component: <AshLanding />,
-  },
-  {
-    key: 1,
-    component: <AlissaLanding />,
-  },
-  {
-    key: 2,
-    component: <WilliamLanding />,
-  },
-  {
-    key: 3,
-    component: <AsmitaLanding />,
-  },
-];
-
-// Change this logic to determine which landing pages to show
-const landingPagesFiltered = landingPages.filter((page) => page.year === currentYear);
-
-function randomNumber(min, max) {
-  return Math.floor(Math.random() * (max - min + 1) + min);
-}
+const currentYear = '2T5';
 
 export const LandingPage = () => {
-  const [pageIndex, setPageIndex] = useState(null);
-  useEffect(() => {
-    if (landingPagesFiltered.length !== 1) {
-      let randIdx = randomNumber(0, landingPagesFiltered.length - 1);
-      const localIdx = window.localStorage.getItem('landing_page_idx');
-
-      if (localIdx !== null) {
-        while (randIdx === JSON.parse(localIdx)) {
-          randIdx = randomNumber(0, landingPagesFiltered.length - 1);
-        }
-      }
-      window.localStorage.setItem('landing_page_idx', JSON.stringify(randIdx));
-      setPageIndex(JSON.parse(randIdx));
-    }
-  }, []);
-
-  useEffect(() => {
-    console.log('pageIndex updated:', pageIndex);
-  }, [pageIndex]);
-
-  console.log('Current pageIndex:', pageIndex);
-
   return (
-    <>
-      {landingPagesFiltered.length === 1
-        ? landingPagesFiltered[0].component
-        : landingPagesFiltered.map((item) => {
-            if (item.key === pageIndex) {
-              return <div key={item.key}>{item.component}</div>;
-            }
-            return null;
-          })}
-    </>
+    <div>
+      <SplineLanding />
+    </div>
   );
 };
diff --git a/client/src/pages/Initial/SplineLanding/SplineLanding.jsx b/client/src/pages/Initial/SplineLanding/SplineLanding.jsx
@@ -0,0 +1,13 @@
+import { React, useEffect, useState } from 'react';
+import './SplineLanding.scss';
+import Spline from '@splinetool/react-spline';
+
+const SplineLanding = () => {
+  return (
+    <div className="bg">
+      <Spline scene="https://prod.spline.design/a7uuTeKGiRGtSK02/scene.splinecode" />
+    </div>
+  );
+};
+
+export { SplineLanding };
diff --git a/client/src/pages/Initial/SplineLanding/SplineLanding.scss b/client/src/pages/Initial/SplineLanding/SplineLanding.scss
@@ -0,0 +1,21 @@
+@import url('https://fonts.googleapis.com/css2?family=Coral+Pixels&family=Micro+5&family=Pixelify+Sans:wght@400..700&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Silkscreen:wght@400;700&family=Tiny5&family=VT323&display=swap');
+
+body,
+html {
+  overflow: hidden;
+}
+
+.bg {
+  background-color: #101627;
+  overflow: hidden;
+  height: 100%;
+  top: 0px;
+}
+
+.spline-viewer {
+  position: fixed;
+  z-index: 0;
+  background-color: #101627;
+  overflow: hidden;
+}
diff --git a/client/src/pages/Login/Login.scss b/client/src/pages/Login/Login.scss
@@ -54,7 +54,7 @@
   margin: 15px 0px 10px 10px;
   color: var(--forgot-message);
   font-weight: 600;
-  cursor: url('../../../assets/cursor/cursor-2t4.png'), auto; // Apply custom cursor here
+  cursor: url('../../../assets/cursor/cursor.png'), auto; // Apply custom cursor here
   transition: color 200ms, transform 200ms;
   font-size: 18px;
 
diff --git a/client/yarn.lock b/client/yarn.lock
@@ -2219,6 +2219,24 @@
   resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553"
   integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==
 
+"@splinetool/react-spline@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@splinetool/react-spline/-/react-spline-4.0.0.tgz#bf510c12c187738ba91c13ca9b03f90babb5708f"
+  integrity sha512-FqrV7/K2q998Y0t83QUauQxsifKWAg9CFZoSb64qRuH7IfHkDs5/OgU1ACkg0aTgsEPtFlH+kATQ+8X6MrizHQ==
+  dependencies:
+    blurhash "2.0.5"
+    lodash.debounce "4.0.8"
+    react-merge-refs "2.1.1"
+    thumbhash "0.1.1"
+
+"@splinetool/runtime@^1.10.2":
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/@splinetool/runtime/-/runtime-1.10.2.tgz#7567d7340c3516a8367c0ea68d8c4e85770d1cc9"
+  integrity sha512-hbLU48g3DUq1Rer0dI/LpUQj3+Rpiyo8oWuGEZLfFBgTzSVzNILQNMfd+KgBnKpwjIeuy9frO+YC17McnEs7iQ==
+  dependencies:
+    on-change "^4.0.0"
+    semver-compare "^1.0.0"
+
 "@storybook/addon-actions@7.0.27", "@storybook/addon-actions@^7.0.20":
   version "7.0.27"
   resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-7.0.27.tgz#d130c8a64fd6e52803cad20b82c3b9cbbc05eca1"
@@ -4322,6 +4340,11 @@ bluebird@^3.5.5:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
+blurhash@2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/blurhash/-/blurhash-2.0.5.tgz#efde729fc14a2f03571a6aa91b49cba80d1abe4b"
+  integrity sha512-cRygWd7kGBQO3VEhPiTgq4Wc43ctsM+o46urrmPOiuAe+07fzlSB9OJVdpgDL0jPqXUVQ9ht7aq7kxOeJHRK+w==
+
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
   version "4.12.0"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
@@ -9605,7 +9628,7 @@ lodash._reinterpolate@^3.0.0:
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
   integrity sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==
 
-lodash.debounce@^4.0.8:
+lodash.debounce@4.0.8, lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
@@ -10459,6 +10482,11 @@ obuf@^1.0.0, obuf@^1.1.2:
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
   integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
 
+on-change@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/on-change/-/on-change-4.0.2.tgz#838129790f09dc2ed04284944bda6e82b92c10b8"
+  integrity sha512-cMtCyuJmTx/bg2HCpHo3ZLeF7FZnBOapLqZHr2AlLeJ5Ul0Zu2mUJJz051Fdwu/Et2YW04ZD+TtU+gVy0ACNCA==
+
 on-finished@2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
@@ -12115,6 +12143,11 @@ react-lazy-load-image-component@1.6.0:
     lodash.debounce "^4.0.8"
     lodash.throttle "^4.1.1"
 
+react-merge-refs@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/react-merge-refs/-/react-merge-refs-2.1.1.tgz#e46763f8f1b881c0226ee54a1a2a10ffefba0233"
+  integrity sha512-jLQXJ/URln51zskhgppGJ2ub7b2WFKGq3cl3NYKtlHoTG+dN2q7EzWrn3hN3EgPsTMvpR9tpq5ijdp7YwFZkag==
+
 react-qrbtf@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/react-qrbtf/-/react-qrbtf-1.2.1.tgz#5c62476b0d3c8a1df4eebb52521ceb9893a445b5"
@@ -12964,6 +12997,11 @@ selfsigned@^1.10.7:
   dependencies:
     node-forge "^0.10.0"
 
+semver-compare@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
+  integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==
+
 "semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
@@ -13907,6 +13945,11 @@ through@^2.3.6, through@^2.3.8:
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
 
+thumbhash@0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/thumbhash/-/thumbhash-0.1.1.tgz#bd2b8616fc043f2b17151dfce0cce1408e0ebbeb"
+  integrity sha512-kH5pKeIIBPQXAOni2AiY/Cu/NKdkFREdpH+TLdM0g6WA7RriCv0kPLgP731ady67MhTAqrVG/4mnEeibVuCJcg==
+
 thunky@^1.0.2:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`@include devices(tablet) {`
`10`	`10`	`user-select: none;`
`11`	`11`	`}`
`12`		`- cursor: url('../assets/cursor/cursor-2t4.png'), auto;`
	`12`	`+ cursor: url('../assets/cursor/cursor.png'), auto;`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`:root {`