Merge pull request #865 from Kovah/2.x-features

Add several new features (#862 #863 #864)
Kovah · Nov 16, 2024 · 5b80fa3 · 5b80fa3
2 parents bba868d + 3e9fedd
commit 5b80fa3
Show file tree

Hide file tree

Showing 44 changed files with 1,056 additions and 459 deletions.
diff --git a/app/Http/Controllers/Admin/SystemSettingsController.php b/app/Http/Controllers/Admin/SystemSettingsController.php
@@ -41,8 +41,11 @@ public function update(SystemSettingsUpdateRequest $request): RedirectResponse
     public function updateGuest(SystemSettingsUpdateRequest $request): RedirectResponse
     {
         $guestSettings = app(GuestSettings::class);
+        $systemSettings = app(SystemSettings::class);
 
-        $settings = $request->except(['_token', 'guest_share']);
+        $systemSettings->guest_access_enabled = $request->input('guest_access_enabled');
+
+        $settings = $request->except(['_token', 'guest_share', 'guest_access_enabled']);
 
         foreach ($settings as $key => $value) {
             $guestSettings->$key = $value;
@@ -56,6 +59,7 @@ public function updateGuest(SystemSettingsUpdateRequest $request): RedirectRespo
             }
         }
 
+        $systemSettings->save();
         $guestSettings->save();
 
         flash(trans('settings.settings_saved'));

diff --git a/app/Http/Controllers/ContactController.php b/app/Http/Controllers/ContactController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Settings\SystemSettings;
+
+class ContactController extends Controller
+{
+    public function __invoke(SystemSettings $systemSettings)
+    {
+        if (!$systemSettings->contact_page_enabled) {
+            abort(404);
+        }
+
+        return view('app.contact', [
+            'title' => $systemSettings->contact_page_title,
+            'content' => $systemSettings->contact_page_content,
+        ]);
+    }
+}
diff --git a/app/Http/Middleware/SettingsMiddleware.php b/app/Http/Middleware/SettingsMiddleware.php
@@ -28,6 +28,8 @@ public function handle(Request $request, Closure $next): mixed
 
         if ($userLocale = usersettings('locale')) {
             app()->setLocale($userLocale);
+        } else {
+            app()->setLocale(guestsettings('locale'));
         }
 
         return $next($request);

diff --git a/app/Http/Requests/SystemSettingsUpdateRequest.php b/app/Http/Requests/SystemSettingsUpdateRequest.php
@@ -11,14 +11,49 @@ public function rules(): array
         return [
             'system_page_title' => [
                 'max:256',
+                'nullable',
+                'string',
             ],
-            'system_guest_access' => [
+            'system_logo_text' => [
+                'max:20',
+                'nullable',
+                'string',
+            ],
+            'additional_footer_link_url' => [
+                'nullable',
+                'string',
+                'required_with:additional_footer_link_text'
+            ],
+            'additional_footer_link_text' => [
+                'max:20',
+                'nullable',
+                'string',
+                'required_with:additional_footer_link_url'
+            ],
+            'contact_page_enabled' => [
                 'boolean',
             ],
+            'contact_page_title' => [
+                'max:20',
+                'nullable',
+                'string',
+            ],
+            'contact_page_content' => [
+                'max:10000',
+                'nullable',
+                'string',
+            ],
             'system_custom_header_content' => [
                 'nullable',
                 'string',
             ],
+            // Guest settings
+            'system_guest_access' => [
+                'boolean',
+            ],
+            'guest_locale' => [
+                'string',
+            ],
             'guest_listitem_count' => [
                 'integer',
             ],

diff --git a/app/Settings/GuestSettings.php b/app/Settings/GuestSettings.php
@@ -10,6 +10,8 @@ class GuestSettings extends Settings
     public bool $links_new_tab;
     public int $darkmode_setting;
 
+    public string $locale;
+
     public bool $share_email;
     public bool $share_buffer;
     public bool $share_evernote;

diff --git a/app/Settings/SystemSettings.php b/app/Settings/SystemSettings.php
@@ -7,9 +7,19 @@
 class SystemSettings extends Settings
 {
     public ?string $page_title;
+    public ?string $logo_text;
+
     public ?string $cron_token;
+
     public ?string $custom_header_content;
 
+    public ?string $additional_footer_link_url;
+    public ?string $additional_footer_link_text;
+
+    public bool $contact_page_enabled;
+    public ?string $contact_page_title;
+    public ?string $contact_page_content;
+
     public bool $guest_access_enabled;
     public bool $setup_completed;