diff --git a/anwendung/src/components/Background.jsx b/anwendung/src/components/Background.jsx new file mode 100644 index 0000000..d6d2682 --- /dev/null +++ b/anwendung/src/components/Background.jsx @@ -0,0 +1,33 @@ +import React from "react"; + +export default function Background() +{ + return ( +
+
+
+
+ ); +} \ No newline at end of file diff --git a/anwendung/src/components/Icons.js b/anwendung/src/components/Icons.js index fa6219d..25c2538 100644 --- a/anwendung/src/components/Icons.js +++ b/anwendung/src/components/Icons.js @@ -6,10 +6,10 @@ export const arrowRight = ` ` -export const deleteItem = ` +export const deleteItem = ` ` -export const editItem = ` +export const editItem = ` ` \ No newline at end of file diff --git a/anwendung/src/components/InputForm.jsx b/anwendung/src/components/InputForm.jsx index 0ad5a58..a754985 100644 --- a/anwendung/src/components/InputForm.jsx +++ b/anwendung/src/components/InputForm.jsx @@ -1,6 +1,7 @@ import Button from "@/components/Button"; import {useRouter} from "next/router"; import {useEffect, useState} from "react"; +import Background from "@/components/Background"; let userInfo = [] @@ -13,13 +14,11 @@ export default function InputForm(p) { this.checked = false; } - setChecked(checked) - { + setChecked(checked) { this.checked = checked; } - setModule(module) - { + setModule(module) { this.module = module; } } @@ -103,13 +102,12 @@ export default function InputForm(p) { } } - if(!found) { + if (!found) { userInfo.push(new UserInfo(user.id, module)); } } - function onCheckBoxClicked(user, e) - { + function onCheckBoxClicked(user, e) { onModuleClicked(user, ""); let found = false; @@ -122,7 +120,7 @@ export default function InputForm(p) { } } - if(!found) { + if (!found) { let temp = new UserInfo(user.id, ""); temp.setChecked(e.target.checked); userInfo.push(temp); @@ -131,19 +129,38 @@ export default function InputForm(p) { return ( <> -
-

SemesterName

- setCourseName(e.target.value)}/> + +
+

SemesterName

+ setCourseName(e.target.value)}/>
-

Semesterstart

-

Semesterende

+

Semesterstart

+

Semesterende

- setStartDate(e.target.value)}/>

-

- setEndDate(e.target.value)}/>
@@ -151,19 +168,57 @@ export default function InputForm(p) { - - - + + + + {users.map(user => ( - - - + +
DozentModulWählen + Freischalten + Dozent + Modul +
{ + +
{ onCheckBoxClicked(user, e); - }}/>
{user.firstName + " " + user.lastName}
{ + onCheckBoxClicked(user, e); + }}/>
{user.firstName + " " + user.lastName}
-
diff --git a/anwendung/src/components/Login.jsx b/anwendung/src/components/Login.jsx index 4229908..8a1fd98 100644 --- a/anwendung/src/components/Login.jsx +++ b/anwendung/src/components/Login.jsx @@ -1,4 +1,4 @@ -import {useState} from "react"; +import React, {useState} from "react"; import Button from "@/components/Button"; import {NextResponse} from "next/server"; import Link from "next/link"; @@ -36,28 +36,30 @@ export default function Login() { const router = useRouter() return ( -
- + //
+

Login


Username

setInputUserName(e.target.value)} - placeholder={hint} className="input input-bordered input-sm w-full max-w-xs" + placeholder={hint} className="input input-bordered input-sm w-full max-w-xs box-shadow" style={{ backgroundColor: backgroundColor }}/>

Password

setInputPassword(e.target.value)} - placeholder={hint} className="input input-bordered input-sm w-full max-w-xs" + placeholder={hint} className="input input-bordered input-sm w-full max-w-xs box-shadow" style={{ backgroundColor: backgroundColor }}/>
-
+ //
); } \ No newline at end of file diff --git a/anwendung/src/components/PopUp.jsx b/anwendung/src/components/PopUp.jsx index a307a20..04fb1b7 100644 --- a/anwendung/src/components/PopUp.jsx +++ b/anwendung/src/components/PopUp.jsx @@ -13,11 +13,11 @@ export default function PopUp(p) { }}>
-
+

{p.hint}

-
diff --git a/anwendung/src/components/SemesterTile.jsx b/anwendung/src/components/SemesterTile.jsx index 6177459..aa2f8db 100644 --- a/anwendung/src/components/SemesterTile.jsx +++ b/anwendung/src/components/SemesterTile.jsx @@ -11,7 +11,7 @@ export default function SemesterTile(p) }) return ( -
p.onClick(e)} className={"semester-tile"}> +
p.onClick(e)} className={"semester-tile box-shadow"}>

{p.text}

-
) diff --git a/anwendung/src/pages/index.js b/anwendung/src/pages/index.js index 2ac4e04..8e00136 100644 --- a/anwendung/src/pages/index.js +++ b/anwendung/src/pages/index.js @@ -11,19 +11,28 @@ import InputForm from "@/components/InputForm"; import Login from "@/components/Login"; import Test from "@/components/Test"; import BasicDateCalendar from "@/components/CalendarSideBar"; - +import {randomInt} from "next/dist/shared/lib/bloom-filter/utils"; +import Background from "@/components/Background"; const inter = Inter({subsets: ['latin']}) export default function Home(p) { - return ( +
+ +

Willkommen in deinem Vorlesungsplaner

- ) } \ No newline at end of file diff --git a/anwendung/src/pages/semesteroverview.js b/anwendung/src/pages/semesteroverview.js index ab97558..e6bb60d 100644 --- a/anwendung/src/pages/semesteroverview.js +++ b/anwendung/src/pages/semesteroverview.js @@ -1,9 +1,10 @@ import Button from "@/components/Button"; -import {useEffect, useState} from "react"; +import React, {useEffect, useState} from "react"; import SemesterTile from "@/components/SemesterTile"; import InputForm from "@/components/InputForm"; import {useRouter} from "next/router"; import PopUp from "@/components/PopUp"; +import Background from "@/components/Background"; export default function SemesterOverview(p) { @@ -91,6 +92,7 @@ export default function SemesterOverview(p) return (
+ { entries.map(e => ( onClickSemester(e, f)} onButtonDeleteClick={() => { localStorage.setItem("currentsid", e.id) @@ -101,7 +103,7 @@ export default function SemesterOverview(p) funcButtonEdit(e, m); }}/>)) } -