From 3ab3b59655a3c17d58570bfd574a4958fe42a131 Mon Sep 17 00:00:00 2001 From: "Arslan, Erdem" Date: Mon, 8 Jan 2024 21:17:48 +0100 Subject: [PATCH 01/35] adjust header and remove space --- pkgs/ui/src/app/layout.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/ui/src/app/layout.tsx b/pkgs/ui/src/app/layout.tsx index 87b7ebd..32c6e35 100644 --- a/pkgs/ui/src/app/layout.tsx +++ b/pkgs/ui/src/app/layout.tsx @@ -76,7 +76,6 @@ export default function RootLayout({ !showSidebarDerived && translate } flex h-full w-full flex-col overflow-y-scroll transition-[margin] duration-150 ease-in-out`} > -
-
From afea3692c6e760357e71da63597cda205159b0f9 Mon Sep 17 00:00:00 2001 From: "Arslan, Erdem" Date: Mon, 8 Jan 2024 21:50:26 +0100 Subject: [PATCH 02/35] move button to collapse the sidebar to the top --- pkgs/ui/src/components/sidebar/index.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/ui/src/components/sidebar/index.tsx b/pkgs/ui/src/components/sidebar/index.tsx index 3b46170..a2f25cf 100644 --- a/pkgs/ui/src/components/sidebar/index.tsx +++ b/pkgs/ui/src/components/sidebar/index.tsx @@ -113,16 +113,16 @@ export function Sidebar(props: SidebarProps) { priority />
+
+ + + +
-
- - - -
{menuEntries.map((menuEntry, idx) => { From dabbe2e2d3307a3582fdb8a0fb597484dc82e29a Mon Sep 17 00:00:00 2001 From: "Arslan, Erdem" Date: Mon, 8 Jan 2024 21:52:14 +0100 Subject: [PATCH 03/35] fix formatting of layout.tsx --- pkgs/ui/src/app/layout.tsx | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/ui/src/app/layout.tsx b/pkgs/ui/src/app/layout.tsx index 32c6e35..c37c394 100644 --- a/pkgs/ui/src/app/layout.tsx +++ b/pkgs/ui/src/app/layout.tsx @@ -76,25 +76,25 @@ export default function RootLayout({ !showSidebarDerived && translate } flex h-full w-full flex-col overflow-y-scroll transition-[margin] duration-150 ease-in-out`} > -
-
- -
-
- TU Berlin Logo -
+
+
+
+
+ TU Berlin Logo +
+
From 27691b0ea84f6c563b121d3e798243417381a4a1 Mon Sep 17 00:00:00 2001 From: "Arslan, Erdem" Date: Mon, 8 Jan 2024 22:05:26 +0100 Subject: [PATCH 04/35] fix responsive design of button to collapse the sidebar --- pkgs/ui/src/components/sidebar/index.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/ui/src/components/sidebar/index.tsx b/pkgs/ui/src/components/sidebar/index.tsx index a2f25cf..bd1767d 100644 --- a/pkgs/ui/src/components/sidebar/index.tsx +++ b/pkgs/ui/src/components/sidebar/index.tsx @@ -113,8 +113,12 @@ export function Sidebar(props: SidebarProps) { priority />
-
- +
+
From f9400180b0d631ddb18c1a2276c3150b86c788fd Mon Sep 17 00:00:00 2001 From: "Arslan, Erdem" Date: Mon, 8 Jan 2024 22:06:17 +0100 Subject: [PATCH 05/35] fix index.tsx formatting --- pkgs/ui/src/components/sidebar/index.tsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/ui/src/components/sidebar/index.tsx b/pkgs/ui/src/components/sidebar/index.tsx index bd1767d..960d643 100644 --- a/pkgs/ui/src/components/sidebar/index.tsx +++ b/pkgs/ui/src/components/sidebar/index.tsx @@ -114,11 +114,7 @@ export function Sidebar(props: SidebarProps) { />
- +
From d7be07406cb12f32868a5d4d0143420d77688461 Mon Sep 17 00:00:00 2001 From: Onur Arslan Date: Mon, 8 Jan 2024 22:28:45 +0100 Subject: [PATCH 06/35] Style adjustments in sidebar collapsible menu - collapse menu adjustments --- pkgs/ui/src/components/sidebar/index.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/ui/src/components/sidebar/index.tsx b/pkgs/ui/src/components/sidebar/index.tsx index 960d643..a671da6 100644 --- a/pkgs/ui/src/components/sidebar/index.tsx +++ b/pkgs/ui/src/components/sidebar/index.tsx @@ -165,7 +165,7 @@ export function Sidebar(props: SidebarProps) { > {menuEntry.icon} @@ -179,7 +179,7 @@ export function Sidebar(props: SidebarProps) { {collapseMenuOpen ? : } @@ -188,7 +188,7 @@ export function Sidebar(props: SidebarProps) { {menuEntry.icon} From ac44bc1471b45a47c38fd81f960c986bea291525 Mon Sep 17 00:00:00 2001 From: Onur Arslan Date: Mon, 8 Jan 2024 22:50:23 +0100 Subject: [PATCH 07/35] Style adjustments in sidebar collapsible menu - close collapsable menu if screen size small --- pkgs/ui/src/components/sidebar/index.tsx | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/ui/src/components/sidebar/index.tsx b/pkgs/ui/src/components/sidebar/index.tsx index a671da6..b5e0c97 100644 --- a/pkgs/ui/src/components/sidebar/index.tsx +++ b/pkgs/ui/src/components/sidebar/index.tsx @@ -6,6 +6,7 @@ import { ListItemButton, ListItemIcon, ListItemText, + useMediaQuery } from "@mui/material"; import Image from "next/image"; import React, { ReactNode } from "react"; @@ -88,14 +89,26 @@ export function Sidebar(props: SidebarProps) { ); const [collapseMenuOpen, setCollapseMenuOpen] = React.useState(true); - const handleCollapseClick = () => { - setCollapseMenuOpen(!collapseMenuOpen); - }; + const isSmallerScreen = useMediaQuery("(max-width: 1025px)"); const handleMenuItemClick = (path: string) => { setActiveMenuItem(path); }; + const handleCollapseClick = () => { + if (isSmallerScreen) { + setCollapseMenuOpen(!collapseMenuOpen); + } + }; + + React.useEffect(() => { + if (isSmallerScreen) { + setCollapseMenuOpen(false); + } else { + setCollapseMenuOpen(true); + } + }, [isSmallerScreen]); + return (
-
- TU Berlin Logo -
From e29b7f667066d116a04a50d0fe0c81264d3a350e Mon Sep 17 00:00:00 2001 From: "Arslan, Erdem" Date: Mon, 8 Jan 2024 23:03:36 +0100 Subject: [PATCH 09/35] fix pipeline --- pkgs/ui/src/components/sidebar/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/ui/src/components/sidebar/index.tsx b/pkgs/ui/src/components/sidebar/index.tsx index b5e0c97..159e015 100644 --- a/pkgs/ui/src/components/sidebar/index.tsx +++ b/pkgs/ui/src/components/sidebar/index.tsx @@ -6,7 +6,7 @@ import { ListItemButton, ListItemIcon, ListItemText, - useMediaQuery + useMediaQuery, } from "@mui/material"; import Image from "next/image"; import React, { ReactNode } from "react"; From 28692dfba4c2abd8b4a7cee7272095686e1bfbd4 Mon Sep 17 00:00:00 2001 From: Onur Arslan Date: Mon, 8 Jan 2024 23:05:37 +0100 Subject: [PATCH 10/35] Style adjustments in sidebar collapsible menu - added burger button distance --- pkgs/ui/src/app/layout.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/ui/src/app/layout.tsx b/pkgs/ui/src/app/layout.tsx index 8b7dbe8..b0e448f 100644 --- a/pkgs/ui/src/app/layout.tsx +++ b/pkgs/ui/src/app/layout.tsx @@ -79,6 +79,7 @@ export default function RootLayout({