Opt-in dark mode support 🌙 (#209)

* Add opt-in dark mode support * Formatting
laravel · Nov 14, 2022 · d40b11f · d40b11f
1 parent 66e8416
commit d40b11f
Show file tree

Hide file tree

Showing 75 changed files with 208 additions and 162 deletions.
diff --git a/src/Console/InstallCommand.php b/src/Console/InstallCommand.php
@@ -6,6 +6,7 @@
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Str;
 use RuntimeException;
+use Symfony\Component\Finder\Finder;
 use Symfony\Component\Process\PhpExecutableFinder;
 use Symfony\Component\Process\Process;
 
@@ -19,6 +20,7 @@ class InstallCommand extends Command
  * @var string
  */
  protected $signature = 'breeze:install {stack=blade : The development stack that should be installed (blade,react,vue,api)}
+ {--dark : Indicate that dark mode support should be installed}
  {--inertia : Indicate that the Vue Inertia stack should be installed (Deprecated)}
  {--pest : Indicate that Pest should be installed}
  {--ssr : Indicates if Inertia SSR support should be installed}
@@ -221,4 +223,17 @@ protected function runCommands($commands)
  $this->output->write(' '.$line);
  });
  }
+
+ /**
+ * Remove Tailwind dark classes from the given files.
+ *
+ * @param \Symfony\Component\Finder\Finder $finder
+ * @return void
+ */
+ protected function removeDarkClasses(Finder $finder)
+ {
+ foreach ($finder as $file) {
+ file_put_contents($file->getPathname(), preg_replace('/\sdark:[^\s"\']+/', '', $file->getContents()));
+ }
+ }
 }
diff --git a/src/Console/InstallsBladeStack.php b/src/Console/InstallsBladeStack.php
@@ -3,6 +3,7 @@
 namespace Laravel\Breeze\Console;
 
 use Illuminate\Filesystem\Filesystem;
