Experiment: simpler light/dark toggle

app/Console/Commands/ResetDemoSettings.php

@@ -49,14 +49,15 @@ public function handle()
         $settings->logo = 'snipe-logo.png';
         $settings->alert_email = '[email protected]';
         $settings->login_note = 'Use `admin` / `password` to login to the demo.';
-        $settings->header_color = null;
+        $settings->header_color = '#3c8dbc';
+        $settings->link_dark_color = '#084d73';
+        $settings->link_light_color = '#86cbf2;';
         $settings->label2_2d_type = 'QRCODE';
         $settings->default_currency = 'USD';
         $settings->brand = 2;
         $settings->ldap_enabled = 0;
         $settings->full_multiple_companies_support = 0;
         $settings->label2_1d_type = 'C128';
-        $settings->skin = '';
         $settings->email_domain = 'snipeitapp.com';
         $settings->email_format = 'filastname';
         $settings->username_format = 'filastname';
@@ -80,6 +81,8 @@ public function handle()
 
         if ($user = User::where('username', '=', 'admin')->first()) {
             $user->locale = 'en-US';
+            $user->enable_confetti = 1;
+            $user->enable_sounds = 1;
             $user->save();
         }
 

app/Http/Controllers/ProfileController.php

@@ -53,10 +53,12 @@ public function postIndex(ImageUploadRequest $request) : RedirectResponse
         $user->last_name = $request->input('last_name');
         $user->website = $request->input('website');
         $user->gravatar = $request->input('gravatar');
-        $user->skin = $request->input('skin');
         $user->phone = $request->input('phone');
         $user->enable_sounds = $request->input('enable_sounds', false);
         $user->enable_confetti = $request->input('enable_confetti', false);
+        $user->link_light_color = $request->input('link_light_color', '#296282');
+        $user->link_dark_color = $request->input('link_dark_color', '#296282');
+        $user->nav_link_color = $request->input('nav_link_color', '#FFFFFF');
 
         if (! config('app.lock_passwords')) {
             $user->locale = $request->input('locale');

app/Http/Controllers/SettingsController.php

@@ -400,11 +400,12 @@ public function postBranding(ImageUploadRequest $request) : RedirectResponse
 
         $setting->brand = $request->input('brand', '1');
         $setting->header_color = $request->input('header_color');
+        $setting->link_light_color = $request->input('link_light_color', '#296282');
+        $setting->link_dark_color = $request->input('link_dark_color', '#296282');
+        $setting->nav_link_color = $request->input('nav_link_color', '#FFFFFF');
         $setting->support_footer = $request->input('support_footer');
         $setting->version_footer = $request->input('version_footer');
         $setting->footer_text = $request->input('footer_text');
-        $setting->skin = $request->input('skin');
-        $setting->allow_user_skin = $request->input('allow_user_skin', '0');
         $setting->show_url_in_emails = $request->input('show_url_in_emails', '0');
         $setting->logo_print_assets = $request->input('logo_print_assets', '0');
         $setting->load_remote = $request->input('load_remote', 0);

app/Http/Kernel.php

@@ -44,6 +44,7 @@ class Kernel extends HttpKernel
             \App\Http\Middleware\CheckForTwoFactor::class,
             \Laravel\Passport\Http\Middleware\CreateFreshApiToken::class,
             \App\Http\Middleware\AssetCountForSidebar::class,
+            \App\Http\Middleware\CheckColorSettings::class,
             \Illuminate\Session\Middleware\AuthenticateSession::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],

app/Http/Middleware/CheckColorSettings.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use App\Models\Setting;
+use Closure;
+use Illuminate\Contracts\Auth\Guard;
+use Illuminate\Support\Facades\Auth;
+
+class CheckColorSettings
+{
+    /**
+     * The Guard implementation.
+     *
+     * @var Guard
+     */
+    protected $auth;
+
+    /**
+     * Create a new filter instance.
+     *
+     * @param  Guard  $auth
+     * @return void
+     */
+    public function __construct(Guard $auth)
+    {
+        $this->auth = $auth;
+    }
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if ($settings = Setting::getSettings()) {
+            $nav_color = $settings->nav_link_color;
+            $link_dark_color = $settings->link_dark_color;
+            $link_light_color = $settings->link_light_color;
+        }
+
+
+        // Override system settings
+        if ($request->user()) {
+
+            if ($request->user()->nav_color) {
+                $nav_color = $request->user()->nav_color;
+            }
+            if ($request->user()->link_dark_color) {
+                $link_dark_color = $request->user()->link_dark_color;
+            }
+            if ($request->user()->nav_color) {
+                $link_light_color = $request->user()->link_light_color;
+            }
+        }
+
+
+        view()->share('nav_link_color', $nav_color);
+        view()->share('link_dark_color', $link_dark_color);
+        view()->share('link_light_color', $link_light_color);
+
+        return $next($request);
+
+    }
+}

