chore: update

Author: debater-coder

apps/client/package.json

@@ -29,10 +29,10 @@
     "@rollup/plugin-replace": "^4.0.0",
     "@sentry/react": "^7.76.0",
     "@sentry/vite-plugin": "^2.9.0",
-    "@tanstack/query-sync-storage-persister": "^4.0.10",
-    "@tanstack/react-query": "^4.20.4",
-    "@tanstack/react-query-devtools": "^4.0.10",
-    "@tanstack/react-query-persist-client": "^4.0.10",
+    "@tanstack/query-sync-storage-persister": "^5.17.19",
+    "@tanstack/react-query": "^5.17.19",
+    "@tanstack/react-query-devtools": "^5.17.19",
+    "@tanstack/react-query-persist-client": "^5.17.19",
     "@types/react-dom": "^18.0.9",
     "@vercel/analytics": "^1.1.1",
     "dayzed": "^3.2.3",

apps/client/src/interfaces/DataProvider.ts

@@ -1,5 +1,28 @@
+import { DateTime } from "luxon";
+
+// A data provider provides a queryFn and a select function. The result of
+// queryFn should be serializable and deserializable with JSON.stringify. THis
+// means types like Date will not work, as they will be serialised to a string
+// but not deserialised back to a Date.
+
+type LongOrShortString = {
+  short: string;
+  long?: string;
+};
+
+type Period = {
+  start: DateTime;
+  end: DateTime;
+  teacher?: LongOrShortString;
+  name?: LongOrShortString;
+  location?: LongOrShortString;
+};
+
 export interface DataProvider {
   activate(): void;
   deactivate(): void;
   isActivated(): boolean;
+
+  // Returns a scan-on barcode if applicable
+  barcode?(): Promise<string>;
 }

apps/client/src/main.tsx

@@ -45,14 +45,10 @@ const toast = new Toast();
 const queryClient = new QueryClient({
   defaultOptions: {
     queries: {
-      cacheTime: Infinity,
+      gcTime: Infinity,
       refetchInterval: 5 * 60 * 1000, // 5 minutes
       refetchIntervalInBackground: true,
       networkMode: "always",
-      useErrorBoundary: (error, query) =>
-        !(error instanceof UnauthorizedError) &&
-        !(error instanceof NetworkError) &&
-        !query.state.data,
     },
   },
   queryCache: new QueryCache({
@@ -78,9 +74,8 @@ const persister = createSyncStoragePersister({
 });
 
 const oauthClient = new OAuth2Client({
-  server: "https://student.sbhs.net.au",
+  server: "https://auth.sbhs.net.au/",
   clientId: config.client_id,
-  tokenEndpoint: "/api/token",
   authorizationEndpoint: config.authorization_endpoint,
 });
 
@@ -134,7 +129,14 @@ const userInterface = new UserInterface(
 // =======
 
 // Initialise analytics
-inject();
+inject({
+  beforeSend: (event) => {
+    if (event.type === "pageview") {
+      event.url = event.url.split("?")[0] ?? event.url;
+    }
+    return event;
+  },
+});
 
 authActions.resolve();
 

apps/client/src/routes/Landing/Hero/Hero.tsx

@@ -47,7 +47,7 @@ export const Hero = () => {
         initial={"hidden"}
         animate={"visible"}
       >
-        Your school life, organised
+        Never be late again
       </Heading>
       <Text fontSize={"xl"} color="gray.500">
         Timetabl is a fast and reliable timetable app for Sydney Boys High

apps/client/src/services/OAuth2Actions/OAuth2Actions.ts

@@ -65,6 +65,10 @@ class OAuth2Actions implements AuthActions {
       new URLSearchParams(window.location.search).entries()
     );
 
+    if (localStorage.getItem("debug") === "true") {
+      console.table(query);
+    }
+
     // Error check
     if (query.error) {
       this.toast.notify({