From 3f62380105bb1f5544c970557a546fd80f48fb6a Mon Sep 17 00:00:00 2001 From: Sebastian Fix Date: Mon, 23 Jun 2025 23:30:09 +0200 Subject: [PATCH 1/8] wip --- .../Controllers/Jobs/JobsIndexController.php | 13 ++++++--- .../Legal/PrivacyIndexController.php | 13 ++++++--- .../Legal/TermsIndexController.php | 13 ++++++--- .../Media/MediaIndexController.php | 13 ++++++--- .../Controllers/Sitemap/SitemapController.php | 3 +++ lang/de_CH.json | 2 +- .../views/layouts/_partials/_footer.blade.php | 27 ++++++++++--------- routes/web.php | 16 +++++------ 8 files changed, 63 insertions(+), 37 deletions(-) diff --git a/app/Http/Controllers/Jobs/JobsIndexController.php b/app/Http/Controllers/Jobs/JobsIndexController.php index 57a5520..f71d036 100644 --- a/app/Http/Controllers/Jobs/JobsIndexController.php +++ b/app/Http/Controllers/Jobs/JobsIndexController.php @@ -4,6 +4,8 @@ use App\Actions\PageAction; use App\Http\Controllers\Controller; +use Illuminate\Http\RedirectResponse; +use Illuminate\Support\Str; use Illuminate\View\View; class JobsIndexController extends Controller @@ -11,10 +13,13 @@ class JobsIndexController extends Controller /** * Display the user's profile form. */ - public function __invoke(): View + public function __invoke(): View|RedirectResponse { - return view('app.jobs.index')->with([ - 'page' => (new PageAction(locale: null, routeName: 'jobs.index'))->default(), - ]); + return redirect()->route(Str::slug(app()->getLocale()).'.start.index'); + + // @todo Notification + /* return view('app.jobs.index')->with([ + 'page' => (new PageAction(locale: null, routeName: 'jobs.index'))->default(), + ]);*/ } } diff --git a/app/Http/Controllers/Legal/PrivacyIndexController.php b/app/Http/Controllers/Legal/PrivacyIndexController.php index 009baa9..f07f17b 100644 --- a/app/Http/Controllers/Legal/PrivacyIndexController.php +++ b/app/Http/Controllers/Legal/PrivacyIndexController.php @@ -4,6 +4,8 @@ use App\Actions\PageAction; use App\Http\Controllers\Controller; +use Illuminate\Http\RedirectResponse; +use Illuminate\Support\Str; use Illuminate\View\View; class PrivacyIndexController extends Controller @@ -11,10 +13,13 @@ class PrivacyIndexController extends Controller /** * Display the user's profile form. */ - public function __invoke(): View + public function __invoke(): View|RedirectResponse { - return view('app.legal.privacy.index')->with([ - 'page' => (new PageAction(locale: null, routeName: 'legal.privacy.index'))->default(), - ]); + return redirect()->route(Str::slug(app()->getLocale()).'.start.index'); + + // @todo Notification + /* return view('app.legal.privacy.index')->with([ + 'page' => (new PageAction(locale: null, routeName: 'legal.privacy.index'))->default(), + ]);*/ } } diff --git a/app/Http/Controllers/Legal/TermsIndexController.php b/app/Http/Controllers/Legal/TermsIndexController.php index a2cf40a..5f4395f 100644 --- a/app/Http/Controllers/Legal/TermsIndexController.php +++ b/app/Http/Controllers/Legal/TermsIndexController.php @@ -4,6 +4,8 @@ use App\Actions\PageAction; use App\Http\Controllers\Controller; +use Illuminate\Http\RedirectResponse; +use Illuminate\Support\Str; use Illuminate\View\View; class TermsIndexController extends Controller @@ -11,10 +13,13 @@ class TermsIndexController extends Controller /** * Display the user's profile form. */ - public function __invoke(): View + public function __invoke(): View|RedirectResponse { - return view('app.legal.terms.index')->with([ - 'page' => (new PageAction(locale: null, routeName: 'legal.terms.index'))->default(), - ]); + return redirect()->route(Str::slug(app()->getLocale()).'.start.index'); + + // @todo Notification + /* return view('app.legal.terms.index')->with([ + 'page' => (new PageAction(locale: null, routeName: 'legal.terms.index'))->default(), + ]);*/ } } diff --git a/app/Http/Controllers/Media/MediaIndexController.php b/app/Http/Controllers/Media/MediaIndexController.php index 0a2c65b..6bd4169 100644 --- a/app/Http/Controllers/Media/MediaIndexController.php +++ b/app/Http/Controllers/Media/MediaIndexController.php @@ -4,6 +4,8 @@ use App\Actions\PageAction; use App\Http\Controllers\Controller; +use Illuminate\Http\RedirectResponse; +use Illuminate\Support\Str; use Illuminate\View\View; class MediaIndexController extends Controller @@ -11,10 +13,13 @@ class MediaIndexController extends Controller /** * Display the user's profile form. */ - public function __invoke(): View + public function __invoke(): View|RedirectResponse { - return view('app.media.index')->with([ - 'page' => (new PageAction(locale: null, routeName: 'media.index'))->default(), - ]); + return redirect()->route(Str::slug(app()->getLocale()).'.start.index'); + + // @todo Notification + /* return view('app.media.index')->with([ + 'page' => (new PageAction(locale: null, routeName: 'media.index'))->default(), + ]);*/ } } diff --git a/app/Http/Controllers/Sitemap/SitemapController.php b/app/Http/Controllers/Sitemap/SitemapController.php index 41962b5..f086be4 100644 --- a/app/Http/Controllers/Sitemap/SitemapController.php +++ b/app/Http/Controllers/Sitemap/SitemapController.php @@ -23,7 +23,10 @@ class SitemapController extends Controller 'products.index', 'services.index', 'contact.index', + 'legal.terms.index', 'legal.imprint.index', + 'legal.privacy.index', + 'jobs.index', ]; protected const array DEFAULT_LOCALES = [ diff --git a/lang/de_CH.json b/lang/de_CH.json index 17c9a9b..292f60b 100644 --- a/lang/de_CH.json +++ b/lang/de_CH.json @@ -20,7 +20,7 @@ "Headquarter": "Hauptsitz", "Imprint": "Impressum", "Info(at)paperflakes.ch": "Info(at)paperflakes.ch", - "Jobs": "Jobs", + "Jobs": "Stellen", "Language": "Sprache", "Last updated at": "Zuletzt aktualisiert am", "Last updated at: :date": "Zuletzt aktualisiert am: :date", diff --git a/resources/views/layouts/_partials/_footer.blade.php b/resources/views/layouts/_partials/_footer.blade.php index a2be1a6..12707a1 100644 --- a/resources/views/layouts/_partials/_footer.blade.php +++ b/resources/views/layouts/_partials/_footer.blade.php @@ -42,23 +42,26 @@ classAttributes="text-lg"/> - {{--
  • - -
    • --}} - {{--
  • - -
    • --}} +
  • + +
    • +
  • + +

    • {{ __('Legal') }}