Merge branch 'trunk'

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);
     }

app/Http/Controllers/SondagesController.php

@@ -155,7 +155,7 @@ class SondagesController extends Controller
         /** @var \app\Models\Employee */
         $employee = auth('employee')->user();
         if ($employee->hasAnweredToSondage($sondage)) {
-            return view('front.sondages.saved', ['answered' => true]);
+            return view('front.sondages.saved', ['answered' => true, 'sondage' => $sondage]);
         }
         return view('front.sondages.show', compact('sondage'));
     }

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;

resources/sass/_classes.scss

@@ -9,4 +9,16 @@
 #siteid {
     color: white;
     margin-right: 100px;
-}
+}
+
+.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;
+}

resources/sass/back.scss

@@ -1,4 +1,4 @@
-@import "_import";
+@import "./_import";
 
 @import "layouts/backend/top_nav";
 

resources/sass/front.scss

@@ -1,2 +1,3 @@
 @import "~swiper/swiper.min";
 @import "front/style.sass";
+@import "./_import";

resources/sass/front_login.scss

@@ -1,2 +1,3 @@
 @import "~swiper/swiper.min";
 @import "front/styleLogin.sass";
+@import "./_import";

resources/views/layouts/backend/head.blade.php

@@ -29,4 +29,4 @@
 <!-- STYLES -->
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css" integrity="sha256-hHKA3d/HttC8OW3Sl093W8DoZudhHJDj++kZYo6MLzA=" crossorigin="anonymous">
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/sweetalert2@11.0.16/dist/sweetalert2.min.css" integrity="sha256-qpXwccFYncH5gTqXFe9EXZ8QeDw1Re68bbNVfFZzIzg=" crossorigin="anonymous">
-<link rel="stylesheet" href="{{ asset('css/preload-back.css') }}">
+<link rel="stylesheet" href="{{ mix('css/preload-back.css') }}">

resources/views/layouts/frontend.blade.php

@@ -7,7 +7,7 @@
     </head>
     <body>
         @include("layouts.frontend.header")
-        <!--@include('layouts.frontend.message')-->
+        @include('layouts.frontend.message')
         @yield('content')
         @include("layouts.frontend.footer")
         @stack('scriptsConstants')

resources/views/layouts/frontend/head.blade.php

@@ -24,8 +24,8 @@
 @preload('mix-manifest.json')
 
 <!-- STYLES -->
-<link rel="stylesheet" href="{{ asset('css/preload-front_login.css') }}">
-<link rel="stylesheet" href="{{ asset('css/preload-front.css') }}">
+<link rel="stylesheet" href="{{ mix('css/preload-front_login.css') }}">
+<link rel="stylesheet" href="{{ mix('css/preload-front.css') }}">
 <style>
 :root {
     @if(isset($societe->colors['primary']))
@@ -53,4 +53,4 @@
     }
     gtag('js', new Date());
     gtag('config', 'G-PTNNFW0ZE1');
-</script>
+</script>

resources/views/layouts/frontend/message.blade.php

@@ -1,5 +1,5 @@
 @if(session('message'))
-<div>
+<div class="alertMessage">
     {{ session('message') }}
 </div>
 @endif