Finish that shit

16 files changed, 519 insertions, 297 deletions

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 7994c2c..e046d58 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -2,6 +2,9 @@
 
 namespace App\Http\Controllers;
 
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Http;
 use Illuminate\View\View;
 use DateTime;
 
@@ -24,7 +27,7 @@ class HomeController extends Controller {
      */
     public function show(): View {
         return view('home', [
-            'age' => $this->returnAge()
+            'age' => $this->returnAge(),
         ]);
     }
 }
diff --git a/app/View/Components/DiscordStatus.php b/app/View/Components/DiscordStatus.php
new file mode 100644
index 0000000..fac06ae
--- /dev/null
+++ b/app/View/Components/DiscordStatus.php
@@ -0,0 +1,66 @@
+<?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 DiscordStatus extends Component
+{
+    /**
+     * Create a new component instance.
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Returns current Discord presence from Lanyard API
+     * @return array|mixed
+     */
+    public function getDiscordPresence(): mixed {
+        // If it's already cached just return that
+        if (Cache::has('discord_presence')) {
+            return Cache::get('discord_presence');
+        }
+
+        $response = Http::get('https://api.lanyard.rest/v1/users/' . Config::get('services.lanyard.user_id'));
+        $data = $response->json();
+        $presence = $data["data"];
+        Cache::put('discord_presence', $presence, now()->addSeconds(60));
+        return $presence;
+    }
+
+    public function getOnlineStatus(): array {
+        $presence = $this->getDiscordPresence();
+        return match ($presence["discord_status"]) {
+            "online", "dnd" => [
+                "text" => "online",
+                "color" => "#02c83a"
+            ],
+            "idle" => [
+                "text" => "away",
+                "color" => "#d77c20"
+            ],
+            default => [
+                "text" => "offline",
+                "color" => "#ca3329"
+            ],
+        };
+    }
+
+    /**
+     * Get the view / contents that represent the component.
+     */
+    public function render(): View|Closure|string
+    {
+        return view('components.discord-status', [
+            'status' => $this->getOnlineStatus(),
+        ]);
+    }
+}
diff --git a/app/View/Components/Weather.php b/app/View/Components/Weather.php
new file mode 100644
index 0000000..69be9fd
--- /dev/null
+++ b/app/View/Components/Weather.php
@@ -0,0 +1,44 @@
+<?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 Weather extends Component
+{
+    /**
+     * Create a new component instance.
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    public function getWeatherData(): mixed {
+        // If it's already cached just return that
+        if (Cache::has('weather_data')) {
+            return Cache::get('weather_data');
+        }
+
+        $response = Http::get('http://'. Config::get('services.weatherlink') . '/v1/current_conditions');
+        $data = $response->json();
+        $conditions = $data["data"]["conditions"];
+        Cache::put('weather_data', $conditions, now()->addSeconds(60));
+        return $conditions;
+    }
+
+    /**
+     * Get the view / contents that represent the component.
+     */
+    public function render(): View|Closure|string
+    {
+        return view('components.weather', [
+            'conditions' => $this->getWeatherData(),
+        ]);
+    }
+}
diff --git a/config/quotes.php b/config/quotes.php
index c1261be..9bfd8ad 100644
--- a/config/quotes.php
+++ b/config/quotes.php
@@ -426,9 +426,7 @@ return [
             "lines" => [
                 [
                     "character" => "KING",
-                    "line" => "(Rage squeals
-
-)"
+                    "line" => "*Rage squeals*"
                 ]
             ],
             "attribution" => "The Owl House, S1E10"
diff --git a/config/services.php b/config/services.php
index 21e97c7..aaad053 100644
--- a/config/services.php
+++ b/config/services.php
@@ -17,5 +17,9 @@ return [
     'lastfm' => [
         'key' => env('LASTFM_KEY'),
         'user' => env('LASTFM_USER'),
-    ]
+    ],
+    'lanyard' => [
+        'user_id' => env('DISCORD_USER_ID'),
+    ],
+    'weatherlink' => env('WEATHERLINK_IP')
 ];
