From 6a55d9d9e0d6ae1313a1d4f3cce57ecd5eedb209 Mon Sep 17 00:00:00 2001
From: aronmal <aron@mal-noh.de>
Date: Thu, 9 Nov 2023 13:52:24 +0100
Subject: [PATCH] Migrate Layout

---
 src/layouts/Layout.astro | 104 +++++++++++++++++++++++----------------
 src/pages/globals.css    |  33 -------------
 src/pages/layout.tsx     |  31 ------------
 3 files changed, 61 insertions(+), 107 deletions(-)
 delete mode 100644 src/pages/globals.css
 delete mode 100644 src/pages/layout.tsx
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index 7b552be..910dbda 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -1,51 +1,69 @@
 ---
-interface Props {
-	title: string;
-}
-
-const { title } = Astro.props;
+import { Footer, NavBar } from "src/pages/util/wrapping_objects";
+import styles from "./util/wrapping_objects.module.css";
 ---
 
 <!doctype html>
 <html lang="en">
-	<head>
-		<meta charset="UTF-8" />
-		<meta name="description" content="Astro description" />
-		<meta name="viewport" content="width=device-width" />
-		<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
-		<meta name="generator" content={Astro.generator} />
-		<title>{title}</title>
-	</head>
-	<body>
-		<slot />
-	</body>
+  <head>
+    <meta charset="UTF-8" />
+    <meta
+      name="description"
+      content="The Splatoon Discord bot with unique features."
+    />
+    <meta name="viewport" content="width=device-width" />
+    <link rel="icon" type="image/x-icon" href="/favicon.ico" />
+    <meta name="generator" content={Astro.generator} />
+    <title>Lil Judd</title>
+  </head>
+  <body>
+    <NavBar />
+    <div class={styles.contentDiv}>
+      <slot />
+    </div>
+    <Footer />
+  </body>
 </html>
+
 <style is:global>
-	:root {
-		--accent: 136, 58, 234;
-		--accent-light: 224, 204, 250;
-		--accent-dark: 49, 10, 101;
-		--accent-gradient: linear-gradient(
-			45deg,
-			rgb(var(--accent)),
-			rgb(var(--accent-light)) 30%,
-			white 60%
-		);
-	}
-	html {
-		font-family: system-ui, sans-serif;
-		background: #13151a;
-		background-size: 224px;
-	}
-	code {
-		font-family:
-			Menlo,
-			Monaco,
-			Lucida Console,
-			Liberation Mono,
-			DejaVu Sans Mono,
-			Bitstream Vera Sans Mono,
-			Courier New,
-			monospace;
-	}
+  @font-face {
+    font-family: "Splatoon";
+    font-style: normal;
+    font-weight: 400;
+    src:
+      url("/assets/fonts/Splatoon2-common.woff2") format("woff2"),
+      url("/assets/fonts/Splatoon2-common.woff") format("woff");
+  }
+
+  :root {
+    --foreground-rgb: 255, 255, 255;
+    font-family: "Splatoon", sans-serif;
+  }
+
+  body {
+    color: rgb(var(--foreground-rgb));
+    background-color: black;
+    background-image: url("https://static.moonleay.net/img/lilJuddWeb/bgs/bg.jpg");
+    background-repeat: repeat;
+    background-size: 300px;
+    background-position: center;
+    min-height: 100vh;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+  }
+
+  body a,
+  p,
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6,
+  span,
+  li,
+  ul {
+    font-family: "Splatoon", sans-serif;
+  }
 </style>
diff --git a/src/pages/globals.css b/src/pages/globals.css
deleted file mode 100644
index 1080537..0000000
--- a/src/pages/globals.css
+++ /dev/null
@@ -1,33 +0,0 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-@font-face {
-    font-family: 'Splatoon';
-    font-style: normal;
-    font-weight: 400;
-    src: url('/assets/fonts/Splatoon2-common.woff2') format('woff2'),
-        url('/assets/fonts/Splatoon2-common.woff') format('woff');
-}
-
-:root {
-    --foreground-rgb: 255, 255, 255;
-    font-family: "Splatoon", sans-serif;
-}
-
-body {
-    color: rgb(var(--foreground-rgb));
-    background-color: black;
-    background-image: url("https://static.moonleay.net/img/lilJuddWeb/bgs/bg.jpg");
-    background-repeat: repeat;
-    background-size: 300px;
-    background-position: center;
-    min-height: 100vh;
-    display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-}
-
-body a,p,h1,h2,h3,h4,h5,h6,span,li,ul {
-    font-family: "Splatoon", sans-serif;
-}
diff --git a/src/pages/layout.tsx b/src/pages/layout.tsx
deleted file mode 100644
index ca1a20f..0000000
--- a/src/pages/layout.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import './globals.css'
-import type {Metadata} from 'next'
-import {Inter} from 'next/font/google'
-import React from "react";
-import {Footer, NavBar} from "@/app/util/wrapping_objects";
-import styles from "./util/wrapping_objects.module.css";
-
-const inter = Inter({ subsets: ['latin'] })
-
-export const metadata: Metadata = {
-  title: 'Lil Judd',
-    description: 'The Splatoon Discord bot with unique features.',
-}
-
-export default function RootLayout({
-  children,
-}: {
-  children: React.ReactNode
-}) {
-  return (
-    <html lang="en">
-      <body className={inter.className}>
-      <NavBar/>
-      <div className={styles.contentDiv}>
-          {children}
-      </div>
-      <Footer/>
-      </body>
-    </html>
-  )
-}
