From 348a2fdf778a52d41a54df3f05309b9fdf2e98cc Mon Sep 17 00:00:00 2001 From: Daniel Heidemann Date: Fri, 1 Nov 2024 21:27:53 +0100 Subject: [PATCH] restructuring --- .../form-tutor}/columns.tsx | 4 +- .../form-tutor}/data-table.tsx | 0 .../form-tutor}/event-table.tsx | 9 +- .../app/(form-tutor)/form-tutor/layout.tsx | 21 + .../(form-tutor)/form-tutor/page.tsx} | 34 +- frontend/app/(planner)/applications/page.tsx | 10 + frontend/app/(planner)/events/columns.tsx | 112 +++++ frontend/app/(planner)/events/data-table.tsx | 139 ++++++ frontend/app/(planner)/events/page.tsx | 66 +++ frontend/app/(planner)/layout.tsx | 20 + frontend/app/(planner)/overview/page.tsx | 10 + frontend/app/(planner)/page.tsx | 121 +++++ frontend/app/(planner)/settings/page.tsx | 10 + frontend/app/(planner)/tutorials/page.tsx | 10 + .../app/(registration)/register/layout.tsx | 16 + .../{ => (registration)}/register/page.tsx | 8 +- frontend/app/actions.ts | 48 -- frontend/app/error.tsx | 17 - frontend/app/favicon.ico | Bin 25931 -> 0 bytes frontend/app/form-tutor/layout.tsx | 22 - frontend/app/form-tutor/page.tsx | 12 - frontend/app/globals.css | 91 ---- frontend/app/layout.tsx | 83 +++- frontend/app/page.tsx | 11 - frontend/app/providers.tsx | 48 -- frontend/app/robots.ts | 10 + frontend/app/ui/event-dialog.tsx | 369 -------------- frontend/app/ui/planner.tsx | 458 ----------------- frontend/assets/fonts/CalSans-SemiBold.woff2 | Bin 0 -> 40932 bytes frontend/components/card-skeleton.tsx | 17 + frontend/components/copy-text-area.tsx | 43 ++ .../components/data-table-column-header.tsx | 31 ++ frontend/components/data-table-pagination.tsx | 97 ++++ .../components/data-table-view-options.tsx | 59 +++ frontend/components/event-dialog.tsx | 469 ++++++++++++++++++ frontend/components/field-error.tsx | 16 - frontend/components/footer.tsx | 2 +- frontend/components/header.tsx | 29 +- frontend/components/modify-event-dialog.tsx | 229 +++++++++ frontend/components/planner-selection.tsx | 133 +++++ frontend/components/planner.tsx | 142 ++++++ frontend/components/providers.tsx | 150 ++++++ frontend/components/sign-in-dialog.tsx | 42 +- frontend/components/submit-button.tsx | 21 - frontend/components/table-skeleton.tsx | 13 + frontend/components/tailwind-indicator.tsx | 16 + frontend/components/ui/button.tsx | 2 +- frontend/components/ui/calendar.tsx | 66 +++ frontend/components/ui/data-table.tsx | 136 +++++ frontend/components/ui/dialog.tsx | 58 ++- .../components/umbrella-popover-selection.tsx | 65 +++ frontend/config/site.ts | 10 + frontend/instrumentation.ts | 10 + frontend/lib/gql/generated/gql.ts | 13 +- frontend/lib/gql/generated/graphql.ts | 30 +- frontend/lib/gql/mutations/event.graphql | 5 + frontend/lib/gql/queries/events.graphql | 13 +- frontend/lib/gql/queries/umbrellas.graphql | 4 +- frontend/lib/{graphClient.ts => graphql.ts} | 0 frontend/lib/to-form-state.ts | 52 -- frontend/lib/utils.ts | 75 ++- frontend/package-lock.json | 358 +++++++++++-- frontend/package.json | 12 +- frontend/styles/globals.css | 81 +++ frontend/types/index.d.ts | 39 ++ otel-collector-config.yaml | 6 +- 66 files changed, 2961 insertions(+), 1342 deletions(-) rename frontend/app/{form-tutor/ui/table => (form-tutor)/form-tutor}/columns.tsx (92%) rename frontend/app/{form-tutor/ui/table => (form-tutor)/form-tutor}/data-table.tsx (100%) rename frontend/app/{form-tutor/ui/table => (form-tutor)/form-tutor}/event-table.tsx (57%) create mode 100644 frontend/app/(form-tutor)/form-tutor/layout.tsx rename frontend/{components/tutor-registration-form.tsx => app/(form-tutor)/form-tutor/page.tsx} (52%) create mode 100644 frontend/app/(planner)/applications/page.tsx create mode 100644 frontend/app/(planner)/events/columns.tsx create mode 100644 frontend/app/(planner)/events/data-table.tsx create mode 100644 frontend/app/(planner)/events/page.tsx create mode 100644 frontend/app/(planner)/layout.tsx create mode 100644 frontend/app/(planner)/overview/page.tsx create mode 100644 frontend/app/(planner)/page.tsx create mode 100644 frontend/app/(planner)/settings/page.tsx create mode 100644 frontend/app/(planner)/tutorials/page.tsx create mode 100644 frontend/app/(registration)/register/layout.tsx rename frontend/app/{ => (registration)}/register/page.tsx (98%) delete mode 100644 frontend/app/actions.ts delete mode 100644 frontend/app/error.tsx delete mode 100644 frontend/app/favicon.ico delete mode 100644 frontend/app/form-tutor/layout.tsx delete mode 100644 frontend/app/form-tutor/page.tsx delete mode 100644 frontend/app/globals.css delete mode 100644 frontend/app/page.tsx delete mode 100644 frontend/app/providers.tsx create mode 100644 frontend/app/robots.ts delete mode 100644 frontend/app/ui/event-dialog.tsx delete mode 100644 frontend/app/ui/planner.tsx create mode 100644 frontend/assets/fonts/CalSans-SemiBold.woff2 create mode 100644 frontend/components/card-skeleton.tsx create mode 100644 frontend/components/copy-text-area.tsx create mode 100644 frontend/components/data-table-column-header.tsx create mode 100644 frontend/components/data-table-pagination.tsx create mode 100644 frontend/components/data-table-view-options.tsx create mode 100644 frontend/components/event-dialog.tsx delete mode 100644 frontend/components/field-error.tsx create mode 100644 frontend/components/modify-event-dialog.tsx create mode 100644 frontend/components/planner-selection.tsx create mode 100644 frontend/components/planner.tsx create mode 100644 frontend/components/providers.tsx delete mode 100644 frontend/components/submit-button.tsx create mode 100644 frontend/components/table-skeleton.tsx create mode 100644 frontend/components/tailwind-indicator.tsx create mode 100644 frontend/components/ui/calendar.tsx create mode 100644 frontend/components/ui/data-table.tsx create mode 100644 frontend/components/umbrella-popover-selection.tsx create mode 100644 frontend/config/site.ts create mode 100644 frontend/instrumentation.ts create mode 100644 frontend/lib/gql/mutations/event.graphql rename frontend/lib/{graphClient.ts => graphql.ts} (100%) delete mode 100644 frontend/lib/to-form-state.ts create mode 100644 frontend/styles/globals.css create mode 100644 frontend/types/index.d.ts diff --git a/frontend/app/form-tutor/ui/table/columns.tsx b/frontend/app/(form-tutor)/form-tutor/columns.tsx similarity index 92% rename from frontend/app/form-tutor/ui/table/columns.tsx rename to frontend/app/(form-tutor)/form-tutor/columns.tsx index e7c63f9..bb8ea6c 100644 --- a/frontend/app/form-tutor/ui/table/columns.tsx +++ b/frontend/app/(form-tutor)/form-tutor/columns.tsx @@ -2,11 +2,11 @@ import { ColumnDef } from "@tanstack/react-table"; import { Checkbox } from "@/components/ui/checkbox"; -import { TutorFormEventsQuery } from "@/lib/gql/generated/graphql"; import { eventBroker } from "@/lib/eventBroker"; import { Badge } from "@/components/ui/badge"; +import {Event} from "@/lib/gql/generated/graphql"; -export const columns: ColumnDef[] = [ +export const columns: ColumnDef[] = [ { accessorKey: "isSelected", header: "", diff --git a/frontend/app/form-tutor/ui/table/data-table.tsx b/frontend/app/(form-tutor)/form-tutor/data-table.tsx similarity index 100% rename from frontend/app/form-tutor/ui/table/data-table.tsx rename to frontend/app/(form-tutor)/form-tutor/data-table.tsx diff --git a/frontend/app/form-tutor/ui/table/event-table.tsx b/frontend/app/(form-tutor)/form-tutor/event-table.tsx similarity index 57% rename from frontend/app/form-tutor/ui/table/event-table.tsx rename to frontend/app/(form-tutor)/form-tutor/event-table.tsx index 9f49cb4..4771664 100644 --- a/frontend/app/form-tutor/ui/table/event-table.tsx +++ b/frontend/app/(form-tutor)/form-tutor/event-table.tsx @@ -1,16 +1,13 @@ -import {TutorFormEventsQuery} from "@/lib/gql/generated/graphql"; +import {Event} from "@/lib/gql/generated/graphql"; import { columns } from "./columns"; import { DataTable } from "./data-table"; -import { getEvents } from "@/app/actions"; import { useEffect, useState } from "react"; const EventTable = () => { - const [data, setData] = useState(null); + const [data, setData] = useState(null); useEffect(() => { const fetchData = async () => { - const result = await getEvents(); - setData(result); }; fetchData(); @@ -22,7 +19,7 @@ const EventTable = () => { return (
- +
); }; diff --git a/frontend/app/(form-tutor)/form-tutor/layout.tsx b/frontend/app/(form-tutor)/form-tutor/layout.tsx new file mode 100644 index 0000000..828a327 --- /dev/null +++ b/frontend/app/(form-tutor)/form-tutor/layout.tsx @@ -0,0 +1,21 @@ +import type { Metadata } from "next"; +import { Inter } from "next/font/google"; + +const inter = Inter({ subsets: ["latin"] }); + +export const metadata: Metadata = { + title: "Tutor:innen Anmeldung", + description: "Anmeldung für Tutor:innen des Vorkurs", +}; + +export default function RootLayout({ + children, +}: Readonly<{ + children: React.ReactNode; +}>) { + return ( + + {children} + + ); +} diff --git a/frontend/components/tutor-registration-form.tsx b/frontend/app/(form-tutor)/form-tutor/page.tsx similarity index 52% rename from frontend/components/tutor-registration-form.tsx rename to frontend/app/(form-tutor)/form-tutor/page.tsx index 4bb29c4..70992f1 100644 --- a/frontend/components/tutor-registration-form.tsx +++ b/frontend/app/(form-tutor)/form-tutor/page.tsx @@ -1,23 +1,21 @@ -"use client"; +"use client" -import { useFormState } from "react-dom"; -import { SubmitButton } from "./submit-button"; -import { FieldError } from "./field-error"; -import { EMPTY_FORM_STATE } from "@/lib/to-form-state"; -import { addTutor } from "@/app/actions"; +import EventTable from "./event-table"; +import { Button } from "@/components/ui/button"; import { Input } from "@/components/ui/input"; -import dynamic from "next/dynamic"; -const EventTable = dynamic(() => import("@/app/form-tutor/ui/table/event-table"), { - ssr: false, -}); - -const TutorRegistrationForm = () => { +export default function Page() { const inputDivStyling = "w-full my-1 grow-0"; const tableDivStyling = "my-5 md:min-h-32 grow"; - const [formState, action] = useFormState(addTutor, EMPTY_FORM_STATE); + + const action = () => { + alert("hello") + } return ( +
+
+

Anmeldung Vorkurstutor:in

@@ -34,11 +32,9 @@ const TutorRegistrationForm = () => {
- - - + +
+
); -}; - -export { TutorRegistrationForm }; +} diff --git a/frontend/app/(planner)/applications/page.tsx b/frontend/app/(planner)/applications/page.tsx new file mode 100644 index 0000000..9293c20 --- /dev/null +++ b/frontend/app/(planner)/applications/page.tsx @@ -0,0 +1,10 @@ + +export const metadata = { + title: "Anmeldungen", +} + +export default function OverviewPage() { + return ( +

Anmeldungen

+ ) +} diff --git a/frontend/app/(planner)/events/columns.tsx b/frontend/app/(planner)/events/columns.tsx new file mode 100644 index 0000000..ee4cb86 --- /dev/null +++ b/frontend/app/(planner)/events/columns.tsx @@ -0,0 +1,112 @@ +import { DataTableColumnHeader } from "@/components/data-table-column-header"; +import { Badge } from "@/components/ui/badge"; +import { Button } from "@/components/ui/button"; +import { Checkbox } from "@/components/ui/checkbox"; +import { + DropdownMenu, + DropdownMenuContent, + DropdownMenuItem, + DropdownMenuLabel, + DropdownMenuTrigger, +} from "@/components/ui/dropdown-menu"; +import { Event } from "@/lib/gql/generated/graphql"; +import { formatDateToDDMM, formatDateToHHMM } from "@/lib/utils"; +import { ColumnDef } from "@tanstack/react-table"; +import { MoreHorizontal } from "lucide-react"; + +export const columns: ColumnDef[] = [ + { + id: "select", + header: ({ table }) => ( + table.toggleAllPageRowsSelected(!!value)} + aria-label="Alle auswählen" + /> + ), + cell: ({ row }) => ( + row.toggleSelected(!!value)} + aria-label="Reihe auswählen" + /> + ), + }, + { + accessorKey: "title", + header: ({ column }) => ( + + ), + }, + { + accessorKey: "date", + header: ({ column }) => ( + + ), + cell: ({ row }) => { + return formatDateToDDMM(new Date(row.original.from)); + }, + }, + { + accessorKey: "from", + header: ({ column }) => ( + + ), + cell: ({ row }) => { + return formatDateToHHMM(new Date(row.original.from)); + }, + }, + { + accessorKey: "to", + header: ({ column }) => ( + + ), + cell: ({ row }) => { + return formatDateToHHMM(new Date(row.original.to)); + }, + }, + { + accessorKey: "type", + header: "Art", + cell: ({ row }) => ( + + {row.original.type.name} + + ), + }, + { + accessorKey: "topic", + header: "Thema", + cell: ({ row }) => ( + + {row.original.topic.name} + + ), + }, + { + id: "actions", + enableHiding: false, + cell: ({ row }) => { + const event = row.original; + + return ( + + + + + + Optionen + Bearbeiten + Löschen + + + ); + }, + }, +]; diff --git a/frontend/app/(planner)/events/data-table.tsx b/frontend/app/(planner)/events/data-table.tsx new file mode 100644 index 0000000..18f732f --- /dev/null +++ b/frontend/app/(planner)/events/data-table.tsx @@ -0,0 +1,139 @@ +"use client"; + +import { + ColumnDef, + ColumnFiltersState, + SortingState, + VisibilityState, + flexRender, + getCoreRowModel, + getFilteredRowModel, + getSortedRowModel, + useReactTable, +} from "@tanstack/react-table"; + +import { + Table, + TableBody, + TableCell, + TableHead, + TableHeader, + TableRow, +} from "@/components/ui/table"; +import React from "react"; +import { Button } from "@/components/ui/button"; +import { Input } from "@/components/ui/input"; +import { + DropdownMenu, + DropdownMenuCheckboxItem, + DropdownMenuContent, + DropdownMenuTrigger, +} from "@/components/ui/dropdown-menu"; +import {DataTablePagination} from "@/components/data-table-pagination"; +import {DataTableViewOptions} from "@/components/data-table-view-options"; +import {useUmbrella} from "@/components/providers"; + +interface DataTableProps { + columns: ColumnDef[]; + data: TData[]; +} + +export function DataTable({ + columns, + data, +}: DataTableProps) { + const {setCloseupID} = useUmbrella() + + const [sorting, setSorting] = React.useState([]); + const [columnFilters, setColumnFilters] = React.useState( + [] + ); + const [columnVisibility, setColumnVisibility] = + React.useState({}); + const [rowSelection, setRowSelection] = React.useState({}); + + const table = useReactTable({ + data, + columns, + getCoreRowModel: getCoreRowModel(), + onSortingChange: setSorting, + getSortedRowModel: getSortedRowModel(), + onColumnFiltersChange: setColumnFilters, + getFilteredRowModel: getFilteredRowModel(), + onColumnVisibilityChange: setColumnVisibility, + onRowSelectionChange: setRowSelection, + state: { + sorting, + columnFilters, + columnVisibility, + rowSelection, + }, + }); + + return ( +
+
+ + table.getColumn("title")?.setFilterValue(event.target.value) + } + className="max-w-sm" + /> + +
+
+ + + {table.getHeaderGroups().map((headerGroup) => ( + + {headerGroup.headers.map((header) => { + return ( + + {header.isPlaceholder + ? null + : flexRender( + header.column.columnDef.header, + header.getContext() + )} + + ); + })} + + ))} + + + {table.getRowModel().rows?.length ? ( + table.getRowModel().rows.map((row) => ( + + {row.getVisibleCells().map((cell) => ( + + {flexRender( + cell.column.columnDef.cell, + cell.getContext() + )} + + ))} + + )) + ) : ( + + + Keine Ergebnisse. + + + )} + +
+
+ +
+ ); +} diff --git a/frontend/app/(planner)/events/page.tsx b/frontend/app/(planner)/events/page.tsx new file mode 100644 index 0000000..f8d8404 --- /dev/null +++ b/frontend/app/(planner)/events/page.tsx @@ -0,0 +1,66 @@ +"use client"; + +import { useUmbrella } from "@/components/providers"; +import { DataTable } from "./data-table"; +import { + Event, + TableEventsDocument, + TableEventsQuery, + TableEventsQueryVariables, +} from "@/lib/gql/generated/graphql"; +import { client } from "@/lib/graphql"; +import { useEffect, useState } from "react"; +import { columns } from "./columns"; +import { TableSkeleton } from "@/components/table-skeleton"; +import { Button } from "@/components/ui/button"; +import { Plus } from "lucide-react"; +import { ModifyEventDialog } from "@/components/modify-event-dialog"; + +export default function EventsPage() { + const [loading, setLoading] = useState(true); + const [events, setEvents] = useState([]); + + const { umbrellaID } = useUmbrella(); + + useEffect(() => { + const fetchData = async () => { + setLoading(true); + + const vars: TableEventsQueryVariables = { + umbrellaID: [umbrellaID ?? 0], + }; + + const eventData = await client.request( + TableEventsDocument, + vars + ); + + if (eventData.events.length) { + setEvents(eventData.events); + } + + setLoading(false); + }; + + fetchData(); + }, [umbrellaID]); + + return ( + <> +
+ {loading ? ( + + ) : ( + <> + + + + + + )} +
+ + ); +} diff --git a/frontend/app/(planner)/layout.tsx b/frontend/app/(planner)/layout.tsx new file mode 100644 index 0000000..4192e1a --- /dev/null +++ b/frontend/app/(planner)/layout.tsx @@ -0,0 +1,20 @@ +import EventDialog from "@/components/event-dialog"; +import { Footer } from "@/components/footer"; +import { PlannerHeader } from "@/components/planner-selection"; + +interface PlannerLayoutProps { + children: React.ReactNode; +} + +export default function PlannerLayout({ children }: PlannerLayoutProps) { + return ( +
+
+ + + {children} +
+
+
+ ); +} diff --git a/frontend/app/(planner)/overview/page.tsx b/frontend/app/(planner)/overview/page.tsx new file mode 100644 index 0000000..f8f6782 --- /dev/null +++ b/frontend/app/(planner)/overview/page.tsx @@ -0,0 +1,10 @@ + +export const metadata = { + title: "Überblick", +} + +export default function OverviewPage() { + return ( +

Overview

+ ) +} diff --git a/frontend/app/(planner)/page.tsx b/frontend/app/(planner)/page.tsx new file mode 100644 index 0000000..a03d2d1 --- /dev/null +++ b/frontend/app/(planner)/page.tsx @@ -0,0 +1,121 @@ +"use client"; + +import { + Event, + Label, + PlannerEventsDocument, + PlannerEventsQuery, + PlannerEventsQueryVariables, +} from "@/lib/gql/generated/graphql"; +import React, { useCallback, useEffect, useState } from "react"; + +import Filter from "@/components/filter"; +import { usePathname, useRouter, useSearchParams } from "next/navigation"; +import { client } from "@/lib/graphql"; +import { CopyTextArea } from "@/components/copy-text-area"; +import { CardSkeleton } from "@/components/card-skeleton"; +import { Planner } from "@/components/planner"; +import { useUmbrella } from "@/components/providers"; + +export default function IndexPage() { + const router = useRouter(); + const searchParams = useSearchParams(); + const pathname = usePathname(); + + const { umbrellaID } = useUmbrella(); + + const [events, setEvents] = useState([]); + const [types, setTypes] = useState([]); + const [topics, setTopics] = useState([]); + const [toFilter, setToFilter] = useState(searchParams.getAll("to")); + const [tyFilter, setTyFilter] = useState(searchParams.getAll("ty")); + const [icalPath, setIcalPath] = useState(""); + const [loading, setLoading] = useState(true); + + const createQueryString = useCallback((name: string, values: string[]) => { + const params = new URLSearchParams(values.map((v) => [name, v])); + return params.toString(); + }, []); + + useEffect(() => { + const fetchData = async () => { + setLoading(true); + + const vars: PlannerEventsQueryVariables = { + umbrellaID: umbrellaID ?? 0, + topic: toFilter.length == 0 ? undefined : toFilter, + type: tyFilter.length == 0 ? undefined : tyFilter, + }; + + const eventData = await client.request( + PlannerEventsDocument, + vars + ); + + if (eventData.events.length) { + if (eventData.typeLabels.length >= 2) { + setTypes(eventData.typeLabels); + } + if (eventData.topicLabels.length >= 2) { + setTopics(eventData.topicLabels); + } + setEvents( + eventData.events.map((e) => ({ + type: { name: "" }, + needsTutors: true, + ID: e.ID, + title: e.title, + from: e.from, + to: e.to, + topic: { name: "", color: e.topic.color }, + })) + ); + setLoading(false); + } + }; + + router.push( + pathname + + "?" + + createQueryString("e", [umbrellaID?.toString() ?? "0"]) + + (toFilter.length ? "&" : "") + + createQueryString("to", toFilter) + + (tyFilter.length ? "&" : "") + + createQueryString("ty", tyFilter) + ); + fetchData(); + }, [toFilter, tyFilter, umbrellaID]); + + useEffect(() => { + setIcalPath(window.location.origin + "/ical/?" + searchParams); + }, [searchParams]); + + return ( + <> + {events.length > 0 && ( +
+
+ t.name)} + filter={toFilter} + setFilter={setToFilter} + /> + t.name)} + filter={tyFilter} + setFilter={setTyFilter} + /> +
+
+ +
+ )} + +
+ {loading ? : } +
+ + ); +} diff --git a/frontend/app/(planner)/settings/page.tsx b/frontend/app/(planner)/settings/page.tsx new file mode 100644 index 0000000..b08ac83 --- /dev/null +++ b/frontend/app/(planner)/settings/page.tsx @@ -0,0 +1,10 @@ + +export const metadata = { + title: "Einstellungen", +} + +export default function OverviewPage() { + return ( +

Einstellungen

+ ) +} diff --git a/frontend/app/(planner)/tutorials/page.tsx b/frontend/app/(planner)/tutorials/page.tsx new file mode 100644 index 0000000..7cb3fd4 --- /dev/null +++ b/frontend/app/(planner)/tutorials/page.tsx @@ -0,0 +1,10 @@ + +export const metadata = { + title: "Tutorien", +} + +export default function OverviewPage() { + return ( +

Tutorien

+ ) +} diff --git a/frontend/app/(registration)/register/layout.tsx b/frontend/app/(registration)/register/layout.tsx new file mode 100644 index 0000000..fc5e979 --- /dev/null +++ b/frontend/app/(registration)/register/layout.tsx @@ -0,0 +1,16 @@ +import { Footer } from "@/components/footer"; +import Header from "@/components/header"; + +interface RegistrationLayoutProps { + children: React.ReactNode; +} + +export default function RegistrationLayout({ children }: RegistrationLayoutProps) { + return ( +
+
+
{children}
+
+
+ ); +} diff --git a/frontend/app/register/page.tsx b/frontend/app/(registration)/register/page.tsx similarity index 98% rename from frontend/app/register/page.tsx rename to frontend/app/(registration)/register/page.tsx index c8fedd2..8e68460 100644 --- a/frontend/app/register/page.tsx +++ b/frontend/app/(registration)/register/page.tsx @@ -12,7 +12,7 @@ import { RegistrationFormQuery, RegistrationFormQueryVariables, } from "@/lib/gql/generated/graphql"; -import { client } from "@/lib/graphClient"; +import { client } from "@/lib/graphql"; import { Button } from "@/components/ui/button"; import { Card, @@ -37,7 +37,7 @@ import { FormItem, FormMessage, } from "@/components/ui/form"; -import { Toaster, toast } from "sonner"; +import { toast } from "sonner"; type Props = { searchParams: { @@ -87,8 +87,6 @@ const Home = ({ searchParams }: Props) => { eventID: parseInt(eventID), }; - await new Promise((resolve) => setTimeout(resolve, 250)); - const data = await client.request( RegistrationFormDocument, vars @@ -140,8 +138,6 @@ const Home = ({ searchParams }: Props) => { return; } - await new Promise((resolve) => setTimeout(resolve, 250)); - const application: NewUserToEventApplication = { // TODO userMail: "tutor1@example.de", diff --git a/frontend/app/actions.ts b/frontend/app/actions.ts deleted file mode 100644 index d78f225..0000000 --- a/frontend/app/actions.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { - FormState, - fromErrorToFormState, - toFormState, -} from "@/lib/to-form-state"; -import { client } from "@/lib/graphClient"; -import { - AddTutorDocument, - AddTutorMutation, - AddTutorMutationVariables, - TutorFormEventsQuery, - TutorFormEventsDocument, -} from "@/lib/gql/generated/graphql"; -import {eventBroker} from "@/lib/eventBroker"; - -export const getEvents = async (): Promise => { - await new Promise((resolve) => setTimeout(resolve, 250)); - - const data = await client.request( - TutorFormEventsDocument - ); - - return Promise.resolve(data); -}; - -export const addTutor = async (formState: FormState, formData: FormData) => { - await new Promise((resolve) => setTimeout(resolve, 250)); - - const firstName = formData.get("fn")?.toString() || ""; - const lastName = formData.get("sn")?.toString() || ""; - const email = formData.get("email")?.toString() || ""; - const eventsAvailable = eventBroker.getEvents(); - - const vars: AddTutorMutationVariables = { - firstName, - lastName, - email, - eventsAvailable, - }; - - try { - await client.request(AddTutorDocument, vars); - } catch (err) { - return fromErrorToFormState(err); - } - - return toFormState("SUCCESS", "Anmeldung erfolgreich"); -}; diff --git a/frontend/app/error.tsx b/frontend/app/error.tsx deleted file mode 100644 index bab8132..0000000 --- a/frontend/app/error.tsx +++ /dev/null @@ -1,17 +0,0 @@ -"use client"; - -import { buttonVariants } from "@/components/ui/button"; -import Image from "next/image"; -import Link from "next/link"; - -export default function Error() { - return ( -
- Error -

Something went wrong!

- - Go Back - -
- ); -} diff --git a/frontend/app/favicon.ico b/frontend/app/favicon.ico deleted file mode 100644 index 718d6fea4835ec2d246af9800eddb7ffb276240c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25931 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 LrJugUA?W`A8`#=m diff --git a/frontend/app/form-tutor/layout.tsx b/frontend/app/form-tutor/layout.tsx deleted file mode 100644 index 8eedc77..0000000 --- a/frontend/app/form-tutor/layout.tsx +++ /dev/null @@ -1,22 +0,0 @@ -import type { Metadata } from "next"; -import { Inter } from "next/font/google"; -import "../globals.css"; - -const inter = Inter({ subsets: ["latin"] }); - -export const metadata: Metadata = { - title: "Tutor:innen Anmeldung", - description: "Anmeldung für Tutor:innen des Vorkurs", -}; - -export default function RootLayout({ - children, - }: Readonly<{ - children: React.ReactNode; -}>) { - return ( - - {children} - - ); -} diff --git a/frontend/app/form-tutor/page.tsx b/frontend/app/form-tutor/page.tsx deleted file mode 100644 index fd3ff86..0000000 --- a/frontend/app/form-tutor/page.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import {TutorRegistrationForm} from "@/components/tutor-registration-form"; - -export default function Page() { - return ( -
-
-

Anmeldung Vorkurstutor:in

- -
-
- ); -} diff --git a/frontend/app/globals.css b/frontend/app/globals.css deleted file mode 100644 index 7239ec5..0000000 --- a/frontend/app/globals.css +++ /dev/null @@ -1,91 +0,0 @@ -@tailwind base; - @tailwind components; - @tailwind utilities; - - @layer base { - :root { - --background: 0 0% 100%; - --foreground: 0 0% 3.9%; - - --card: 0 0% 100%; - --card-foreground: 0 0% 3.9%; - - --popover: 0 0% 100%; - --popover-foreground: 0 0% 3.9%; - - --primary: 0 0% 9%; - --primary-foreground: 0 0% 98%; - - --secondary: 0 0% 96.1%; - --secondary-foreground: 0 0% 9%; - - --muted: 0 0% 96.1%; - --muted-foreground: 0 0% 45.1%; - - --accent: 0 0% 96.1%; - --accent-foreground: 0 0% 9%; - - --destructive: 0 84.2% 60.2%; - --destructive-foreground: 0 0% 98%; - - --border: 0 0% 89.8%; - --input: 0 0% 89.8%; - --ring: 0 0% 3.9%; - - --radius: 0.5rem; - - --chart-1: 12 76% 61%; - - --chart-2: 173 58% 39%; - - --chart-3: 197 37% 24%; - - --chart-4: 43 74% 66%; - - --chart-5: 27 87% 67%; - } - - .dark { - --background: 0 0% 3.9%; - --foreground: 0 0% 98%; - - --card: 0 0% 3.9%; - --card-foreground: 0 0% 98%; - - --popover: 0 0% 3.9%; - --popover-foreground: 0 0% 98%; - - --primary: 0 0% 98%; - --primary-foreground: 0 0% 9%; - - --secondary: 0 0% 14.9%; - --secondary-foreground: 0 0% 98%; - - --muted: 0 0% 14.9%; - --muted-foreground: 0 0% 63.9%; - - --accent: 0 0% 14.9%; - --accent-foreground: 0 0% 98%; - - --destructive: 0 62.8% 30.6%; - --destructive-foreground: 0 0% 98%; - - --border: 0 0% 14.9%; - --input: 0 0% 14.9%; - --ring: 0 0% 83.1%; - --chart-1: 220 70% 50%; - --chart-2: 160 60% 45%; - --chart-3: 30 80% 55%; - --chart-4: 280 65% 60%; - --chart-5: 340 75% 55%; - } - } - - @layer base { - * { - @apply border-border; - } - body { - @apply bg-background text-foreground; - } - } \ No newline at end of file diff --git a/frontend/app/layout.tsx b/frontend/app/layout.tsx index 54ec0f6..4413971 100644 --- a/frontend/app/layout.tsx +++ b/frontend/app/layout.tsx @@ -1,31 +1,74 @@ -import type { Metadata } from "next"; -import { Inter } from "next/font/google"; -import "./globals.css"; +import { Inter as FontSans } from "next/font/google"; +import localFont from "next/font/local"; + +import "@/styles/globals.css"; import { Toaster } from "@/components/ui/sonner"; +import { cn } from "@/lib/utils"; +import { siteConfig } from "@/config/site"; +import { TailwindIndicator } from "@/components/tailwind-indicator"; +import { + UserProvider, + ThemeProvider, + UmbrellaProvider, +} from "@/components/providers"; import Header from "@/components/header"; -import { Providers } from "./providers"; -import {Footer} from "@/components/footer"; +import { Suspense } from "react"; + +const fontSans = FontSans({ + subsets: ["latin"], + variable: "--font-sans", +}); -const inter = Inter({ subsets: ["latin"] }); +const fontHeading = localFont({ + src: "../assets/fonts/CalSans-SemiBold.woff2", + variable: "--font-heading", +}); -export const metadata: Metadata = { - title: "Vorkurs", - description: "Dashboard und Infoseite des Vorkurses", +export const metadata = { + title: { + default: siteConfig.name, + }, + description: siteConfig.description, + keywords: ["pepp"], + creator: "Fachschaft MathPhysInfo", + openGraph: { + type: "website", + locale: "en_US", + url: siteConfig.url, + title: siteConfig.name, + description: siteConfig.description, + siteName: siteConfig.name, + }, }; -export default function RootLayout({ - children, -}: Readonly<{ +interface RootLayoutProps { children: React.ReactNode; -}>) { +} + +export default function RootLayout({ children }: RootLayoutProps) { return ( - - -
-
{children}
- - -