From d4c2f80eec523f6e1088517cb2c5f8e88795649c Mon Sep 17 00:00:00 2001
From: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Date: Thu, 10 Feb 2022 11:22:07 +0100
Subject: [PATCH] #42 - wip

---
 .../Http/Controllers/GoogleController.php     |  4 +-
 .../Http/Controllers/HolidayController.php    |  6 +-
 .../SelectYearPeriodController.php            |  2 +-
 .../Http/Controllers/UserController.php       |  8 +-
 .../Controllers/VacationLimitController.php   |  2 +-
 .../Controllers/VacationRequestController.php | 15 ++-
 resources/js/Pages/Login.vue                  | 49 +---------
 resources/js/Shared/FlashMessage.vue          | 97 +++++++++++++++++++
 resources/js/Shared/Layout/AppLayout.vue      |  7 +-
 resources/js/Shared/Layout/GuestLayout.vue    |  4 +-
 resources/js/Shared/MainMenu.vue              |  8 +-
 resources/lang/pl.json                        | 16 ++-
 12 files changed, 146 insertions(+), 72 deletions(-)
 create mode 100644 resources/js/Shared/FlashMessage.vue

diff --git a/app/Infrastructure/Http/Controllers/GoogleController.php b/app/Infrastructure/Http/Controllers/GoogleController.php
index 6f15e8d..2f419f3 100644
--- a/app/Infrastructure/Http/Controllers/GoogleController.php
+++ b/app/Infrastructure/Http/Controllers/GoogleController.php
@@ -29,9 +29,7 @@ class GoogleController extends Controller
         } catch (ModelNotFoundException) {
             return redirect()
                 ->route("login")
-                ->withErrors([
-                    "oauth" => __("User does not exist."),
-                ]);
+                ->with("error", __("User does not exist."));
         }
 
         $auth->guard()->login($user, true);
diff --git a/app/Infrastructure/Http/Controllers/HolidayController.php b/app/Infrastructure/Http/Controllers/HolidayController.php
index e69a8ff..fe256dd 100644
--- a/app/Infrastructure/Http/Controllers/HolidayController.php
+++ b/app/Infrastructure/Http/Controllers/HolidayController.php
@@ -35,7 +35,7 @@ class HolidayController extends Controller
 
         return redirect()
             ->route("holidays.index")
-            ->with("success", __("Holiday has been created"));
+            ->with("success", __("Holiday has been created."));
     }
 
     public function edit(Holiday $holiday): Response
@@ -51,7 +51,7 @@ class HolidayController extends Controller
 
         return redirect()
             ->route("holidays.index")
-            ->with("success", __("Holiday has been updated"));
+            ->with("success", __("Holiday has been updated."));
     }
 
     public function destroy(Holiday $holiday): RedirectResponse
@@ -60,6 +60,6 @@ class HolidayController extends Controller
 
         return redirect()
             ->route("holidays.index")
-            ->with("success", __("Holiday has been deleted"));
+            ->with("success", __("Holiday has been deleted."));
     }
 }
diff --git a/app/Infrastructure/Http/Controllers/SelectYearPeriodController.php b/app/Infrastructure/Http/Controllers/SelectYearPeriodController.php
index 14b95e7..75b3cd3 100644
--- a/app/Infrastructure/Http/Controllers/SelectYearPeriodController.php
+++ b/app/Infrastructure/Http/Controllers/SelectYearPeriodController.php
@@ -17,6 +17,6 @@ class SelectYearPeriodController extends Controller
 
         return redirect()
             ->back()
-            ->with("success", __("Selected year period has been changed"));
+            ->with("success", __("Selected year period has been changed."));
     }
 }
diff --git a/app/Infrastructure/Http/Controllers/UserController.php b/app/Infrastructure/Http/Controllers/UserController.php
index 113657a..a49e9ee 100644
--- a/app/Infrastructure/Http/Controllers/UserController.php
+++ b/app/Infrastructure/Http/Controllers/UserController.php
@@ -46,7 +46,7 @@ class UserController extends Controller
 
         return redirect()
             ->route("users.index")
-            ->with("success", __("User has been created"));
+            ->with("success", __("User has been created."));
     }
 
     public function edit(User $user): Response
@@ -64,7 +64,7 @@ class UserController extends Controller
 
         return redirect()
             ->route("users.index")
-            ->with("success", __("User has been updated"));
+            ->with("success", __("User has been updated."));
     }
 
     public function destroy(User $user): RedirectResponse
@@ -73,7 +73,7 @@ class UserController extends Controller
 
         return redirect()
             ->route("users.index")
