From c9299b5410a55fa867826e389d16a48479a78504 Mon Sep 17 00:00:00 2001
From: Frankie B <git@diskfloppy.me>
Date: Tue, 11 Jun 2024 18:02:01 +0100
Subject: Merge MVC rewrite into master (#21)

* Just commit it all

* Require auth

* crap

* Update homepage

* Block AI scrapers

* Update cache update script

* Add dummy file

* Remove unnecessary lastfm config var

* Use withQueryParameters for LastFM API

* Fix embeds

* Update example env

* Smard
---
 resources/views/errors/401.blade.php               |  9 ++--
 resources/views/errors/402.blade.php               |  9 ++--
 resources/views/errors/403.blade.php               |  9 ++--
 resources/views/errors/404.blade.php               | 31 ++-----------
 resources/views/errors/418.blade.php               |  9 ++--
 resources/views/errors/419.blade.php               |  9 ++--
 resources/views/errors/429.blade.php               |  9 ++--
 resources/views/errors/500.blade.php               |  9 ++--
 resources/views/errors/503.blade.php               |  9 ++--
 resources/views/errors/generic-error.blade.php     |  7 ++-
 resources/views/errors/guestbook-ipban.blade.php   |  7 ++-
 .../views/errors/guestbook-ratelimit.blade.php     |  7 ++-
 resources/views/errors/layout.blade.php            | 53 ----------------------
 resources/views/errors/minimal.blade.php           | 24 ++--------
 14 files changed, 48 insertions(+), 153 deletions(-)
 delete mode 100644 resources/views/errors/layout.blade.php

(limited to 'resources/views/errors')

diff --git a/resources/views/errors/401.blade.php b/resources/views/errors/401.blade.php
index 5c586db..7c0d081 100644
--- a/resources/views/errors/401.blade.php
+++ b/resources/views/errors/401.blade.php
@@ -1,5 +1,4 @@
-@extends('errors::minimal')
-
-@section('title', __('Unauthorized'))
-@section('code', '401')
-@section('message', __('Unauthorized'))
+<x-minimal-error>
+    <x-slot:code>401</x-slot:code>
+    <x-slot:message>Unauthorized</x-slot:message>
+</x-minimal-error>
diff --git a/resources/views/errors/402.blade.php b/resources/views/errors/402.blade.php
index 3bc23ef..4048cba 100644
--- a/resources/views/errors/402.blade.php
+++ b/resources/views/errors/402.blade.php
@@ -1,5 +1,4 @@
-@extends('errors::minimal')
-
-@section('title', __('Payment Required'))
-@section('code', '402')
-@section('message', __('Payment Required'))
+<x-minimal-error>
+    <x-slot:code>402</x-slot:code>
+    <x-slot:message>Payment Required</x-slot:message>
+</x-minimal-error>
diff --git a/resources/views/errors/403.blade.php b/resources/views/errors/403.blade.php
index a5506f0..d661d00 100644
--- a/resources/views/errors/403.blade.php
+++ b/resources/views/errors/403.blade.php
@@ -1,5 +1,4 @@
-@extends('errors::minimal')
-
-@section('title', __('Forbidden'))
-@section('code', '403')
-@section('message', __($exception->getMessage() ?: 'Forbidden'))
+<x-minimal-error>
+    <x-slot:code>403</x-slot:code>
+    <x-slot:message>{{__($exception->getMessage() ?: 'Forbidden')}}</x-slot:message>
+</x-minimal-error>
diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
index ebd22b7..812ec99 100644
--- a/resources/views/errors/404.blade.php
+++ b/resources/views/errors/404.blade.php
@@ -1,27 +1,4 @@
-@extends('errors::minimal')
-@section('content')
-
-<h1>Error 404 | <strong>Page not found!</strong></h1>
-<hr align="left">
-<h2>The page <code class="addr">/{{ Request::path() }}/</code> doesn't exist! Did you mean...</h2>
-<ul>
-    <li><a href="//www.diskfloppy.me/">diskfloppy.me</a></li>
-    <li><a href="//git.diskfloppy.me/">git.diskfloppy.me</a></li>
-    <li><a href="//weather.diskfloppy.me">weather.diskfloppy.me</a></li>
-    <li><a href="//dl.diskfloppy.me/">dl.diskfloppy.me</a></li>
-    <li><a href="https://status.diskfloppy.me">status.diskfloppy.me</a> (HTTPS Only)</li>
-    <li><a href="gopher://diskfloppy.me">gopher://diskfloppy.me</a></li>
-</ul>
-<p>Still haven't found what you were looking for or believe this is a server error? Contact the <a href="mailto:webmaster@diskfloppy.me">webmaster</a>!</p>
-<br>
-<h4>Diagnostic Info</h4>
-<table><tr><td>
-            <code>
-                Server: &nbsp;{{ gethostname() }}<br>
-                Your IP: {{ Request::ip() }}<br>
-                Epoch: &nbsp;&nbsp;{{ now()->timestamp }}<br>
-                Agent: &nbsp;&nbsp;Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:122.0) Gecko/20100101 Firefox/122.0	</code>
-        </td></tr></table>
-<hr align="left">
-<p>&copy; floppydisk 2021-2024</p>
-@endsection
+<x-minimal-error>
+    <x-slot:code>404</x-slot:code>
+    <x-slot:message>Page not found!</x-slot:message>
+</x-minimal-error>
diff --git a/resources/views/errors/418.blade.php b/resources/views/errors/418.blade.php
index 412ea92..7ced586 100644
--- a/resources/views/errors/418.blade.php
+++ b/resources/views/errors/418.blade.php
@@ -1,5 +1,4 @@
-@extends('errors::minimal')
-
-@section('title', __('I\'m a teapot'))
-@section('code', '418')
-@section('message', __('I\'m a teapot'))
+<x-minimal-error>
+    <x-slot:code>418</x-slot:code>
+    <x-slot:message>I'm a teapot</x-slot:message>
+</x-minimal-error>
diff --git a/resources/views/errors/419.blade.php b/resources/views/errors/419.blade.php
index c09216e..7008bd8 100644
--- a/resources/views/errors/419.blade.php
+++ b/resources/views/errors/419.blade.php
@@ -1,5 +1,4 @@
-@extends('errors::minimal')
-
-@section('title', __('Page Expired'))
-@section('code', '419')
-@section('message', __('Page Expired'))
+<x-minimal-error>
+    <x-slot:code>419</x-slot:code>
+    <x-slot:message>Page Expired</x-slot:message>
+</x-minimal-error>
diff --git a/resources/views/errors/429.blade.php b/resources/views/errors/429.blade.php
index f01b07b..9ff195b 100644
--- a/resources/views/errors/429.blade.php
+++ b/resources/views/errors/429.blade.php
@@ -1,5 +1,4 @@
-@extends('errors::minimal')
-
-@section('title', __('Too Many Requests'))
-@section('code', '429')
-@section('message', __('Too Many Requests'))
+<x-minimal-error>
+    <x-slot:code>429</x-slot:code>
+    <x-slot:message>Too Many Requests</x-slot:message>
+</x-minimal-error>
diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php
index d9e95d9..d2c28c5 100644
--- a/resources/views/errors/500.blade.php
+++ b/resources/views/errors/500.blade.php
@@ -1,5 +1,4 @@
-@extends('errors::minimal')
-
-@section('title', __('Server Error'))
-@section('code', '500')
-@section('message', __('Server Error'))
+<x-minimal-error>
+    <x-slot:code>500</x-slot:code>
+    <x-slot:message>Server Error</x-slot:message>
+</x-minimal-error>
diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php
index c5a9dde..708c4d9 100644
--- a/resources/views/errors/503.blade.php
+++ b/resources/views/errors/503.blade.php
@@ -1,5 +1,4 @@
-@extends('errors::minimal')
-
-@section('title', __('Service Unavailable'))
-@section('code', '503')
-@section('message', __('Service Unavailable'))
+<x-minimal-error>
+    <x-slot:code>503</x-slot:code>
+    <x-slot:message>Service Unavailable</x-slot:message>
+</x-minimal-error>
diff --git a/resources/views/errors/generic-error.blade.php b/resources/views/errors/generic-error.blade.php
index 6f08ea5..0082093 100644
--- a/resources/views/errors/generic-error.blade.php
+++ b/resources/views/errors/generic-error.blade.php
@@ -1,9 +1,8 @@
-@extends('layouts.minimal')
-@section('title', 'Error 401: Unauthorized User!')
-@section('content')
+<x-minimal>
+    <x-slot:title>Error 401: Unauthorized User!</x-slot:title>
     <h1>{{ $error }}</h1>
     <hr>
     @if(isset($description))
         <p>{{ $description }}</p>
     @endif
