Merge branch 'update-backend-routes-for-events' of https://github.com/devsoc-unsw/notangles into update-backend-routes-for-events

Sophie Fox · Sophie Fox · commit fe86f3192bae · 2025-09-04T15:31:31.000+10:00
diff --git a/client/src/App.tsx b/client/src/App.tsx
@@ -432,7 +432,15 @@ const App: React.FC = () => {
 
   useEffect(() => {
     updateTimetableEvents();
+<<<<<<< HEAD
+<<<<<<< HEAD
   }, [year, convertToLocalTimezone]);
+=======
+  }, [year, isConvertToLocalTimezone]);
+>>>>>>> c6776d9 (Remove old account implementation (#1036))
+=======
+  }, [year, convertToLocalTimezone]);
+>>>>>>> a3e9ad5 (Migrate settings to Tanstack Query (#1040))
 
   // The following three useUpdateEffects update local storage whenever a change is made to the timetable
   useUpdateEffect(() => {
diff --git a/client/src/components/landingPage/HeroSection/HeroSection.tsx b/client/src/components/landingPage/HeroSection/HeroSection.tsx
@@ -1,9 +1,9 @@
 import { NavigateNext } from '@mui/icons-material';
 import { useNavigate } from 'react-router-dom';
-
 import notangles from '../../../assets/notangles_1.png';
 import { useAuth } from '../../../hooks/useAuth';
 import { FlipWords } from '../flip-words';
+import { useAuth } from '../../../hooks/useAuth';
 
 const HeroSection = ({ handleStartClick }: { handleStartClick: () => void }) => {
   const { loggedIn } = useAuth();
diff --git a/client/src/components/landingPage/LandingPage.tsx b/client/src/components/landingPage/LandingPage.tsx
@@ -10,6 +10,8 @@ import HeroSection from './HeroSection/HeroSection';
 import FeaturesSection from './KeyFeaturesSection/FeaturesSection';
 import ScrollingFeaturesSection from './ScrollingFeaturesSection';
 import SponsorsSection from './SponsorsSection';
+import { useNavigate } from 'react-router-dom';
+import { API_URL } from '../../api/config';
 
 const LandingPage = () => {
   const [authModalOpen, setAuthModalOpen] = useState(false);
@@ -30,11 +32,15 @@ const LandingPage = () => {
           </div>
         </header>
         <div className="snap-center h-screen">
+<<<<<<< HEAD
           <HeroSection
             handleStartClick={() => {
               setAuthModalOpen(true);
             }}
           />
+=======
+          <HeroSection handleStartClick={() => setAuthModalOpen(true)} />
+>>>>>>> 5f38135 (Add authentication guard and login modal (#1039))
         </div>
         <div className="snap-center h-screen flex flex-col justify-center items-center">
           <div className="flex pt-20 flex-col items-around justify-around">
@@ -49,6 +55,7 @@ const LandingPage = () => {
           <Footer />
         </div>
       </div>
+<<<<<<< HEAD
       <AuthModal
         open={authModalOpen}
         onClose={() => {
@@ -57,6 +64,9 @@ const LandingPage = () => {
         loading={loading}
         onSignIn={onSignIn}
       />
+=======
+      <AuthModal open={authModalOpen} onClose={() => setAuthModalOpen(false)} loading={loading} onSignIn={onSignIn} />
+>>>>>>> 5f38135 (Add authentication guard and login modal (#1039))
     </>
   );
 };
diff --git a/client/src/components/login/AuthGuard.tsx b/client/src/components/login/AuthGuard.tsx
@@ -1,5 +1,4 @@
 import { Navigate } from 'react-router-dom';
-
 import { useAuth } from '../../hooks/useAuth';
 import PageLoading from '../pageLoading/PageLoading';
 
diff --git a/client/src/components/login/AuthModal.tsx b/client/src/components/login/AuthModal.tsx
@@ -90,6 +90,7 @@ export default function LoginDialog({ open, onClose, onSignIn, loading = false }
                   Sign in to continue
                 </Typography>
 
+<<<<<<< HEAD
                 <Button
                   fullWidth
                   startIcon={<AccountCircleIcon />}
@@ -133,6 +134,21 @@ export default function LoginDialog({ open, onClose, onSignIn, loading = false }
                   }}
                   disabled
                 >
+=======
+                <Button fullWidth startIcon={<AccountCircleIcon />} onClick={() => onSignIn('devsoc')} sx={{ mb: 2 }}>
+                  Sign in with zID
+                </Button>
+
+                <Button fullWidth startIcon={<GoogleIcon />} onClick={() => onSignIn('google')} sx={{ mb: 2 }} disabled>
+                  Sign in with Google
+                </Button>
+
+                <Button fullWidth startIcon={<GitHubIcon />} onClick={() => onSignIn('github')} sx={{ mb: 2 }} disabled>
+                  Sign in with GitHub
+                </Button>
+
+                <Button fullWidth variant="outlined" onClick={() => onSignIn('guest')} disabled>
+>>>>>>> 5f38135 (Add authentication guard and login modal (#1039))
                   Continue as Guest
                 </Button>
               </>
diff --git a/client/src/components/sidebar/UserAccount.tsx b/client/src/components/sidebar/UserAccount.tsx
@@ -2,7 +2,10 @@ import { LoginRounded, LogoutRounded } from '@mui/icons-material';
 import { Button, IconButton, Tooltip } from '@mui/material';
 import { styled } from '@mui/material/styles';
 import React, { useState } from 'react';
+<<<<<<< HEAD
 
+=======
+>>>>>>> c6776d9 (Remove old account implementation (#1036))
 import { API_URL } from '../../api/config';
 import storage from '../../utils/storage';
 import { createDefaultTimetable } from '../../utils/timetableHelpers';
diff --git a/client/src/components/sidebar/friends/FriendsDialog.tsx b/client/src/components/sidebar/friends/FriendsDialog.tsx
@@ -3,6 +3,10 @@ import { Close as CloseIcon } from '@mui/icons-material';
 import { Badge, Dialog, DialogTitle, IconButton, Paper, styled, Typography } from '@mui/material';
 import React, { useState } from 'react';
 
+<<<<<<< HEAD
+=======
+import { User } from './User';
+>>>>>>> c6776d9 (Remove old account implementation (#1036))
 import FriendsTablist from './FriendsTablist';
 import { User } from './User';
 
diff --git a/client/src/components/sidebar/friends/FriendsTablist.tsx b/client/src/components/sidebar/friends/FriendsTablist.tsx
@@ -5,6 +5,10 @@ import Tab from '@mui/material/Tab';
 import Tabs from '@mui/material/Tabs';
 import * as React from 'react';
 
+<<<<<<< HEAD
+=======
+import { User } from './User';
+>>>>>>> c6776d9 (Remove old account implementation (#1036))
 import AddAFriendTab from './AddAFriendTab';
 import RequestsTab from './RequestsTab';
 import { User } from './User';
diff --git a/client/src/components/sidebar/friends/YourFriendsTab.tsx b/client/src/components/sidebar/friends/YourFriendsTab.tsx
@@ -5,8 +5,12 @@ import React from 'react';
 
 import { API_URL } from '../../../api/config';
 import NetworkError from '../../../interfaces/NetworkError';
+<<<<<<< HEAD
 import { User } from './User';
+=======
+>>>>>>> c6776d9 (Remove old account implementation (#1036))
 import UserProfile from './UserProfile';
+import { User } from './User';
 
 const StyledContainer = styled('div')`
   display: flex;
diff --git a/client/src/hooks/useAuth.tsx b/client/src/hooks/useAuth.tsx
@@ -23,13 +23,26 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
   });
 
   useEffect(() => {
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> a3e9ad5 (Migrate settings to Tanstack Query (#1040))
     getUserProfile()
       .then((data) => {
         setState({ loading: false, loggedIn: true, user: data });
       })
       .catch(() => {
         setState({ loading: false, loggedIn: false, user: null });
       });
+=======
+    fetch(`${API_URL.server}/user/profile`, { credentials: 'include' })
+      .then((res) => {
+        if (!res.ok) throw new Error('not logged in');
+        return res.json();
+      })
+      .then((data) => setState({ loading: false, loggedIn: true, user: data }))
+      .catch(() => setState({ loading: false, loggedIn: false, user: null }));
+>>>>>>> 5f38135 (Add authentication guard and login modal (#1039))
   }, []);
 
   return <AuthContext.Provider value={state}>{children}</AuthContext.Provider>;
diff --git a/client/src/index.tsx b/client/src/index.tsx
@@ -21,6 +21,16 @@ import AppContextProvider from './context/AppContext';
 import CourseContextProvider from './context/CourseContext';
 import { AuthProvider } from './hooks/useAuth';
 import * as swRegistration from './serviceWorkerRegistration';
+import { AuthGuard } from './components/login/AuthGuard';
+import { AuthProvider } from './hooks/useAuth';
+
+declare module '@tanstack/react-query' {
+  interface Register {
+    mutationMeta: {
+      invalidatesQuery?: QueryKey;
+    };
+  }
+}
 
 declare module '@tanstack/react-query' {
   interface Register {
@@ -37,6 +47,10 @@ Sentry.init({
 });
 
 const Root: React.FC = () => {
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> a3e9ad5 (Migrate settings to Tanstack Query (#1040))
   const queryClient = new QueryClient({
     mutationCache: new MutationCache({
       onSettled: async (_data, _error, _variables, _context, mutation) => {
@@ -51,7 +65,9 @@ const Root: React.FC = () => {
     }),
   });
 
+<<<<<<< HEAD
   return (
+<<<<<<< HEAD
     <ErrorBoundary>
       <AuthProvider>
         <ApolloProvider client={client}>
@@ -87,6 +103,84 @@ const Root: React.FC = () => {
         </ApolloProvider>
       </AuthProvider>
     </ErrorBoundary>
+=======
+    <ApolloProvider client={client}>
+      <AppContextProvider>
+        <CourseContextProvider>
+          <BrowserRouter>
+            <Routes>
+              {hasVisited ? (
+                <Route element={<App />} path="/">
+                  <Route path="/event/:encrypted" element={<EventShareModal />} />
+                </Route>
+              ) : (
+                <Route element={<LandingPage />} path="/" />
+              )}
+            </Routes>
+          </BrowserRouter>
+        </CourseContextProvider>
+      </AppContextProvider>
+    </ApolloProvider>
+>>>>>>> c6776d9 (Remove old account implementation (#1036))
+=======
+  return (
+    <AuthProvider>
+      <ApolloProvider client={client}>
+        <AppContextProvider>
+          <CourseContextProvider>
+            <BrowserRouter>
+              <Routes>
+                <Route element={<LandingPage />} path="/" />
+                <Route
+                  element={
+                    <AuthGuard>
+                      <App />
+                    </AuthGuard>
+                  }
+                  path="/home"
+                >
+                  <Route path="/home/event/:encrypted" element={<EventShareModal />} />
+                </Route>
+              </Routes>
+            </BrowserRouter>
+          </CourseContextProvider>
+        </AppContextProvider>
+      </ApolloProvider>
+    </AuthProvider>
+>>>>>>> 5f38135 (Add authentication guard and login modal (#1039))
+=======
+  return (
+    <ErrorBoundary>
+      <AuthProvider>
+        <ApolloProvider client={client}>
+          <AppContextProvider>
+            <CourseContextProvider>
+              <BrowserRouter>
+                <Routes>
+                  <Route element={<LandingPage />} path="/" />
+                  <Route
+                    element={
+                      <QueryClientProvider client={queryClient}>
+                        <Suspense fallback={<PageLoading />}>
+                          <AuthGuard>
+                            <App />
+                          </AuthGuard>
+                          {import.meta.env.MODE === 'development' && <ReactQueryDevtools initialIsOpen={false} />}
+                        </Suspense>
+                      </QueryClientProvider>
+                    }
+                    path="/home"
+                  >
+                    <Route path="/home/event/:encrypted" element={<EventShareModal />} />
+                  </Route>
+                </Routes>
+              </BrowserRouter>
+            </CourseContextProvider>
+          </AppContextProvider>
+        </ApolloProvider>
+      </AuthProvider>
+    </ErrorBoundary>
+>>>>>>> a3e9ad5 (Migrate settings to Tanstack Query (#1040))
   );
 };
 
diff --git a/server/.prettierrc b/server/.prettierrc
diff --git a/server/prisma/migrations/migration_lock.toml b/server/prisma/migrations/migration_lock.toml
diff --git a/server/src/auth/auth.controller.ts b/server/src/auth/auth.controller.ts
@@ -11,9 +11,13 @@ export class AuthController {
   @Get('callback/devsoc')
   @UseGuards(AuthGuard('oidc'))
   callback(@Res() res: Response) {
+<<<<<<< HEAD
     res.redirect(
       (process.env.NODE_ENV === 'dev' ? `http://` : `https://`) +
         `${process.env.CLIENT_HOST_NAME}:${process.env.CLIENT_HOST_PORT}/home`,
     );
+=======
+    res.redirect('http://localhost:3001/api/user/profile');
+>>>>>>> 8d7fdc4 (Implement OIDC)
   }
-}
+}
diff --git a/server/src/auth/oidc.strategy.ts b/server/src/auth/oidc.strategy.ts
@@ -94,6 +94,7 @@ export class OidcStrategy extends PassportStrategy(Strategy, 'oidc') {
       },
     });
 
+<<<<<<< HEAD
     if (user.createdAt.getTime() === user.lastLogin.getTime()) {
       await this.prisma.settings.create({
         data: {
@@ -102,6 +103,8 @@ export class OidcStrategy extends PassportStrategy(Strategy, 'oidc') {
       });
     }
 
+=======
+>>>>>>> 8d7fdc4 (Implement OIDC)
     const login = promisify(req.login.bind(req));
     await login(user);
     return user;
diff --git a/server/src/graphql/graphql.module.ts b/server/src/graphql/graphql.module.ts
diff --git a/server/src/user/types.ts b/server/src/user/types.ts
@@ -1,3 +1,5 @@
+import { EventType } from '../generated/prisma/enums';
+
 export class UserInfo {
   id: string;
   firstName: string;
@@ -15,3 +17,13 @@ export class UserSettings {
   unscheduleClassesByDefault: boolean;
   hideExamClasses: boolean;
 }
+
+export class EventParameters {
+  id: string;
+  colour: string;
+  dayOfWeek: number;
+  start: number;
+  end: number;
+  type: EventType;
+  timetableId: string;
+}
diff --git a/server/src/user/user.controller.ts b/server/src/user/user.controller.ts
diff --git a/server/src/user/user.service.ts b/server/src/user/user.service.ts
diff --git a/server/test/jest-e2e.json b/server/test/jest-e2e.json
diff --git a/server/tsconfig.build.json b/server/tsconfig.build.json

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import { Navigate } from 'react-router-dom';`
`2`		`-`
`3`	`2`	`import { useAuth } from '../../hooks/useAuth';`
`4`	`3`	`import PageLoading from '../pageLoading/PageLoading';`
`5`	`4`