From 6894e2db8435992030dd0407f2e0bbfa3f171515 Mon Sep 17 00:00:00 2001
From: 1day2die <ownerdennis8@gmail.com>
Date: Mon, 8 May 2023 14:01:02 +0200
Subject: [PATCH] ReImplement ThemeSwitcher

---
 app/Providers/AppServiceProvider.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 8b82efad..fb6e8f9c 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -4,6 +4,7 @@ namespace App\Providers;
 
 use App\Extensions\PaymentGateways\PayPal\PayPalSettings;
 use App\Models\UsefulLink;
+use App\Settings\GeneralSettings;
 use App\Settings\MailSettings;
 use Exception;
 use Illuminate\Pagination\Paginator;
@@ -12,6 +13,7 @@ use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Facades\URL;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\ServiceProvider;
+use Qirolab\Theme\Theme;
 
 
 class AppServiceProvider extends ServiceProvider
@@ -87,6 +89,17 @@ class AppServiceProvider extends ServiceProvider
             Log::error("Couldnt find useful_links. Probably the installation is not completet. " . $e);
         }
 
+        $generalSettings = $this->app->make(GeneralSettings::class);
+        if (!file_exists(base_path('themes') . "/" . $generalSettings->theme)) {
+            $generalSettings->theme = "default";
+        }
+
+        if ($generalSettings->theme && $generalSettings->theme !== config('theme.active')) {
+            Theme::set($generalSettings->theme, "default");
+        } else {
+            Theme::set("default", "default");
+        }
+
 
         $settings = $this->app->make(MailSettings::class);
         $settings->setConfig();