From 00552747c9583c0ebbeb91cf602061945b5274c3 Mon Sep 17 00:00:00 2001 From: erishBRBS Date: Tue, 15 Apr 2025 14:56:48 +0800 Subject: [PATCH] route modified --- app/Livewire/MainContentManager.php | 12 ++--- config/livewire.php | 2 +- .../livewire/navigation/drawer.blade.php | 2 +- routes/web.php | 53 ++++++++++--------- 4 files changed, 37 insertions(+), 32 deletions(-) diff --git a/app/Livewire/MainContentManager.php b/app/Livewire/MainContentManager.php index 54d93a5..6370ca3 100644 --- a/app/Livewire/MainContentManager.php +++ b/app/Livewire/MainContentManager.php @@ -8,12 +8,12 @@ class MainContentManager extends Component { public $activePage; - public function mount() - { - $segments = request()->segments(); - // Get the last part of the URL path - $this->activePage = end($segments) ?? 'user-management'; - } + // public function mount() + // { + // $segments = request()->segments(); + // // Get the last part of the URL path + // $this->activePage = end($segments) ?? 'user-management'; + // } protected $listeners = ['navigate-to-page' => 'setPage']; diff --git a/config/livewire.php b/config/livewire.php index 76347cb..9d28d1b 100644 --- a/config/livewire.php +++ b/config/livewire.php @@ -38,7 +38,7 @@ return [ | */ - 'layout' => 'layouts.app', + 'layout' => 'layouts.dashboard', /* |--------------------------------------------------------------------------- diff --git a/resources/views/livewire/navigation/drawer.blade.php b/resources/views/livewire/navigation/drawer.blade.php index 3431ede..42151dc 100644 --- a/resources/views/livewire/navigation/drawer.blade.php +++ b/resources/views/livewire/navigation/drawer.blade.php @@ -112,7 +112,7 @@
Branches Stations - Fuelsgit asdasd + Fuels
diff --git a/routes/web.php b/routes/web.php index ac23c63..e0df06d 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,10 +1,12 @@ name('layouts.app'); -Route::get('/dashboard', function () { - return view('main.dashboard'); // This view extends layouts.dashboard -}); +// Route::get('/dashboard', function () { +// return view('main.dashboard'); // This view extends layouts.dashboard +// }); -// Route::get('/main/profile', Profile::class); -// Route::get('/main/user-management', UserManagement::class); -// Route::get('/main/notification', Notification::class); -// Route::get('/main/member-management/card-member', CardMember::class); -// Route::get('/main/member-management/locked-account', LockedAccount::class); -// Route::get('/main/home-page-mobile/photo-slider', PhotoSlider::class); -// Route::get('/main/promotion', Promotion::class); -// Route::get('/main/top-up', TopUp::class); -// Route::get('/main/about-us/card-type', CardType::class); -// Route::get('/main/about-us/terms-and-privacy', TermsAndPrivacy::class); -// Route::get('/main/report/registration-report', RegistrationReport::class); -// Route::get('/main/report/top-up-usage-report', TopUpUsageReport::class); -// Route::get('/main/report/mobile-usage-report', MobileUsageReport::class); -// Route::get('/main/report/station-rating-report', StationRatingReport::class); -// Route::get('/main/system-parameter', SystemParameter::class); -// Route::get('/main/station-locator/branch', Branch::class); -// Route::get('/main/station-locator/station', Station::class); -// Route::get('/main/station-locator/fuel', Fuel::class); +Route::get('/main', MainContentManager::class)->name('main.dashboard'); -Route::get('/main/{page?}', function () { - return view('main.dashboard'); -})->where('page', '.*'); \ No newline at end of file +Route::get('/main/profile', Profile::class)->name('profile.profile'); +Route::get('/main/user-management', UserManagement::class)->name('user-management.user-management'); +Route::get('/main/notification', Notification::class)->name('notification.notification'); +Route::get('/main/member-management/card-member', CardMember::class)->name('member-management.card-member'); +Route::get('/main/member-management/locked-account', LockedAccount::class)->name('member-management.locked-account'); +Route::get('/main/home-page-mobile/photo-slider', PhotoSlider::class)->name('home-page-mobile.photo-slider'); +Route::get('/main/promotion', Promotion::class)->name('promotion.promotion'); +Route::get('/main/top-up', TopUp::class)->name('top-up.top-up'); +Route::get('/main/about-us/card-type', CardType::class)->name('about-us.card-type'); +Route::get('/main/about-us/terms-and-privacy', TermsAndPrivacy::class)->name('about-us.terms-and-privacy'); +Route::get('/main/report/registration-report', RegistrationReport::class)->name('report.registration-report'); +Route::get('/main/report/top-up-usage-report', TopUpUsageReport::class)->name('report.top-up-usage-report'); +Route::get('/main/report/mobile-usage-report', MobileUsageReport::class)->name('report.mobile-usage-report'); +Route::get('/main/report/station-rating-report', StationRatingReport::class)->name('report.station-rating-report'); +Route::get('/main/system-parameter', SystemParameter::class)->name('system-parameter.system-parameter'); +Route::get('/main/station-locator/branch', Branch::class)->name('station-locator.branch'); +Route::get('/main/station-locator/station', Station::class)->name('station-locator.station'); +Route::get('/main/station-locator/fuel', Fuel::class)->name('station-locator.fuel'); + +// Route::get('/main/{page?}', function () { +// return view('main.dashboard'); +// })->where('page', '.*'); \ No newline at end of file