From 5e0b525c5989a0cf459c7e2a472ec73e0c023797 Mon Sep 17 00:00:00 2001
From: Roardom <roardom@protonmail.com>
Date: Fri, 23 Aug 2024 09:54:01 +0000
Subject: [PATCH] fix: new users not receiving default stylesheet defined in
 config

---
 resources/views/partials/head.blade.php       |  2 +-
 .../views/user/general_setting/edit.blade.php | 30 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/resources/views/partials/head.blade.php b/resources/views/partials/head.blade.php
index 0bb2204404..9d8ab48b3f 100644
--- a/resources/views/partials/head.blade.php
+++ b/resources/views/partials/head.blade.php
@@ -17,7 +17,7 @@
 @if (auth()->user()->settings?->standalone_css === null)
     @vite('resources/sass/main.scss')
 
-    @switch(auth()->user()->settings?->style)
+    @switch(auth()->user()->settings?->style ?? config('other.default_style', 0))
         @case(0)
             @vite('resources/sass/themes/_light.scss')
 
diff --git a/resources/views/user/general_setting/edit.blade.php b/resources/views/user/general_setting/edit.blade.php
index 6443458450..0a9c495911 100644
--- a/resources/views/user/general_setting/edit.blade.php
+++ b/resources/views/user/general_setting/edit.blade.php
@@ -55,105 +55,105 @@ class="form__option"
                             <option
                                 class="form__option"
                                 value="0"
-                                @selected($user->settings === null || $user->settings?->style === 0)
+                                @selected($user->settings?->style ?? config('other.default_style', 0) === 0)
                             >
                                 Light
                             </option>
                             <option
                                 class="form__option"
                                 value="1"
-                                @selected($user->settings?->style === 1)
+                                @selected($user->settings?->style ?? config('other.default_style', 0) === 1)
                             >
                                 Galactic
                             </option>
                             <option
                                 class="form__option"
                                 value="2"
-                                @selected($user->settings?->style === 2)
+                                @selected($user->settings?->style ?? config('other.default_style', 0) === 2)
                             >
                                 Dark Blue
                             </option>
                             <option
                                 class="form__option"
                                 value="3"
-                                @selected($user->settings?->style === 3)
+                                @selected($user->settings?->style ?? config('other.default_style', 0) === 3)
                             >
                                 Dark Green
                             </option>
                             <option
                                 class="form__option"
                                 value="4"
-                                @selected($user->settings?->style === 4)
+                                @selected($user->settings?->style ?? config('other.default_style', 0) === 4)
                             >
                                 Dark Pink
                             </option>
                             <option
                                 class="form__option"
                                 value="5"
-                                @selected($user->settings?->style === 5)
+                                @selected($user->settings?->style ?? config('other.default_style', 0) === 5)
                             >
                                 Dark Purple
                             </option>
                             <option
                                 class="form__option"
                                 value="6"
-                                @selected($user->settings?->style === 6)
+                                @selected($user->settings?->style ?? config('other.default_style', 0) === 6)
                             >
                                 Dark Red
                             </option>
                             <option
                                 class="form__option"
                                 value="7"
-                                @selected($user->settings?->style === 7)
+                                @selected($user->settings?->style ?? config('other.default_style', 0) === 7)
                             >
                                 Dark Teal
                             </option>
                             <option
                                 class="form__option"
                                 value="8"
-                                @selected($user->settings?->style === 8)
+                                @selected($user->settings?->style ?? config('other.default_style', 0) === 8)
                             >
                                 Dark Yellow
                             </option>
                             <option
                                 class="form__option"
                                 value="9"
-                                @selected($user->settings?->style === 9)
+                                @selected($user->settings?->style ?? config('other.default_style', 0) === 9)
                             >
                                 Cosmic Void
                             </option>
                             <option
                                 class="form__option"
                                 value="10"
-                                @selected($user->settings?->style === 10)
+                                @selected($user->settings?->style ?? config('other.default_style', 0) === 10)
                             >
                                 Nord
                             </option>
                             <option
                                 class="form__option"
                                 value="11"
-                                @selected($user->settings?->style === 11)
+                                @selected($user->settings?->style ?? config('other.default_style', 0) === 11)
                             >
                                 Revel (Desktop only)
                             </option>
                             <option
                                 class="form__option"
                                 value="12"
-                                @selected($user->settings?->style === 12)
+                                @selected($user->settings?->style ?? config('other.default_style', 0) === 12)
                             >
                                 Material Design 3 Light
                             </option>
                             <option
                                 class="form__option"
                                 value="13"
-                                @selected($user->settings?->style === 13)
+                                @selected($user->settings?->style ?? config('other.default_style', 0) === 13)
                             >
                                 Material Design 3 Dark
                             </option>
                             <option
                                 class="form__option"
                                 value="14"
-                                @selected($user->settings?->style === 14)
+                                @selected($user->settings?->style ?? config('other.default_style', 0) === 14)
                             >
                                 Material Design 3 Amoled
                             </option>