diff --git a/public/css/master.css b/public/css/master.css
index 4da69c1..fff505d 100644
--- a/public/css/master.css
+++ b/public/css/master.css
@@ -239,3 +239,98 @@ a.button:hover img {
     padding-left: 10px;
     border-left: solid 2px var(--foreground);
 }
+
+.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;
+    padding: 5px;
+}
+
+.calculator-spec-table td {
+    border: var(--foreground) solid 1px;
+}
+
+.calculator-spec-table td {
+    padding: 5px 10px 5px 5px;
+}
+
+.calculator-spec-table tr td:first-child {
+    background-color: var(--background-secondary);
+}
diff --git a/resources/views/calculators.blade.php b/resources/views/calculators.blade.php
index 7f3603b..e36ac43 100644
--- a/resources/views/calculators.blade.php
+++ b/resources/views/calculators.blade.php
@@ -1,18 +1,20 @@
 <x-layout>
     <x-slot:title>Calculators</x-slot:title>
-        <h1>CASIO fx-CG50</h1>
+    <div class="section">
+        <h2>CASIO fx-CG50</h2>
         <p>TBD</p>
-        <h2>Pictures</h2>
+        <br>
+        <p><strong>Pictures</strong></p>
         <img src="{{ asset('images/calculators/casio-fx-cg50/1s.jpeg') }}" width="15%" alt="Casio fx-CG50 Front view">
         <img src="{{ asset('images/calculators/casio-fx-cg50/2s.jpeg') }}" width="15%" alt="Casio fx-CG50 Rear view (battery cover removed)">
         <img src="{{ asset('images/calculators/casio-fx-cg50/3s.jpeg') }}" width="15%" alt="Casio fx-CG50 Front view (top half)">
         <img src="{{ asset('images/calculators/casio-fx-cg50/4s.jpeg') }}" width="15%" alt="Casio fx-CG50 Front view (bottom half)">
-
-        <hr>
-
-        <h1>CASIO fx-120 (1977-78)</h1>
+    </div>
+    <div class="section">
+        <h2>CASIO fx-120 (1977-78)</h2>
         <p>TBD</p>
-        <h2>Specifications</h2>
+        <br>
+        <p><strong>Specifications</strong></p>
         <table class="calculator-spec-table">
             <tr>
                 <td><b>Size</b></td>
@@ -43,42 +45,40 @@
                 <td>12-digit VFD (NEC LD8197A)</td>
             </tr>
         </table>
-        <h2>Pictures</h2>
-        <p>Click images to view full size</p>
+        <br>
+        <p><strong>Pictures</strong></p>
         <img src="{{ asset('images/calculators/casio-fx-120/1s.jpeg') }}" width="15%" alt="Casio fx-120 Front view">
         <img src="{{ asset('images/calculators/casio-fx-120/2s.jpeg') }}" width="15%" alt="Casio fx-120 Front view (top half)">
         <img src="{{ asset('images/calculators/casio-fx-120/3s.jpeg') }}" width="15%" alt="Casio fx-120 Front view (bottom half)">
         <img src="{{ asset('images/calculators/casio-fx-120/4s.jpeg') }}" width="15%" alt="Casio fx-120 Rear view (battery and expansion covers removed">
-
-        <hr>
-
-        <h1>CASIO fx-82 (1982-85)</h1>
+    </div>
+    <div class="section">
+        <h2>CASIO fx-82 (1982-85)</h2>
         <p>TBD</p>
