Initial redesign commit

author: floppydiskette <git@diskfloppy.me> 2024-08-08 02:00:44 +0100
committer: floppydiskette <git@diskfloppy.me> 2024-08-08 02:00:44 +0100
commit: e3f67fec07884b70e2a988ac0bb8cf6c9a750582 (patch)
tree: 280593edcd53a8789b4330e8aac708f1a34e3659 /resources
parent: 9900446d9590024c34f55a45055776a396fb694e (diff)
9 files changed, 166 insertions, 125 deletions
diff --git a/resources/views/bookmarks.blade.php b/resources/views/bookmarks.blade.php
index 739c4c2..c8d0e11 100644
--- 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="info-section">
+        <div class="section">
             <h2>{{ $category->name }}</h2>
             <hr>
             <ul>
diff --git a/resources/views/components/layout.blade.php b/resources/views/components/layout.blade.php
index 93fccef..294c153 100644
--- a/resources/views/components/layout.blade.php
+++ b/resources/views/components/layout.blade.php
@@ -14,6 +14,7 @@
     <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,83 +23,66 @@
     <meta property="og:image" content="/favicon-128x128.png">
 </head>
 <body onload="setSchemeSelector()">
-<div class="page">
-    <div id="header" class="header">
-        <x-navbar title="{{ $title }}"/>
-        <hr>
-    </div> <!-- header -->
-    <div id="content" class="content" role="main">
-        {{ $slot }}
-    </div> <!-- content -->
-    <div id="footer" class="footer">
-        <hr>
-        <div class="footer" role="contentinfo">
-            <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>&nbsp;
-            <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>&nbsp;
-            <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>&nbsp;
-            <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>&nbsp;
-            <a href="https://jigsaw.w3.org/css-validator/check/referer" class="button">
-                <img src="{{ URL::asset('images/buttons/vcss-blue.gif') }}" width="88" height="31"
-                     class="pixel" alt="Valid CSS!">
-            </a>&nbsp;
-            <a href="https://wiby.me/" class="button">
-                <img src="{{ URL::asset('images/buttons/wiby.gif') }}" width="88" height="31"
-                     class="pixel" alt="Wiby - Search Engine for the Classic Web">
-            </a><br>
-            <p>This site is best viewed at 1024x768 with 16-bit color or better<br>
-            &copy; floppydisk 2021-{{ date('Y') }}, v{{ config('app.version') }}, <a
-                href="https://github.com/floppydisk05/diskfloppy.me">Source</a>,
-            Served by {{ gethostname() }}<br>
-            <label for="scheme-selector">Color Scheme:</label>
-            <select id="scheme-selector">
-                <optgroup label="Misc">
-                    <option value="c64">C64</option>
-                </optgroup>
-                <optgroup label="Light">
-                    <option value="catppuccin-latte">Catppuccin Latte</option>
-                    <option value="gruvbox">Gruvbox</option>
-                    <option value="man-page">Man Page</option>
-                    <option value="papercolor-light">Papercolor Light</option>
-                    <option value="rose-pine-dawn">Rosé Pine Dawn</option>
-                    <option value="solarized-light">Solarized Light</option>
-                    <option value="terminal-basic">Terminal Basic</option>
-                </optgroup>
-                <optgroup label="Dark">
-                    <option value="catppuccin-frappe">Catppuccin Frappé</option>
-                    <option value="catppuccin-macchiato" selected="selected">Catppuccin Macchiato</option>
-                    <option value="catppuccin-mocha">Catppuccin Mocha</option>
-                    <option value="gruvbox-dark">Gruvbox Dark</option>
-                    <option value="gruvbox-material">Gruvbox Material</option>
-                    <option value="maia">Maia</option>
-                    <option value="mono-amber">Mono Amber</option>
-                    <option value="mono-cyan">Mono Cyan</option>
-                    <option value="mono-green">Mono Green</option>
-                    <option value="mono-red">Mono Red</option>
-                    <option value="mono-white">Mono White</option>
-                    <option value="mono-yellow">Mono Yellow</option>
-                    <option value="papercolor-dark">Papercolor Dark</option>
-                    <option value="rose-pine">Rosé Pine</option>
-                    <option value="rose-pine-moon">Rose Pine Moon</option>
-                    <option value="shel">Shel</option>
-                    <option value="slate">Slate</option>
-                    <option value="solarized-dark">Solarized Dark</option>
-                </optgroup>
-            </select>
-            <button onclick="swapScheme()">Apply</button></p>
+<div class="container">
+    <div class="page">
+        <div class="header">
+            <h1>{{ str_replace("www.", "", Request::getHost()) }}</h1>
         </div>
