-
+
Manage Users
-
+
Manage Projects
diff --git a/frontend/src/Pages/LoginPage.tsx b/frontend/src/Pages/LoginPage.tsx
index 9b4290d..6ccf8fa 100644
--- a/frontend/src/Pages/LoginPage.tsx
+++ b/frontend/src/Pages/LoginPage.tsx
@@ -1,9 +1,8 @@
import Button from "../Components/Button";
import Logo from "/src/assets/Logo.svg";
import "./LoginPage.css";
-import { FormEvent, useEffect, useState } from "react";
-import { NewUser } from "../Types/Users";
-import { useNavigate } from "react-router-dom";
+import { useEffect } from "react";
+import { Link } from "react-router-dom";
const PreloadBackgroundAnimation = (): JSX.Element => {
useEffect(() => {
@@ -27,39 +26,6 @@ const PreloadBackgroundAnimation = (): JSX.Element => {
};
function LoginPage(): JSX.Element {
- //Example users for testing without backend, remove when using backend
- const admin: NewUser = {
- name: "admin",
- password: "123",
- };
- const pmanager: NewUser = {
- name: "pmanager",
- password: "123",
- };
- const user: NewUser = {
- name: "user",
- password: "123",
- };
-
- const navigate = useNavigate();
-
- /* On submit (enter or button click) check if username and password match any user
- and if so, redirect to correct page */
- function handleSubmit(event: FormEvent
): void {
- event.preventDefault();
- //TODO: Compare with db instead when finished
- if (username === admin.name && password === admin.password) {
- navigate("/admin-menu");
- } else if (username === pmanager.name && password === pmanager.password) {
- navigate("/PM-project-page");
- } else if (username === user.name && password === user.password) {
- navigate("/your-projects");
- }
- }
-
- const [username, setUsername] = useState("");
- const [password, setPassword] = useState("");
-
return (
<>
@@ -85,30 +51,24 @@ function LoginPage(): JSX.Element {
{" "}
Please log in to continue{" "}
-
+
>
diff --git a/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx b/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx
index 8028863..de1699b 100644
--- a/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx
+++ b/frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx
@@ -1,7 +1,6 @@
import BasicWindow from "../../Components/BasicWindow";
import Button from "../../Components/Button";
import NewTimeReport from "../../Components/TimeReport";
-import BackButton from "../../Components/BackButton";
function UserEditTimeReportPage(): JSX.Element {
const content = (
@@ -19,7 +18,12 @@ function UserEditTimeReportPage(): JSX.Element {
return;
}}
/>
-