From a94bbdd7ff72fe9b14c034ac667f8dfa81343888 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Thu, 30 Jun 2022 15:05:38 +0200 Subject: [PATCH 1/3] =?UTF-8?q?Ticket=20n=C2=B0=20955=20fix=20reset=20pwd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/EmployeesController.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/EmployeesController.php b/app/Http/Controllers/EmployeesController.php index ff51bb4..5d71806 100644 --- a/app/Http/Controllers/EmployeesController.php +++ b/app/Http/Controllers/EmployeesController.php @@ -281,15 +281,12 @@ class EmployeesController extends Controller /** @var \App\Models\Employee */ $employee = Employee::where('matricule', $request->matricule)->firstOrFail(); /** @var \App\Models\EmployeeMailToken */ - $token = $employee->token ?? new EmployeeMailToken(); - $token->fill([ - 'email' => $employee->email, - 'employee_id' => $employee->id - ]); + $token = EmployeeMailToken::whereHas('employee', function ($q) use ($employee) { + $q->where('id', $employee->id); + })->firstOrNew(); + $token->email = $employee->email; + $token->employee()->associate($employee); $token->saveOrFail(); - $token->employee()->associate($token); - $token->saveOrFail(); - $employee->saveOrFail(); SendMailResetPasswordToEmployee::dispatchAfterResponse($employee, $token); return \redirect()->back()->with('successMail', true); } From 03e9643be1529ca0dd4c1534ef2d9ea69ed50557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Thu, 30 Jun 2022 15:21:11 +0200 Subject: [PATCH 2/3] Fix missing alert message on front + add message must be logged in --- app/Http/Middleware/Authenticate.php | 2 ++ resources/sass/_classes.scss | 14 +++++++++++++- resources/sass/back.scss | 2 +- resources/sass/front.scss | 1 + resources/sass/front_login.scss | 1 + resources/views/layouts/backend/head.blade.php | 2 +- resources/views/layouts/frontend.blade.php | 2 +- resources/views/layouts/frontend/head.blade.php | 6 +++--- resources/views/layouts/frontend/message.blade.php | 2 +- 9 files changed, 24 insertions(+), 8 deletions(-) diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index 74ac384..ddd2a61 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -3,6 +3,7 @@ namespace App\Http\Middleware; use Illuminate\Auth\Middleware\Authenticate as Middleware; +use Illuminate\Support\Facades\Session; class Authenticate extends Middleware { @@ -19,6 +20,7 @@ class Authenticate extends Middleware 'employee' => route('employees.login') ]; if (! $request->expectsJson()) { + Session::flash('message', trans('Vous devez vous identifier pour àccéder à cette page')); foreach ($request->route()->gatherMiddleware() as $middleware) { if (\is_string($middleware) and strpos($middleware, 'auth:') !== false) { $route = $logins[str_replace('auth:', '', $middleware)] ?? null; diff --git a/resources/sass/_classes.scss b/resources/sass/_classes.scss index 441cfa3..b825d75 100644 --- a/resources/sass/_classes.scss +++ b/resources/sass/_classes.scss @@ -9,4 +9,16 @@ #siteid { color: white; margin-right: 100px; -} \ No newline at end of file +} + +.alertMessage { + text-align: center; + max-width: 80%; + min-width: 15rem; + margin: 1rem auto; + padding: 0.5rem 1rem; + background-color: #e5e2e2; + font-weight: bold; + border-radius: 0.4rem; + font-family: Tahoma; +} diff --git a/resources/sass/back.scss b/resources/sass/back.scss index 75716a2..bd2bd89 100644 --- a/resources/sass/back.scss +++ b/resources/sass/back.scss @@ -1,4 +1,4 @@ -@import "_import"; +@import "./_import"; @import "layouts/backend/top_nav"; diff --git a/resources/sass/front.scss b/resources/sass/front.scss index 2538c30..1a25aab 100644 --- a/resources/sass/front.scss +++ b/resources/sass/front.scss @@ -1,2 +1,3 @@ @import "~swiper/swiper.min"; @import "front/style.sass"; +@import "./_import"; diff --git a/resources/sass/front_login.scss b/resources/sass/front_login.scss index 30d015e..bc6cbc4 100644 --- a/resources/sass/front_login.scss +++ b/resources/sass/front_login.scss @@ -1,2 +1,3 @@ @import "~swiper/swiper.min"; @import "front/styleLogin.sass"; +@import "./_import"; diff --git a/resources/views/layouts/backend/head.blade.php b/resources/views/layouts/backend/head.blade.php index 668513b..8c36663 100644 --- a/resources/views/layouts/backend/head.blade.php +++ b/resources/views/layouts/backend/head.blade.php @@ -29,4 +29,4 @@ - + diff --git a/resources/views/layouts/frontend.blade.php b/resources/views/layouts/frontend.blade.php index 5391b64..9d27c0d 100644 --- a/resources/views/layouts/frontend.blade.php +++ b/resources/views/layouts/frontend.blade.php @@ -7,7 +7,7 @@ @include("layouts.frontend.header") - + @include('layouts.frontend.message') @yield('content') @include("layouts.frontend.footer") @stack('scriptsConstants') diff --git a/resources/views/layouts/frontend/head.blade.php b/resources/views/layouts/frontend/head.blade.php index d150c33..ae72b90 100644 --- a/resources/views/layouts/frontend/head.blade.php +++ b/resources/views/layouts/frontend/head.blade.php @@ -24,8 +24,8 @@ @preload('mix-manifest.json') - - + +