-        <h2>Pictures</h2>
-        <p>Click images to view full size</p>
+        <br>
+        <p><strong>Pictures</strong></p>
         <img src="{{ asset('images/calculators/casio-fx-82/1s.jpeg') }}" width="15%" alt="Casio fx-82 Front view">
         <img src="{{ asset('images/calculators/casio-fx-82/2s.jpeg') }}" width="15%" alt="Casio fx-82 Rear view (battery cover removed)">
         <img src="{{ asset('images/calculators/casio-fx-82/3s.jpeg') }}" width="15%" alt="Casio fx-82 Front view (top half)">
         <img src="{{ asset('images/calculators/casio-fx-82/4s.jpeg') }}" width="15%" alt="Casio fx-82 Front view (bottom half)">
-
-        <hr>
-
-        <h1>Texas Instruments TI-30 (1976-90)</h1>
+    </div>
+    <div class="section">
+        <h2>Texas Instruments TI-30 (1976-90)</h2>
         <p>TBD</p>
-        <h2>Pictures</h2>
-        <p>Click images to view full size</p>
+        <br>
+        <p><strong>Pictures</strong></p>
         <img src="{{ asset('images/calculators/ti-30/1s.jpeg') }}" width="15%" alt="Texas Instruments TI-30 Front view (with manual)">
         <img src="{{ asset('images/calculators/ti-30/2s.jpeg') }}" width="15%" alt="Texas Instruments TI-30 Rear view (battery cover removed)">
         <img src="{{ asset('images/calculators/ti-30/3s.jpeg') }}" width="15%" alt="Texas Instruments TI-30 Front view (top half)">
         <img src="{{ asset('images/calculators/ti-30/4s.jpeg') }}" width="15%" alt="Texas Instruments TI-30 Front view (bottom half)">
-
-        <hr>
-
-        <h1>Texet 880 Executive (1977-78)</h1>
+    </div>
+    <div class="section">
+        <h2>Texet 880 Executive (1977-78)</h2>
         <p>The calculator measures 74.2mm x 135mm x 22.2mm. It weighs 86g without the battery installed, which is a 9v PP3-type battery. Rather than the usual press-stud type holder, the housing has two metal slide clips. There is also what I assume to be a sponge at one end which is supposed to aid in holding the battery in, however it appears to have gone completely hard and I will most likely replace it in the future. There's small adaptor hole at the top, of which the input isn't specified (though it's generally agreed that it's 4.5v centre-positive).</p>
         <p>The case is black &amp; silvery colored with a thin brushed metallic front panel. The eight-digit bubble display has an absolutely <i>terrible</i> viewing angle, which means you either have to be holding it under your coat or against your face to read it!</p>
-        The keypad is particularly strange in the way that it has 3 cancel buttons, <pre>[CE]</pre>, <pre>[C]</pre> and <pre>[CA]</pre>, while the <pre>[CS]</pre> button is a Clear Sign button, <i>not</i> another cancel! The keys themselves are particularly stiff, and you really have to push them to get them to register. Many 880s suffered something referred to as the "pseudo fixed decimal bug" where, if you typed in <pre>1 + 1.00 = </pre>, it would display <pre>2.00</pre> instead of the expected <pre>2</pre>
-        <h2>Specifications</h2>
+        The keypad is particularly strange in the way that it has 3 cancel buttons, [CE], [C] and [CA], while the [CS] button is a Clear Sign button, <i>not</i> another cancel! The keys themselves are particularly stiff, and you really have to push them to get them to register. Many 880s suffered something referred to as the "pseudo fixed decimal bug" where, if you typed in 1 + 1.00 = , it would display 2.00 instead of the expected 2
+        <br>
+        <p><strong>Specifications</strong></p>
         <table class="calculator-spec-table">
             <tr>
                 <td><b>Size</b></td>
@@ -105,10 +105,10 @@
                 <td>8-digit LED</td>
             </tr>
         </table>
-        <h2>Pictures</h2>
-        <p>Click images to view full size</p>
+        <p><strong>Pictures</strong></p>
         <img src="{{ asset('images/calculators/texet-880/1s.jpeg') }}" width="15%" alt="Texet 880 Executive Front view">
         <img src="{{ asset('images/calculators/texet-880/2s.jpeg') }}" width="15%" alt="Texet 880 Executive Rear view (battery cover removed)">
         <img src="{{ asset('images/calculators/texet-880/3s.jpeg') }}" width="15%" alt="Texet 880 Executive Front view (top half)">
         <img src="{{ asset('images/calculators/texet-880/4s.jpeg') }}" width="15%" alt="Texet 880 Executive Front view (bottom half)">
