diff --git a/app/Livewire/MainContentManager.php b/app/Livewire/MainContentManager.php index 6370ca3..54d93a5 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/resources/views/livewire/navigation/drawer.blade.php b/resources/views/livewire/navigation/drawer.blade.php index 42151dc..3152e28 100644 --- a/resources/views/livewire/navigation/drawer.blade.php +++ b/resources/views/livewire/navigation/drawer.blade.php @@ -3,117 +3,122 @@ Unioil Logo + + diff --git a/routes/web.php b/routes/web.php index e0df06d..bb7a7f0 100644 --- a/routes/web.php +++ b/routes/web.php @@ -33,27 +33,27 @@ Route::get('/login', function () { // return view('main.dashboard'); // This view extends layouts.dashboard // }); -Route::get('/main', MainContentManager::class)->name('main.dashboard'); +// Route::get('/main', MainContentManager::class)->name('main.dashboard'); -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/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 +Route::get('/main/{page?}', function () { + return view('main.dashboard'); +})->where('page', '.*'); \ No newline at end of file