From 588966a94fe385a7c9f4ea8f2a6ff3af3c92feb2 Mon Sep 17 00:00:00 2001
From: floppydiskette <floppydisk@hyprcat.net>
Date: Thu, 28 Nov 2024 00:07:08 +0000
Subject: Sure is a new site design
---
resources/views/bookmarks.blade.php | 2 +-
resources/views/components/current-track.blade.php | 2 +-
resources/views/components/layout.blade.php | 140 +++++----------------
resources/views/components/minimal.blade.php | 16 +++
resources/views/components/navigation.blade.php | 19 ++-
resources/views/components/top-tracks.blade.php | 2 -
resources/views/components/wah.blade.php | 5 +
.../views/errors/guestbook-ratelimit.blade.php | 16 ++-
resources/views/guestbook.blade.php | 2 +-
resources/views/home.blade.php | 79 ++++++------
10 files changed, 114 insertions(+), 169 deletions(-)
create mode 100644 resources/views/components/wah.blade.php
(limited to 'resources')
diff --git a/resources/views/bookmarks.blade.php b/resources/views/bookmarks.blade.php
index f75e9b4..24c0a05 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="section">
+ <div class="bookmark-category">
<h2>{{ $category->name }}</h2>
@if($category->id == 1)
<p><em>(These are shuffled every load)</em></p>
diff --git a/resources/views/components/current-track.blade.php b/resources/views/components/current-track.blade.php
index 0770240..50d3367 100644
--- 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>
diff --git a/resources/views/components/layout.blade.php b/resources/views/components/layout.blade.php
index 59ef75b..199ee55 100644
--- 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 -->
@@ -23,110 +17,40 @@
<meta property="og:image" content="/favicon-128x128.png">
</head>
<body>
-<div class="page-container">
- <div>
- <div id="site-header">
- <h1>niko's site</h1>
+ <div class="page-container">
+ <div id="header">
+ <h1>wah!</h1>
+ <p>
+ (dot moe)
+ </p>
+ <x-navigation></x-navigation>
</div>
- <div><x-navigation/></div>
- <div class="section centerbox"><x-discord-status/></div>
- <div class="section"><x-weather/></div>
- </div>
- <div>
- {{ $slot }}
- </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 id="content">
+ {{ $slot }}
</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/transrights.gif') }}" width="88" height="31"
- class="pixel" alt="Trans rights now!">
- <img src="{{ URL::asset('images/buttons/yuri.gif') }}" width="88" height="31"
- class="pixel" alt="Catgirl yuri now!">
- <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">
+ <div id="footer">
+ <div>
+ <span>
+ ℗ 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>
+ <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>
</div>
</div>
-</div>
-
</body>
</html>
-
-{{--<div class="container">--}}
-{{-- <div class="page">--}}
-{{-- <header>--}}
-{{-- <h1>{{ str_replace("www.", "", Request::getHost()) }}</h1>--}}
-{{-- </header>--}}
-{{-- <div class="navbar">--}}
-{{-- <p>--}}
-{{-- <strong>Current Path:</strong>--}}
-{{-- @if(Request::getRequestUri() == "/")--}}
-{{-- /--}}
-{{-- @else--}}
-{{-- {{ str_replace("/", " / ", rtrim(Request::getRequestUri(), "/")) }}--}}
-{{-- @endif--}}
-{{-- </p>--}}
-{{-- </div>--}}
-{{-- <div class="content">--}}
-{{-- <main>--}}
-{{-- {{ $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>--}}
-{{-- (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>--}}
-{{-- Served by {{ gethostname() }}--}}
-{{-- </div>--}}
-{{-- <div>--}}
-
-{{-- </div>--}}
-{{-- </footer>--}}
-{{-- </div>--}}
-{{--</div>--}}
-{{--</body>--}}
-{{--</html>--}}
diff --git a/resources/views/components/minimal.blade.php b/resources/views/components/minimal.blade.php
index e69de29..37e6e03 100644
--- 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>
diff --git a/resources/views/components/navigation.blade.php b/resources/views/components/navigation.blade.php
index 176384e..502dd35 100644
--- a/resources/views/components/navigation.blade.php
+++ b/resources/views/components/navigation.blade.php
@@ -1,14 +1,9 @@
<nav>
- <p><strong>Navigation:</strong></p>
- <div class="navlinks">
- <a href="/">/home/niko</a><br>
- <a href="//git.diskfloppy.me/">~/git</a><br>
- <a href="/pub/">~/pub</a><br>
- <a href="/computers/">~/computers</a><br>
- <a href="/calculators/">~/calculators</a><br>
- <a href="/bookmarks/">~/bookmarks</a><br>
- <a href="/guestbook/">~/guestbook</a><br>
- <a href="//weather.diskfloppy.me/">~/weather</a><br>
- <a href="/music/">~/music</a><br>
- </div>
+ <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>
diff --git a/resources/views/components/top-tracks.blade.php b/resources/views/components/top-tracks.blade.php
index 0b563b4..a8c94f2 100644
--- 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>
diff --git a/resources/views/components/wah.blade.php b/resources/views/components/wah.blade.php
new file mode 100644
index 0000000..cea770e
--- /dev/null
+++ 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>
diff --git a/resources/views/errors/guestbook-ratelimit.blade.php b/resources/views/errors/guestbook-ratelimit.blade.php
index cb24d9e..3f4820b 100644
--- 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>
- <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 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>
diff --git a/resources/views/guestbook.blade.php b/resources/views/guestbook.blade.php
index f9f04ca..667eba8 100644
--- 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>
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 1b17b0f..002f8b2 100644
--- 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>
- <br>
- <p>QuickFacts™:</p>
- <ul>
- <li>{{ $age }} y/o, he/him, British</li>
- <li>Theatre Technician, "Web Developer" and NixOS User</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><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>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>
- </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>
+ <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>Some quick facts about me:</p>
+ <ul>
+ <li>19 y/o, he/him, British</li>
+ <li>Theatre Technician and "Web Developer"</li>
+ <li>Loves ETC desks, prefers Generics to LEDs for some reason</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><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>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>
+ </ul>
+
+{{-- <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>
--
cgit v1.2.3-54-g00ecf