+    </div>
 </x-layout>
diff --git a/resources/views/components/current-track.blade.php b/resources/views/components/current-track.blade.php
index d42ad3b..0770240 100644
--- a/resources/views/components/current-track.blade.php
+++ b/resources/views/components/current-track.blade.php
@@ -1,4 +1,4 @@
-<div class="info-table current-track">
+<div class="section current-track">
     <h2>Last/Current Track:</h2>
     <a href="{{ $track["url"] }}">{{ $track["title"] }} • {{ $track["artist"] }}</a><br>
 </div>
diff --git a/resources/views/components/discord-status.blade.php b/resources/views/components/discord-status.blade.php
new file mode 100644
index 0000000..00d2c7a
--- /dev/null
+++ b/resources/views/components/discord-status.blade.php
@@ -0,0 +1,3 @@
+<span>I'm</span>
+<h2 class="online-status" style="color: {{ $status["color"] }};text-shadow: var(--firefox-shadow) {{ $status["color"] }}4f !important">{{ $status["text"] }}!</h2>
+<p><strong>Time in Britain:</strong> <span id="clock"></span></p>
diff --git a/resources/views/components/layout.blade.php b/resources/views/components/layout.blade.php
index 294c153..1d1b22d 100644
--- a/resources/views/components/layout.blade.php
+++ b/resources/views/components/layout.blade.php
@@ -45,7 +45,7 @@
             <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 centerbox"><x-discord-status/></div>
                 <div class="section"><x-weather/></div>
             </div>
         </div>
diff --git a/resources/views/components/online-status.blade.php b/resources/views/components/online-status.blade.php
deleted file mode 100644
index 5c63deb..0000000
--- a/resources/views/components/online-status.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<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/toh-quote.blade.php b/resources/views/components/toh-quote.blade.php
index 898b001..d9dfab1 100644
--- a/resources/views/components/toh-quote.blade.php
+++ b/resources/views/components/toh-quote.blade.php
@@ -1,6 +1,12 @@
 <p class="quote">
     @foreach($quote["lines"] as $line)
-        <strong>{{ $line["character"] }}:</strong> "{{ $line["line"] }}"<br>
+        <strong>{{ $line["character"] }}:</strong>
+        {{-- Literally only one thing will trigger this lmao --}}
+        @if($line["line"] == "*Rage squeals*")
+            {{ $line["line"] }}
+        @else
+            "{{ $line["line"] }}"
+        @endif<br>
     @endforeach
     <small>({{ $quote["attribution"] }})</small>
 </p>
diff --git a/resources/views/components/top-tracks.blade.php b/resources/views/components/top-tracks.blade.php
index a8c94f2..0b563b4 100644
--- a/resources/views/components/top-tracks.blade.php
+++ b/resources/views/components/top-tracks.blade.php
@@ -1,3 +1,4 @@
+<div class="section">
 <table class="music-top10">
     <caption>
         <h2 style="margin-bottom: 5px">Top 10 Tracks (Last 30 days):</h2>
@@ -14,3 +15,4 @@
         <x-track :track="$track" :count="$count"/>
     @endforeach
 </table>
