Finish that shit

7 files changed, 25 insertions, 13 deletions

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>