diff --git a/app/Livewire/Branch.php b/app/Livewire/Branch.php index 6d50d48..4e4355a 100644 --- a/app/Livewire/Branch.php +++ b/app/Livewire/Branch.php @@ -3,7 +3,9 @@ namespace App\Livewire; use Livewire\Component; +use Livewire\Attributes\Layout; // Required for layout declaration +#[Layout('layouts.dashboard')] // Attribute syntax for Laravel 11 class Branch extends Component { public function render() diff --git a/app/Livewire/CardMember.php b/app/Livewire/CardMember.php index a05060d..0af1943 100644 --- a/app/Livewire/CardMember.php +++ b/app/Livewire/CardMember.php @@ -3,7 +3,9 @@ namespace App\Livewire; use Livewire\Component; +use Livewire\Attributes\Layout; // Required for layout declaration +#[Layout('layouts.dashboard')] // Attribute syntax for Laravel 11 class CardMember extends Component { public function render() diff --git a/app/Livewire/CardType.php b/app/Livewire/CardType.php index 977f482..6bf42d1 100644 --- a/app/Livewire/CardType.php +++ b/app/Livewire/CardType.php @@ -3,7 +3,9 @@ namespace App\Livewire; use Livewire\Component; +use Livewire\Attributes\Layout; // Required for layout declaration +#[Layout('layouts.dashboard')] // Attribute syntax for Laravel 11 class CardType extends Component { public function render() diff --git a/app/Livewire/Drawer.php b/app/Livewire/Drawer.php index 9920bfe..dc9edeb 100644 --- a/app/Livewire/Drawer.php +++ b/app/Livewire/Drawer.php @@ -8,10 +8,6 @@ class Drawer extends Component { public function selectPage($page) { - // // Log the selected page to Laravel's log file (you'll find this in storage/logs/laravel.log) - // logger('Page selected:', [$page]); - - // Dispatch the navigate-to-page event to update the active page in the MainContentManager component $this->dispatch('navigate-to-page', page: $page); } diff --git a/app/Livewire/Fuel.php b/app/Livewire/Fuel.php index 168dbcf..a4c8ec4 100644 --- a/app/Livewire/Fuel.php +++ b/app/Livewire/Fuel.php @@ -3,7 +3,9 @@ namespace App\Livewire; use Livewire\Component; +use Livewire\Attributes\Layout; // Required for layout declaration +#[Layout('layouts.dashboard')] // Attribute syntax for Laravel 11 class Fuel extends Component { public function render() diff --git a/app/Livewire/LockedAccount.php b/app/Livewire/LockedAccount.php index 70f8163..6749e8c 100644 --- a/app/Livewire/LockedAccount.php +++ b/app/Livewire/LockedAccount.php @@ -3,11 +3,13 @@ namespace App\Livewire; use Livewire\Component; +use Livewire\Attributes\Layout; // Required for layout declaration +#[Layout('layouts.dashboard')] // Attribute syntax for Laravel 11 class LockedAccount extends Component { public function render() { - return view('livewire.member-management.card-member'); + return view('livewire.member-management.locked-account'); } } diff --git a/app/Livewire/MainContentManager.php b/app/Livewire/MainContentManager.php index 2cdd35b..54d93a5 100644 --- a/app/Livewire/MainContentManager.php +++ b/app/Livewire/MainContentManager.php @@ -1,18 +1,24 @@ segments(); + // Get the last part of the URL path + $this->activePage = end($segments) ?? 'user-management'; + } protected $listeners = ['navigate-to-page' => 'setPage']; public function setPage($page) { - // dd($page); // To check the value of $page $this->activePage = $page; } diff --git a/app/Livewire/MobileUsageReport.php b/app/Livewire/MobileUsageReport.php index e2b49bb..2484854 100644 --- a/app/Livewire/MobileUsageReport.php +++ b/app/Livewire/MobileUsageReport.php @@ -3,7 +3,9 @@ namespace App\Livewire; use Livewire\Component; +use Livewire\Attributes\Layout; // Required for layout declaration +#[Layout('layouts.dashboard')] // Attribute syntax for Laravel 11 class MobileUsageReport extends Component { public function render() diff --git a/app/Livewire/Notification.php b/app/Livewire/Notification.php index 9ecb8df..0211a4f 100644 --- a/app/Livewire/Notification.php +++ b/app/Livewire/Notification.php @@ -3,7 +3,6 @@ namespace App\Livewire; use Livewire\Component; - class Notification extends Component { public function render() diff --git a/app/Livewire/PhotoSlider.php b/app/Livewire/PhotoSlider.php index aeb274b..d79531c 100644 --- a/app/Livewire/PhotoSlider.php +++ b/app/Livewire/PhotoSlider.php @@ -3,11 +3,13 @@ namespace App\Livewire; use Livewire\Component; +use Livewire\Attributes\Layout; // Required for layout declaration +#[Layout('layouts.dashboard')] // Attribute syntax for Laravel 11 class PhotoSlider extends Component { public function render() { - return view('livewire.photo-slider'); + return view('livewire.home-page-mobile.photo-slider'); } } diff --git a/app/Livewire/Promotion.php b/app/Livewire/Promotion.php index f52fe65..0680f9c 100644 --- a/app/Livewire/Promotion.php +++ b/app/Livewire/Promotion.php @@ -3,7 +3,9 @@ namespace App\Livewire; use Livewire\Component; +use Livewire\Attributes\Layout; // Required for layout declaration +#[Layout('layouts.dashboard')] // Attribute syntax for Laravel 11 class Promotion extends Component { public function render() diff --git a/app/Livewire/RegistrationReport.php b/app/Livewire/RegistrationReport.php index 51fddfc..bd0f44a 100644 --- a/app/Livewire/RegistrationReport.php +++ b/app/Livewire/RegistrationReport.php @@ -3,7 +3,9 @@ namespace App\Livewire; use Livewire\Component; +use Livewire\Attributes\Layout; // Required for layout declaration +#[Layout('layouts.dashboard')] // Attribute syntax for Laravel 11 class RegistrationReport extends Component { public function render() diff --git a/app/Livewire/Station.php b/app/Livewire/Station.php index 1bcff66..7dc8dc0 100644 --- a/app/Livewire/Station.php +++ b/app/Livewire/Station.php @@ -3,7 +3,9 @@ namespace App\Livewire; use Livewire\Component; +use Livewire\Attributes\Layout; // Required for layout declaration +#[Layout('layouts.dashboard')] // Attribute syntax for Laravel 11 class Station extends Component { public function render() diff --git a/app/Livewire/StationRatingReport.php b/app/Livewire/StationRatingReport.php index 072374b..0fc9708 100644 --- a/app/Livewire/StationRatingReport.php +++ b/app/Livewire/StationRatingReport.php @@ -3,7 +3,9 @@ namespace App\Livewire; use Livewire\Component; +use Livewire\Attributes\Layout; // Required for layout declaration +#[Layout('layouts.dashboard')] // Attribute syntax for Laravel 11 class StationRatingReport extends Component { public function render() diff --git a/app/Livewire/SystemParameter.php b/app/Livewire/SystemParameter.php index 229f71a..00e1aaa 100644 --- a/app/Livewire/SystemParameter.php +++ b/app/Livewire/SystemParameter.php @@ -3,7 +3,9 @@ namespace App\Livewire; use Livewire\Component; +use Livewire\Attributes\Layout; // Required for layout declaration +#[Layout('layouts.dashboard')] // Attribute syntax for Laravel 11 class SystemParameter extends Component { public function render() diff --git a/app/Livewire/TermsAndPrivacy.php b/app/Livewire/TermsAndPrivacy.php index 79674d8..d322f9c 100644 --- a/app/Livewire/TermsAndPrivacy.php +++ b/app/Livewire/TermsAndPrivacy.php @@ -3,7 +3,9 @@ namespace App\Livewire; use Livewire\Component; +use Livewire\Attributes\Layout; // Required for layout declaration +#[Layout('layouts.dashboard')] // Attribute syntax for Laravel 11 class TermsAndPrivacy extends Component { public function render() diff --git a/app/Livewire/TopUp.php b/app/Livewire/TopUp.php index 17c8cdb..fde724d 100644 --- a/app/Livewire/TopUp.php +++ b/app/Livewire/TopUp.php @@ -3,7 +3,9 @@ namespace App\Livewire; use Livewire\Component; +use Livewire\Attributes\Layout; // Required for layout declaration +#[Layout('layouts.dashboard')] // Attribute syntax for Laravel 11 class TopUp extends Component { public function render() diff --git a/app/Livewire/TopUpUsageReport.php b/app/Livewire/TopUpUsageReport.php index 387b9d9..2f7d39b 100644 --- a/app/Livewire/TopUpUsageReport.php +++ b/app/Livewire/TopUpUsageReport.php @@ -3,7 +3,9 @@ namespace App\Livewire; use Livewire\Component; +use Livewire\Attributes\Layout; // Required for layout declaration +#[Layout('layouts.dashboard')] // Attribute syntax for Laravel 11 class TopUpUsageReport extends Component { public function render() diff --git a/app/Livewire/UserManagement.php b/app/Livewire/UserManagement.php index 2a55207..a06b058 100644 --- a/app/Livewire/UserManagement.php +++ b/app/Livewire/UserManagement.php @@ -1,15 +1,13 @@ 'components.layouts.app', + 'layout' => 'layouts.app', /* |--------------------------------------------------------------------------- diff --git a/package-lock.json b/package-lock.json index a268819..c073b36 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,6 +5,7 @@ "packages": { "": { "dependencies": { + "@alpinejs/persist": "^3.14.9", "alpinejs": "^3.14.9" }, "devDependencies": { @@ -30,6 +31,12 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@alpinejs/persist": { + "version": "3.14.9", + "resolved": "https://registry.npmjs.org/@alpinejs/persist/-/persist-3.14.9.tgz", + "integrity": "sha512-Td9hWEUtFFguYCRjXhq06sDultW21wXUnVro7YWJm+vjGu/nV/v3hepOXyYVjkGvH/F+zjx5UkzWXXzr3UiQ/w==", + "license": "MIT" + }, "node_modules/@esbuild/aix-ppc64": { "version": "0.25.2", "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.2.tgz", diff --git a/package.json b/package.json index 186f339..5a9ade4 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "vite": "^6.0.11" }, "dependencies": { + "@alpinejs/persist": "^3.14.9", "alpinejs": "^3.14.9" } } diff --git a/resources/js/app.js b/resources/js/app.js index 8cef84c..5125bc0 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -1,4 +1,8 @@ import './bootstrap'; import Alpine from 'alpinejs'; +import persist from '@alpinejs/persist'; -Alpine.start(); \ No newline at end of file +Alpine.plugin(persist); + +window.Alpine = Alpine; +Alpine.start(); diff --git a/resources/views/layouts/dashboard.blade.php b/resources/views/layouts/dashboard.blade.php index 7831202..fd02da6 100644 --- a/resources/views/layouts/dashboard.blade.php +++ b/resources/views/layouts/dashboard.blade.php @@ -13,10 +13,11 @@ {{-- Main Content --}}
- @yield('main-page-content') + @yield('main-content-manager')
@livewireScripts + diff --git a/resources/views/livewire/auth/login-form.blade.php b/resources/views/livewire/auth/login-form.blade.php index 9b64a77..a2eea2a 100644 --- a/resources/views/livewire/auth/login-form.blade.php +++ b/resources/views/livewire/auth/login-form.blade.php @@ -7,17 +7,17 @@

