Merge branch 'dev' into 435-page-number-navigator-for-faq-subcom-page…

…-questions

.github/workflows/beta_deployment.yml

@@ -80,7 +80,7 @@ jobs:
         run: docker push registry.digitalocean.com/uoft-orientation/orientation-client:beta
 
       # - name: Run garbage collector
-      # run: doctl registry garbage-collection start --include-untagged-manifests --force uoft-orientation
+      #   run: doctl registry garbage-collection start --include-untagged-manifests --force uoft-orientation
 
   deploy_beta:
     runs-on: ubuntu-20.04

README.md

@@ -106,7 +106,7 @@ Pages are stored in `./client/src/util/pages.jsx`. To add a page, add it to the
 The Snackbar provider is wrapped at the root of the app. Therefore it can be accessed by the child components. You can use setSnackbar to show a snackbar message. 
 
 An example usage:
-```js
+```jsx
 // Import useContext from React
 import React, { useState, useEffect, useContext } from 'react';
 // Import the context

client/index.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>F!rosh Week</title>
-    <link rel="icon" type="image/x-icon" href="/src/assets/logo/main-frosh-logo.ico">
+    <link rel="icon" type="image/x-icon" href="/src/assets/logo/main-logo.png">
     <meta name="description" content="The University of Toronto's Engineering Student's Orientation Week Event">
     <meta name="keywords" content="F!rosh Week, UofT Engineering, Engineering Orientation, F!rosh Week UofT, Frosh Week, Frosh Week UofT, University of Toronto, University of Toronto Orientation">
     <meta name="author" content="Orientation Committee">

client/package.json

@@ -65,4 +65,4 @@
     "vite": "^4.3.9",
     "vite-plugin-rewrite-all": "^1.0.1"
   }
-}
+}

client/src/App.jsx

@@ -17,7 +17,7 @@ import { getUserInfo } from './state/user/saga';
 
 import { LandingPage } from './pages/Initial/LandingPage';
 
-const readyForFrosh = false;
+const readyForFrosh = true;
 
 export default function App() {
   const dispatch = useDispatch();

client/src/App.scss

@@ -1,19 +1,31 @@
 @import './scssStyles/_mixins.scss';
+@import url('https://fonts.googleapis.com/css2?family=Almendra+SC&display=swap');
 
 * {
   box-sizing: border-box;
   margin: 0;
   padding: 0;
-  font-family: 'Nunito', sans-serif;
+  font-family: 'Proxima Nova', sans-serif;
   @include devices(tablet) {
     user-select: none;
   }
+  cursor: url('../assets/cursor/cursor-2t4.png'), auto;
 }
 
 :root {
   --dark-mode: true;
 }
 
+@font-face {
+  font-family: 'LittleWitches';
+  src: url('../assets/fonts/LittleWitches-K7r7y.otf') format('opentype');
+}
+
+@font-face {
+  font-family: 'Proxima Nova';
+  src: url('../assets/fonts/proximanova_regular.ttf') format('opentype');
+}
+
 @font-face {
   font-family: 'Inter';
   font-style: normal;
@@ -46,15 +58,15 @@ html {
   background-color: var(--page-bg);
   scroll-behavior: smooth;
   overflow-x: hidden;
-  font-family: 'Nunito', sans-serif;
+  font-family: 'Proxima Nova', sans-serif;
 }
 
 h1,
 h2,
 h3,
 h4,
 h5 {
-  font-family: 'Nunito-Bold', sans-serif;
+  font-family: 'LittleWitches', serif;
   margin: 0px;
   padding: 0px;
 }
@@ -63,7 +75,6 @@ a {
   text-decoration: none;
   color: var(--text-link);
   transition: text-decoration-color 250ms;
-  cursor: pointer;
   background: linear-gradient(to left, var(--text-link), var(--text-link));
   background-size: 100% 2px, 0 2px;
   background-position: 0% 100%, 0 100%;
@@ -78,9 +89,11 @@ button {
 input {
   background-color: (--faq-searchbar-bg);
 }
+
 input[type='text'] {
   color: var(--black);
 }
+
 ::placeholder {
   color: var(--placeholder-text);
 }