From 9aa461f9d8a18e25f582603867504eb52b0061b3 Mon Sep 17 00:00:00 2001 From: Ole Jacob Mellgren Date: Tue, 9 Apr 2024 18:37:46 +0200 Subject: [PATCH 1/3] VF-102 lagde brukersiden --- src/pages/controlpanel/components/Brukere.tsx | 83 +++++++++++++++++++ src/pages/controlpanel/routes.tsx | 2 + 2 files changed, 85 insertions(+) create mode 100644 src/pages/controlpanel/components/Brukere.tsx diff --git a/src/pages/controlpanel/components/Brukere.tsx b/src/pages/controlpanel/components/Brukere.tsx new file mode 100644 index 00000000..0afcc351 --- /dev/null +++ b/src/pages/controlpanel/components/Brukere.tsx @@ -0,0 +1,83 @@ +import React, { useState } from "react"; +import Navbar from "./Navbar"; +import CreateTable from "./CreateTable"; + +const Brukere = (): JSX.Element => { + const select = ["Aktive Brukere", "Inaktive Brukere"]; + const [selected, setSelected] = useState(select[0]); + + interface User { + name: string; + phone: string; + email: string; + study: string; + region: string; + } + + const aktiveBrukereListe: User[] = [ + { + name: "Amalie Skram", + phone: "12345678", + email: "Aaryan.er.kul@hotmail.com", + study: "MTDT", + region: "Trondheim", + }, + { + name: "Filip King", + phone: "12345678", + email: "Filip443@gmail.com", + study: "BIT", + region: "Trondheim", + }, + { + name: "Mauriccio", + phone: "69443293", + email: "mauriccio@hotmail.com", + study: "MTDT", + region: "Madagaskar", + }, + ]; + + const inaktiveBrukereListe: User[] = [ + { + name: "OJ Simpy", + phone: "76543232", + email: "OJ@hotmail.com", + study: "MTDT", + region: "Trondheim", + }, + { + name: "Alfie Queen", + phone: "12345678", + email: "Alfie@gmail.com", + study: "MTDT", + region: "Trondheim", + }, + { + name: "Mauriccio", + phone: "69443293", + email: "mauriccio@hotmail.com", + study: "MTDT", + region: "Madagaskar", + }, + ]; + + return ( +
+
+

Brukere

+
+ + +
+ {(selected === select[0] && ( + + )) || (selected === select[1] && ( + + ))} +
+
+ ); +}; + +export default Brukere; \ No newline at end of file diff --git a/src/pages/controlpanel/routes.tsx b/src/pages/controlpanel/routes.tsx index 4a259ef3..f0f61379 100644 --- a/src/pages/controlpanel/routes.tsx +++ b/src/pages/controlpanel/routes.tsx @@ -4,6 +4,7 @@ import { AppRoute } from "App"; import Skoler from "pages/controlpanel/components/Skoler"; import Teaminteresse from "pages/controlpanel/components/Teaminteresse"; import Assistent from "pages/controlpanel/components/Assistent"; +import Brukere from "pages/controlpanel/components/Brukere"; import RegistrerSoker from "./components/RegistrerSoker/RegistrerSoker"; import Teammedlemmer from "./components/Teammedlemmer"; @@ -15,6 +16,7 @@ const routes: AppRoute[] = [ { path: "/kontrollpanel/teaminteresse", element: , name: "Teaminteresse" }, { path: "/kontrollpanel/assistenter", element: , name: "Assistent" }, { path: "/kontrollpanel/registrer-soker", element: , name: "Registrer søker" }, + { path: "/kontrollpanel/brukere", element: , name: "Brukere" }, ]; export default routes; From 9d06c8ba85f5fa241974fd5bd651da8c74e53903 Mon Sep 17 00:00:00 2001 From: mauricew Date: Wed, 10 Apr 2024 18:15:44 +0200 Subject: [PATCH 2/3] Fiks lint errors --- src/pages/controlpanel/components/Brukere.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/controlpanel/components/Brukere.tsx b/src/pages/controlpanel/components/Brukere.tsx index 0afcc351..4c905db7 100644 --- a/src/pages/controlpanel/components/Brukere.tsx +++ b/src/pages/controlpanel/components/Brukere.tsx @@ -68,7 +68,7 @@ const Brukere = (): JSX.Element => {

Brukere

- +
{(selected === select[0] && ( @@ -80,4 +80,4 @@ const Brukere = (): JSX.Element => { ); }; -export default Brukere; \ No newline at end of file +export default Brukere; From 14068b5c82f6c7b88605f6c2f9fc1f91551354dd Mon Sep 17 00:00:00 2001 From: mauricew Date: Wed, 10 Apr 2024 18:31:21 +0200 Subject: [PATCH 3/3] Make responsive --- src/pages/controlpanel/components/Brukere.tsx | 31 ++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/src/pages/controlpanel/components/Brukere.tsx b/src/pages/controlpanel/components/Brukere.tsx index 4c905db7..faaf8bc4 100644 --- a/src/pages/controlpanel/components/Brukere.tsx +++ b/src/pages/controlpanel/components/Brukere.tsx @@ -66,15 +66,32 @@ const Brukere = (): JSX.Element => {

Brukere

-
- - +
+
+ +
+
{(selected === select[0] && ( - - )) || (selected === select[1] && ( - - ))} + + )) || + (selected === select[1] && ( + + ))}
);