From a26917e72531b006c1340243e0363e0e37624ebe Mon Sep 17 00:00:00 2001 From: cybernexus Date: Sun, 18 Aug 2024 19:16:12 +0200 Subject: [PATCH] - Change Logout logic - Change redirect logic after language switching (to stay on the same page, instead of redirecting to the home page) - Change navigation links & layout - Change language switcher layout --- app/Livewire/Auth/Logout.php | 10 +- app/Livewire/Features/LanguageSwitcher.php | 4 +- app/Livewire/Features/Navbar.php | 13 ++ app/Livewire/User/Settings.php | 13 ++ composer.json | 2 + composer.lock | 135 +++++++++++++++++- lang/en/notifications.php | 3 +- lang/hu.json | 4 +- lang/hu/notifications.php | 3 +- .../views/components/layouts/app.blade.php | 4 +- .../components/navigation/footer.blade.php | 2 +- .../navigation/menu-desktop.blade.php | 10 -- .../navigation/menu-mobile.blade.php | 58 -------- .../components/navigation/navbar.blade.php | 29 ---- .../navigation/navigation-links.blade.php | 45 ------ .../navigation/search-bar.blade.php | 10 -- .../navigation/search-icon.blade.php | 8 -- .../views/livewire/auth/logout.blade.php | 17 --- .../features/language-switcher.blade.php | 91 +----------- .../views/livewire/features/navbar.blade.php | 81 +++++++++++ .../livewire/features/notification.blade.php | 15 +- .../views/livewire/user/settings.blade.php | 6 + routes/auth.php | 4 + routes/web.php | 4 + tests/Feature/Livewire/Auth/LoginTest.php | 6 +- .../Features/LanguageSwitcherTest.php | 4 +- .../Feature/Livewire/Features/NavbarTest.php | 17 +++ tests/Feature/Livewire/User/SettingsTest.php | 25 ++++ 28 files changed, 337 insertions(+), 286 deletions(-) create mode 100644 app/Livewire/Features/Navbar.php create mode 100644 app/Livewire/User/Settings.php delete mode 100644 resources/views/components/navigation/menu-desktop.blade.php delete mode 100644 resources/views/components/navigation/menu-mobile.blade.php delete mode 100644 resources/views/components/navigation/navbar.blade.php delete mode 100644 resources/views/components/navigation/navigation-links.blade.php delete mode 100644 resources/views/components/navigation/search-bar.blade.php delete mode 100644 resources/views/components/navigation/search-icon.blade.php delete mode 100644 resources/views/livewire/auth/logout.blade.php create mode 100644 resources/views/livewire/features/navbar.blade.php create mode 100644 resources/views/livewire/user/settings.blade.php create mode 100644 tests/Feature/Livewire/Features/NavbarTest.php create mode 100644 tests/Feature/Livewire/User/SettingsTest.php diff --git a/app/Livewire/Auth/Logout.php b/app/Livewire/Auth/Logout.php index 9e2c899..bb6c935 100644 --- a/app/Livewire/Auth/Logout.php +++ b/app/Livewire/Auth/Logout.php @@ -7,6 +7,11 @@ class Logout extends Component { + public function mount() + { + $this->logout(); + } + public function logout() { Auth::logout(); @@ -14,9 +19,4 @@ public function logout() session()->regenerate(); $this->redirect(route('home'), navigate: true); } - - public function render() - { - return view('livewire.auth.logout'); - } } diff --git a/app/Livewire/Features/LanguageSwitcher.php b/app/Livewire/Features/LanguageSwitcher.php index af33ddf..53ad0f8 100644 --- a/app/Livewire/Features/LanguageSwitcher.php +++ b/app/Livewire/Features/LanguageSwitcher.php @@ -21,7 +21,7 @@ public function render() public function mount(LocalizationService $localizationService) { $this->selectedLanguage = $localizationService->getAppLocale(); - $this->languages = collect(Config::get('app.locales')); + $this->languages = Config::get('app.locales'); } public function updatedSelectedLanguage(LocalizationService $localizationService) @@ -29,6 +29,6 @@ public function updatedSelectedLanguage(LocalizationService $localizationService $localizationService->updateCurrentlySelectedLanguage(Auth::id(), $this->selectedLanguage); $localizationService->setAppLocale($this->selectedLanguage); - return $this->redirect('/', navigate: true); + return $this->redirect(request()->header('Referer'), navigate: true); } } diff --git a/app/Livewire/Features/Navbar.php b/app/Livewire/Features/Navbar.php new file mode 100644 index 0000000..b35ba51 --- /dev/null +++ b/app/Livewire/Features/Navbar.php @@ -0,0 +1,13 @@ + 'Welcome to CyberNexus, :username! Thank you for registering:)', ], 'info' => [ - 'no_notifications_available' => 'There aren\'t any notifications', + 'title' => 'Notifications', + 'no_notifications_available' => 'No notifications available', ], ]; diff --git a/lang/hu.json b/lang/hu.json index 429062c..5c689b9 100644 --- a/lang/hu.json +++ b/lang/hu.json @@ -73,8 +73,8 @@ "Hide": "Elrejt", "Hide :name": "Elrejtés :name", "Home": "Főoldal", - "Account": "Fiókom", - "Account data": "Fiók adatok", + "Account": "Profil", + "Account data": "Profil adatok", "Dont have an account yet?": "Nincs még fiókod?", "Already have an account?": "Van már fiókod?", "HTTP Version Not Supported": "A HTTP-verzió nem támogatott", diff --git a/lang/hu/notifications.php b/lang/hu/notifications.php index f14611e..dc4f022 100644 --- a/lang/hu/notifications.php +++ b/lang/hu/notifications.php @@ -8,6 +8,7 @@ 'success' => 'Üdvözöllek az oldalon, :username! Jó böngészést!:)', ], 'info' => [ - 'no_notifications_available' => 'Nincs új értesítés', + 'title' => 'Értesítések', + 'no_notifications_available' => 'Nincsenek értesítések', ], ]; diff --git a/resources/views/components/layouts/app.blade.php b/resources/views/components/layouts/app.blade.php index fd0c05f..e310040 100644 --- a/resources/views/components/layouts/app.blade.php +++ b/resources/views/components/layouts/app.blade.php @@ -14,13 +14,13 @@ class="flex flex-col overflow-x-hidden transition-all duration-300 bg-center bg-default md:text-xl lg:text-2xl text-primary-500"> {{-- Toast messages --}} - + {{-- Email notification --}} {{-- Navbar --}} - + @livewire('features.navbar') {{-- Main content --}}
diff --git a/resources/views/components/navigation/footer.blade.php b/resources/views/components/navigation/footer.blade.php index 8945630..af2a651 100644 --- a/resources/views/components/navigation/footer.blade.php +++ b/resources/views/components/navigation/footer.blade.php @@ -41,7 +41,7 @@ class="btn bg-primary-100 hover:bg-surface-100 hover:text-primary-100 text-surfa