+</div>
diff --git a/resources/views/components/weather.blade.php b/resources/views/components/weather.blade.php
index 09d9a37..b4dfcaa 100644
--- a/resources/views/components/weather.blade.php
+++ b/resources/views/components/weather.blade.php
@@ -1,7 +1,11 @@
-<p><strong>Weather:</strong></p>
-<p>
-    69C<br>
-    0mm/hr<br>
-    69%<br>
-    420inHg
-</p>
+<p><strong>Weather Conditions:</strong></p>
+<hr style="margin: 4px 0">
+<p><strong>Temperature:</strong> {{ round(($conditions[0]["temp"] - 32) * (5/9), 1) }} degC</p>
+<p><strong>Rain:</strong> {{ ($conditions[0]["rain_rate_last"] * 0.2) }}mm/hr ({{ $conditions[0]["rainfall_daily"] }}mm today)</p>
+@if ($conditions[0]["wind_speed_last"] != 0)
+    <p><strong>Wind:</strong> {{ round($conditions[0]["wind_speed_last"], 1) }}mph ({{ $conditions[0]["wind_dir_last"] }} deg)</p>
+@else
+    <p><strong>Wind:</strong> 0mph</p>
+@endif
+<p><strong>Humidity:</strong> {{ round($conditions[0]["hum"], 1) }}%</p>
+<p><strong>Pressure:</strong> {{ round($conditions[2]["bar_sea_level"], 1) }} inHg</p>
diff --git a/resources/views/computers.blade.php b/resources/views/computers.blade.php
index e188ba3..4d3457e 100644
--- a/resources/views/computers.blade.php
+++ b/resources/views/computers.blade.php
@@ -1,252 +1,253 @@
 <x-layout>
     <x-slot:title>Computers</x-slot:title>
