MS1.5 Fix an issue where the site is wrong

.vscode/launch.json

@@ -0,0 +1,23 @@
+{
+	// Use IntelliSense to learn about possible attributes.
+	// Hover to view descriptions of existing attributes.
+	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+	"version": "0.2.0",
+	"configurations": [
+		{
+			"name": "Launch Edge",
+			"request": "launch",
+			"type": "pwa-msedge",
+			"url": "http://localhost:3000",
+			"webRoot": "${workspaceFolder}/frontend"
+		},
+		{
+			"name": "Attach to Edge",
+			"port": 9222,
+			"request": "attach",
+			"type": "pwa-msedge",
+			"webRoot": "${workspaceFolder}/frontend"
+		}
+
+	]
+}

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.4",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^1.2.34",

frontend/src/App.tsx

@@ -9,6 +9,7 @@ import Cookies from "js-cookie";
 import { COOKIE_SCHOOL_PREFERENCE } from "./utils/constants";
 import { KECHBEvents, KECHGEvents } from "./data/events-mock";
 import Footer from "./components/Footer";
+import { KECHBAlerts, KECHGAlerts } from "./data/alerts";
 
 /*function App() {
   return (
@@ -79,6 +80,9 @@ class App extends Component<Record<string, never>> {
 								eventsFetcher={
 									async () => KECHBEvents
 								}
+								alertsFetcher={
+									async () => KECHBAlerts
+								}
 							/>
 						),
 					},
@@ -91,6 +95,10 @@ class App extends Component<Record<string, never>> {
 								eventsFetcher={
 									async () => KECHGEvents
 								}
+
+								alertsFetcher={
+									async () => KECHGAlerts
+								}
 							/>
 						),
 					},

frontend/src/components/SiteContainer.tsx

@@ -20,6 +20,8 @@ export interface SiteProps {
 	weekMarkerDate: GregorianDay;
 	/** Events data - eventually replaced with state */
 	eventsFetcher: () => Promise<EventData>;
+	/** Fetches site alert */
+	alertsFetcher: () => Promise<AlertResponce>;
 }
 
 const baseEventImageStyle = {
@@ -92,7 +94,8 @@ export default class SiteContainer extends Component<SiteProps, TheState> {
 
 		// const response: AlertResponce = await baseResponse.json();
 
-		const response = KECHBAlerts;
+		//const response = KECHBAlerts;
+		const response = await this.props.alertsFetcher();
 
 		this.setState({
 			alert: response,
@@ -138,6 +141,10 @@ export default class SiteContainer extends Component<SiteProps, TheState> {
 	forwardOrRewindToDay(d: Date, goTo: GregorianDay, forwardList: number[]) {
 		const dhere = new Date(d);
 		const day = dhere.getUTCDay();
+		//console.log(day);
+		//console.log(dhere.getUTCDate());
+		//console.log(forwardList);
+		//console.log(goTo);
 		// Sunday is day 0
 		// Sat is Day 6
 		// If Sun or Sat go to next week
@@ -158,10 +165,10 @@ export default class SiteContainer extends Component<SiteProps, TheState> {
 	async getCalendar() {
 		const inputDate = new Date();
 		// Used for fiddling:
-		// inputDate.setDate(1);
-		// inputDate.setMonth(0);
-		// inputDate.setFullYear(2021);
-		const weekStart = this.forwardOrRewindToDay(inputDate, this.props.weekMarkerDate, [0, 6]);
+		//inputDate.setDate(1);
+		//inputDate.setMonth(2);
+		//inputDate.setFullYear(2021);
+		const weekStart = this.forwardOrRewindToDay(inputDate, this.props.weekMarkerDate, [6]);
 		weekStart.setUTCHours(0, 0, 0, 0); // Set to start of day
 		const weekEnd = new Date(weekStart);
 		weekEnd.setUTCDate(weekEnd.getUTCDate() + 1);
@@ -251,6 +258,7 @@ export default class SiteContainer extends Component<SiteProps, TheState> {
 			// NOTE: getScrollDownWithAdditional was originally fed 150 instead of 0
 			return (
 				<>
+					{this.state.alert.showAlert ? <AlertBanner alert={this.state.alert} /> : null}
 					<h2>It is neither Week A nor B.</h2>
 					<h3>This means it&#39;s probably a holiday.</h3>
 					<Button style={{ marginRight: "auto" }} className="forward" onClick={getScrollDownWithAdditional(0)}><div>events</div></Button>

frontend/src/data/alerts.ts

@@ -12,8 +12,18 @@ export const KECHBAlerts: AlertResponce = {
 	showAlert: true,
 	//message: "BREAKING: Student Council Chair Adeen Irfan has resigned, triggering an election.",
 	// alertLevel: ThreatLevels.CRITICAL,
-	message: "NEWS: KECHB team \"The Standard Solutions\" wins the Cambridge Chemistry Race, beating 48 other schools from across the country",
+	message: "Lateral Flow Testing: Please keep an eye on your parent/guardian's emails. You should have been already been sent some information.",
+	alertLevel: ThreatLevels.SEVERE,
+	//linkText: "more info",
+	//linkTo: "https://twitter.com/KEVICHB/status/1359153991104557064?s=20"
+};
+
+export const KECHGAlerts: AlertResponce = {
+	showAlert: false,
+	//message: "BREAKING: Student Council Chair Adeen Irfan has resigned, triggering an election.",
+	// alertLevel: ThreatLevels.CRITICAL,
+	message: "Welcome to IsItWeekA!  We'll use these banner for important alerts in the future.",
 	alertLevel: ThreatLevels.LOW,
-	linkText: "more info",
-	linkTo: "https://twitter.com/KEVICHB/status/1359153991104557064?s=20"
+	//linkText: "more info",
+	//linkTo: "https://twitter.com/KEVICHB/status/1359153991104557064?s=20"
 };