-@stop
+</x-minimal>
diff --git a/resources/views/errors/guestbook-ipban.blade.php b/resources/views/errors/guestbook-ipban.blade.php
index 386d22a..5072e35 100644
--- a/resources/views/errors/guestbook-ipban.blade.php
+++ b/resources/views/errors/guestbook-ipban.blade.php
@@ -1,6 +1,5 @@
-@extends('layouts.minimal')
-@section('title', 'Error 403: IP Blocked!')
-@section('content')
+<x-minimal>
+    <x-slot:title>Error 403: IP Blocked!</x-slot:title>
     <h1>Error 403: IP Blocked!</h1>
     <hr>
     <p>Your IP has been banned from submitting to the guestbook.</p>
@@ -9,4 +8,4 @@
     @endif
     <br>
     Click <a href="/guestbook">here</a> to go back to the guestbook.
-@stop
+</x-minimal>
diff --git a/resources/views/errors/guestbook-ratelimit.blade.php b/resources/views/errors/guestbook-ratelimit.blade.php
index 7fecd97..cb24d9e 100644
--- a/resources/views/errors/guestbook-ratelimit.blade.php
+++ b/resources/views/errors/guestbook-ratelimit.blade.php
@@ -1,10 +1,9 @@
-@extends('layouts.minimal')
-@section('title', 'Error 429: Overclocking Detected!')
-@section('content')
+<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.
-@stop
+</x-minimal>
diff --git a/resources/views/errors/layout.blade.php b/resources/views/errors/layout.blade.php
deleted file mode 100644
index 019c2cd..0000000
--- a/resources/views/errors/layout.blade.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-
-        <title>@yield('title')</title>
-
-        <!-- Styles -->
-        <style>
-            html, body {
-                background-color: #fff;
-                color: #636b6f;
-                font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-                font-weight: 100;
-                height: 100vh;
-                margin: 0;
-            }
-
-            .full-height {
-                height: 100vh;
-            }
-
-            .flex-center {
-                align-items: center;
-                display: flex;
-                justify-content: center;
-            }
-
-            .position-ref {
-                position: relative;
-            }
-
-            .content {
-                text-align: center;
-            }
-
-            .title {
-                font-size: 36px;
-                padding: 20px;
-            }
-        </style>
-    </head>
-    <body>
-        <div class="flex-center position-ref full-height">
-            <div class="content">
-                <div class="title">
-                    @yield('message')
-                </div>
-            </div>
-        </div>
-    </body>
-</html>
diff --git a/resources/views/errors/minimal.blade.php b/resources/views/errors/minimal.blade.php
index e15c833..4ae6830 100644
--- a/resources/views/errors/minimal.blade.php
+++ b/resources/views/errors/minimal.blade.php
@@ -1,21 +1,3 @@
-@extends('layouts.minimal')
-@section('content')
-    <h1>Error @yield('code') | <strong>@yield('message')</strong></h1>
-    <hr align="left">
-    <p>Here, have a cat...</p>
-    <img src="https://http.cat/@yield('code')" width="500"><br><br>
-    <p>If you believe this is a server error, contact the <a href="mailto:webmaster@diskfloppy.me">webmaster</a></p>
-    <br>
-    <h4>Diagnostic Info</h4>
-    <table><tr><td>
-                <code>
-                    Server: &nbsp;{{ gethostname() }}<br>
-                    Your IP: {{ Request::ip() }}<br>
-                    Root: &nbsp;&nbsp;&nbsp;{!! url('') !!}<br>
-                    Path: &nbsp;&nbsp;&nbsp;/{{ Request::path() }}/<br>
-                    Epoch: &nbsp;&nbsp;{{ now()->timestamp }}<br>
-                    Agent: &nbsp;&nbsp;Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:122.0) Gecko/20100101 Firefox/122.0	</code>
-            </td></tr></table>
-    <hr align="left">
-    <p>&copy; floppydisk 2021-2024</p>
-@endsection
+<x-minimal>
+
+</x-minimal>
-- 
cgit v1.2.3-54-g00ecf