Adding updates to authentication and adding default white background

thedevdojo · May 27, 2024 · de3f5a3 · de3f5a3
1 parent a7cfa52
commit de3f5a3
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 vendor/
 node_modules/
+.DS_Store
diff --git a/config/devdojo/auth/appearance.php b/config/devdojo/auth/appearance.php
@@ -12,7 +12,7 @@
         'height' => '32',
     ],
     'background' => [
-        'color' => '#000000',
+        'color' => '#ffffff',
         'image' => '',
         'image_overlay_color' => '#000000',
         'image_overlay_opacity' => '0.5',

diff --git a/public/build/assets/styles.css b/public/build/assets/styles.css
diff --git a/resources/views/components/layouts/app.blade.php b/resources/views/components/layouts/app.blade.php
@@ -23,8 +23,8 @@
         </main>
 
         @if(config('devdojo.auth.settings.enable_branding') && !app()->isLocal())
-            <a href="https://devdojo.com/auth" target="_blank" class="flex fixed bottom-0 left-1/2 z-30 justify-center items-center px-2.5 py-1.5 w-auto text-xs font-medium rounded-t-lg border -translate-x-1/2 cursor-pointer bg-zinc-900 hover:bg-zinc-800/70 text-white/40 hover:text-white/80 border-zinc-800">
-                <svg class="mr-1 w-5 h-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 151 201" fill="none"><path fill="currentColor" fill-rule="evenodd" d="M75.847.132c-28.092 23.884-45.7 25-75 25v96.125c0 15.285 4.238 26.069 12.393 35.442l17.526-33.718.345-.661 5.06-9.74L76.496 35l40.323 77.58c20.95 2.616 30.894 8.93 30.894 8.93a219.818 219.818 0 0 0-24.117 1.321l-1.371.15c-1.345.158-2.69.326-4.017.502a227.52 227.52 0 0 0-41.712 9.705C50.36 141.907 30.44 153.7 18.4 161.993c9.303 8.615 22.183 16.475 38.353 26.344 5.927 3.616 12.296 7.503 19.093 11.795 6.796-4.292 13.165-8.179 19.091-11.795 16.494-10.066 29.564-18.042 38.907-26.861a205.398 205.398 0 0 0-35.223-19.64 225.71 225.71 0 0 1 30.106-6.358l10.533 20.272c7.627-9.153 11.586-19.721 11.586-34.493V25.132c-29.3 0-46.909-1.117-75-25Zm.649 112.615c-6.892.793-14.306 1.973-22.26 3.655l2.566-4.923 19.694-37.896 19.693 37.896c-6.582.089-13.155.513-19.693 1.268Z" clip-rule="evenodd"/></svg>
+            <a href="https://devdojo.com/platform/auth?utm_source=branding" target="_blank" class="flex fixed bottom-0 left-1/2 z-30 justify-center items-center px-2.5 py-1.5 w-auto text-xs font-medium rounded-t-lg border -translate-x-1/2 cursor-pointer bg-zinc-900 text-white/80 hover:text-white border-zinc-800">
+                <svg class="mr-1 -ml-1 w-5 h-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 151 201" fill="none"><path fill="currentColor" fill-rule="evenodd" d="M75.847.132c-28.092 23.884-45.7 25-75 25v96.125c0 15.285 4.238 26.069 12.393 35.442l17.526-33.718.345-.661 5.06-9.74L76.496 35l40.323 77.58c20.95 2.616 30.894 8.93 30.894 8.93a219.818 219.818 0 0 0-24.117 1.321l-1.371.15c-1.345.158-2.69.326-4.017.502a227.52 227.52 0 0 0-41.712 9.705C50.36 141.907 30.44 153.7 18.4 161.993c9.303 8.615 22.183 16.475 38.353 26.344 5.927 3.616 12.296 7.503 19.093 11.795 6.796-4.292 13.165-8.179 19.091-11.795 16.494-10.066 29.564-18.042 38.907-26.861a205.398 205.398 0 0 0-35.223-19.64 225.71 225.71 0 0 1 30.106-6.358l10.533 20.272c7.627-9.153 11.586-19.721 11.586-34.493V25.132c-29.3 0-46.909-1.117-75-25Zm.649 112.615c-6.892.793-14.306 1.973-22.26 3.655l2.566-4.923 19.694-37.896 19.693 37.896c-6.582.089-13.155.513-19.693 1.268Z" clip-rule="evenodd"/></svg>
                 <p>Secured by DevDojo</p>
             </a>
         @endif

diff --git a/resources/views/pages/auth/setup/appearance.blade.php b/resources/views/pages/auth/setup/appearance.blade.php
@@ -1,10 +1,11 @@
 <?php
 
-use function Laravel\Folio\name;
+use function Laravel\Folio\{middleware, name};
 use Livewire\Volt\Component;
 use Livewire\Attributes\Validate;
 use Devdojo\Auth\Helper;
 
+middleware(['auth', 'view-auth-setup']);
 name('auth.setup.appearance');
 
 new class extends Component

diff --git a/resources/views/pages/auth/setup/index.blade.php b/resources/views/pages/auth/setup/index.blade.php
@@ -1,9 +1,10 @@
 <?php
 
-use function Laravel\Folio\name;
+use function Laravel\Folio\{middleware, name};
 use Livewire\Volt\Component;
 use Livewire\Attributes\Validate;
 
+middleware(['auth', 'view-auth-setup']);
 name('auth.setup');
 
 new class extends Component

diff --git a/resources/views/pages/auth/setup/language.blade.php b/resources/views/pages/auth/setup/language.blade.php
@@ -1,10 +1,11 @@
 <?php
 
-use function Laravel\Folio\name;
+use function Laravel\Folio\{middleware, name};
 use Livewire\Volt\Component;
 use Livewire\Attributes\Validate;
 use Devdojo\Auth\Helper;
 
+middleware(['auth', 'view-auth-setup']);
 name('auth.setup.language');
 
 new class extends Component

diff --git a/resources/views/pages/auth/setup/providers.blade.php b/resources/views/pages/auth/setup/providers.blade.php
@@ -1,11 +1,12 @@
 <?php
 
-use function Laravel\Folio\name;
+use function Laravel\Folio\{middleware, name};
 use Livewire\Volt\Component;
 use Livewire\Attributes\Validate;
 use Devdojo\Auth\Helper;
 use Devdojo\ConfigWriter\ArrayFile;
 
+middleware(['auth', 'view-auth-setup']);
 name('auth.setup.providers');
 
 new class extends Component

diff --git a/resources/views/pages/auth/setup/settings.blade.php b/resources/views/pages/auth/setup/settings.blade.php
@@ -1,11 +1,12 @@
 <?php
 
-use function Laravel\Folio\name;
+use function Laravel\Folio\{middleware, name};
 use Livewire\Volt\Component;
 use Livewire\Attributes\Validate;
 use Devdojo\Auth\Helper;
 use Devdojo\ConfigWriter\ArrayFile;
 
+middleware(['auth', 'view-auth-setup']);
 name('auth.setup.settings');
 
 new class extends Component

diff --git a/src/AuthServiceProvider.php b/src/AuthServiceProvider.php
@@ -4,6 +4,7 @@
 
 use Devdojo\Auth\Http\Middleware\TwoFactorChallenged;
 use Devdojo\Auth\Http\Middleware\TwoFactorEnabled;
+use Devdojo\Auth\Http\Middleware\ViewAuthSetup;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\ServiceProvider;
@@ -22,6 +23,7 @@ public function boot(): void
 
         Route::middlewareGroup('two-factor-challenged', [TwoFactorChallenged::class]);
         Route::middlewareGroup('two-factor-enabled', [TwoFactorEnabled::class]);
+        Route::middlewareGroup('view-auth-setup', [ViewAuthSetup::class]);
 
         /*
          * Optional methods to load your package assets
@@ -59,6 +61,11 @@ public function boot(): void
                 __DIR__.'/../database/migrations' => database_path('migrations'),
             ], 'auth:migrations');
 
+            // Publish the components
+            $this->publishes([
+                __DIR__.'/../resources/views/components/elements' => resource_path('views/components/app/elements'),
+            ], 'auth:components');
+
             // Registering package commands.
             // $this->commands([]);
         }

diff --git a/src/Http/Middleware/ViewAuthSetup.php b/src/Http/Middleware/ViewAuthSetup.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Devdojo\Auth\Http\Middleware;
+
+use Closure;
+use Illuminate\Support\Facades\Gate;
+
+class ViewAuthSetup
+{
+    public function handle($request, Closure $next)
+    {
+        if (app()->isLocal() || Gate::allows('viewAuthSetup')) {
+            return $next($request);
+        }
+
+        abort(403);
+    }
+}