From 40d4735fe91b67f4b64ee3047525c502e3e1528d Mon Sep 17 00:00:00 2001
From: code913 <54856929+code913@users.noreply.github.com>
Date: Fri, 3 Nov 2023 15:46:30 +0000
Subject: [PATCH] refactor: move header into +layout file

---
 src/lib/Header.svelte     | 113 ------------------------------------
 src/routes/+layout.svelte | 117 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 114 insertions(+), 116 deletions(-)
 delete mode 100644 src/lib/Header.svelte

diff --git a/src/lib/Header.svelte b/src/lib/Header.svelte
deleted file mode 100644
index 78b6759..0000000
--- a/src/lib/Header.svelte
+++ /dev/null
@@ -1,113 +0,0 @@
-<script>
-    import "@material/web/iconbutton/outlined-icon-button";
-    import "@material/web/icon/icon";
-
-    let navShown = false;
-</script>
-
-<header>
-    <nav>
-        <a class="brand" href="/">Cursed Creations</a>
-        <!-- svelte-ignore a11y-click-events-have-key-events -->
-        <!-- svelte-ignore a11y-no-static-element-interactions -->
-        <md-outlined-icon-button class="menu" aria-label="Toggle navigation" on:click={(_) => (navShown = !navShown)}>
-            <!-- https://fonts.google.com/icons -->
-            <md-icon><svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M120-240v-80h720v80H120Zm0-200v-80h720v80H120Zm0-200v-80h720v80H120Z" /></svg></md-icon>
-        </md-outlined-icon-button>
-        <ul class="links" class:shown={navShown}>
-            {#each [["/", "Home"], ["/downloads", "Mods"], ["/wiki", "Wiki"]] as [href, display]}
-                <li><a {href}>{display}</a></li>
-            {/each}
-        </ul>
-    </nav>
-</header>
-
-<style lang="scss">
-    $space: 4ch;
-
-    header {
-        display: contents;
-    }
-
-    nav {
-        display: grid;
-        align-items: center;
-        column-gap: $space;
-        padding: #{$space * 0.5};
-        background: var(--md-sys-color-surface-container-high);
-        min-height: 5svh;
-
-        grid-template: {
-            areas: "brand links .";
-            columns: auto auto 1fr;
-        }
-
-        * {
-            color: var(--md-sys-color-on-surface);
-        }
-
-        a {
-            text-decoration: none;
-
-            &:hover,
-            &:focus,
-            &:focus-within,
-            &:focus-visible {
-                color: var(--md-sys-color-on-surface-variant);
-            }
-        }
-
-        :global(.menu) {
-            display: none;
-        }
-
-        @each $area in ("brand", "menu", "links") {
-            :global(& .#{$area}) {
-                grid-area: unquote($area);
-            }
-        }
-    }
-
-    .brand {
-        font-weight: bolder;
-        font-size: 1.4rem;
-    }
-
-    .menu {
-        justify-self: end;
-    }
-
-    .links {
-        list-style-type: none;
-        display: flex;
-        padding: 0;
-        column-gap: $space;
-
-        li {
-            display: contents;
-        }
-    }
-
-    @media (max-width: 800px) {
-        nav {
-            grid-template: {
-                areas: "brand menu" "links links";
-                columns: 1fr auto;
-                rows: auto min-content;
-            }
-        }
-
-        .menu {
-            display: revert-layer;
-        }
-
-        .links {
-            flex-direction: column;
-            row-gap: #{$space * 0.5};
-
-            &:not(.shown) {
-                display: none;
-            }
-        }
-    }
-</style>
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 3eef38c..0d07d5c 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,11 +1,122 @@
 <script>
-    import Header from "$lib/Header.svelte";
+    import "@material/web/iconbutton/outlined-icon-button";
+    import "@material/web/icon/icon";
+
+    let navShown =  false;
 </script>
 
-<Header />
+<header>
+    <nav>
+        <a class="brand" href="/">Cursed Creations</a>
+        <!-- svelte-ignore a11y-click-events-have-key-events -->
+        <!-- svelte-ignore a11y-no-static-element-interactions -->
+        <md-outlined-icon-button aria-label="Toggle navigation" on:click={() => (navShown = !navShown)}>
+            <!-- https://fonts.google.com/icons -->
+            <md-icon
+                ><svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M120-240v-80h720v80H120Zm0-200v-80h720v80H120Zm0-200v-80h720v80H120Z" /></svg
+                ></md-icon
+            >
+        </md-outlined-icon-button>
+        <ul class="links" class:shown={navShown}>
+            {#each [["/", "Home"], ["/downloads", "Mods"], ["/wiki", "Wiki"]] as [href, display]}
+                <li><a {href}>{display}</a></li>
+            {/each}
+        </ul>
+    </nav>
+</header>
 <main><slot /></main>
 
-<style>
+<style lang="scss">
+    // Code for the navbar
+    $space: 4ch;
+
+    header {
+        display: contents;
+    }
+
+    nav {
+        display: grid;
+        align-items: center;
+        column-gap: $space;
+        padding: #{$space * 0.5};
+        background: var(--md-sys-color-surface-container-high);
+        min-height: 5svh;
+
+        grid-template: {
+            areas: "brand links .";
+            columns: auto auto 1fr;
+        }
+
+        * {
+            color: var(--md-sys-color-on-surface);
+        }
+
+        a {
+            text-decoration: none;
+
+            &:hover,
+            &:focus,
+            &:focus-within,
+            &:focus-visible {
+                color: var(--md-sys-color-on-surface-variant);
+            }
+        }
+
+        @each $area in ("brand", "menu", "links") {
+            :global(& .#{$area}) {
+                grid-area: unquote($area);
+            }
+        }
+    }
+
+    .brand {
+        font-weight: bolder;
+        font-size: 1.4rem;
+        grid-area: brand;
+    }
+
+    md-outlined-icon-button {
+        display: none;
+        justify-self: end;
+        grid-area: menu;
+    }
+
+    .links {
+        list-style-type: none;
+        display: flex;
+        padding: 0;
+        column-gap: $space;
+        grid-area: links;
+
+        li {
+            display: contents;
+        }
+    }
+
+    @media (max-width: 800px) {
+        nav {
+            grid-template: {
+                areas: "brand menu" "links links";
+                columns: 1fr auto;
+                rows: auto min-content;
+            }
+        }
+
+        md-outlined-icon-button {
+            display: revert-layer;
+        }
+
+        .links {
+            flex-direction: column;
+            row-gap: #{$space * 0.5};
+
+            &:not(.shown) {
+                display: none;
+            }
+        }
+    }
+
+    // Code for everything else
     main {
         padding: 2ch;
     }