database/migrations/2025_11_28_175733_add_link_colors_to_settings.php

@@ -0,0 +1,121 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        $setting = DB::table('settings')->select(['skin', 'header_color'])->first();
+
+        Schema::table('settings', function (Blueprint $table) {
+            $table->string('link_dark_color')->after('header_color')->nullable()->default(null);
+            $table->string('link_light_color')->after('header_color')->nullable()->default(null);
+            $table->string('nav_link_color')->after('header_color')->nullable()->default(null);
+        });
+
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('link_dark_color')->after('skin')->nullable()->default(null);
+            $table->string('link_light_color')->after('skin')->nullable()->default(null);
+            $table->string('nav_link_color')->after('skin')->nullable()->default(null);
+        });
+
+
+        // Set Snipe-IT defaults
+        $link_dark_color = '#89c9ed';
+        $link_light_color = '#296282';
+        $nav_color = '#ffffff';
+        $header_color = '#3c8dbc';
+
+        if ($setting) {
+
+            switch ($setting->skin) {
+                case ('green' || 'green-dark'):
+                    $header_color = '#00a65a';
+                    $link_dark_color = '#00a65a';
+                    $link_light_color = '#00a65a';
+                    $nav_color = '#ffffff';
+
+                case ('red' || 'red-dark'):
+                    $header_color = '#dd4b39';
+                    $link_dark_color = '#dd4b39';
+                    $link_light_color = '#dd4b39';
+                    $nav_color = '#ffffff';
+
+                case ('orange' || 'orange-dark'):
+                    $header_color = '#FF851B';
+                    $link_dark_color = '#FF851B';
+                    $link_light_color = '#FF851B';
+                    $nav_color = '#ffffff';
+
+                case ('black' || 'black-dark'):
+                    $header_color = '#000000';
+                    $link_dark_color = '#111';
+                    $link_light_color = '#111';
+                    $nav_color = '#ffffff';
+
+                case ('purple' || 'purple-dark'):
+                    $header_color = '#605ca8';
+                    $link_dark_color = '#605ca8';
+                    $link_light_color = '#605ca8';
+                    $nav_color = '#ffffff';
+
+                case ('yellow' || 'yellow-dark') :
+                    $header_color = '#f39c12';
+                    $link_dark_color = '#f39c12';
+                    $link_light_color = '#f39c12';
+                    $nav_color = '#ffffff';
+
+                case 'contrast':
+                    $header_color = '#001F3F';
+                    $link_dark_color = '#86cbf2';
+                    $link_light_color = '#084d73';
+                    $nav_color = '#ffffff';
+                    break;
+            }
+
+            // Override the header color if the settings have one
+            if ($setting->header_color) {
+                $header_color = $setting->header_color;
+                \Log::debug('A header color was found, so lets use that instead: '.$setting->header_color);
+            }
+
+
+            DB::table('settings')->update([
+                'link_light_color' => $link_light_color,
+                'link_dark_color' => $link_dark_color,
+                'nav_link_color' => $nav_color,
+                'header_color' => $header_color]);
+
+            DB::table('users')->whereNull('skin')->update([
+                'link_light_color' => $link_light_color,
+                'link_dark_color' => $link_dark_color,
+                'nav_link_color' => $nav_color]);
+        }
+
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('settings', function ($table) {
+            $table->dropColumn('link_dark_color');
+            $table->dropColumn('link_light_color');
+            $table->dropColumn('nav_link_color');
+        });
+
+        Schema::table('users', function ($table) {
+            $table->dropColumn('link_dark_color');
+            $table->dropColumn('link_light_color');
+            $table->dropColumn('nav_link_color');
+        });
+    }
+};