From 894894d66c19817feb2438c85217286c763b5d77 Mon Sep 17 00:00:00 2001
From: Alexis Gousseau <alexis.gousseau@ldc.fr>
Date: Tue, 19 Apr 2022 11:39:27 +0200
Subject: [PATCH 1/2] Ticket 775 : fix tickets count on resetPassword pages

---
 app/Http/Controllers/UserController.php |  5 +++++
 routes/web.php                          | 11 +++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 426ee51..ec4b1d3 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -34,6 +34,11 @@ class UserController extends Controller
         $model->sendMailConfirm();
     }
 
+    public function passwordReset()
+    {
+        return view('users.passwordReset');
+    }
+
     public function passwordResetSubmit()
     {
         /** @var \App\Models\User */
diff --git a/routes/web.php b/routes/web.php
index a1f69ab..849a571 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -31,11 +31,11 @@ Route::middleware(['throttle:credentials'])->group(function () {
         'logout'   => true,
         'register' => false,
         'reset'    => true,
-// for resetting passwords
+        // for resetting passwords
         'confirm'  => true,
-// for additional password confirmations
+        // for additional password confirmations
         'verify'   => false,
-// for email verification
+        // for email verification
     ]);
 });
 
@@ -50,9 +50,8 @@ Route::get('/ping', function () {
 Route::middleware(['auth'])->group(function () {
 
     // Logged user actions
-    Route::view('/users/change-password', 'users.passwordReset')->name('users.passwordReset');
-    Route::post('/users/change-password', [UserController::class, 'passwordResetSubmit'])
-        ->name('users.passwordResetSubmit');
+    Route::get('/users/change-password', [UserController::class, 'passwordReset'])->name('users.passwordReset');
+    Route::post('/users/change-password', [UserController::class, 'passwordResetSubmit'])->name('users.passwordResetSubmit');
     Route::get('/users/stats', [UserController::class, 'stats'])->name('users.stats');
 
     // Ticket

From 11a70825d61b696bb1d8555c5703ee5a47898f0f Mon Sep 17 00:00:00 2001
From: Alexis Gousseau <alexis.gousseau@ldc.fr>
Date: Tue, 19 Apr 2022 12:46:56 +0200
Subject: [PATCH 2/2] fix front shedule

---
 resources/js/components/ScheduleComponent.vue | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/resources/js/components/ScheduleComponent.vue b/resources/js/components/ScheduleComponent.vue
index 071492d..da3b5aa 100644
--- a/resources/js/components/ScheduleComponent.vue
+++ b/resources/js/components/ScheduleComponent.vue
@@ -699,19 +699,22 @@ table.schedules_table {
 
 .dynCell{
     position: relative;
+    z-index: -1;
+    &:hover {
+        z-index: initial;
+    }
     &.day {
         //position: relative;
         &:hover .btn {
             opacity: 1;
         }
         &:hover .cellsizer{
-            height: 150px;
-            padding-left: 2rem;
+            height: 140px;
+            padding-top: 2rem;
             position: absolute;
             width: 200%;
             left: -50%;
             top: -50%;
-            z-index: 20;
             border: 1px solid;
         }
         $buttonBgColor: #4d4d4d;
@@ -772,18 +775,18 @@ table.schedules_table {
                 color: darken($color: #fff, $amount: 5);
             }
             &:nth-last-child(2) {
-                top: 2.1rem;
+                top: 0.1rem;
                 right: inherit;
-                left: 0.1rem;
+                left: 2.1rem;
             }
             &:nth-last-child(3) {
                 right: inherit;
-                top: 4.1rem;
-                left: 0.1rem;
+                top: 0.1rem;
+                left: 4.1rem;
             }
             &:nth-last-child(1) {
-                top: calc(150px - 2rem);
-                right: 0.1rem;
+                top: 0.1rem;
+                left: calc(100% - 1.9rem);
             }
         }
     }