Merge pull request #729 from UofT-Frosh-Orientation/dev

Dev to Beta

.github/ISSUE_TEMPLATE/backend-issue.md

@@ -2,7 +2,7 @@
 name: Backend Issue
 about: Submit an issue regarding the server and API
 title: ''
-labels: backend
+labels: back-end
 
 ---
 
@@ -38,4 +38,4 @@ Link any resources or people that might be helpful in the accomplishment of the
 
 - [Link 1]()
 - [Link 2]()
-- [Link 3]()
+- [Link 3]()

.github/ISSUE_TEMPLATE/frontend-issue.md

@@ -2,7 +2,7 @@
 name: Frontend Issue
 about: Submit an issue regarding the appearance and visuals
 title: ''
-labels: frontend
+labels: front-end
 assignees: 
 
 ---

.github/workflows/backend_tests.yml

@@ -0,0 +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

.github/workflows/frontend_tests.yml

@@ -0,0 +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

client/package.json

@@ -7,6 +7,7 @@
     "build": "vite build",
     "build:beta": "VITE_API_BASE_URL=https://api.beta.orientation.skule.ca vite build",
     "preview": "vite preview",
+    "preview:build": "vite build && vite preview",
     "lint": "eslint src",
     "format": "prettier --write \"**/*.+(js|jsx|css|scss|json)\"",
     "storybook": "start-storybook -p 6006",
