From 71ed81e30ce9c8838a385cceff6f3a759b2e414f Mon Sep 17 00:00:00 2001 From: E98Developer Date: Wed, 6 May 2026 21:07:36 +0200 Subject: [PATCH] =?UTF-8?q?EV3-413=20Kil=C3=A9p=C3=A9skor=20azonos=20login?= =?UTF-8?q?=20oldara=20=C3=ADr=C3=A1ny=C3=ADt=C3=A1s=20FIX=20login=20route?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/LegacyLayoutController.php | 7 ++++++- .../email/priceListChangeNotify.blade.php | 2 +- resources/views/layout/login.blade.php | 2 +- .../views/layout/speedButtonNavBar.blade.php | 2 +- routes/web.php | 19 ++++++++++++------- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/LegacyLayoutController.php b/app/Http/Controllers/LegacyLayoutController.php index 0d3b1f1..02571a2 100644 --- a/app/Http/Controllers/LegacyLayoutController.php +++ b/app/Http/Controllers/LegacyLayoutController.php @@ -2,12 +2,17 @@ namespace App\Http\Controllers; +use Illuminate\Http\RedirectResponse; use Illuminate\View\View; class LegacyLayoutController extends Controller { - public function show(string $path = ''): View + public function show(string $path = ''): View|RedirectResponse { + if (! auth()->check()) { + return redirect()->route('login'); + } + $targetUrl = $path !== '' ? url($path) : route('dashboard.index'); diff --git a/resources/views/email/priceListChangeNotify.blade.php b/resources/views/email/priceListChangeNotify.blade.php index 5160ac9..299444f 100644 --- a/resources/views/email/priceListChangeNotify.blade.php +++ b/resources/views/email/priceListChangeNotify.blade.php @@ -1,7 +1,7 @@

Tisztelt Egységvezető, Kedves Munkatársunk!

Új árlista került feltöltésre a Szállítói webrendelő felületre.

Az újonnan feltöltött dokumentum megnevezése: {{$priceList['fileName']}}.

-

Letölthető fájl: {{$priceList['fileName']}}

+

Letölthető fájl: {{$priceList['fileName']}}

Kérjük, hogy a lehető leghamarabb nézd át a feltöltött árlistát, mivel az Egységed számára fontos információt, megváltozott beszerzési árakat tartalmaz.

Köszönjük az együttműködésed!

Üdvözlettel: Központi Beszerzési osztály

diff --git a/resources/views/layout/login.blade.php b/resources/views/layout/login.blade.php index ca863b1..652855c 100644 --- a/resources/views/layout/login.blade.php +++ b/resources/views/layout/login.blade.php @@ -7,7 +7,7 @@ @endif -
+ @csrf @if ($errors->any())
diff --git a/resources/views/layout/speedButtonNavBar.blade.php b/resources/views/layout/speedButtonNavBar.blade.php index 3ccbbdb..17df9aa 100644 --- a/resources/views/layout/speedButtonNavBar.blade.php +++ b/resources/views/layout/speedButtonNavBar.blade.php @@ -6,7 +6,7 @@ 'icon'=>'ico_home', 'link'=>'?m=dashboard', ]; -if(auth()->user()->hasRole(['root','developer','admin'])){ +if(auth()->check() && auth()->user()->hasRole(['root','developer','admin'])){ $priceListRoute=route('admin.priceList.index'); $supplierRoute=route('admin.supplier.index'); }else{ diff --git a/routes/web.php b/routes/web.php index 9ade74a..b32cae1 100644 --- a/routes/web.php +++ b/routes/web.php @@ -57,7 +57,16 @@ Route::get('/test', [TestController::class, 'test'])->name('test'); -Route::post('/login', [LoginController::class, 'authenticate'])->name('login'); +Route::get('/login', function () { + if (! auth()->check()) { + return view('layout.login'); + } + + return redirect()->route('legacy.show'); +})->name('login'); + +Route::post('/login', [LoginController::class, 'authenticate'])->name('login.post'); + Route::get('/logout', function () { Auth::logout(); \request()->session()->invalidate(); @@ -69,12 +78,8 @@ Route::get('/orderFeedback/{feedbackId}', [\App\Http\Controllers\SupplierFeedbackController::class, 'orderFeedback'])->name('orderFeedback'); Route::get('/', function () { - if (! auth()->check()) { - return view('layout.login'); - } - - return redirect()->route('legacy.show'); -})->name('landing'); + return redirect()->route('login'); +}); Route::get('/legacy/{path?}', [LegacyLayoutController::class, 'show']) ->where('path', '.*')