From bed08c84de2bf448f8f16559b929b46645496462 Mon Sep 17 00:00:00 2001
From: "Thomas \"ajnart\" Camlong" <thomascamlong@gmail.com>
Date: Fri, 22 Jul 2022 13:18:29 +0200
Subject: [PATCH] :arrow_up: Upgrade layout for new React and NextJS versions

---
 src/components/layout/Header.tsx  | 42 -------------------------------
 src/components/layout/Layout.tsx  |  5 ++--
 src/components/layout/Widgets.tsx | 20 ++++++---------
 3 files changed, 10 insertions(+), 57 deletions(-)

diff --git a/src/components/layout/Header.tsx b/src/components/layout/Header.tsx
index 27fadf06e..15bb9f3d8 100644
--- a/src/components/layout/Header.tsx
+++ b/src/components/layout/Header.tsx
@@ -56,48 +56,6 @@ export function Header(props: any) {
           <DockerMenuButton />
           <SettingsMenuButton />
           <AddItemShelfButton />
-          <ActionIcon className={classes.burger} variant="default" radius="md" size="xl">
-            <Burger
-              opened={!hidden}
-              onClick={(_) => {
-                toggleHidden();
-                toggleOpened();
-              }}
-            />
-          </ActionIcon>
-          <Drawer
-            size="auto"
-            padding="xl"
-            position="right"
-            hidden={hidden}
-            title={<Title order={3}>Modules</Title>}
-            opened
-            onClose={() => {
-              toggleHidden();
-            }}
-          >
-            <Transition
-              mounted={opened}
-              transition="pop-top-right"
-              duration={300}
-              timingFunction="ease"
-              onExit={() => toggleOpened()}
-            >
-              {(styles) => (
-                <div style={styles}>
-                  <ScrollArea offsetScrollbars style={{ height: '90vh' }}>
-                    <Group my="sm" grow direction="column" style={{ width: 300 }}>
-                      <ModuleWrapper module={CalendarModule} />
-                      <ModuleWrapper module={TotalDownloadsModule} />
-                      <ModuleWrapper module={WeatherModule} />
-                      <ModuleWrapper module={DateModule} />
-                      <ModuleWrapper module={DashdotModule} />
-                    </Group>
-                  </ScrollArea>
-                </div>
-              )}
-            </Transition>
-          </Drawer>
         </Group>
       </Group>
     </Head>
diff --git a/src/components/layout/Layout.tsx b/src/components/layout/Layout.tsx
index a40c6a801..56f51f613 100644
--- a/src/components/layout/Layout.tsx
+++ b/src/components/layout/Layout.tsx
@@ -6,6 +6,7 @@ import Navbar from './Navbar';
 import { HeaderConfig } from './HeaderConfig';
 import { Background } from './Background';
 import { useConfig } from '../../tools/state';
+import { useMediaQuery } from '@mantine/hooks';
 
 const useStyles = createStyles((theme) => ({
   main: {},
@@ -19,8 +20,8 @@ export default function Layout({ children, style }: any) {
   return (
     <AppShell
       header={<Header />}
-      navbar={widgetPosition ? <Navbar /> : <></>}
-      aside={widgetPosition ? <></> : <Aside />}
+      navbar={widgetPosition ? <Navbar /> : undefined}
+      aside={widgetPosition ? undefined : <Aside />}
       footer={<Footer links={[]} />}
     >
       <HeaderConfig />
diff --git a/src/components/layout/Widgets.tsx b/src/components/layout/Widgets.tsx
index 0eceae4c4..f71b7b06c 100644
--- a/src/components/layout/Widgets.tsx
+++ b/src/components/layout/Widgets.tsx
@@ -5,19 +5,13 @@ import { DashdotModule } from '../modules/dash.';
 import { ModuleWrapper } from '../modules/moduleWrapper';
 
 export default function Widgets(props: any) {
-  const matches = useMediaQuery('(min-width: 800px)');
-
   return (
-    <>
-      {matches && (
-        <Group my="sm" grow direction="column" style={{ width: 300 }}>
-          <ModuleWrapper module={CalendarModule} />
-          <ModuleWrapper module={TotalDownloadsModule} />
-          <ModuleWrapper module={WeatherModule} />
-          <ModuleWrapper module={DateModule} />
-          <ModuleWrapper module={DashdotModule} />
-        </Group>
-      )}
-    </>
+    <Group my="sm" grow direction="column" style={{ width: 300 }}>
+      <ModuleWrapper module={CalendarModule} />
+      <ModuleWrapper module={TotalDownloadsModule} />
+      <ModuleWrapper module={WeatherModule} />
+      <ModuleWrapper module={DateModule} />
+      <ModuleWrapper module={DashdotModule} />
+    </Group>
   );
 }