From 3f9424f6b58d70fa9445f2a61e1879432fb410b1 Mon Sep 17 00:00:00 2001 From: Krzysztof Strzelecki Date: Fri, 31 Jan 2020 19:07:55 +0100 Subject: [PATCH] =?UTF-8?q?Zawieszanie=20u=C5=BCytkownika?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/SessionsController.php | 9 ++++++- .../Controllers/fireFightersController.php | 18 +++++++++++++ resources/views/fireFighters.blade.php | 26 ++++++++++++------- resources/views/userProfile.blade.php | 8 +++--- routes/web.php | 2 ++ 5 files changed, 48 insertions(+), 15 deletions(-) diff --git a/app/Http/Controllers/SessionsController.php b/app/Http/Controllers/SessionsController.php index 5d25142..e04c395 100644 --- a/app/Http/Controllers/SessionsController.php +++ b/app/Http/Controllers/SessionsController.php @@ -15,9 +15,16 @@ class SessionsController extends Controller { if (auth()->attempt(request(['email', 'password'])) == false) { return back()->withErrors([ - 'message' => 'The email or password is incorrect, please try again' + 'message' => 'Podany adres email lub hasło jest nieprawidłowe, proszę spróbować ponownie.' ]); } + elseif(auth()->user()->statusID == 1) + { + auth()->logout(); + return back()->withErrors([ + 'message' => 'Twoje konto zostało zawieszone.' + ]); + } return redirect()->to('/jednostka'); } diff --git a/app/Http/Controllers/fireFightersController.php b/app/Http/Controllers/fireFightersController.php index 716e1e8..c7c1e55 100644 --- a/app/Http/Controllers/fireFightersController.php +++ b/app/Http/Controllers/fireFightersController.php @@ -138,5 +138,23 @@ class fireFightersController extends Controller return fireFightersController::create(); } + public function activate() + { + $request = request(); + $user = User::find( $request-> userID); + $user-> statusID = 0; + $user->save(); + return redirect()->to('/strazacy'); + } + + public function deactivate() + { + $request = request(); + $user = User::find( $request-> userID); + $user-> statusID = 1; + $user->save(); + return redirect()->to('/strazacy'); + } + } diff --git a/resources/views/fireFighters.blade.php b/resources/views/fireFighters.blade.php index 1de1fba..de7cbc9 100644 --- a/resources/views/fireFighters.blade.php +++ b/resources/views/fireFighters.blade.php @@ -96,17 +96,23 @@ Edytuj Odznaczenia + @if( auth()->user()->id != $user->id) + @if ($user->statusID == 0) +
+ {{ csrf_field() }} + + +
+ @elseif ($user->statusID == 1) +
+ {{ csrf_field() }} + + +
+ @endif + @endif - - {{-- --}} - {{--
--}} - {{-- {{ csrf_field() }}--}} - {{--
--}} - {{-- --}} - {{-- --}} - {{--
--}} - {{--
--}} - {{-- --}} + @php $i++; @endphp diff --git a/resources/views/userProfile.blade.php b/resources/views/userProfile.blade.php index eb05ba4..6e17770 100644 --- a/resources/views/userProfile.blade.php +++ b/resources/views/userProfile.blade.php @@ -41,10 +41,10 @@ Adres e-mail: {{ $userData->email}} - - Numer ewidencyjny: - {{ $userData->number}} - + {{-- --}} + {{-- Numer ewidencyjny: --}} + {{-- {{ $userData->number}} --}} + {{-- --}} Stopień: {{ $userData->rank}} diff --git a/routes/web.php b/routes/web.php index efb6fd7..64026e8 100644 --- a/routes/web.php +++ b/routes/web.php @@ -54,6 +54,8 @@ Route::get('/strazacy/add', 'fireFightersController@addForm'); Route::post('/strazacy', 'fireFightersController@store'); Route::get('/strazacy/edit/{id}', 'fireFightersController@editForm'); Route::post('/strazacy/edit', 'fireFightersController@update'); +Route::post('strazacy/activate', 'fireFightersController@activate'); +Route::post('strazacy/deactivate', 'fireFightersController@deactivate'); Route::get('/strazacy/odznaczenia/{id}', 'DecorationsController@create'); Route::post('/strazacy/odznaczenia/{id}', 'DecorationsController@store');