Sign in to continue

-
+ @csrf
- + @error('username') {{ $message }} @enderror
- + @error('password') {{ $message }} @enderror
diff --git a/resources/views/livewire/member-management/locked-account.blade.php b/resources/views/livewire/member-management/locked-account.blade.php index 0c6b60b..22fbb2d 100644 --- a/resources/views/livewire/member-management/locked-account.blade.php +++ b/resources/views/livewire/member-management/locked-account.blade.php @@ -1,4 +1,5 @@
-
-

This is locked account page

-
+
+

This is locked account page

+
+ diff --git a/resources/views/livewire/navigation/drawer.blade.php b/resources/views/livewire/navigation/drawer.blade.php index 4776ea2..3431ede 100644 --- a/resources/views/livewire/navigation/drawer.blade.php +++ b/resources/views/livewire/navigation/drawer.blade.php @@ -1,22 +1,21 @@ - - -
-
+
Unioil Logo
- diff --git a/resources/views/livewire/user-management/user-management.blade.php b/resources/views/livewire/user-management/user-management.blade.php index 3ae08e2..9eaa7a7 100644 --- a/resources/views/livewire/user-management/user-management.blade.php +++ b/resources/views/livewire/user-management/user-management.blade.php @@ -1,3 +1,3 @@
-

This is user management page

+ This is the user management page.
diff --git a/resources/views/main/dashboard.blade.php b/resources/views/main/dashboard.blade.php index beee3ae..a087006 100644 --- a/resources/views/main/dashboard.blade.php +++ b/resources/views/main/dashboard.blade.php @@ -1,5 +1,6 @@ @extends('layouts.dashboard') -@section('main-page-content') +@section('main-content-manager') @endsection + diff --git a/routes/web.php b/routes/web.php index 283907c..ac23c63 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,5 +1,22 @@ where('page', '.*'); \ No newline at end of file