-            ->with("success", __("User has been deleted"));
+            ->with("success", __("User has been deleted."));
     }
 
     public function restore(User $user): RedirectResponse
@@ -82,6 +82,6 @@ class UserController extends Controller
 
         return redirect()
             ->route("users.index")
-            ->with("success", __("User has been restored"));
+            ->with("success", __("User has been restored."));
     }
 }
diff --git a/app/Infrastructure/Http/Controllers/VacationLimitController.php b/app/Infrastructure/Http/Controllers/VacationLimitController.php
index 7d207d6..2762b7d 100644
--- a/app/Infrastructure/Http/Controllers/VacationLimitController.php
+++ b/app/Infrastructure/Http/Controllers/VacationLimitController.php
@@ -35,6 +35,6 @@ class VacationLimitController extends Controller
 
         return redirect()
             ->back()
-            ->with("success", __("Vacation limits have been updated"));
+            ->with("success", __("Vacation limits have been updated."));
     }
 }
diff --git a/app/Infrastructure/Http/Controllers/VacationRequestController.php b/app/Infrastructure/Http/Controllers/VacationRequestController.php
index 739a1da..4b6a655 100644
--- a/app/Infrastructure/Http/Controllers/VacationRequestController.php
+++ b/app/Infrastructure/Http/Controllers/VacationRequestController.php
@@ -93,7 +93,8 @@ class VacationRequestController extends Controller
         $stateManager->markAsCreated($vacationRequest);
 
         return redirect()
-            ->route("vacation.requests.index");
+            ->route("vacation.requests.show", $vacationRequest)
+            ->with("success", __("Vacation request has been created."));
     }
 
     public function reject(
@@ -102,7 +103,8 @@ class VacationRequestController extends Controller
     ): RedirectResponse {
         $stateManager->reject($vacationRequest);
 
-        return redirect()->back();
+        return redirect()->back()
+            ->with("success", __("Vacation request has been rejected."));
     }
 
     public function cancel(
@@ -111,7 +113,8 @@ class VacationRequestController extends Controller
     ): RedirectResponse {
         $stateManager->cancel($vacationRequest);
 
-        return redirect()->back();
+        return redirect()->back()
+            ->with("success", __("Vacation request has been canceled."));
     }
 
     public function acceptAsTechnical(
@@ -120,7 +123,8 @@ class VacationRequestController extends Controller
     ): RedirectResponse {
         $stateManager->acceptAsTechnical($vacationRequest);
 
-        return redirect()->back();
+        return redirect()->back()
+            ->with("success", __("Vacation request has been accepted."));
     }
 
     public function acceptAsAdministrative(
@@ -129,6 +133,7 @@ class VacationRequestController extends Controller
     ): RedirectResponse {
         $stateManager->acceptAsAdministrative($vacationRequest);
 
-        return redirect()->back();
+        return redirect()->back()
+            ->with("success", __("Vacation request has been accepted."));
     }
 }
diff --git a/resources/js/Pages/Login.vue b/resources/js/Pages/Login.vue
index 324fd4e..b379630 100644
--- a/resources/js/Pages/Login.vue
+++ b/resources/js/Pages/Login.vue
@@ -1,41 +1,5 @@
 <template>
   <InertiaHead title="Zaloguj się" />
-  <transition
-    enter-active-class="transform ease-out duration-300 transition"
-    enter-from-class="translate-y-2 opacity-0 sm:translate-y-0 sm:translate-x-2"
-    enter-to-class="translate-y-0 opacity-100 sm:translate-x-0"
-    leave-active-class="transition ease-in duration-100"
-    leave-from-class="opacity-100"
-    leave-to-class="opacity-0"
-  >
-    <div
-      v-if="errors.oauth"
-      class="absolute inset-x-2 top-2 sm:mx-auto sm:w-full sm:max-w-md bg-red-500 shadow-lg rounded-lg pointer-events-auto ring-1 ring-black ring-opacity-5 overflow-hidden"
-    >
-      <div class="p-4">
-        <div class="flex items-center">
-          <div class="w-0 flex-1 flex justify-between">
-            <ExclamationIcon class="h-5 w-5 text-white" />
-            <p class="w-0 flex-1 text-sm font-medium text-white">
-              {{ errors.oauth }}
-            </p>
-          </div>
-          <div class="ml-4 flex-shrink-0 flex">
-            <button
-              class="bg-red-500 rounded-md inline-flex text-red-100 hover:text-red-400 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-600"
-              @click="delete errors.oauth"
-            >
-              <span class="sr-only">Close</span>
-              <XIcon
-                class="h-5 w-5"
-                aria-hidden="true"
-              />
-            </button>
-          </div>
-        </div>
-      </div>
-    </div>
-  </transition>
   <div
     class="sm:mx-auto sm:w-full sm:max-w-md text-white space-y-4 flex flex-col items-center rounded-lg px-4 py-8"
     dusk="login-link"