-    </div> <!-- footer -->
-</div> <!-- page -->
+        <div class="navbar">
+            <p>
+                <strong>Current Path:</strong>
+                @if(Request::getRequestUri() == "/")
+                    /
+                @else
+                    {{ str_replace("/", " / ", rtrim(Request::getRequestUri(), "/")) }}
+                @endif
+            </p>
+        </div>
+        <div class="content">
+            <div class="main">
+                {{ $slot }}
+            </div>
+            <div class="sidebar">
+                <div class="section"><x-navigation/></div>
+                <div class="section"><x-settings/></div>
+                <div class="section centerbox"><x-online-status/></div>
+                <div class="section"><x-weather/></div>
+            </div>
+        </div>
+        <div class="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><br>
+                Served by {{ gethostname() }}
+            </div>
+            <div>
+                <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><br>
+                <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>
+                <a href="https://jigsaw.w3.org/css-validator/check/referer" class="button">
+                    <img src="{{ URL::asset('images/buttons/vcss-blue.gif') }}" width="88" height="31"
+                         class="pixel" alt="Valid CSS!">
+                </a>
+                <a href="https://wiby.me/" class="button">
+                    <img src="{{ URL::asset('images/buttons/wiby.gif') }}" width="88" height="31"
+                         class="pixel" alt="Wiby - Search Engine for the Classic Web">
+                </a>
+            </div>
+        </div>
+    </div>
+</div>
 </body>
 </html>
diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php
deleted file mode 100644
index 1853a51..0000000
--- a/resources/views/components/navbar.blade.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<nav>
-    <h1>{{ str_replace("www.", "", Request::getHost()) }} | <strong>{{ $title }}</strong></h1>
-    <div class="nav-wrapper">
-        <div>
-            <a href="/" title="Home"><img class="pixel navbar-icon" src="{{ asset('images/icons/nav/home2.png') }}" alt="Home" width="32" height="32"></a>
-            <a href="//git.diskfloppy.me/" title="cgit"><img class="pixel navbar-icon" src="{{ asset('images/icons/nav/repo.png') }}" alt="cgit" width="32" height="32"></a>
-            <a href="/pub/" title="Public Files"><img class="pixel navbar-icon" src="{{ asset('images/icons/nav/pubfiles.png') }}" alt="Public Files" width="32" height="32"></a>
-            <a href="/computers/" title="Computers"><img class="pixel navbar-icon" src="{{ asset('images/icons/nav/computers.png') }}" alt="Computers" width="32" height="32"></a>
-            <a href="/calculators/" title="Calculators"><img class="pixel navbar-icon" src="{{ asset('images/icons/nav/calculators.png') }}" alt="Calculators" width="32" height="32"></a>
-            <a href="/bookmarks/" title="Bookmarks"><img class="pixel navbar-icon" src="{{ asset('images/icons/nav/bookmarks.png') }}" alt="Bookmarks" width="32" height="32"></a>
-            <a href="/guestbook/" title="Guestbook"><img class="pixel navbar-icon" src="{{ asset('images/icons/nav/guestbook.png') }}" alt="Guestbook" width="32" height="32"></a>
-            <a href="//weather.diskfloppy.me/" title="Weather"><img class="pixel navbar-icon" src="{{ asset('images/icons/nav/weather.png') }}" alt="Weather" width="32" height="32"></a>
-            <a href="/music/" title="Music"><img class="pixel navbar-icon" src="{{ asset('images/icons/nav/music.png') }}" alt="Music" width="32" height="32"></a>&nbsp;&nbsp;
-        </div>
-    </div>
-</nav>
diff --git a/resources/views/components/navigation.blade.php b/resources/views/components/navigation.blade.php
new file mode 100644
index 0000000..a3d4270
--- /dev/null
+++ b/resources/views/components/navigation.blade.php
@@ -0,0 +1,30 @@
+<p><strong>Navigation:</strong></p>
+<div class="navlinks">
+<a href="/" title="Home">
+    <img class="pixel navbar-icon" src="{{ asset('images/icons/nav/home2.png') }}" alt="Home" width="16" height="16">Home
+</a><br>
+<a href="//git.diskfloppy.me/" title="cgit">
+    <img class="pixel navbar-icon" src="{{ asset('images/icons/nav/repo.png') }}" alt="cgit" width="16" height="16">Git
+</a><br>
+<a href="/pub/" title="Public Files">
+	<img class="pixel navbar-icon" src="{{ asset('images/icons/nav/pubfiles.png') }}" alt="Public Files" width="16" height="16">Public Files
+</a><br>
+<a href="/computers/" title="Computers">
+	<img class="pixel navbar-icon" src="{{ asset('images/icons/nav/computers.png') }}" alt="Computers" width="16" height="16">Computers
+</a><br>
+<a href="/calculators/" title="Calculators">
+	<img class="pixel navbar-icon" src="{{ asset('images/icons/nav/calculators.png') }}" alt="Calculators" width="16" height="16">Calculators
+</a><br>
+<a href="/bookmarks/" title="Bookmarks">
+	<img class="pixel navbar-icon" src="{{ asset('images/icons/nav/bookmarks.png') }}" alt="Bookmarks" width="16" height="16">Bookmarks
+</a><br>
+<a href="/guestbook/" title="Guestbook">
+	<img class="pixel navbar-icon" src="{{ asset('images/icons/nav/guestbook.png') }}" alt="Guestbook" width="16" height="16">Guestbook
+</a><br>
+<a href="//weather.diskfloppy.me/" title="Weather">
+	<img class="pixel navbar-icon" src="{{ asset('images/icons/nav/weather.png') }}" alt="Weather" width="16" height="16">Weather
+</a><br>
+<a href="/music/" title="Music">
+	<img class="pixel navbar-icon" src="{{ asset('images/icons/nav/music.png') }}" alt="Music" width="16" height="16">Music
+</a><br>
+</div>
diff --git a/resources/views/components/online-status.blade.php b/resources/views/components/online-status.blade.php
new file mode 100644
index 0000000..5c63deb
--- /dev/null
+++ b/resources/views/components/online-status.blade.php
@@ -0,0 +1,3 @@
+<span>I'm</span>
+<h2 class="online-status">Online!</h2>
+<p><strong>Time in Britain:</strong> <span id="clock"></span></p>
diff --git a/resources/views/components/settings.blade.php b/resources/views/components/settings.blade.php
new file mode 100644
index 0000000..8851f6c
--- /dev/null
+++ b/resources/views/components/settings.blade.php
@@ -0,0 +1,37 @@
+<p><strong>Site Settings:</strong></p>
+<label for="scheme-selector">Colors:</label>
+<select id="scheme-selector">
+{{--    <optgroup label="Misc">--}}
+{{--        <option value="c64">C64</option>--}}
+{{--    </optgroup>--}}
+    <optgroup label="Light">
+        <option value="catppuccin-latte">Catppuccin Latte</option>
+{{--        <option value="gruvbox">Gruvbox</option>--}}
+{{--        <option value="man-page">Man Page</option>--}}
+{{--        <option value="papercolor-light">Papercolor Light</option>--}}
+{{--        <option value="rose-pine-dawn">Rosé Pine Dawn</option>--}}
+{{--        <option value="solarized-light">Solarized Light</option>--}}
+{{--        <option value="terminal-basic">Terminal Basic</option>--}}
+    </optgroup>
+    <optgroup label="Dark">
+        <option value="catppuccin-frappe">Catppuccin Frappé</option>
+        <option value="catppuccin-macchiato" selected="selected">Catppuccin Macchiato</option>
+        <option value="catppuccin-mocha">Catppuccin Mocha</option>
+{{--        <option value="gruvbox-dark">Gruvbox Dark</option>--}}
+{{--        <option value="gruvbox-material">Gruvbox Material</option>--}}
+{{--        <option value="maia">Maia</option>--}}
+{{--        <option value="mono-amber">Mono Amber</option>--}}
+{{--        <option value="mono-cyan">Mono Cyan</option>--}}
+{{--        <option value="mono-green">Mono Green</option>--}}
+{{--        <option value="mono-red">Mono Red</option>--}}
+{{--        <option value="mono-white">Mono White</option>--}}
+{{--        <option value="mono-yellow">Mono Yellow</option>--}}
+{{--        <option value="papercolor-dark">Papercolor Dark</option>--}}
+{{--        <option value="rose-pine">Rosé Pine</option>--}}
+{{--        <option value="rose-pine-moon">Rose Pine Moon</option>--}}
+{{--        <option value="shel">Shel</option>--}}
+{{--        <option value="slate">Slate</option>--}}
+{{--        <option value="solarized-dark">Solarized Dark</option>--}}
+    </optgroup>
+</select><br>
+<button onclick="swapScheme()">Apply</button>
diff --git a/resources/views/components/weather.blade.php b/resources/views/components/weather.blade.php
new file mode 100644
index 0000000..09d9a37
--- /dev/null
+++ b/resources/views/components/weather.blade.php
@@ -0,0 +1,7 @@
+<p><strong>Weather:</strong></p>
+<p>
+    69C<br>
+    0mm/hr<br>
+    69%<br>
+    420inHg
+</p>
diff --git a/resources/views/guestbook.blade.php b/resources/views/guestbook.blade.php
index bed4211..f9f04ca 100644
--- a/resources/views/guestbook.blade.php
+++ b/resources/views/guestbook.blade.php
@@ -56,24 +56,20 @@
         @php
             $user_agent = $parser->parse($entry->agent);
         @endphp
