From 5d288b2d2366337582610373d0568e421e9e598a Mon Sep 17 00:00:00 2001 From: Julia Kang Date: Tue, 1 Aug 2023 20:48:43 -0700 Subject: [PATCH] reduce 8th period by 5 mins, retirement update --- client/src/pages/settings/About.tsx | 5 +- scripts/input/schedule.txt | 6 +- scripts/output/schedule.json | 340 ++++++++++++++-------------- shared/data/schedule.ts | 4 +- 4 files changed, 178 insertions(+), 177 deletions(-) diff --git a/client/src/pages/settings/About.tsx b/client/src/pages/settings/About.tsx index 5f979237..ffc66803 100644 --- a/client/src/pages/settings/About.tsx +++ b/client/src/pages/settings/About.tsx @@ -1,4 +1,4 @@ -import {SectionHeader} from '../../components/layout/HeaderPage'; +import { SectionHeader } from '../../components/layout/HeaderPage'; import Badge from '../../components/layout/Badge'; @@ -37,7 +37,8 @@ export default function About() { WATT was jointly created by Kevin, who made the frontend, and Yu-Ting, who originally wrote the backend.{' '} Roger helped immensely with Schoology integration, - as well as maintaining the backend and scripts. Julia will be maintaining the app next year. + as well as maintaining the backend and scripts. After graduating with the class of 2023, Kevin and Yu-Ting have since retired, and + Julia is now maintaining the app. Special thanks to Mylie who designed our lovely logo.

diff --git a/scripts/input/schedule.txt b/scripts/input/schedule.txt index 8063d4b1..1f3dd905 100644 --- a/scripts/input/schedule.txt +++ b/scripts/input/schedule.txt @@ -1,7 +1,7 @@ # Manually inputting schedule, but in a readable format # This file is PARSED by ../code/genSchedule.js # (Information about the format of this file can be found there) -# Referenced from https://resources.finalsite.net/images/v1624041057/pausdorg/vibke3ykbm6a98bddjkr/2021-22_Bell_Schedule-1.pdf +# Referenced from https://resources.finalsite.net/images/v1659630874/pausdorg/ym6r00djfss0likabvnt/22-23BellScheduleColorV2.jpg # Some notes: # Brunch only lasts 5 minutes, leaving a 10 minute passing period @@ -27,7 +27,7 @@ Brunch: 10:35 - 10:40 Lunch: 12:20 - 12:50 3: 1:00 - 2:30 4: 2:40 - 4:10 -8: 4:20 - 5:55 +8: 4:20 - 5:50 Wednesday 0: 7:55 - 8:50 @@ -46,7 +46,7 @@ Brunch: 10:35 - 10:40 Lunch: 12:20 - 12:50 3: 1:00 - 2:30 4: 2:40 - 4:10 -8: 4:20 - 5:55 +8: 4:20 - 5:50 Friday 5: 9:00 - 10:35 diff --git a/scripts/output/schedule.json b/scripts/output/schedule.json index 4e94144a..621de27c 100644 --- a/scripts/output/schedule.json +++ b/scripts/output/schedule.json @@ -1,172 +1,172 @@ { - "M": { - "0": { - "s": 475, - "e": 530 - }, - "1": { - "s": 540, - "e": 585 - }, - "2": { - "s": 595, - "e": 640 - }, - "3": { - "s": 655, - "e": 700 - }, - "4": { - "s": 710, - "e": 755 - }, - "5": { - "s": 795, - "e": 840 - }, - "6": { - "s": 850, - "e": 895 - }, - "7": { - "s": 905, - "e": 950 - }, - "8": { - "s": 960, - "e": 1005 - }, - "B": { - "s": 640, - "e": 645 - }, - "L": { - "s": 755, - "e": 785 - } - }, - "T": { - "0": { - "s": 475, - "e": 530 - }, - "1": { - "s": 540, - "e": 635 - }, - "2": { - "s": 650, - "e": 740 - }, - "3": { - "s": 780, - "e": 870 - }, - "4": { - "s": 880, - "e": 970 - }, - "8": { - "s": 980, - "e": 1075 - }, - "B": { - "s": 635, - "e": 640 - }, - "L": { - "s": 740, - "e": 770 - } - }, - "W": { - "0": { - "s": 475, - "e": 530 - }, - "5": { - "s": 540, - "e": 635 - }, - "6": { - "s": 650, - "e": 740 - }, - "7": { - "s": 780, - "e": 870 - }, - "B": { - "s": 635, - "e": 640 - }, - "L": { - "s": 740, - "e": 770 - }, - "P": { - "s": 880, - "e": 930 - } - }, - "R": { - "0": { - "s": 475, - "e": 530 - }, - "1": { - "s": 540, - "e": 635 - }, - "2": { - "s": 650, - "e": 740 - }, - "3": { - "s": 780, - "e": 870 - }, - "4": { - "s": 880, - "e": 970 - }, - "8": { - "s": 980, - "e": 1075 - }, - "B": { - "s": 635, - "e": 640 - }, - "L": { - "s": 740, - "e": 770 - } - }, - "F": { - "5": { - "s": 540, - "e": 635 - }, - "6": { - "s": 650, - "e": 740 - }, - "7": { - "s": 840, - "e": 930 - }, - "B": { - "s": 635, - "e": 640 - }, - "L": { - "s": 740, - "e": 770 - }, - "S": { - "s": 780, - "e": 830 - } + "M": { + "0": { + "s": 475, + "e": 530 + }, + "1": { + "s": 540, + "e": 585 + }, + "2": { + "s": 595, + "e": 640 + }, + "3": { + "s": 655, + "e": 700 + }, + "4": { + "s": 710, + "e": 755 + }, + "5": { + "s": 795, + "e": 840 + }, + "6": { + "s": 850, + "e": 895 + }, + "7": { + "s": 905, + "e": 950 + }, + "8": { + "s": 960, + "e": 1005 + }, + "B": { + "s": 640, + "e": 645 + }, + "L": { + "s": 755, + "e": 785 + } + }, + "T": { + "0": { + "s": 475, + "e": 530 + }, + "1": { + "s": 540, + "e": 635 + }, + "2": { + "s": 650, + "e": 740 + }, + "3": { + "s": 780, + "e": 870 + }, + "4": { + "s": 880, + "e": 970 + }, + "8": { + "s": 980, + "e": 1070 + }, + "B": { + "s": 635, + "e": 640 + }, + "L": { + "s": 740, + "e": 770 + } + }, + "W": { + "0": { + "s": 475, + "e": 530 + }, + "5": { + "s": 540, + "e": 635 + }, + "6": { + "s": 650, + "e": 740 + }, + "7": { + "s": 780, + "e": 870 + }, + "B": { + "s": 635, + "e": 640 + }, + "L": { + "s": 740, + "e": 770 + }, + "P": { + "s": 880, + "e": 930 + } + }, + "R": { + "0": { + "s": 475, + "e": 530 + }, + "1": { + "s": 540, + "e": 635 + }, + "2": { + "s": 650, + "e": 740 + }, + "3": { + "s": 780, + "e": 870 + }, + "4": { + "s": 880, + "e": 970 + }, + "8": { + "s": 980, + "e": 1070 + }, + "B": { + "s": 635, + "e": 640 + }, + "L": { + "s": 740, + "e": 770 + } + }, + "F": { + "5": { + "s": 540, + "e": 635 + }, + "6": { + "s": 650, + "e": 740 + }, + "7": { + "s": 840, + "e": 930 + }, + "B": { + "s": 635, + "e": 640 + }, + "L": { + "s": 740, + "e": 770 + }, + "S": { + "s": 780, + "e": 830 } -} \ No newline at end of file + } +} diff --git a/shared/data/schedule.ts b/shared/data/schedule.ts index 43df2ee6..0854c6b0 100644 --- a/shared/data/schedule.ts +++ b/shared/data/schedule.ts @@ -108,7 +108,7 @@ const schedule: {[key: string]: PeriodObj[]} = { { "n": "8", "s": 980, - "e": 1075 + "e": 1070 } ], "W": [ @@ -187,7 +187,7 @@ const schedule: {[key: string]: PeriodObj[]} = { { "n": "8", "s": 980, - "e": 1075 + "e": 1070 } ], "F": [