From 4c39a2ea1a119973f041c911671d169c4cdb9afe Mon Sep 17 00:00:00 2001 From: Julian Prieber Date: Thu, 19 Dec 2024 16:30:31 +0100 Subject: [PATCH] Add SPA_MODE configuration and update related views for conditional loading --- .env | 4 +- .../views/components/config/config.blade.php | 3 + .../views/components/finishing.blade.php | 6 ++ resources/views/layouts/sidebar.blade.php | 59 ++++++++----------- resources/views/panel/users.blade.php | 4 +- resources/views/studio/page.blade.php | 8 ++- 6 files changed, 46 insertions(+), 38 deletions(-) diff --git a/.env b/.env index a7fdb5c..5453e45 100644 --- a/.env +++ b/.env @@ -134,4 +134,6 @@ MANUAL_USER_VERIFICATION=true ENABLE_REPORT_ICON=false ENABLE_ADMIN_BAR=true -ENABLE_ADMIN_BAR_USERS=false \ No newline at end of file +ENABLE_ADMIN_BAR_USERS=false + +SPA_MODE=false \ No newline at end of file diff --git a/resources/views/components/config/config.blade.php b/resources/views/components/config/config.blade.php index 14f8feb..055f9a5 100644 --- a/resources/views/components/config/config.blade.php +++ b/resources/views/components/config/config.blade.php @@ -276,6 +276,9 @@ foreach($users as $user){if($user->littlelink_name != $configValue2){echo '

{{__('messages.Panel settings')}}

+{{toggle('SPA_MODE')}} + + {{toggle('NOTIFY_EVENTS')}} diff --git a/resources/views/components/finishing.blade.php b/resources/views/components/finishing.blade.php index 8cf603a..5210121 100644 --- a/resources/views/components/finishing.blade.php +++ b/resources/views/components/finishing.blade.php @@ -162,6 +162,12 @@ if (EnvEditor::keyExists('ALLOW_REGISTRATION')) { } } +if (EnvEditor::keyExists('SPA_MODE')) { + /* Do nothing if key already exists */ +} else { + EnvEditor::addKey('SPA_MODE', 'false'); +} + try { $file = base_path('storage/RSTAC'); if (file_exists($file)) { diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php index 62b9032..5e1f44d 100755 --- a/resources/views/layouts/sidebar.blade.php +++ b/resources/views/layouts/sidebar.blade.php @@ -4,6 +4,8 @@ use App\Models\UserData; $usrhandl = Auth::user()->littlelink_name; + $spa = env('SPA_MODE', false); + $betaServer = env('BETA_SERVER', 'https://beta.linkstack.org/'); $versionServer = env('VERSION_SERVER', 'https://version.linkstack.org/'); @endphp @@ -16,7 +18,9 @@ {{ env('APP_NAME') }} - @livewireStyles + @if($spa) + @livewireStyles + @endif @@ -71,29 +75,12 @@ -{{-- --}} - - - - - - + + @@ -102,10 +89,6 @@ - - - - @@ -168,14 +151,15 @@ - {{-- -
-
-
+ @if(!$spa) + +
+
+
+
-
- - --}} + + @endif