-    <table class="computers">
-        <tr>
-            <th>MODEL</th>
-            <th>CPU</th>
-            <th>GPU</th>
-            <th>STORAGE</th>
-            <th>RAM</th>
-            <th>OS</th>
-        </tr>
-        <tr>
-            <td>Random Whitebox<br>(???)</td>
-            <td>486DX2</td>
-            <td></td>
-            <td>280MB HDD</td>
-            <td>16MB</td>
-            <td>MS-DOS 6.22 &amp; Windows for Workgroups 3.11</td>
-        </tr>
-        <tr>
-            <td>MacBook Pro 14"<br>(2023)</td>
-            <td colspan="2">M3 Pro</td>
-            <td>500GB SSD</td>
-            <td>18GB</td>
-            <td>macOS Sonoma</td>
-        </tr>
-        <tr>
-            <td>MacBook Pro 13"<br>(2018)</td>
-            <td>Intel i5-8592U (2.3GHz)</td>
-            <td>Intel Iris Plus 655</td>
-            <td>250GB SSD</td>
-            <td>8GB</td>
-            <td>macOS Mojave</td>
-        </tr>
-        <tr>
-            <td>Lenovo ThinkPad T430<br>(2012)</td>
-            <td>Intel Core i7 (idk what it is)</td>
-            <td></td>
-            <td></td>
-            <td>16GB</td>
-            <td>Windows 7 Pro / NixOS</td>
-        </tr>
-        <tr>
-            <td>IBM ThinkPad X41T<br>(2005)</td>
-            <td>Intel Pentium M (1.6GHz)</td>
-            <td>Mobile Intel Express Chipset (128MB)</td>
-            <td>40GB HDD</td>
-            <td>1.5GB</td>
-            <td>Windows XP Tablet PC Edition</td>
-        </tr>
-        <tr>
-            <td>Dell OptiPlex GX1<br>(1999)</td>
-            <td>Intel Pentium II (Deschutes, 400MHz)</td>
-            <td>ATI 3D Rage Pro (4MB)</td>
-            <td>40GB HDD</td>
-            <td>639MB</td>
-            <td>Windows 2000</td>
-        </tr>
-        <tr>
-            <td>IBM ThinkPad T40<br>(2003)</td>
-            <td>Intel Pentium M (1.3GHz)</td>
-            <td>ATI Mobility Radeon 7500 (32MB)</td>
-            <td>N/A</td>
-            <td>N/A</td>
-            <td>N/A</td>
-        </tr>
-        <tr>
-            <td>HP Compaq Elite 8100<br>(2010)</td>
-            <td>Intel Core i7 (something or other)</td>
-            <td></td>
-            <td></td>
-            <td>16GB</td>
-            <td>Windows Vista Ultimate (64-bit)</td>
-        </tr>
-        <tr>
-            <td>Mac mini<br>(2014)</td>
-            <td>Intel Core i5-4278U (2.6GHz)</td>
-            <td>Intel Iris Graphics</td>
-            <td>1TB HDD</td>
-            <td>8GB</td>
-            <td>Proxmox VE 8.2</td>
-        </tr>
-        <tr>
-            <td>Fujitsu Milan<br>(1996)</td>
-            <td>Intel Pentium</td>
-            <td></td>
-            <td>1215MB HDD</td>
-            <td>32MB</td>
-            <td>Windows 98 SE</td>
-        </tr>
-        <tr>
-            <td>Compaq Armada M300<br>(1999)</td>
-            <td>Intel Pentium III</td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-        </tr>
-        <tr>
-            <td>SuperMicro X9SCM</td>
-            <td>Intel Pentium G850 (2.9GHz)</td>
-            <td>Matrox MGA G6200eW</td>
-            <td>2TB HDD / 80GB HDD</td>
-            <td>16GB</td>
-            <td>Proxmox VE 8.2</td>
-        </tr>
-        <tr>
-            <td>Main PC</td>
-            <td>Intel Core i7-6700K (4GHz)</td>
-            <td>NVidia GTX 1060 (3GB)</td>
-            <td>(multiple)</td>
-            <td>64GB</td>
-            <td>Windows 10 Pro / NixOS</td>
-        </tr>
-        <tr>
-            <td>Toshiba Qosmio F20<br>(2005)</td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td>N/A</td>
-            <td>N/A</td>
-        </tr>
-        <tr>
-            <td>MacBook Pro 13"<br>(2009)</td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td>N/A</td>
-            <td>N/A</td>
-        </tr>
-        <tr>
-            <td>Packard-Bell EasyNote MIT-LYN01<br>(???)</td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td>Windows XP Home</td>
-        </tr>
-        <tr>
-            <td>Sony VAIO PCG-3B1M<br>(???)</td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td>Windows Vista</td>
-        </tr>
-        <tr>
-            <td>Dell OptiPlex 745 USFF<br>(2006)</td>
-            <td>Intel Pentium Dual Core</td>
-            <td>Intel Integrated</td>
-            <td>(multiple)</td>
-            <td>4GB</td>
-            <td>(multiple)</td>
-        </tr>
-        <tr>
-            <td>Dell Inspiron 1525<br>(2008)</td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td>N/A</td>
-            <td>N/A</td>
-        </tr>
-        <tr>
-            <td>Random Whitebox 2</td>
-            <td>AMD Phenom II X6-1055T</td>
-            <td></td>
-            <td></td>
-            <td>8GB</td>
-            <td>N/A</td>
-        </tr>
-        <tr>
-            <td>Dell Latitude D531<br>(2007)</td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td>Windows XP Professional</td>
-        </tr>
-        <tr>
-            <td>IBM ThinkPad R40<br>(2003)</td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td>Windows 2000</td>
-        </tr>
-        <tr>
-            <td>Dell Latitude CPi<br>(2001)</td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td>Windows 2000</td>
-        </tr>
-        <tr>
-            <td>Dell Latitude CPx<br>(1999)</td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td>Windows 98 SE</td>
-        </tr>
-        <tr>
-            <td>Dell Latitude 4898T<br>(???)</td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td>N/A</td>
-            <td>N/A</td>
-        </tr>
-        <tr>
-            <td>Time 8375<br>(???)</td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td>N/A</td>
-            <td>N/A</td>
-        </tr>
-        <tr>
-            <td>Toshiba Satellite 200CDS<br>(1996)</td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-        </tr>
-        <tr>
-            <td>HP Compaq NC6000<br>(2004)</td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td>N/A</td>
-            <td>N/A</td>
-        </tr>
-        <tr>
-            <td>IBM Personal Computer 330<br>(1997)</td>
-            <td>Intel Pentium</td>
-            <td></td>
-            <td></td>
-            <td>N/A</td>
-            <td>N/A</td>
-        </tr>
-        <tr>
-            <td>Shuttle XPC SN21G5<br>(2006)</td>
-            <td>AMD Athlon 64 X2</td>
-            <td></td>
-            <td></td>
-            <td>N/A</td>
-            <td>N/A</td>
-        </tr>
-    </table>
+    <p>TBD</p>
+{{--    <table class="computers">--}}
+{{--        <tr>--}}
+{{--            <th>MODEL</th>--}}
+{{--            <th>CPU</th>--}}
+{{--            <th>GPU</th>--}}
+{{--            <th>STORAGE</th>--}}
+{{--            <th>RAM</th>--}}
+{{--            <th>OS</th>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>Random Whitebox<br>(???)</td>--}}
+{{--            <td>486DX2</td>--}}
+{{--            <td></td>--}}
+{{--            <td>280MB HDD</td>--}}
+{{--            <td>16MB</td>--}}
+{{--            <td>MS-DOS 6.22 &amp; Windows for Workgroups 3.11</td>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>MacBook Pro 14"<br>(2023)</td>--}}
+{{--            <td colspan="2">M3 Pro</td>--}}
+{{--            <td>500GB SSD</td>--}}
+{{--            <td>18GB</td>--}}
+{{--            <td>macOS Sonoma</td>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>MacBook Pro 13"<br>(2018)</td>--}}
+{{--            <td>Intel i5-8592U (2.3GHz)</td>--}}
+{{--            <td>Intel Iris Plus 655</td>--}}
+{{--            <td>250GB SSD</td>--}}
+{{--            <td>8GB</td>--}}
+{{--            <td>macOS Mojave</td>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>Lenovo ThinkPad T430<br>(2012)</td>--}}
+{{--            <td>Intel Core i7 (idk what it is)</td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td>16GB</td>--}}
+{{--            <td>Windows 7 Pro / NixOS</td>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>IBM ThinkPad X41T<br>(2005)</td>--}}
+{{--            <td>Intel Pentium M (1.6GHz)</td>--}}
+{{--            <td>Mobile Intel Express Chipset (128MB)</td>--}}
+{{--            <td>40GB HDD</td>--}}
+{{--            <td>1.5GB</td>--}}
+{{--            <td>Windows XP Tablet PC Edition</td>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>Dell OptiPlex GX1<br>(1999)</td>--}}
+{{--            <td>Intel Pentium II (Deschutes, 400MHz)</td>--}}
+{{--            <td>ATI 3D Rage Pro (4MB)</td>--}}
+{{--            <td>40GB HDD</td>--}}
+{{--            <td>639MB</td>--}}
+{{--            <td>Windows 2000</td>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>IBM ThinkPad T40<br>(2003)</td>--}}
+{{--            <td>Intel Pentium M (1.3GHz)</td>--}}
+{{--            <td>ATI Mobility Radeon 7500 (32MB)</td>--}}
+{{--            <td>N/A</td>--}}
+{{--            <td>N/A</td>--}}
+{{--            <td>N/A</td>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>HP Compaq Elite 8100<br>(2010)</td>--}}
+{{--            <td>Intel Core i7 (something or other)</td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td>16GB</td>--}}
+{{--            <td>Windows Vista Ultimate (64-bit)</td>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>Mac mini<br>(2014)</td>--}}
+{{--            <td>Intel Core i5-4278U (2.6GHz)</td>--}}
+{{--            <td>Intel Iris Graphics</td>--}}
+{{--            <td>1TB HDD</td>--}}
+{{--            <td>8GB</td>--}}
+{{--            <td>Proxmox VE 8.2</td>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>Fujitsu Milan<br>(1996)</td>--}}
+{{--            <td>Intel Pentium</td>--}}
+{{--            <td></td>--}}
+{{--            <td>1215MB HDD</td>--}}
+{{--            <td>32MB</td>--}}
+{{--            <td>Windows 98 SE</td>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>Compaq Armada M300<br>(1999)</td>--}}
+{{--            <td>Intel Pentium III</td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>SuperMicro X9SCM</td>--}}
+{{--            <td>Intel Pentium G850 (2.9GHz)</td>--}}
+{{--            <td>Matrox MGA G6200eW</td>--}}
+{{--            <td>2TB HDD / 80GB HDD</td>--}}
+{{--            <td>16GB</td>--}}
+{{--            <td>Proxmox VE 8.2</td>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>Main PC</td>--}}
+{{--            <td>Intel Core i7-6700K (4GHz)</td>--}}
+{{--            <td>NVidia GTX 1060 (3GB)</td>--}}
+{{--            <td>(multiple)</td>--}}
+{{--            <td>64GB</td>--}}
+{{--            <td>Windows 10 Pro / NixOS</td>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>Toshiba Qosmio F20<br>(2005)</td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td>N/A</td>--}}
+{{--            <td>N/A</td>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>MacBook Pro 13"<br>(2009)</td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td>N/A</td>--}}
+{{--            <td>N/A</td>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>Packard-Bell EasyNote MIT-LYN01<br>(???)</td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td>Windows XP Home</td>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>Sony VAIO PCG-3B1M<br>(???)</td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td>Windows Vista</td>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>Dell OptiPlex 745 USFF<br>(2006)</td>--}}
+{{--            <td>Intel Pentium Dual Core</td>--}}
+{{--            <td>Intel Integrated</td>--}}
+{{--            <td>(multiple)</td>--}}
+{{--            <td>4GB</td>--}}
+{{--            <td>(multiple)</td>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>Dell Inspiron 1525<br>(2008)</td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td>N/A</td>--}}
+{{--            <td>N/A</td>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>Random Whitebox 2</td>--}}
+{{--            <td>AMD Phenom II X6-1055T</td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td>8GB</td>--}}
+{{--            <td>N/A</td>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>Dell Latitude D531<br>(2007)</td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td>Windows XP Professional</td>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>IBM ThinkPad R40<br>(2003)</td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td>Windows 2000</td>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>Dell Latitude CPi<br>(2001)</td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td>Windows 2000</td>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>Dell Latitude CPx<br>(1999)</td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td>Windows 98 SE</td>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>Dell Latitude 4898T<br>(???)</td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td>N/A</td>--}}
+{{--            <td>N/A</td>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>Time 8375<br>(???)</td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td>N/A</td>--}}
+{{--            <td>N/A</td>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>Toshiba Satellite 200CDS<br>(1996)</td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>HP Compaq NC6000<br>(2004)</td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td>N/A</td>--}}
+{{--            <td>N/A</td>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>IBM Personal Computer 330<br>(1997)</td>--}}
+{{--            <td>Intel Pentium</td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td>N/A</td>--}}
+{{--            <td>N/A</td>--}}
+{{--        </tr>--}}
+{{--        <tr>--}}
+{{--            <td>Shuttle XPC SN21G5<br>(2006)</td>--}}
+{{--            <td>AMD Athlon 64 X2</td>--}}
+{{--            <td></td>--}}
+{{--            <td></td>--}}
+{{--            <td>N/A</td>--}}
+{{--            <td>N/A</td>--}}
+{{--        </tr>--}}
+{{--    </table>--}}
 </x-layout>
diff --git a/resources/views/music.blade.php b/resources/views/music.blade.php
index 0fd5d84..92e5a90 100644
--- a/resources/views/music.blade.php
+++ b/resources/views/music.blade.php
@@ -1,6 +1,5 @@
 <x-layout>
     <x-slot:title>Music</x-slot:title>
     <x-current-track :track="$current_track"/>
-    <hr>
     <x-top-tracks :tracks="$top_tracks"/>
 </x-layout>