2024-11-28 00:10:56 +00:00
22 changed files with 340 additions and 457 deletions
--- a/.gitignore
+++ b/.gitignore
@ -21,3 +21,4 @@ yarn-error.log
 /log
 /storage
 /tmp
+/public/pub
--- a/app/View/Components/wah.php
+++ b/app/View/Components/wah.php
@ -0,0 +1,39 @@
+<?php
+
+namespace App\View\Components;
+
+use Closure;
+use Illuminate\Contracts\View\View;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Http;
+use Illuminate\View\Component;
+
+class Wah extends Component
+{
+    /**
+     * Create a new component instance.
+     */
+    public function __construct() {}
+
+
+    public function getWah(): string {
+        try {
+            $response = Http::get('https://api.tinyfox.dev/img.json?animal=wah');
+            $data = $response->json();
+            return "https://tinyfox.dev".$data["loc"];
+        } catch (Exception $ex) {
+            return "";
+        }
+
+    }
+
+    /**
+     * Get the view / contents that represent the component.
+     */
+    public function render(): View|Closure|string {
+        return view('components.wah', [
+            'wah' => $this->getWah(),
+        ]);
+    }
+}
--- a/public/css/master.css
+++ b/public/css/master.css
@ -1,75 +1,65 @@
-@font-face {
-    font-family: 'BigBlue TerminalPlus';
-    src: url('/fonts/BigBlue_TerminalPlus.woff2') format('woff2'),
-    url('/fonts/BigBlue_TerminalPlus.woff') format('woff');
-    font-weight: normal;
-    font-style: normal;
-    font-display: swap;
+:root {
+    --background: #f2efbd;
+    --foreground: #2a271c;
+    --border-color: #f27405;
+    --border: var(--border-color) 2px solid;
+    --shadow-color: hsla(11, 96%, 43%, 0.4);
+    --shadow: drop-shadow(8px 8px var(--shadow-color));
+    --shadow-small: drop-shadow(3px 3px var(--shadow-color));
+    --links: hsl(183, 93%, 27%);
+    --links-hover: hsl(183, 93%, 15%);
+    --table-header: hsla(11, 96%, 43%, 0.2);
 }

-@font-face {
-    font-family: pixel nes;
-    src: url("/fonts/Pixel_NES.eot?") format("eot"),
-    url("/fonts/Pixel_NES.woff") format("woff"),
-    url("/fonts/Pixel_NES.ttf") format("truetype");
-    font-style: normal;
-    font-weight: 400;
-}
-
-@font-face {
-    font-family: nec_apc3;
-    src: url("/fonts/Web437_NEC_APC3_8x16.woff") format("woff");
-    font-style: normal;
-    font-weight: 400;
-}
-
-@font-face {
-    font-family: nec_apc3;
-    src: url("/fonts/Web437_Nix8810_M16.woff") format("woff");
-    font-style: normal;
-    font-weight: 700;
-}
-
-@supports (-moz-appearance:none) {
-    h2 {
-        text-shadow: var(--firefox-shadow) var(--shadow) !important;
-    }
-}
-
-html,
-body,
-.container {
+html {
    height: 100%;
+    color-scheme: light;
 }

 body {
-    background-color: var(--background);
    color: var(--foreground);
+    min-height: 100%;
+    background-color: hsla(0, 0%, 0%, 0);
+    padding: 10px;
 }

-body,
-button,
-select {
-    font-family: russiangothic, ms ui gothic, "nec_apc3", Tahoma, sans-serif;
-}
-
-h1,
-h2 {
-    font-family: "pixel nes", sans-serif;
+/*noinspection CssUnknownTarget*/
+body::before {
+    content: "";
+    position: fixed;
+    top: 0;
+    left: 0;
+    background-image: url("/images/background.jpg");
+    width: 100%;
+    height: 100%;
+    z-index: -1;
+    opacity: 0.8;
+    background-size: cover;
+    background-attachment: fixed;
+    overflow: hidden;
 }

 h1,
 h2,
 h3,
 h4,
+h5,
+h6 {
+    margin: 20px 0 0 0;
+}
+
+p,
 ul,
-p {
+ol,
+dl,
+menu,
+dir {
    margin: 0;
 }

 hr {
    border: none;
-    border-top: 1px solid var(--foreground);
+    border-top: var(--border);
 }

 a {
@ -78,266 +68,170 @@ a {
 }

 a:hover {
-    text-decoration: underline;
+    color: var(--links-hover);
+    text-decoration: underline solid;
 }

-ul {
-    list-style: square;
-    padding-left: 0;
-    list-style-position: inside;
+div.page-container {
+    width: 800px;
+    margin: 5px auto;
 }

-.container {
-    display: flex;
-    /*align-items: center;*/
-    justify-content: center;
-}
-
-.page {
-    min-width: var(--page-width);
-    max-width: var(--page-width);
-}
-
-.navbar {
-    border: var(--foreground) solid 1px;
-}
-
-.navbar ul {
-    list-style-type: none;
-    margin: 0;
-    padding: 0;
-    overflow: hidden;
-}
-
-.navbar li {
-    float: left;
-    border-right: solid var(--foreground) 1px;
-}
-
-.navbar li a {
-    display: block;
-    text-align: center;
-    color: var(--foreground);
-    text-decoration: none;
-    padding: 5px 7px 5px 5px;
-}
-
-.navbar li a:hover {
-    background-color: var(--foreground);
-    color: var(--background);
-}
-
-.pathbar {
-    border: 1px solid var(--foreground);
-    padding: 5px;
-}
-
-.content {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 10px;
-    padding: 0;
-}
-
-.section {
-    border: var(--foreground) 1px solid;
-    padding: 10px;
-}
-
-.sidebar {
-    flex-basis: var(--sidebar-width);
-    flex-grow: 1;
-}
-
-main {
-    flex-basis: 0;
-    flex-grow: 999;
-    min-inline-size: 50%;
-}
-
-.navbar,
-.content,
-header,
-footer {
-    margin: 10px 10px 0 0;
-}
-
-header,
-footer,
-.navbar {
-    padding: 5px;
-}
-
-footer {
-    display: grid;
-    grid-template-columns: repeat(2, auto);
-    grid-template-rows: 1fr;
-    grid-column-gap: 0;
-    grid-row-gap: 0;
-}
-
-footer div:last-child {
-    text-align: right;
-}
-
-select {
-    background-color: var(--background-secondary);
-    border: 1px solid var(--foreground);
-    color: var(--foreground);
-    padding: 0.25em;
-}
-
-button {
+div.page-container > div {
    background-color: var(--background);
-    color: var(--foreground);
-    border: 1px solid var(--foreground);
-    padding: 0.25em 0.5em;
+    filter: var(--shadow);
+    padding: 10px;
+    border: var(--border);
+    margin-bottom: 20px;
+    /* temporary */
+    /* height: 600px; */
 }

-button:hover {
-    background-color: var(--foreground);
-    color: var(--background);
-}
-
-img.pixel {
-    image-rendering: pixelated;
-}
-
-a.button,
-a.button:hover {
-    text-decoration: none;
-}
-
-a.button:hover img {
-    opacity: 80%;
-}
-
-main > .section,
-.sidebar > .section {
-    margin-bottom: 10px;
-}
-
-main > .section:last-child,
-.sidebar > .section:last-child {
+div.page-container > div:last-child {
    margin-bottom: 0;
 }

-.navbar-icon {
-    margin-right: 0.25em;
+div#header h1 {
+    margin: 0;
+    font-style: italic;
 }

-.navlinks {
-    padding-left: 10px;
-}
-
-.online-status {
+div#header h1,
+div#header p {
    display: inline;
 }

-.centerbox {
-    text-align: center;
+div#content {
+    position: relative;
 }

-.quote {
-    padding-left: 10px;
-    border-left: solid 2px var(--foreground);
+div#content::after {
+    display: block;
+    content: "";
+    clear: both;
 }

-.music-top10 {
-    width: 100%;
-}
-
-.music-top10 td,
-.music-top10 th {
-    border: none;
-    border-left: 1px dotted var(--foreground);
-    padding: 2px 5px
-}
-
-.music-top10 tr:nth-child(1) th {
-    border-bottom: 1px dotted var(--foreground);
-}
-
-.music-top10 tr:nth-child(2) td {
-    padding-top: 5px;
-}
-
-.music-top10 td:first-child,
-.music-top10 th:first-child {
-    border: none;
-}
-
-.music-top10 tr th:first-child {
-    text-align: right;
-}
-
-.music-top10 td {
-    max-width: 200px;
-    white-space: nowrap;
-    text-overflow:ellipsis;
-    overflow: hidden;
-}
-
-.music-top10 tr td:first-child {
-    text-align: right;
-}
-
-.music-top10 tr td:nth-child(2),
-.music-top10 tr td:nth-child(3) {
-}
-
-
-.current-track h2 {
-    margin: 0;
-}
-
-table.computers {
-    table-layout: auto;
-    width: 75%;
-}
-
-table.computers td ul {
-    margin: 0;
-    padding-left: 20px;
-}
-
-table.computers .section-title {
-    text-decoration: underline;
-    font-style: italic;
-    font-weight: bold;
-}
-
-table.computers p.description {
-    font-style: italic;
-    margin: 5px 0 2px 0;
-}
-
-table.computers th {
-    background-color: var(--background-secondary);
-}
-
-table.computers td:first-child {
-    white-space: nowrap;
-}
-
-table.computers td,
-table.computers th {
-    border: var(--foreground) solid 1px;
+div.wah {
+    float: right;
+    border: var(--border);
    padding: 5px;
+    filter: var(--shadow-small);
+    background-color: var(--background);
 }

-.calculator-spec-table td {
-    border: var(--foreground) solid 1px;
+div.wah img {
+    display: block;
 }

-.calculator-spec-table td {
-    padding: 5px 10px 5px 5px;
+div.wah h3,
+div.wah p {
+    text-align: center;
+    margin: 5px 0;
+    font-style: italic;
 }

-.calculator-spec-table tr td:first-child {
-    background-color: var(--background-secondary);
+div.wah p {
+    margin-bottom: 0;
 }

-.sidebar > .section > button {
-    margin-top: 5px;
+div.wah img {
+    width: 250px;
+}
+
+div#footer {
+    display: grid;
+    grid-template-columns: auto 1fr;
+    grid-template-rows: 1fr;
+    grid-column-gap: 0px;
+    grid-row-gap: 0px;
+    align-items: center;
+}
+
+div#footer div:last-child {
+    text-align: right;
+}
+
+div#footer div:last-child img {
+    image-rendering: pixelated;
+    margin: 0;
+    padding: 0;
+    width: 88px;
+    height: 31px;
+}
+
+/** Guestbook **/
+table.form input,
+table.form textarea,
+table.form button {
+    background-color: var(--background);
+    border: var(--border);
+    filter: var(--shadow-small);
+}
+
+table.form input,
+table.form textarea {
+    width: 250px;
+}
+
+table.form button:hover {
+    background-color: var(--border-color);
+    color: var(--background);
+    filter: none;
+}
+
+table.form tr td,
+table.gb-entry-form-container td:last-child {
+    vertical-align: top;
+}
+
+div.gb-entry {
+    border: var(--border);
+    filter: var(--shadow-small);
+    background-color: var(--background);
+    width: 75%;
+    padding: 10px;
+}
+
+/** Music **/
+table.music-top10 {
+    border: var(--border);
+    filter: var(--shadow-small);
+    background-color: var(--background);
+    border-collapse: collapse;
+}
+
+table.music-top10 th,
+table.music-top10 td {
+    padding: 2px 5px;
+}
+
+table.music-top10 th:first-child {
+    text-align: left;
+}
+
+table.music-top10 tr:first-child th {
+    border-right: var(--border);
+    border-bottom: var(--border);
+}
+
+table.music-top10 tr:first-child th:last-child {
+    border-right: none;
+}
+
+table.music-top10 tr td {
+    border-right: var(--border);
+}
+
+table.music-top10 tr td:last-child {
+    border-right: none;
+}
+table.music-top10 tr:first-child th,
+table.music-top10 tr td:first-child {
+    background-color: var(--table-header);
+}
+
+
+/** Bookmarks **/
+div.bookmark-category:first-child h2 {
+    margin: 0;
 }
--- a/public/images/background.jpg
+++ b/public/images/background.jpg
--- a/public/images/background.svg
+++ b/public/images/background.svg
@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svgjs="http://svgjs.dev/svgjs" viewBox="0 0 800 800" preserveAspectRatio="xMidYMid slice"><defs><pattern id="pppixelate-pattern" width="20" height="20" patternUnits="userSpaceOnUse" patternTransform="translate(0 0) scale(8) rotate(0)" shape-rendering="crispEdges">
+    <rect width="1" height="1" x="9" y="0" fill="#FFFFFF80"></rect><rect width="1" height="1" x="10" y="0" fill="#FFFFFF80"></rect><rect width="1" height="1" x="9" y="1" fill="#FFFFFF80"></rect><rect width="1" height="1" x="10" y="1" fill="#FFFFFF80"></rect><rect width="1" height="1" x="9" y="2" fill="#FFFFFF80"></rect><rect width="1" height="1" x="10" y="2" fill="#FFFFFF80"></rect><rect width="1" height="1" x="9" y="3" fill="#FFFFFF80"></rect><rect width="1" height="1" x="10" y="3" fill="#FFFFFF80"></rect><rect width="1" height="1" x="9" y="4" fill="#FFFFFF80"></rect><rect width="1" height="1" x="10" y="4" fill="#FFFFFF80"></rect><rect width="1" height="1" x="9" y="5" fill="#FFFFFF80"></rect><rect width="1" height="1" x="10" y="5" fill="#FFFFFF80"></rect><rect width="1" height="1" x="9" y="6" fill="#FFFFFF80"></rect><rect width="1" height="1" x="10" y="6" fill="#FFFFFF80"></rect><rect width="1" height="1" x="9" y="7" fill="#FFFFFF80"></rect><rect width="1" height="1" x="10" y="7" fill="#FFFFFF80"></rect><rect width="1" height="1" x="9" y="8" fill="#FFFFFF80"></rect><rect width="1" height="1" x="10" y="8" fill="#FFFFFF80"></rect><rect width="1" height="1" x="0" y="9" fill="#FFFFFF80"></rect><rect width="1" height="1" x="1" y="9" fill="#FFFFFF80"></rect><rect width="1" height="1" x="2" y="9" fill="#FFFFFF80"></rect><rect width="1" height="1" x="3" y="9" fill="#FFFFFF80"></rect><rect width="1" height="1" x="4" y="9" fill="#FFFFFF80"></rect><rect width="1" height="1" x="5" y="9" fill="#FFFFFF80"></rect><rect width="1" height="1" x="6" y="9" fill="#FFFFFF80"></rect><rect width="1" height="1" x="7" y="9" fill="#FFFFFF80"></rect><rect width="1" height="1" x="8" y="9" fill="#FFFFFF80"></rect><rect width="1" height="1" x="9" y="9" fill="#FFFFFFbf"></rect><rect width="1" height="1" x="10" y="9" fill="#FFFFFFbf"></rect><rect width="1" height="1" x="11" y="9" fill="#FFFFFF80"></rect><rect width="1" height="1" x="12" y="9" fill="#FFFFFF80"></rect><rect width="1" height="1" x="13" y="9" fill="#FFFFFF80"></rect><rect width="1" height="1" x="14" y="9" fill="#FFFFFF80"></rect><rect width="1" height="1" x="15" y="9" fill="#FFFFFF80"></rect><rect width="1" height="1" x="16" y="9" fill="#FFFFFF80"></rect><rect width="1" height="1" x="17" y="9" fill="#FFFFFF80"></rect><rect width="1" height="1" x="18" y="9" fill="#FFFFFF80"></rect><rect width="1" height="1" x="19" y="9" fill="#FFFFFF80"></rect><rect width="1" height="1" x="0" y="10" fill="#FFFFFF80"></rect><rect width="1" height="1" x="1" y="10" fill="#FFFFFF80"></rect><rect width="1" height="1" x="2" y="10" fill="#FFFFFF80"></rect><rect width="1" height="1" x="3" y="10" fill="#FFFFFF80"></rect><rect width="1" height="1" x="4" y="10" fill="#FFFFFF80"></rect><rect width="1" height="1" x="5" y="10" fill="#FFFFFF80"></rect><rect width="1" height="1" x="6" y="10" fill="#FFFFFF80"></rect><rect width="1" height="1" x="7" y="10" fill="#FFFFFF80"></rect><rect width="1" height="1" x="8" y="10" fill="#FFFFFF80"></rect><rect width="1" height="1" x="9" y="10" fill="#FFFFFFbf"></rect><rect width="1" height="1" x="10" y="10" fill="#FFFFFFbf"></rect><rect width="1" height="1" x="11" y="10" fill="#FFFFFF80"></rect><rect width="1" height="1" x="12" y="10" fill="#FFFFFF80"></rect><rect width="1" height="1" x="13" y="10" fill="#FFFFFF80"></rect><rect width="1" height="1" x="14" y="10" fill="#FFFFFF80"></rect><rect width="1" height="1" x="15" y="10" fill="#FFFFFF80"></rect><rect width="1" height="1" x="16" y="10" fill="#FFFFFF80"></rect><rect width="1" height="1" x="17" y="10" fill="#FFFFFF80"></rect><rect width="1" height="1" x="18" y="10" fill="#FFFFFF80"></rect><rect width="1" height="1" x="19" y="10" fill="#FFFFFF80"></rect><rect width="1" height="1" x="9" y="11" fill="#FFFFFF80"></rect><rect width="1" height="1" x="10" y="11" fill="#FFFFFF80"></rect><rect width="1" height="1" x="9" y="12" fill="#FFFFFF80"></rect><rect width="1" height="1" x="10" y="12" fill="#FFFFFF80"></rect><rect width="1" height="1" x="9" y="13" fill="#FFFFFF80"></rect><rect width="1" height="1" x="10" y="13" fill="#FFFFFF80"></rect><rect width="1" height="1" x="9" y="14" fill="#FFFFFF80"></rect><rect width="1" height="1" x="10" y="14" fill="#FFFFFF80"></rect><rect width="1" height="1" x="9" y="15" fill="#FFFFFF80"></rect><rect width="1" height="1" x="10" y="15" fill="#FFFFFF80"></rect><rect width="1" height="1" x="9" y="16" fill="#FFFFFF80"></rect><rect width="1" height="1" x="10" y="16" fill="#FFFFFF80"></rect><rect width="1" height="1" x="9" y="17" fill="#FFFFFF80"></rect><rect width="1" height="1" x="10" y="17" fill="#FFFFFF80"></rect><rect width="1" height="1" x="9" y="18" fill="#FFFFFF80"></rect><rect width="1" height="1" x="10" y="18" fill="#FFFFFF80"></rect><rect width="1" height="1" x="9" y="19" fill="#FFFFFF80"></rect><rect width="1" height="1" x="10" y="19" fill="#FFFFFF80"></rect>
+  </pattern></defs><rect width="100%" height="100%" fill="url(#pppixelate-pattern)"></rect></svg>
--- a/public/images/buttons/csshard.gif
+++ b/public/images/buttons/csshard.gif
--- a/public/images/buttons/thnlqd.png
+++ b/public/images/buttons/thnlqd.png
--- a/public/images/buttons/transrights.gif
+++ b/public/images/buttons/transrights.gif
--- a/public/images/buttons/yuri.gif
+++ b/public/images/buttons/yuri.gif
--- a/public/images/noik.png
+++ b/public/images/noik.png
--- a/public/pub
+++ b/public/pub
@ -1 +0,0 @@
-/srv/pubfiles
--- a/public/sitemap.xml
+++ b/public/sitemap.xml
@ -3,37 +3,27 @@
 		<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 <url>
 	<loc>https://www.diskfloppy.me/</loc>
-	<lastmod>2024-09-01T17:44:54+01:00</lastmod>
+	<lastmod>2024-11-27T23:59:26+00:00</lastmod>
 	<priority>1.0</priority>
 </url>
 <url>
 	<loc>https://www.diskfloppy.me/pub/</loc>
-	<lastmod>2024-09-01T17:44:54+01:00</lastmod>
+	<lastmod>2024-11-27T23:59:26+00:00</lastmod>
 	<priority>0.8</priority>
 </url>
-<url>
-	<loc>https://www.diskfloppy.me/computers</loc>
-	<lastmod>2024-09-01T17:44:56+01:00</lastmod>
-	<priority>1.0</priority>
-</url>
-<url>
-	<loc>https://www.diskfloppy.me/calculators</loc>
-	<lastmod>2024-09-01T17:44:56+01:00</lastmod>
-	<priority>1.0</priority>
-</url>
 <url>
 	<loc>https://www.diskfloppy.me/bookmarks</loc>
-	<lastmod>2024-09-01T17:44:57+01:00</lastmod>
+	<lastmod>2024-11-27T23:59:26+00:00</lastmod>
 	<priority>1.0</priority>
 </url>
 <url>
 	<loc>https://www.diskfloppy.me/guestbook</loc>
-	<lastmod>2024-09-01T17:44:57+01:00</lastmod>
+	<lastmod>2024-11-27T23:59:26+00:00</lastmod>
 	<priority>1.0</priority>
 </url>
 <url>
 	<loc>https://www.diskfloppy.me/music</loc>
-	<lastmod>2024-09-01T17:44:58+01:00</lastmod>
+	<lastmod>2024-11-27T23:59:26+00:00</lastmod>
 	<priority>1.0</priority>
 </url>
 </urlset>
--- a/resources/views/bookmarks.blade.php
+++ b/resources/views/bookmarks.blade.php
@ -1,7 +1,7 @@
 <x-layout>
    <x-slot:title>Bookmarks</x-slot:title>
    @foreach($categories as $category)
-        <div class="section">
+        <div class="bookmark-category">
            <h2>{{ $category->name }}</h2>
            @if($category->id == 1)
                <p><em>(These are shuffled every load)</em></p>
--- a/resources/views/components/current-track.blade.php
+++ b/resources/views/components/current-track.blade.php
@ -1,4 +1,4 @@
-<div class="section current-track">
+<div class="current-track">
    <h2>Last/Current Track:</h2>
    <a href="{{ $track["url"] }}">{{ $track["title"] }} • {{ $track["artist"] }}</a><br>
 </div>
--- a/resources/views/components/layout.blade.php
+++ b/resources/views/components/layout.blade.php
@ -1,6 +1,3 @@
-@php // Get colorscheme from cookie and apply immediately
-    $colorscheme = request()->cookie('colorscheme', 'catppuccin-macchiato');
-@endphp
 <!DOCTYPE html>
 <html lang="en">
 <head>
@ -8,13 +5,10 @@
    <meta charset="utf-8">
    <meta property="og:type" content="website">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="theme-color" content="#333333">
-    <link rel="stylesheet" href="{{ asset("/css/colorschemes/$colorscheme.css") }}" id="css-colorscheme"/>
+    <meta name="theme-color" content="#f27405">
    <link rel="stylesheet" href="{{ asset('/css/master.css') }}"/>
    <link rel="icon" type="image/png" href="{{ asset('/favicon-32x32.png') }}" sizes="32x32"/>
    <link rel="icon" type="image/png" href="{{ asset('/favicon-16x16.png') }}" sizes="16x16"/>
-    <script src="{{ asset('/js/schemeSwap.js') }}"></script>
-    <script src="{{ asset('/js/liveClock.js') }}"></script>
    {!! (intval(date('n')) == 12) ? '<script src="/js/christmas/snow.js"></script>' : '' !!}

    <!-- Page-specific -->
@ -22,82 +16,40 @@
    <meta property="og:title" content="{{ str_replace("www.", "", Request::getHost()) }} | {{ $title }}">
    <meta property="og:image" content="/favicon-128x128.png">
 </head>
-<body onload="setSchemeSelector()">
-<div class="container">
-    <div class="page">
-        <header>
-            <h1>{{ str_replace("www.", "", Request::getHost()) }}</h1>
-        </header>
-        <div class="navbar">
+<body>
+    <div class="page-container">
+        <div id="header">
+            <h1>wah!</h1>
            <p>
-                <strong>Current Path:</strong>
-                @if(Request::getRequestUri() == "/")
-                    /
-                @else
-                    {{ str_replace("/", " / ", rtrim(Request::getRequestUri(), "/")) }}
-                @endif
+                (dot moe)
            </p>
+            <x-navigation></x-navigation>
        </div>
-        <div class="content">
-            <main>
+        <div id="content">
            {{ $slot }}
-            </main>
-            <div class="sidebar">
-                <div class="section"><nav><x-navigation/></nav></div>
-                <div class="section"><x-settings/></div>
-                <div class="section centerbox"><x-discord-status/></div>
-                <div class="section"><x-weather/></div>
        </div>
-        </div>
-        <footer>
+        <div id="footer">
            <div>
-                (c) floppydisk 2021-{{ date('Y') }}<br>
-                v{{ config('app.version') }},
-                <a href="https://git.frzn.dev/fwoppydwisk/diskfloppy.me/releases/latest">Source</a>,
-                <a href="/privacy">Privacy Policy?</a><br>
+                <span>
+                    &copysr; floppydisk 2021-{{ date('Y') }}<br>
+                    v{{ config('app.version') }}, <a href="https://git.frzn.dev/fwoppydwisk/diskfloppy.me/releases/latest">Source</a><br>
                    Served by {{ gethostname() }}
+                </span>
            </div>
            <div>
-                <a href="https://confusionunknown.nekoweb.org/" class="button">
-                    <img src="{{ URL::asset('images/buttons/cnfunknown.gif') }}" width="88" height="31"
-                         class="pixel" alt="confusionunknown">
-                </a>
-                <a href="https://julimiro.eu/" class="button">
-                    <img src="{{ URL::asset('images/buttons/juli.gif') }}" width="88" height="31"
-                         class="pixel" alt="julimiro">
-                </a>
-                <a href="https://x86.breadtf.com/" class="button">
-                    <img src="{{ URL::asset('images/buttons/x86.gif') }}" width="88" height="31"
-                         class="pixel" alt="x86Overflow">
-                </a>
-                <img src="{{ URL::asset('images/buttons/brokenimage.gif') }}" width="88" height="31"
-                     class="pixel" alt="Made with my own two paws">
-                <img src="{{ URL::asset('images/buttons/brokenimage.gif') }}" width="88" height="31"
-                     class="pixel" alt="Made with my own two paws">
-                <img src="{{ URL::asset('images/buttons/brokenimage.gif') }}" width="88" height="31"
-                     class="pixel" alt="Made with my own two paws"><br>
-                <a href="https://dimden.dev/" class="button">
-                    <img src="https://dimden.dev/services/images/88x31.gif" width="88" height="31"
-                         class="pixel" alt="dimden.dev">
-                </a>
-                <a href="https://www.linux.org/" class="button">
-                    <img src="{{ URL::asset('images/buttons/linuxnow.gif') }}" width="88"
-                         class="pixel" height="31" alt="Linux NOW!">
-                </a>
-                <a href="https://www.vim.org/" class="button">
-                    <img src="{{ URL::asset('images/buttons/vim.gif') }}" width="88" height="31"
-                         class="pixel" alt="vim">
-                </a>
-                <a href="https://wave.webaim.org/" class="button">
-                    <img src="{{ URL::asset('images/buttons/evaluatedWAVE.png') }}" width="88" height="31"
-                         class="pixel" alt="Evaluated to be accessible!">
-                </a>
-                <img src="{{ URL::asset('images/buttons/aliasing.png') }}" width="88" height="31"
-                     class="pixel" alt="I heart aliasing!">
-                <img src="{{ URL::asset('images/buttons/paws.gif') }}" width="88" height="31"
-                     class="pixel" alt="Made with my own two paws">
+                <img src="{{ URL::asset('images/buttons/cnfunknown.gif') }}">
+                <img src="{{ URL::asset('images/buttons/juli.gif') }}">
+                <img src="{{ URL::asset('images/buttons/x86.gif') }}">
+                <img src="{{ URL::asset('images/buttons/thnlqd.png') }}">
+                <img src="https://dimden.dev/services/images/88x31.gif">
+                <img src="{{ URL::asset('images/buttons/csshard.gif') }}"><br>
+                <img src="{{ URL::asset('images/buttons/linuxnow.gif') }}">
+                <img src="{{ URL::asset('images/buttons/paws.gif') }}">
+                <img src="{{ URL::asset('images/buttons/transrights.gif') }}">
+                <img src="{{ URL::asset('images/buttons/debian.gif') }}">
+                <img src="{{ URL::asset('images/buttons/vim.gif') }}">
+                <img src="{{ URL::asset('images/buttons/aliasing.png') }}">
            </div>
-        </footer>
        </div>
    </div>
 </body>
--- a/resources/views/components/minimal.blade.php
+++ b/resources/views/components/minimal.blade.php
@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta property="og:type" content="website">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="theme-color" content="#f27405">
+    <link rel="stylesheet" href="{{ asset('/css/master.css') }}"/>
+    <link rel="icon" type="image/png" href="{{ asset('/favicon-32x32.png') }}" sizes="32x32"/>
+    <link rel="icon" type="image/png" href="{{ asset('/favicon-16x16.png') }}" sizes="16x16"/>
+    <title>{{ $title ?? 'Unknown' }}</title>
+</head>
+<body>
+{{ $slot }}
+</body>
+</html>
--- a/resources/views/components/navigation.blade.php
+++ b/resources/views/components/navigation.blade.php
@ -1,30 +1,9 @@
-<p><strong>Navigation:</strong></p>
-<div class="navlinks">
-<a href="/">
-    <img class="pixel navbar-icon" src="{{ asset('images/icons/nav/home2.png') }}" width="16" height="16" alt="">Home
-</a><br>
-<a href="//git.diskfloppy.me/">
-    <img class="pixel navbar-icon" src="{{ asset('images/icons/nav/repo.png') }}" width="16" height="16" alt="">Git
-</a><br>
-<a href="/pub/">
-	<img class="pixel navbar-icon" src="{{ asset('images/icons/nav/pubfiles.png') }}" width="16" height="16" alt="">Public Files
-</a><br>
-<a href="/computers/">
-	<img class="pixel navbar-icon" src="{{ asset('images/icons/nav/computers.png') }}" width="16" height="16" alt="">Computers
-</a><br>
-<a href="/calculators/">
-	<img class="pixel navbar-icon" src="{{ asset('images/icons/nav/calculators.png') }}" width="16" height="16" alt="">Calculators
-</a><br>
-<a href="/bookmarks/">
-	<img class="pixel navbar-icon" src="{{ asset('images/icons/nav/bookmarks.png') }}" width="16" height="16" alt="">Bookmarks
-</a><br>
-<a href="/guestbook/">
-	<img class="pixel navbar-icon" src="{{ asset('images/icons/nav/guestbook.png') }}" width="16" height="16" alt="">Guestbook
-</a><br>
-<a href="//weather.diskfloppy.me/">
-	<img class="pixel navbar-icon" src="{{ asset('images/icons/nav/weather.png') }}" width="16" height="16" alt="">Weather
-</a><br>
-<a href="/music/">
-	<img class="pixel navbar-icon" src="{{ asset('images/icons/nav/music.png') }}" width="16" height="16" alt="">Music
-</a><br>
-</div>
+<nav>
+    <strong>Pages:</strong>
+    <a href="/">home</a> |
+    <a href="//git.wah.moe">git</a> |
+    <a href="/pub">files</a> |
+    <a href="/bookmarks">bookmarks</a> |
+    <a href="/guestbook">guestbook</a> |
+    <a href="/music">music</a>
+</nav>
--- a/resources/views/components/top-tracks.blade.php
+++ b/resources/views/components/top-tracks.blade.php
@ -1,4 +1,3 @@
-<div class="section">
 <table class="music-top10">
    <caption>
        <h2 style="margin-bottom: 5px">Top 10 Tracks (Last 30 days):</h2>
@ -15,4 +14,3 @@
        <x-track :track="$track" :count="$count"/>
    @endforeach
 </table>
-</div>
--- a/resources/views/components/wah.blade.php
+++ b/resources/views/components/wah.blade.php
@ -0,0 +1,5 @@
+<div class="wah">
+    <h3>Random Wah!</h3>
+    <img src="{{ $wah }}">
+    <p>Image "stolen" from <a href="https://tinyfox.dev/">tinyfox.dev</a></p>
+</div>
--- a/resources/views/errors/guestbook-ratelimit.blade.php
+++ b/resources/views/errors/guestbook-ratelimit.blade.php
@ -1,9 +1,13 @@
 <x-minimal>
    <x-slot:title>Error 429: Overclocking Detected!</x-slot:title>
-    <h1>Error 429: Overclocking Detected!</h1>
+    <div class="page-container">
+        <div>
+            <h1 style="margin-top: 0">Error 429: Overclocking Detected!</h1>
            <hr>
            <p>Whoa there! Your submissions are going at warp speed.</p>
            <p>Remember you can only submit an entry <u>once every hour</u>!</p>
            <br>
            Click <a href="/guestbook">here</a> to go back to the guestbook.
+        </div>
+    </div>
 </x-minimal>
--- a/resources/views/guestbook.blade.php
+++ b/resources/views/guestbook.blade.php
@ -56,7 +56,7 @@
        @php
            $user_agent = $parser->parse($entry->agent);
        @endphp
-        <div class="section">
+        <div class="gb-entry">
            Submitted by <strong>{{ $entry->name }}</strong>
            on <strong>{{ $entry->created_at->format('Y-m-d') }}</strong>
            at <strong>{{ $entry->created_at->format('h:i:s A (e)') }}</strong>
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@ -1,42 +1,45 @@
 <x-layout>
    <x-slot:title>Home</x-slot:title>

-    <div class="section">
-        <h2>About Me</h2>
-        <hr>
-        <p>Hi! This is my personal homepage on the <strong>W</strong>orld <strong>W</strong>ide <strong>W</strong>eb.</p>
+    <x-wah></x-wah>
+    <p>Hi! This is my personal homepage on the <strong>W</strong>orld <strong>W</strong>ide
+        <strong>W</strong>eb.
+    </p>
    <br>
-        <p>QuickFacts&trade;:</p>
+    <p>Some quick facts about me:</p>
    <ul>
-            <li>{{ $age }} y/o, he/him, British</li>
-            <li>Theatre Technician, &quot;Web Developer&quot; and NixOS User</li>
+        <li>19 y/o, he/him, British</li>
+        <li>Theatre Technician and &quot;Web Developer&quot;</li>
        <li>Loves ETC desks, prefers Generics to LEDs for some reason</li>
-            <li>Has a crippling Soundcraft addiction</li>
        <li>Spends way too much time on his computer</li>
-            <li>Favorite games: <a href="https://steamcommunity.com/id/fwoppydwisk/recommended/420530/">OneShot</a>, Minecraft, Stardew Valley, N++ and Starbound</li>
+        <li>Favorite games: <a href="https://steamcommunity.com/id/fwoppydwisk/recommended/420530/">OneShot</a>,
+            Minecraft, Stardew Valley, N++ and Starbound</li>
        <li><a href="http://wxqa.com/">CWOP</a> member</li>
    </ul>
    <br>
    <p>Interests:</p>
    <ul>
-            <li><strong>Tech Theatre</strong> - Lighting, Stage Management, etc. (<a href="https://www.controlbooth.com/members/floppydisk.28673/">ControlBooth</a>)</li>
-            <li><strong>Programming</strong> - HTML, CSS, JavaScript, C#, Java, PHP, Ruby, Python (<a href="https://github.com/floppydisk05">GitHub</a>)</li>
+        <li><strong>Tech Theatre</strong> - Lighting, Stage Management, etc. (<a
+                href="https://www.controlbooth.com/members/floppydisk.28673/">ControlBooth</a>)</li>
+        <li><strong>Programming</strong> - HTML, CSS, JavaScript, C#, Java, PHP, Ruby, Python (<a
+                href="https://github.com/floppydisk05">GitHub</a>)</li>
        <li><strong>Photography</strong> - <a href="https://www.flickr.com/photos/floppydisk/">Flickr</a></li>
-            <li><strong>Gaming</strong> - <a href="https://steamcommunity.com/id/fwoppydwisk/">Steam Profile</a></li>
+        <li><strong>Gaming</strong> - <a href="https://steamcommunity.com/id/fwoppydwisk/">Steam Profile</a>
+        </li>
    </ul>
-    </div>
-    <div class="section">
-        <h2>Random Quote</h2>
-        <hr>
-        <x-toh-quote/>
-    </div>
-    <div class="section">
-        <h2>Contact</h2>
-        <hr>
-        <p>
-            <strong>E-mail:</strong> <a href="mailto:contact@diskfloppy.me">contact@diskfloppy.me</a><br>
-            <strong>Mastodon:</strong> <a rel="me" href="https://c.im/@floppydisk">@floppydisk@c.im</a><br>
-            <strong>Matrix:</strong> <a href="https://matrix.to/#/@floppydisk:arcticfoxes.net">@floppydisk:arcticfoxes.net</a>
-        </p>
-    </div>
+
+{{--    <div class="section">--}}
+{{--        <h2>Random Quote</h2>--}}
+{{--        <hr>--}}
+{{--        <x-toh-quote/>--}}
+{{--    </div>--}}
+{{--    <div class="section">--}}
+{{--        <h2>Contact</h2>--}}
+{{--        <hr>--}}
+{{--        <p>--}}
+{{--            <strong>E-mail:</strong> <a href="mailto:contact@diskfloppy.me">contact@diskfloppy.me</a><br>--}}
+{{--            <strong>Mastodon:</strong> <a rel="me" href="https://c.im/@floppydisk">@floppydisk@c.im</a><br>--}}
+{{--            <strong>Matrix:</strong> <a href="https://matrix.to/#/@floppydisk:arcticfoxes.net">@floppydisk:arcticfoxes.net</a>--}}
+{{--        </p>--}}
+{{--    </div>--}}
 </x-layout>