@@ -19,6 +20,7 @@
   "dependencies": {
     "@react-pdf/renderer": "^3.1.12",
     "@reduxjs/toolkit": "^1.9.5",
+    "@tanstack/react-table": "^8.9.3",
     "axios": "^1.4.0",
     "email-validator": "^2.0.4",
     "export-from-json": "^1.7.2",

client/src/App.jsx

@@ -13,8 +13,10 @@ import { AskQuestionButton } from './components/button/AskQuestionButton/AskQues
 import { DarkModeProvider } from './util/DarkModeProvider';
 import { SnackbarProvider } from './util/SnackbarProvider';
 
+
 import { getScuntSettings } from './state/scuntSettings/saga';
 import { scuntSettingsSelector } from './state/scuntSettings/scuntSettingsSlice';
+
 
 export default function App() {
   const dispatch = useDispatch();

client/src/components/MakeReceipt/MakeReceipt.jsx

@@ -1,24 +1,14 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Document, Page, Text, View, Svg, Circle, StyleSheet, Link } from '@react-pdf/renderer';
-import { QRNormal } from 'react-qrbtf';
 import ReactDOMServer from 'react-dom/server';
-
-const styles = StyleSheet.create({
-  page: {
-    backgroundColor: '#E4E4E4',
-  },
-  qrcode: {
-    display: 'flex',
-    alignItems: 'center',
-    justifyContent: 'center',
-  },
-});
+import { QRNormal } from 'react-qrbtf';
+import { Document, Page, Text, View, Svg, Circle, Link } from '@react-pdf/renderer';
 
 const MakeReceipt = (froshObject) => {
   if (!froshObject.id) {
     throw new Error('No ID provided to MakeReceipt.jsx');
   }
+
   const qr = (
     <QRNormal
       value={froshObject.id}
@@ -88,8 +78,19 @@ const MakeReceipt = (froshObject) => {
 
   return (
     <Document>
-      <Page size="A4" style={styles.page}>
-        <View style={styles.qrcode}>
+      <Page
+        size="A4"
+        style={{
+          backgroundColor: '#E4E4E4',
+        }}
+      >
+        <View
+          style={{
+            display: 'flex',
+            alignItems: 'center',
+            justifyContent: 'center',
+          }}
+        >
           <Svg fill="white" style={{ width: '250px', padding: '10px 0 0 0' }}>
             {t1}
           </Svg>

client/src/components/MakeSchedulePDF/MakeSchedulePDF.jsx

@@ -0,0 +1,87 @@
+import React from 'react';
+import { getFroshGroupSchedule } from '../../pages/Profile/functions';
+import { Document, Page, Text, View, Svg, Line, Font, StyleSheet } from '@react-pdf/renderer';
+import MainFroshLogo from '../../assets/logo/frosh-main-logo-with-bg.svg';
+
+const styles = StyleSheet.create({
+  page: {
+    backgroundColor: '#E4E4E4',
+  },
+  eventBubble: {
+    backgroundColor: '#58458f', 
+    borderRadius: '10px', 
+    padding: '10px', 
+    margin: '10px'
+  },
+  eventName: {
+    fontSize: 12, 
+    fontWeight: 'bold',
+    padding: '10px 0', 
+    color: '#fff'
+  },
+  eventLoc: {
+    fontSize: 12, 
+    padding: '10px 0', 
+    color: '#fff'
+  },
+  eventDate: {
+    fontSize: 11,
+    fontStyle: 'italic',
+    color: '#fff',
+    padding: '5px 0'
+  },
+  eventDesc: {
+    fontSize: 12, 
+    color: '#fff',
+    padding: '10px 0'
+  }
+});
+
+const MakeSchedulePDF = (froshObject) => {
+  const froshGroup = froshObject?.froshGroup;
+  const scheduleData = getFroshGroupSchedule(froshGroup);
+
+  return (
+    <Document>
+      <Page size="A4" style={styles.page}>
+        <View style={{ padding: '30px' }}>
+          <Text style={{ fontSize: 16, color: '#2c1370', padding: '20px 0', fontWeight: 'bold' }}>
+            F!rosh Schedule 2T3
+          </Text>
+          <Svg height="10" width="500">
+            <Line x1="0" y1="0" x2="500" y2="0" strokeWidth={4} stroke="rgb(49,25,87)" />
+          </Svg>
+          {Object.keys(scheduleData).map((day) => (
+            <div key={day}>
+              <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.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> : <></>
+                  }
+                </div>
+              ))}
+            </div>
+          ))}
+        </View>
+      </Page>
+    </Document>
+  );
+};
+
+export { MakeSchedulePDF };

client/src/components/button/AskQuestionButton/AskQuestionButton.jsx

@@ -115,7 +115,9 @@ const AskQuestionButton = () => {
   const { user } = useSelector(userSelector);
 
   const leader = user?.userType === 'leadur';
-  if (leader) {
+
+  if (leader || !user) {
+    // don't show FAQ button if leadur or if not logged in
     return <></>;
   }
   return (

client/src/components/form/Dropdown/Dropdown.jsx

@@ -1,6 +1,5 @@
-import React, { useState, useRef, useEffect, useContext } from 'react';
+import React, { useState, useEffect, useContext } from 'react';
 import PropTypes from 'prop-types';
-
 import './Dropdown.scss';
 import { useWrapperRef } from '../../../hooks/useWrapperRef';
 import Arrow from '../../../../assets/icons/angle-down-solid.svg';
@@ -17,7 +16,7 @@ const Dropdown = ({
   filterLabel,
   maxLetters,
 }) => {
-  const { darkMode, setDarkModeStatus } = useContext(DarkModeContext);
+  const { darkMode } = useContext(DarkModeContext);
 
   useEffect(() => {
     if (localStorageKey !== undefined) {
@@ -47,7 +46,7 @@ const Dropdown = ({
     initialSelectedIndex === undefined ? values[0] : values[initialSelectedIndex],
   );
 
-  const dropdownItems = values.map((value, index) => (
+  const dropdownItems = values.map((value) => (
     <div
       className={'dropdown-item'}
       onClick={() => {
@@ -71,7 +70,7 @@ const Dropdown = ({
       key={`dropdownItem-${value}`}
       tabIndex="0"
     >
-      {filterLabel ? filterLabel(value.toString()) : value.toString()}
+      {filterLabel ? filterLabel(value) : value}
     </div>
   ));
 
@@ -97,17 +96,11 @@ const Dropdown = ({
         >
           <div className={'dropdown-selected-label'}>
             {maxLetters
-              ? (filterLabel ? filterLabel(selected.toString()) : selected.toString()).substring(
-                  0,
-                  maxLetters,
-                ) +
-                ((filterLabel ? filterLabel(selected.toString()) : selected.toString()).length >
-                maxLetters
-                  ? '...'
-                  : '')
+              ? (filterLabel ? filterLabel(selected) : selected).substring(0, maxLetters) +
+                ((filterLabel ? filterLabel(selected) : selected).length > maxLetters ? '...' : '')
               : filterLabel
-              ? filterLabel(selected.toString())
-              : selected.toString()}
+              ? filterLabel(selected)
+              : selected}
           </div>
           <div className={`dropdown-image${isOpen ? ' open' : ''}`}>
             {darkMode ? (

client/src/components/input/TextInput/TextInput.jsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useContext, useEffect, useRef, useState } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import './TextInput.scss';
 import EyeSolid from '../../../../assets/icons/eye-solid.svg';
@@ -15,7 +15,7 @@ const TextInput = ({
   isRequiredInput,
   errorFeedback,
   onChange,
-  onEnterKey,
+  onKeyDown,
   localStorageKey,
   isDisabled,
   inputArgs,
@@ -79,12 +79,6 @@ const TextInput = ({
 
   const [type, setType] = useState(inputType ? inputType : 'text');
 
-  // const onKeyPress = (target) => {
-  //   if (target.charCode === 13) {
-  //     if (onEnterKey) onEnterKey(value);
-  //   }
-  // };
-
   const onInputChange = (event) => {
     let value = event.target.value;
     if (hasRestrictedInput) {
@@ -157,7 +151,7 @@ const TextInput = ({
             }
             required={isRequiredInput}
             disabled={isDisabled}
-            // onKeyPress={onKeyPress}
+            onKeyDown={onKeyDown}
             value={value ?? ''}
             placeholder={placeholder}
             type={type}
@@ -177,7 +171,7 @@ const TextInput = ({
             }
             required={isRequiredInput}
             disabled={isDisabled}
-            // onKeyPress={onKeyPress}
+            onKeyDown={onKeyDown}
             value={value ?? ''}
             placeholder={placeholder}
             type={type}
@@ -226,7 +220,7 @@ TextInput.propTypes = {
   isRequiredInput: PropTypes.bool,
   errorFeedback: PropTypes.string,
   onChange: PropTypes.func,
-  onEnterKey: PropTypes.func,
+  onKeyDown: PropTypes.func,
   localStorageKey: PropTypes.string,
   isDisabled: PropTypes.bool,
   inputArgs: PropTypes.object,