@@ -66,21 +30,10 @@
 
 <script>
 import GuestLayout from '@/Shared/Layout/GuestLayout'
-import {XIcon} from '@heroicons/vue/solid'
-import {ExclamationIcon} from '@heroicons/vue/solid'
 
 export default {
   name: 'LoginPage',
-  components: {
-    XIcon,
-    ExclamationIcon,
-  },
+
   layout: GuestLayout,
-  props: {
-    errors: {
-      type: Object,
-      default: () => ({oauth: null}),
-    },
-  },
 }
 </script>
diff --git a/resources/js/Shared/FlashMessage.vue b/resources/js/Shared/FlashMessage.vue
new file mode 100644
index 0000000..2498aed
--- /dev/null
+++ b/resources/js/Shared/FlashMessage.vue
@@ -0,0 +1,97 @@
+<template>
+  <transition
+    enter-active-class="transform ease-out duration-300 transition"
+    enter-from-class="opacity-0"
+    enter-to-class="opacity-100"
+    leave-active-class="transition ease-in duration-100"
+    leave-from-class="opacity-100"
+    leave-to-class="opacity-0"
+  >
+    <div
+      v-if="$page.props.flash.success && show"
+      class="fixed bottom-4 right-0 mx-auto w-full max-w-md bg-green-500 shadow-lg rounded-lg pointer-events-auto ring-1 ring-black ring-opacity-5 overflow-hidden z-50 sm:mr-4"
+    >
+      <div class="p-4">
+        <div class="flex items-center">
+          <div class="w-0 flex-1 flex justify-between">
+            <CheckCircleIcon class="h-5 w-5 text-white mr-2" />
+            <p class="w-0 flex-1 text-sm font-medium text-white">
+              {{ $page.props.flash.success }}
+            </p>
+          </div>
+          <div class="ml-4 flex-shrink-0 flex">
+            <button
+              class="bg-green-500 rounded-md inline-flex text-green-100 hover:text-green-400 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-green-600"
+              @click="show = false"
+            >
+              <span class="sr-only">Close</span>
+              <XIcon
+                class="h-5 w-5"
+                aria-hidden="true"
+              />
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </transition>
+  <div
+    v-if="($page.props.flash.error) && show"
+    class="fixed bottom-4 right-0 mx-auto w-full max-w-md bg-red-500 shadow-lg rounded-lg pointer-events-auto ring-1 ring-black ring-opacity-5 overflow-hidden z-50 sm:mr-4"
+  >
+    <div class="p-4">
+      <div class="flex items-center">
+        <div class="w-0 flex-1 flex justify-between">
+          <ExclamationIcon class="h-5 w-5 text-white mr-2" />
+          <p class="w-0 flex-1 text-sm font-medium text-white">
+            {{ $page.props.flash.error }}
+          </p>
+        </div>
+        <div class="ml-4 flex-shrink-0 flex">
+          <button
+            class="bg-red-500 rounded-md inline-flex text-red-100 hover:text-red-400 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-600"
+            @click="show = false"
+          >
+            <span class="sr-only">Close</span>
+            <XIcon
+              class="h-5 w-5"
+              aria-hidden="true"
+            />
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {XIcon} from '@heroicons/vue/outline'
+import {ExclamationIcon, CheckCircleIcon} from '@heroicons/vue/solid'
+
+export default {
+  name: 'FlashMessage',
+  components: {
+    CheckCircleIcon,
+    ExclamationIcon,
+    XIcon,
+  },
+  props: {
+    flash: Object,
+    default: () => ({success: null, error: null}),
+  },
+  data() {
+    return {
+      show:true,
+    }
+  },
+  watch: {
+    '$page.props.flash': {
+      handler() {
+        this.show = true
+        setTimeout(() => this.show = false, 6000)
+      },
+    },
+    deep: true,
+  },
+}
+</script>
diff --git a/resources/js/Shared/Layout/AppLayout.vue b/resources/js/Shared/Layout/AppLayout.vue
index 7ad4df4..5ac204d 100644
--- a/resources/js/Shared/Layout/AppLayout.vue
+++ b/resources/js/Shared/Layout/AppLayout.vue
@@ -2,6 +2,7 @@
   <div class="min-h-full">
     <MainMenu />
     <main class="lg:ml-64 flex flex-col flex-1 py-8">
