data seeds; er diagram; design changes

FachschaftMathPhysInfo · Oct 15, 2024 · fbf44c3 · fbf44c3
1 parent 0563b55
commit fbf44c3
Show file tree

Hide file tree

Showing 24 changed files with 1,470 additions and 217 deletions.
diff --git a/.env b/.env
@@ -1,5 +1,6 @@
 PUBLIC_URL="http://localhost:8080"
 API_KEY=""
+PEPPER_KEY=""
 
 POSTGRES_PASSWORD="password123"
 POSTGRES_USER="postgres"

diff --git a/frontend/app/layout.tsx b/frontend/app/layout.tsx
@@ -1,8 +1,10 @@
 import type { Metadata } from "next";
 import { Inter } from "next/font/google";
 import "./globals.css";
-import {Toaster} from "@/components/ui/sonner";
+import { Toaster } from "@/components/ui/sonner";
 import Header from "@/components/header";
+import { Providers } from "./providers";
+import {Footer} from "@/components/footer";
 
 const inter = Inter({ subsets: ["latin"] });
 
@@ -18,9 +20,12 @@ export default function RootLayout({
 }>) {
   return (
     <html lang="en">
-      <Header />
-      <body className={inter.className}>{children}</body>
-      <Toaster />
+      <Providers>
+        <Header />
+        <body className={inter.className}><div className="mt-[60px]">{children}</div></body>
+        <Toaster />
+      </Providers>
+      <Footer />
     </html>
   );
 }
diff --git a/frontend/app/page.tsx b/frontend/app/page.tsx
@@ -1,14 +1,11 @@
 import React, { Suspense } from "react";
 import { Skeleton } from "@/components/ui/skeleton";
 import Planner from "./ui/planner";
-import { Providers } from "./providers";
 
 export default function Home() {
   return (
     <Suspense fallback={<Skeleton className="h-10 w-[200px]" />}>
-      <Providers>
-        <Planner />
-      </Providers>
+      <Planner />
     </Suspense>
   );
 }
diff --git a/frontend/app/providers.tsx b/frontend/app/providers.tsx
@@ -1,12 +1,14 @@
-"use client"
+"use client";
 
-import {ReactNode, createContext, useContext, useState} from "react";
-import { User } from "@/lib/gql/generated/graphql"
+import { ReactNode, createContext, useContext, useState } from "react";
+import { User } from "@/lib/gql/generated/graphql";
+import { ThemeProvider as NextThemesProvider } from "next-themes";
+import { type ThemeProviderProps } from "next-themes/dist/types";
 
 type UserContextType = {
   user: User | null;
-  setUser: (user: User | null) => void
-}
+  setUser: (user: User | null) => void;
+};
 
 const UserContext = createContext<UserContextType | undefined>(undefined);
 
@@ -15,8 +17,8 @@ export const useUser = () => {
   if (!context) {
     throw new Error("useUser must be used within a UserProvider");
   }
-  return context
-}
+  return context;
+};
 
 const UserProvider = ({ children }: { children: ReactNode }) => {
   const [user, setUser] = useState<User | null>(null);
@@ -28,8 +30,19 @@ const UserProvider = ({ children }: { children: ReactNode }) => {
   );
 };
 
+const ThemeProvider = ({ children, ...props }: ThemeProviderProps) => {
+  return <NextThemesProvider {...props}>{children}</NextThemesProvider>;
+};
+
 export const Providers = ({ children }: { children: ReactNode }) => {
   return (
-    <UserProvider>{children}</UserProvider>
-  )
-}
+    <ThemeProvider
+      attribute="class"
+      defaultTheme="system"
+      enableSystem
+      disableTransitionOnChange
+    >
+      <UserProvider>{children}</UserProvider>
+    </ThemeProvider>
+  );
+};
diff --git a/frontend/app/registration/page.tsx → frontend/app/register/page.tsx b/frontend/app/registration/page.tsx → frontend/app/register/page.tsx
diff --git a/frontend/app/ui/event-dialog.tsx b/frontend/app/ui/event-dialog.tsx
@@ -1,7 +1,6 @@
 "use client";
 
 import {
-  AddStudentApplicationForEventMutationVariables,
   AddStudentRegistrationForEventDocument,
   AddStudentRegistrationForEventMutation,
   AddStudentRegistrationForEventMutationVariables,
@@ -15,7 +14,6 @@ import {
   UserEventRegistrationDocument,
   UserEventRegistrationQuery,
   UserEventRegistrationQueryVariables,
-  UserToEventRegistration,
 } from "@/lib/gql/generated/graphql";
 import { client } from "@/lib/graphClient";
 import React, { useEffect, useState } from "react";
@@ -41,6 +39,7 @@ import MapPreview from "@/components/map-preview";
 import { useUser } from "../providers";
 import { SignInDialog } from "@/components/sign-in-dialog";
 import { DialogTrigger } from "@radix-ui/react-dialog";
+import { MailLinkWithLabel } from "@/components/links/email";
 
 export default function EventDialog({ id }: { id: number }) {
   const { user } = useUser();
@@ -229,6 +228,9 @@ export default function EventDialog({ id }: { id: number }) {
                 {event?.tutorsAssigned?.map((e, i) => {
                   const capacity = e.room?.capacity ?? 1;
                   const utilization = (registrations[i] / capacity) * 100;
+                  const isRegisteredEvent =
+                    e.room?.number === registration?.room.number &&
+                    e.room?.building.ID === registration?.room.building.ID;
 
                   return (
                     <TableRow key={e.room?.number} className="relative">
@@ -250,18 +252,10 @@ export default function EventDialog({ id }: { id: number }) {
                               </p>
                             </HoverCardTrigger>
                             <HoverCardContent>
-                              <p className="mb-1 text-xs text-muted-foreground">
-                                {t.fn + " " + t.sn}
-                              </p>
-                              <div className="flex flex-row items-center">
-                                <Mail className="mr-2 h-4 w-4 opacity-70" />
-                                <a
-                                  href={"mailto:" + t.mail}
-                                  className="hover:underline text-blue-500"
-                                >
-                                  {t.mail}
-                                </a>
-                              </div>
+                              <MailLinkWithLabel
+                                mail={t.mail}
+                                label={t.fn + " " + t.sn}
+                              />
                             </HoverCardContent>
                           </HoverCard>
                         ))}
@@ -337,7 +331,9 @@ export default function EventDialog({ id }: { id: number }) {
                       <TableCell className="relative z-1">
                         <Button
                           disabled={utilization == 100 || !user || regLoading}
-                          variant="outline"
+                          variant={
+                            isRegisteredEvent && user ? "destructive" : "outline"
+                          }
                           onClick={() => {
                             handleRegistrationChange(
                               {
@@ -353,10 +349,8 @@ export default function EventDialog({ id }: { id: number }) {
                           {regLoading && (
                             <Loader2 className="mr-2 h-4 w-4 animate-spin" />
                           )}
-                          {registration
-                            ? e.room?.number === registration.room.number &&
-                              e.room.building.ID ===
-                                registration.room.building.ID
+                          {registration && user
+                            ? isRegisteredEvent
                               ? "Abmelden"
                               : "Wechseln"
                             : "Anmelden"}