+use Symfony\Component\Finder\Finder;
 
 trait InstallsBladeStack
 {
@@ -36,6 +37,14 @@ protected function installBladeStack()
  (new Filesystem)->ensureDirectoryExists(resource_path('views'));
  (new Filesystem)->copyDirectory(__DIR__.'/../../stubs/default/resources/views', resource_path('views'));
 
+ if (! $this->option('dark')) {
+ $this->removeDarkClasses((new Finder)
+ ->in(resource_path('views'))
+ ->name('*.blade.php')
+ ->notName('welcome.blade.php')
+ );
+ }
+
  // Components...
  (new Filesystem)->ensureDirectoryExists(app_path('View/Components'));
  (new Filesystem)->copyDirectory(__DIR__.'/../../stubs/default/app/View/Components', app_path('View/Components'));

diff --git a/src/Console/InstallsInertiaStacks.php b/src/Console/InstallsInertiaStacks.php
@@ -3,6 +3,7 @@
 namespace Laravel\Breeze\Console;
 
 use Illuminate\Filesystem\Filesystem;
+use Symfony\Component\Finder\Finder;
 use Symfony\Component\Process\Process;
 
 trait InstallsInertiaStacks
@@ -58,6 +59,14 @@ protected function installInertiaVueStack()
  (new Filesystem)->copyDirectory(__DIR__.'/../../stubs/inertia-vue/resources/js/Layouts', resource_path('js/Layouts'));
  (new Filesystem)->copyDirectory(__DIR__.'/../../stubs/inertia-vue/resources/js/Pages', resource_path('js/Pages'));
 
+ if (! $this->option('dark')) {
+ $this->removeDarkClasses((new Finder)
+ ->in(resource_path('js'))
+ ->name('*.vue')
+ ->notName('Welcome.vue')
+ );
+ }
+
  // Tests...
  $this->installTests();
  (new Filesystem)->copyDirectory(__DIR__.'/../../stubs/inertia-common/tests/Feature', base_path('tests/Feature'));
@@ -171,6 +180,14 @@ protected function installInertiaReactStack()
  (new Filesystem)->copyDirectory(__DIR__.'/../../stubs/inertia-react/resources/js/Layouts', resource_path('js/Layouts'));
  (new Filesystem)->copyDirectory(__DIR__.'/../../stubs/inertia-react/resources/js/Pages', resource_path('js/Pages'));
 
+ if (! $this->option('dark')) {
+ $this->removeDarkClasses((new Finder)
+ ->in(resource_path('js'))
+ ->name('*.jsx')
+ ->notName('Welcome.jsx')
+ );
+ }
+
  // Tests...
  $this->installTests();
  (new Filesystem)->copyDirectory(__DIR__.'/../../stubs/inertia-common/tests/Feature', base_path('tests/Feature'));

diff --git a/stubs/default/resources/views/auth/confirm-password.blade.php b/stubs/default/resources/views/auth/confirm-password.blade.php
@@ -6,7 +6,7 @@
  </a>
  </x-slot>
 
- <div class="mb-4 text-sm text-gray-600">
+ <div class="mb-4 text-sm text-gray-600 dark:text-gray-400">
  {{ __('This is a secure area of the application. Please confirm your password before continuing.') }}
  </div>
 

diff --git a/stubs/default/resources/views/auth/forgot-password.blade.php b/stubs/default/resources/views/auth/forgot-password.blade.php
@@ -6,7 +6,7 @@
  </a>
  </x-slot>
 
- <div class="mb-4 text-sm text-gray-600">
+ <div class="mb-4 text-sm text-gray-600 dark:text-gray-400">
  {{ __('Forgot your password? No problem. Just let us know your email address and we will email you a password reset link that will allow you to choose a new one.') }}
  </div>
 

diff --git a/stubs/default/resources/views/auth/login.blade.php b/stubs/default/resources/views/auth/login.blade.php
@@ -36,14 +36,14 @@
  <!-- Remember Me -->
  <div class="block mt-4">
  <label for="remember_me" class="inline-flex items-center">
- <input id="remember_me" type="checkbox" class="rounded border-gray-300 text-indigo-600 shadow-sm focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50" name="remember">
- <span class="ml-2 text-sm text-gray-600">{{ __('Remember me') }}</span>
+ <input id="remember_me" type="checkbox" class="rounded dark:bg-gray-900 border-gray-300 dark:border-gray-700 text-indigo-600 shadow-sm focus:ring-indigo-500 dark:focus:ring-indigo-600 dark:focus:ring-offset-gray-800" name="remember">
+ <span class="ml-2 text-sm text-gray-600 dark:text-gray-400">{{ __('Remember me') }}</span>
  </label>
  </div>
 
  <div class="flex items-center justify-end mt-4">
  @if (Route::has('password.request'))
- <a class="underline text-sm text-gray-600 hover:text-gray-900" href="{{ route('password.request') }}">
+ <a class="underline text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800" href="{{ route('password.request') }}">
  {{ __('Forgot your password?') }}
  </a>
  @endif

diff --git a/stubs/default/resources/views/auth/register.blade.php b/stubs/default/resources/views/auth/register.blade.php
@@ -51,7 +51,7 @@
  </div>
 
  <div class="flex items-center justify-end mt-4">
- <a class="underline text-sm text-gray-600 hover:text-gray-900" href="{{ route('login') }}">
+ <a class="underline text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800" href="{{ route('login') }}">
  {{ __('Already registered?') }}
  </a>
 

diff --git a/stubs/default/resources/views/auth/verify-email.blade.php b/stubs/default/resources/views/auth/verify-email.blade.php
@@ -6,12 +6,12 @@
  </a>
  </x-slot>
 
- <div class="mb-4 text-sm text-gray-600">
+ <div class="mb-4 text-sm text-gray-600 dark:text-gray-400">
  {{ __('Thanks for signing up! Before getting started, could you verify your email address by clicking on the link we just emailed to you? If you didn\'t receive the email, we will gladly send you another.') }}
  </div>
 
  @if (session('status') == 'verification-link-sent')
- <div class="mb-4 font-medium text-sm text-green-600">
+ <div class="mb-4 font-medium text-sm text-green-600 dark:text-green-400">
  {{ __('A new verification link has been sent to the email address you provided during registration.') }}
  </div>
  @endif
@@ -30,7 +30,7 @@
  <form method="POST" action="{{ route('logout') }}">
  @csrf
 
- <button type="submit" class="underline text-sm text-gray-600 hover:text-gray-900">
+ <button type="submit" class="underline text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800">
  {{ __('Log Out') }}
  </button>
  </form>

diff --git a/stubs/default/resources/views/components/auth-card.blade.php b/stubs/default/resources/views/components/auth-card.blade.php
@@ -1,9 +1,9 @@
-<div class="min-h-screen flex flex-col sm:justify-center items-center pt-6 sm:pt-0 bg-gray-100">
+<div class="min-h-screen flex flex-col sm:justify-center items-center pt-6 sm:pt-0 bg-gray-100 dark:bg-gray-900">
  <div>
  {{ $logo }}
  </div>
 
- <div class="w-full sm:max-w-md mt-6 px-6 py-4 bg-white shadow-md overflow-hidden sm:rounded-lg">
+ <div class="w-full sm:max-w-md mt-6 px-6 py-4 bg-white dark:bg-gray-800 shadow-md overflow-hidden sm:rounded-lg">
  {{ $slot }}
  </div>
 </div>
diff --git a/stubs/default/resources/views/components/auth-session-status.blade.php b/stubs/default/resources/views/components/auth-session-status.blade.php
@@ -1,7 +1,7 @@
 @props(['status'])
 
 @if ($status)
- <div {{ $attributes->merge(['class' => 'font-medium text-sm text-green-600']) }}>
+ <div {{ $attributes->merge(['class' => 'font-medium text-sm text-green-600 dark:text-green-400']) }}>
  {{ $status }}
  </div>
 @endif
diff --git a/stubs/default/resources/views/components/danger-button.blade.php b/stubs/default/resources/views/components/danger-button.blade.php
@@ -1,3 +1,3 @@
-<button {{ $attributes->merge(['type' => 'submit', 'class' => 'inline-flex items-center px-4 py-2 bg-red-600 border border-transparent rounded-md font-semibold text-xs text-white uppercase tracking-widest hover:bg-red-500 active:bg-red-600 focus:outline-none focus:border-red-300 focus:shadow-outline-red transition ease-in-out duration-150']) }}>
+<button {{ $attributes->merge(['type' => 'submit', 'class' => 'inline-flex items-center px-4 py-2 bg-red-600 border border-transparent rounded-md font-semibold text-xs text-white uppercase tracking-widest hover:bg-red-500 active:bg-red-700 focus:outline-none focus:ring-2 focus:ring-red-500 focus:ring-offset-2 dark:focus:ring-offset-gray-800 transition ease-in-out duration-150']) }}>
  {{ $slot }}
 </button>
diff --git a/stubs/default/resources/views/components/dropdown-link.blade.php b/stubs/default/resources/views/components/dropdown-link.blade.php
@@ -1 +1 @@
-<a {{ $attributes->merge(['class' => 'block px-4 py-2 text-sm leading-5 text-gray-700 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 transition duration-150 ease-in-out']) }}>{{ $slot }}</a>
+<a {{ $attributes->merge(['class' => 'block w-full px-4 py-2 text-left text-sm leading-5 text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-800 focus:outline-none focus:bg-gray-100 dark:focus:bg-gray-800 transition duration-150 ease-in-out']) }}>{{ $slot }}</a>
diff --git a/stubs/default/resources/views/components/dropdown.blade.php b/stubs/default/resources/views/components/dropdown.blade.php
@@ -1,4 +1,4 @@
-@props(['align' => 'right', 'width' => '48', 'contentClasses' => 'py-1 bg-white'])
+@props(['align' => 'right', 'width' => '48', 'contentClasses' => 'py-1 bg-white dark:bg-gray-700'])
 
 @php
 switch ($align) {

diff --git a/stubs/default/resources/views/components/input-error.blade.php b/stubs/default/resources/views/components/input-error.blade.php
@@ -1,7 +1,7 @@
 @props(['messages'])
 
 @if ($messages)
- <ul {{ $attributes->merge(['class' => 'text-sm text-red-600 space-y-1']) }}>
+ <ul {{ $attributes->merge(['class' => 'text-sm text-red-600 dark:text-red-400 space-y-1']) }}>
  @foreach ((array) $messages as $message)
  <li>{{ $message }}</li>
  @endforeach

diff --git a/stubs/default/resources/views/components/input-label.blade.php b/stubs/default/resources/views/components/input-label.blade.php
@@ -1,5 +1,5 @@
 @props(['value'])
 
-<label {{ $attributes->merge(['class' => 'block font-medium text-sm text-gray-700']) }}>
+<label {{ $attributes->merge(['class' => 'block font-medium text-sm text-gray-700 dark:text-gray-300']) }}>
  {{ $value ?? $slot }}
 </label>
diff --git a/stubs/default/resources/views/components/modal.blade.php b/stubs/default/resources/views/components/modal.blade.php
@@ -59,12 +59,12 @@ class="fixed inset-0 transform transition-all"
  x-transition:leave-start="opacity-100"
  x-transition:leave-end="opacity-0"
  >
- <div class="absolute inset-0 bg-gray-500 opacity-75"></div>
+ <div class="absolute inset-0 bg-gray-500 dark:bg-gray-900 opacity-75"></div>
  </div>
 
  <div
  x-show="show"
- class="mb-6 bg-white rounded-lg overflow-hidden shadow-xl transform transition-all sm:w-full {{ $maxWidth }} sm:mx-auto"
+ class="mb-6 bg-white dark:bg-gray-800 rounded-lg overflow-hidden shadow-xl transform transition-all sm:w-full {{ $maxWidth }} sm:mx-auto"
  x-transition:enter="ease-out duration-300"
  x-transition:enter-start="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
  x-transition:enter-end="opacity-100 translate-y-0 sm:scale-100"

diff --git a/stubs/default/resources/views/components/nav-link.blade.php b/stubs/default/resources/views/components/nav-link.blade.php
@@ -2,8 +2,8 @@
 
 @php
 $classes = ($active ?? false)
- ? 'inline-flex items-center px-1 pt-1 border-b-2 border-indigo-400 text-sm font-medium leading-5 text-gray-900 focus:outline-none focus:border-indigo-700 transition duration-150 ease-in-out'
- : 'inline-flex items-center px-1 pt-1 border-b-2 border-transparent text-sm font-medium leading-5 text-gray-500 hover:text-gray-700 hover:border-gray-300 focus:outline-none focus:text-gray-700 focus:border-gray-300 transition duration-150 ease-in-out';
+ ? 'inline-flex items-center px-1 pt-1 border-b-2 border-indigo-400 dark:border-indigo-600 text-sm font-medium leading-5 text-gray-900 dark:text-gray-100 focus:outline-none focus:border-indigo-700 transition duration-150 ease-in-out'
+ : 'inline-flex items-center px-1 pt-1 border-b-2 border-transparent text-sm font-medium leading-5 text-gray-500 dark:text-gray-400 hover:text-gray-700 dark:hover:text-gray-300 hover:border-gray-300 dark:hover:border-gray-700 focus:outline-none focus:text-gray-700 dark:focus:text-gray-300 focus:border-gray-300 dark:focus:border-gray-700 transition duration-150 ease-in-out';
 @endphp
 
 <a {{ $attributes->merge(['class' => $classes]) }}>

diff --git a/stubs/default/resources/views/components/primary-button.blade.php b/stubs/default/resources/views/components/primary-button.blade.php
@@ -1,3 +1,3 @@
-<button {{ $attributes->merge(['type' => 'submit', 'class' => 'inline-flex items-center px-4 py-2 bg-gray-800 border border-transparent rounded-md font-semibold text-xs text-white uppercase tracking-widest hover:bg-gray-700 active:bg-gray-900 focus:outline-none focus:border-gray-900 focus:ring ring-gray-300 disabled:opacity-25 transition ease-in-out duration-150']) }}>
+<button {{ $attributes->merge(['type' => 'submit', 'class' => 'inline-flex items-center px-4 py-2 bg-gray-800 dark:bg-gray-200 border border-transparent rounded-md font-semibold text-xs text-white dark:text-gray-800 uppercase tracking-widest hover:bg-gray-700 dark:hover:bg-white focus:bg-gray-700 dark:focus:bg-white active:bg-gray-900 dark:active:bg-gray-300 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 dark:focus:ring-offset-gray-800 transition ease-in-out duration-150']) }}>
  {{ $slot }}
 </button>
diff --git a/stubs/default/resources/views/components/responsive-nav-link.blade.php b/stubs/default/resources/views/components/responsive-nav-link.blade.php
@@ -2,8 +2,8 @@
 
 @php
 $classes = ($active ?? false)
- ? 'block pl-3 pr-4 py-2 border-l-4 border-indigo-400 text-base font-medium text-indigo-700 bg-indigo-50 focus:outline-none focus:text-indigo-800 focus:bg-indigo-100 focus:border-indigo-700 transition duration-150 ease-in-out'
- : 'block pl-3 pr-4 py-2 border-l-4 border-transparent text-base font-medium text-gray-600 hover:text-gray-800 hover:bg-gray-50 hover:border-gray-300 focus:outline-none focus:text-gray-800 focus:bg-gray-50 focus:border-gray-300 transition duration-150 ease-in-out';
+ ? 'block w-full pl-3 pr-4 py-2 border-l-4 border-indigo-400 dark:border-indigo-600 text-left text-base font-medium text-indigo-700 dark:text-indigo-300 bg-indigo-50 dark:bg-indigo-900/50 focus:outline-none focus:text-indigo-800 dark:focus:text-indigo-200 focus:bg-indigo-100 dark:focus:bg-indigo-900 focus:border-indigo-700 dark:focus:border-indigo-300 transition duration-150 ease-in-out'
+ : 'block w-full pl-3 pr-4 py-2 border-l-4 border-transparent text-left text-base font-medium text-gray-600 dark:text-gray-400 hover:text-gray-800 dark:hover:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-700 hover:border-gray-300 dark:hover:border-gray-600 focus:outline-none focus:text-gray-800 dark:focus:text-gray-200 focus:bg-gray-50 dark:focus:bg-gray-700 focus:border-gray-300 dark:focus:border-gray-600 transition duration-150 ease-in-out';
 @endphp
 
 <a {{ $attributes->merge(['class' => $classes]) }}>

diff --git a/stubs/default/resources/views/components/secondary-button.blade.php b/stubs/default/resources/views/components/secondary-button.blade.php
@@ -1,3 +1,3 @@
-<button {{ $attributes->merge(['type' => 'button', 'class' => 'inline-flex items-center px-4 py-2 bg-white border border-gray-300 rounded-md font-semibold text-xs text-gray-700 uppercase tracking-widest shadow-sm hover:text-gray-500 active:text-gray-800 active:bg-gray-50 focus:outline-none focus:border-blue-300 focus:ring focus:ring-blue-200 disabled:opacity-25 transition']) }}>
+<button {{ $attributes->merge(['type' => 'button', 'class' => 'inline-flex items-center px-4 py-2 bg-white dark:bg-gray-800 border border-gray-300 dark:border-gray-500 rounded-md font-semibold text-xs text-gray-700 dark:text-gray-300 uppercase tracking-widest shadow-sm hover:bg-gray-50 dark:hover:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 dark:focus:ring-offset-gray-800 disabled:opacity-25 transition ease-in-out duration-150']) }}>
  {{ $slot }}
 </button>
diff --git a/stubs/default/resources/views/components/text-input.blade.php b/stubs/default/resources/views/components/text-input.blade.php
@@ -1,3 +1,3 @@
 @props(['disabled' => false])
 
-<input {{ $disabled ? 'disabled' : '' }} {!! $attributes->merge(['class' => 'rounded-md shadow-sm border-gray-300 focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50']) !!}>
+<input {{ $disabled ? 'disabled' : '' }} {!! $attributes->merge(['class' => 'border-gray-300 dark:border-gray-700 dark:bg-gray-900 dark:text-gray-300 focus:border-indigo-500 dark:focus:border-indigo-600 focus:ring-indigo-500 dark:focus:ring-indigo-600 rounded-md shadow-sm']) !!}>
diff --git a/stubs/default/resources/views/dashboard.blade.php b/stubs/default/resources/views/dashboard.blade.php
@@ -1,14 +1,14 @@
 <x-app-layout>
  <x-slot name="header">
- <h2 class="font-semibold text-xl text-gray-800 leading-tight">
+ <h2 class="font-semibold text-xl text-gray-800 dark:text-gray-200 leading-tight">
  {{ __('Dashboard') }}
  </h2>
  </x-slot>
 
  <div class="py-12">
  <div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
- <div class="bg-white overflow-hidden shadow-sm sm:rounded-lg">
- <div class="p-6 bg-white border-b border-gray-200">
+ <div class="bg-white dark:bg-gray-800 overflow-hidden shadow-sm sm:rounded-lg">
+ <div class="p-6 text-gray-900 dark:text-gray-100">
  You're logged in!
  </div>
  </div>

diff --git a/stubs/default/resources/views/layouts/app.blade.php b/stubs/default/resources/views/layouts/app.blade.php
@@ -14,12 +14,12 @@
  @vite(['resources/css/app.css', 'resources/js/app.js'])
  </head>
  <body class="font-sans antialiased">
- <div class="min-h-screen bg-gray-100">
+ <div class="min-h-screen bg-gray-100 dark:bg-gray-900">
  @include('layouts.navigation')
 
  <!-- Page Heading -->
  @if (isset($header))
- <header class="bg-white shadow">
+ <header class="bg-white dark:bg-gray-800 shadow">
  <div class="max-w-7xl mx-auto py-6 px-4 sm:px-6 lg:px-8">
  {{ $header }}
  </div>