+      <FlashMessage />
       <div>
         <slot />
       </div>
@@ -11,9 +12,13 @@
 
 <script>
 import MainMenu from '@/Shared/MainMenu'
+import FlashMessage from '@/Shared/FlashMessage'
 
 export default {
   name: 'AppLayout',
-  components: {MainMenu},
+  components: {
+    FlashMessage,
+    MainMenu,
+  },
 }
 </script>
diff --git a/resources/js/Shared/Layout/GuestLayout.vue b/resources/js/Shared/Layout/GuestLayout.vue
index 5c2589c..e8de661 100644
--- a/resources/js/Shared/Layout/GuestLayout.vue
+++ b/resources/js/Shared/Layout/GuestLayout.vue
@@ -1,12 +1,14 @@
-
 <template>
   <div class="min-h-screen flex flex-col justify-center py-12 sm:px-6 lg:px-8 bg-blumilk-25">
+    <FlashMessage />
     <slot />
   </div>
 </template>
 
 <script>
+import FlashMessage from '@/Shared/FlashMessage'
 export default {
   name: 'GuestLayout',
+  components: {FlashMessage},
 }
 </script>
diff --git a/resources/js/Shared/MainMenu.vue b/resources/js/Shared/MainMenu.vue
index d5df879..5318860 100644
--- a/resources/js/Shared/MainMenu.vue
+++ b/resources/js/Shared/MainMenu.vue
@@ -363,11 +363,11 @@ export default {
 
     const navigation = [
       {name: 'Strona główna', href: '/', icon: HomeIcon, current: true},
-      {name: 'Użytkownicy', href: '/users', icon: UserGroupIcon, current: false},
-      {name: 'Dostępne urlopy', href: '/vacation-limits', icon: SunIcon, current: false},
-      {name: 'Twoje wnioski', href: '/vacation-requests', icon: CollectionIcon, current: false},
-      {name: 'Dni wolne', href: '/holidays', icon: StarIcon, current: false},
+      {name: 'Wnioski urlopowe', href: '/vacation-requests', icon: CollectionIcon, current: false},
       {name: 'Kalendarz urlopów', href: '/vacation-calendar', icon: CalendarIcon, current: false},
+      {name: 'Dni wolne', href: '/holidays', icon: StarIcon, current: false},
+      {name: 'Limity urlopów', href: '/vacation-limits', icon: SunIcon, current: false},
+      {name: 'Użytkownicy', href: '/users', icon: UserGroupIcon, current: false},
     ]
     const userNavigation = [
       {name: 'Your Profile', href: '#'},
diff --git a/resources/lang/pl.json b/resources/lang/pl.json
index 01cf187..5594968 100644
--- a/resources/lang/pl.json
+++ b/resources/lang/pl.json
@@ -30,5 +30,19 @@
   "You have approved vacation request in this range.": "Masz zaakceptowany wniosek urlopowy w tym zakresie dat.",
   "You have exceeded your vacation limit.": "Przekroczyłeś/aś limit urlopu.",
   "Vacation needs minimum one day.": "Urlop musi być co najmniej na jeden dzień.",
-  "The vacation request cannot be created at the turn of the year.": "Wniosek urlopowy nie może zostać złożony na przełomie roku."
+  "The vacation request cannot be created at the turn of the year.": "Wniosek urlopowy nie może zostać złożony na przełomie roku.",
+  "User has been created.": "Użytkownik został utworzony.",
+  "User has been updated.": "Użytkownik został zaktualizowany.",
+  "User has been deleted.": "Użytkownik został usunięty.",
+  "User has been restored.": "Użytkownik został przywrócony.",
+  "Holiday has been created.": "Dzień wolny został utworzony.",
+  "Holiday has been updated.": "Dzień wolny został zaktualizowany.",
+  "Holiday has been deleted.": "Dzień wolny został usunięty.",
+  "Selected year period has been changed.": "Wybrany rok został zmieniony.",
+  "Vacation limits have been updated.": "Limity urlopów zostały zaktualizowane.",
+  "Vacation request has been created.": "Wniosek urlopowy został utworzony.",
+  "Vacation request has been accepted.": "Wniosek urlopowy został zaakceptowany.",
+  "Vacation request has been rejected.": "Wniosek urlopowy został odrzucony.",
+  "Vacation request has been canceled.": "Wniosek urlopowy został anulowany."
+
 }