From 1f99769522f6d8439c5f2f57cf57cb92721163a4 Mon Sep 17 00:00:00 2001 From: Alexander Gabriel Date: Sun, 7 Jun 2026 21:30:03 +0200 Subject: [PATCH] revert 6ea60fcbb56b1fe0354f3f9a6b59fc81ccdfa26a revert move settings to new page --- .env.example | 2 - app/Http/Controllers/SettingsController.php | 38 ----------------- app/Http/Middleware/SettingsPassword.php | 19 --------- resources/views/camera.blade.php | 2 + resources/views/settings-login.blade.php | 46 --------------------- resources/views/settings.blade.php | 35 ---------------- routes/web.php | 10 ----- 7 files changed, 2 insertions(+), 150 deletions(-) delete mode 100644 app/Http/Controllers/SettingsController.php delete mode 100644 app/Http/Middleware/SettingsPassword.php delete mode 100644 resources/views/settings-login.blade.php delete mode 100644 resources/views/settings.blade.php diff --git a/.env.example b/.env.example index 604de52..c0660ea 100644 --- a/.env.example +++ b/.env.example @@ -63,5 +63,3 @@ AWS_BUCKET= AWS_USE_PATH_STYLE_ENDPOINT=false VITE_APP_NAME="${APP_NAME}" - -SETTINGS_PASSWORD=admin diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php deleted file mode 100644 index 0adbee7..0000000 --- a/app/Http/Controllers/SettingsController.php +++ /dev/null @@ -1,38 +0,0 @@ -input('password') === $password) { - session(['settings_authenticated' => true]); - return redirect()->route('settings'); - } - - return back()->withErrors(['password' => 'Falsches Passwort.']); - } - - public function index(): View - { - return view('settings'); - } - - public function logout(): RedirectResponse - { - session()->forget('settings_authenticated'); - return redirect()->route('settings.login'); - } -} diff --git a/app/Http/Middleware/SettingsPassword.php b/app/Http/Middleware/SettingsPassword.php deleted file mode 100644 index 695660a..0000000 --- a/app/Http/Middleware/SettingsPassword.php +++ /dev/null @@ -1,19 +0,0 @@ -route('settings.login'); - } - - return $next($request); - } -} diff --git a/resources/views/camera.blade.php b/resources/views/camera.blade.php index bf05846..dcfe7ea 100644 --- a/resources/views/camera.blade.php +++ b/resources/views/camera.blade.php @@ -15,6 +15,8 @@ @livewire('camera-capture') + @livewire('photo-settings') + @livewireScripts diff --git a/resources/views/settings-login.blade.php b/resources/views/settings-login.blade.php deleted file mode 100644 index 8db4b5f..0000000 --- a/resources/views/settings-login.blade.php +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - Einstellungen – Fotobox - @if (file_exists(public_path('build/manifest.json')) || file_exists(public_path('hot'))) - @vite(['resources/css/app.css', 'resources/js/app.js']) - @endif - - - -
-

Einstellungen

- -
- @csrf - -
- - - @error('password') -

{{ $message }}

- @enderror -
- - -
- -
- - ← Zurück zur Fotobox - -
-
- - - diff --git a/resources/views/settings.blade.php b/resources/views/settings.blade.php deleted file mode 100644 index 1f7f4c5..0000000 --- a/resources/views/settings.blade.php +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - Einstellungen – Fotobox - @if (file_exists(public_path('build/manifest.json')) || file_exists(public_path('hot'))) - @vite(['resources/css/app.css', 'resources/js/app.js']) - @endif - @livewireStyles - - - -
-
-

Einstellungen

-
- - ← Fotobox - -
- @csrf - -
-
-
- - @livewire('photo-settings') -
- - @livewireScripts - - diff --git a/routes/web.php b/routes/web.php index da99cf9..6951d20 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,18 +1,8 @@ middleware(\App\Http\Middleware\RestrictToSubnet::class) ->name('camera'); - -Route::get('/settings/login', [SettingsController::class, 'login'])->name('settings.login'); -Route::post('/settings/login', [SettingsController::class, 'authenticate'])->name('settings.authenticate'); -Route::post('/settings/logout', [SettingsController::class, 'logout'])->name('settings.logout'); - -Route::get('/settings', [SettingsController::class, 'index']) - ->middleware(SettingsPassword::class) - ->name('settings');