-        <table class="gb-entry" role="presentation">
-            <tr>
-                <td>
-                    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>
-                    <hr>
-                    <span class="guestbook-message">{{ $entry->message }}</span>
-                    <hr>
-                    @if($entry->agent === "Agent Unavailable")
-                        <address>Agent unavailable</address>
-                    @else
-                        <address>Posted using <strong>{{ $user_agent->ua->toString() }}</strong>
-                            on <strong>{{ $user_agent->os->toString() }}</strong></address>
-                    @endif
-                </td>
-            </tr>
-        </table>
+        <div class="section">
+            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>
+            <hr>
+            <span class="guestbook-message">{{ $entry->message }}</span>
+            <hr>
+            @if($entry->agent === "Agent Unavailable")
+                <address>Agent unavailable</address>
+            @else
+                <address>Posted using <strong>{{ $user_agent->ua->toString() }}</strong>
+                    on <strong>{{ $user_agent->os->toString() }}</strong></address>
+            @endif
+        </div>
         <br>
     @endforeach
 </x-layout>
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 86c7063..a251881 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -1,10 +1,12 @@
 <x-layout>
     <x-slot:title>Home</x-slot:title>
-    <p>Hi! This is my personal homepage on the <strong>W</strong>orld <strong>W</strong>ide <strong>W</strong>eb.</p>
 
-    <div class="info-section">
-        <h2>QuickFacts&trade;</h2>
+    <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>
+        <br>
+        <p>QuickFacts&trade;:</p>
         <ul>
             <li>{{ $age }} y/o, he/him, British</li>
             <li>Theatre Technician, &quot;Web Developer&quot; and NixOS User</li>
@@ -14,10 +16,8 @@
             <li>Favorite games: <a href="https://steamcommunity.com/id/floppydisk05/recommended/420530/">OneShot</a>, Minecraft, Stardew Valley, N++ and Starbound</li>
             <li><a href="http://wxqa.com/">CWOP</a> member</li>
         </ul>
-    </div>
-    <div class="info-section">
-        <h2>Interests</h2>
-        <hr>
+        <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>
@@ -25,16 +25,16 @@
             <li><strong>Gaming</strong> - <a href="https://steamcommunity.com/id/floppydisk05/">Steam Profile</a></li>
         </ul>
     </div>
-    <div class="info-section">
-        <h2>Things they never said</h2>
+    <div class="section">
+        <h2>Random Quote</h2>
         <hr>
-        <p>
-            <script type="text/javascript" src="{{ asset("/js/neverSaid.js") }}"></script>
+        <p class="quote">
+            <script type="text/javascript" src="{{ asset("/js/randomQuote.js") }}"></script>
             <noscript>Oops! You need JavaScript enabled to view this content.</noscript>
         </p>
     </div>
-    <div class="info-section">
-        <h2>Contact &amp; social</h2>
+    <div class="section">
+        <h2>Contact</h2>
         <hr>
         <p>
             <strong>E-mail:</strong> <a href="mailto:contact@diskfloppy.me">contact@diskfloppy.me</a><br>
author	floppydiskette <git@diskfloppy.me>	2024-08-08 02:00:44 +0100
committer	floppydiskette <git@diskfloppy.me>	2024-08-08 02:00:44 +0100
commit	e3f67fec07884b70e2a988ac0bb8cf6c9a750582 (patch)
tree	280593edcd53a8789b4330e8aac708f1a34e3659 /resources
parent	9900446d9590024c34f55a45055776a396fb694e (diff)