From 62c4c1c6774ee8d54bf79e1b397b52dfd6d7a142 Mon Sep 17 00:00:00 2001
From: Chris Friemann <github@chris.friemann.nl>
Date: Mon, 22 Jan 2024 12:38:31 +0100
Subject: [PATCH 01/13] feat: add real data

---
 src/app/Http/Controllers/AdminController.php | 29 +++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/app/Http/Controllers/AdminController.php b/src/app/Http/Controllers/AdminController.php
index e292d35..40906fc 100644
--- a/src/app/Http/Controllers/AdminController.php
+++ b/src/app/Http/Controllers/AdminController.php
@@ -2,6 +2,10 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\Fine;
+use App\Models\Item;
+use App\Models\Reservation;
+use App\Models\User;
 use Illuminate\Http\Request;
 use Inertia\Inertia;
 
@@ -9,15 +13,26 @@ class AdminController extends Controller
 {
   public function index()
   {
+    $user = auth()->user();
+
+    if (!$user) {
+      // $user = auth()->loginUsingId(1);
+      return Inertia::location('/');
+    }
+
+    // Get the Statistics
+    $items = Item::count();
+    $customers = User::count();
+    $reservations = Reservation::count();
+    $invoices = Fine::count();
+
     return Inertia::render('admin/index', [
-      'userData' => [
-        'name' => 'John Doe',
-      ],
+      'userData' => $user,
       'count' => [
-        'items' => 10,
-        'customers' => 20,
-        'reservations' => 30,
-        'invoices' => 40,
+        'items' => $items,
+        'customers' => $customers,
+        'reservations' => $reservations,
+        'invoices' => $invoices,
       ],
       'chart1' => [
         'labels' => ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug'],

From 7aaae214eaceec73382328d43927e350c23bb3da Mon Sep 17 00:00:00 2001
From: Chris Friemann <github@chris.friemann.nl>
Date: Mon, 22 Jan 2024 12:40:21 +0100
Subject: [PATCH 02/13] fix: name always = John Doe and default count

---
 src/resources/vue/pages/admin/index.vue | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/resources/vue/pages/admin/index.vue b/src/resources/vue/pages/admin/index.vue
index eb282fb..a7dd847 100644
--- a/src/resources/vue/pages/admin/index.vue
+++ b/src/resources/vue/pages/admin/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <AdminLayout :user-data="{name: 'John Doe'}">
+  <AdminLayout :user-data="userData">
     <div class="admin-content">
       <div class="dashboard">
         <span class="dashboard-title">Dashboard</span>
@@ -49,18 +49,15 @@ export default {
       userData: {
         type: Object,
         required: true,
-        default: () => ({
-          name: "John Doe",
-        }),
       },
       count: {
         type: Object,
         required: true,
         default: () => ({
-          items: 1,
-          customers: 1,
-          reservations: 1,
-          openInvoices: 1,
+          items: 0,
+          customers: 0,
+          reservations: 0,
+          openInvoices: 0,
         }),
       },
       chart1: {

From 2e5c3edd21a04543159645fcfaa028f77cc54a74 Mon Sep 17 00:00:00 2001
From: Chris Friemann <github@chris.friemann.nl>
Date: Mon, 22 Jan 2024 12:41:02 +0100
Subject: [PATCH 03/13] fix: no default for userData

---
 src/resources/vue/layouts/admin-layout.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/resources/vue/layouts/admin-layout.vue b/src/resources/vue/layouts/admin-layout.vue
index f1746c7..5b61bea 100644
--- a/src/resources/vue/layouts/admin-layout.vue
+++ b/src/resources/vue/layouts/admin-layout.vue
@@ -19,9 +19,6 @@
       userData: {
         type: Object,
         required: true,
-        default: () => ({
-          name: "John Doe",
-        }),
       },
     },
   };

From c0caf51e61f0bbc94e9f2f0598996150de5a0860 Mon Sep 17 00:00:00 2001
From: Chris Friemann <github@chris.friemann.nl>
Date: Mon, 22 Jan 2024 12:41:21 +0100
Subject: [PATCH 04/13] fix: better props

---
 src/resources/vue/components/admin/Siderbar.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/resources/vue/components/admin/Siderbar.vue b/src/resources/vue/components/admin/Siderbar.vue
index 89ea380..a638cbe 100644
--- a/src/resources/vue/components/admin/Siderbar.vue
+++ b/src/resources/vue/components/admin/Siderbar.vue
@@ -55,7 +55,13 @@
 import Icon from "@/icon.vue"
 export default {
   name: "AdminSidebar",
-  props: ["userData"],
+  props: {
+    userData: {
+      type: Object,
+      required: true,
+      default: () => ({}),
+    },
+  },
   components: {
     Icon
   },

From ab42f00f44c9ba5e1dcc2a5556ace688a119e51f Mon Sep 17 00:00:00 2001
From: Chris Friemann <github@chris.friemann.nl>
Date: Mon, 22 Jan 2024 12:43:13 +0100
Subject: [PATCH 05/13] fix: default userData not needed

---
 src/resources/vue/components/admin/Siderbar.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/resources/vue/components/admin/Siderbar.vue b/src/resources/vue/components/admin/Siderbar.vue
index a638cbe..3906141 100644
--- a/src/resources/vue/components/admin/Siderbar.vue
+++ b/src/resources/vue/components/admin/Siderbar.vue
@@ -59,7 +59,6 @@ export default {
     userData: {
       type: Object,
       required: true,
-      default: () => ({}),
     },
   },
   components: {

From aa2073d6d18bca858621b73c05727c350f93a9dd Mon Sep 17 00:00:00 2001
From: Chris Friemann <github@chris.friemann.nl>
Date: Mon, 22 Jan 2024 12:43:29 +0100
Subject: [PATCH 06/13] feat: get firstname and first letter of lastname

---
 src/resources/vue/components/admin/Siderbar.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/resources/vue/components/admin/Siderbar.vue b/src/resources/vue/components/admin/Siderbar.vue
index 3906141..60dcd52 100644
--- a/src/resources/vue/components/admin/Siderbar.vue
+++ b/src/resources/vue/components/admin/Siderbar.vue
@@ -37,7 +37,7 @@
       <div class="dropdown">
         <a href="#" class="d-flex align-items-center link-light text-decoration-none dropdown-toggle" id="dropdownUser2" data-bs-toggle="dropdown" aria-expanded="false">
           <Icon icon="full-person" size="24" color="white" />
-          <strong class="p-1">{{ userData.name }}</strong>
+          <strong class="p-1">{{ name }}</strong>
         </a>
         <ul class="dropdown-menu text-small shadow" aria-labelledby="dropdownUser2">
           <li><a class="dropdown-item" href="#">Profile</a></li>
@@ -64,6 +64,9 @@ export default {
   components: {
     Icon
   },
+  created() {
+    this.name = this.userData.first_name + " " + this.userData.last_name.charAt(0) + "."
+  },
 }
 </script>
 

From 765ac9f2bd0e225dea7cf97c6202cefbf96bb7ee Mon Sep 17 00:00:00 2001
From: Chris Friemann <github@chris.friemann.nl>
Date: Wed, 24 Jan 2024 11:52:53 +0100
Subject: [PATCH 07/13] feat: add userData to all pages and tabs in file

---
 .../Http/Middleware/HandleInertiaRequests.php | 89 ++++++++++++-------
 1 file changed, 56 insertions(+), 33 deletions(-)

diff --git a/src/app/Http/Middleware/HandleInertiaRequests.php b/src/app/Http/Middleware/HandleInertiaRequests.php
index 8c85cd2..a2e70f7 100644
--- a/src/app/Http/Middleware/HandleInertiaRequests.php
+++ b/src/app/Http/Middleware/HandleInertiaRequests.php
@@ -3,41 +3,64 @@
 namespace App\Http\Middleware;
 
 use Illuminate\Http\Request;
+use Inertia\Inertia;
 use Inertia\Middleware;
 
 class HandleInertiaRequests extends Middleware
 {
-    /**
-     * The root template that's loaded on the first page visit.
-     *
-     * @see https://inertiajs.com/server-side-setup#root-template
-     * @var string
-     */
-    protected $rootView = 'app';
-
-    /**
-     * Determines the current asset version.
-     *
-     * @see https://inertiajs.com/asset-versioning
-     * @param  \Illuminate\Http\Request  $request
-     * @return string|null
-     */
-    public function version(Request $request): ?string
-    {
-        return parent::version($request);
-    }
-
-    /**
-     * Defines the props that are shared by default.
-     *
-     * @see https://inertiajs.com/shared-data
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function share(Request $request): array
-    {
-        return array_merge(parent::share($request), [
-            //
-        ]);
-    }
+	/**
+	 * The root template that's loaded on the first page visit.
+	 *
+	 * @see https://inertiajs.com/server-side-setup#root-template
+	 * @var string
+	 */
+	protected $rootView = 'app';
+
+	/**
+	 * Determines the current asset version.
+	 *
+	 * @see https://inertiajs.com/asset-versioning
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return string|null
+	 */
+	public function version(Request $request): ?string
+	{
+		return parent::version($request);
+	}
+
+	/**
+	 * Defines the props that are shared by default.
+	 *
+	 * @see https://inertiajs.com/shared-data
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return array
+	 */
+	public function share(Request $request): array
+	{
+		$user = auth()->user();
+
+		if (!$user) {
+			return array_merge(parent::share($request), [
+				//
+			]);
+		}
+
+		return array_merge(parent::share($request), [
+			'userData' => fn() => $request->user()
+				? $request->user()->only('id', 'first_name', 'last_name', 'email')
+				: null,
+		]);
+	}
+
+	// handle
+	public function handle($request, \Closure $next)
+	{
+		$user = auth()->user();
+
+		if (!$user && $request->path() !== '/') {
+			return Inertia::location('/');
+		};
+
+		return parent::handle($request, $next);
+	}
 }

From f453253b242fb81fbbf10204bd958d43e90144e6 Mon Sep 17 00:00:00 2001
From: Chris Friemann <github@chris.friemann.nl>
Date: Wed, 24 Jan 2024 11:53:14 +0100
Subject: [PATCH 08/13] refactor: moved userAuth to InertiaRequests

---
 src/app/Http/Controllers/AdminController.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/app/Http/Controllers/AdminController.php b/src/app/Http/Controllers/AdminController.php
index 40906fc..2d47e26 100644
--- a/src/app/Http/Controllers/AdminController.php
+++ b/src/app/Http/Controllers/AdminController.php
@@ -13,13 +13,6 @@ class AdminController extends Controller
 {
   public function index()
   {
-    $user = auth()->user();
-
-    if (!$user) {
-      // $user = auth()->loginUsingId(1);
-      return Inertia::location('/');
-    }
-
     // Get the Statistics
     $items = Item::count();
     $customers = User::count();
@@ -27,7 +20,6 @@ public function index()
     $invoices = Fine::count();
 
     return Inertia::render('admin/index', [
-      'userData' => $user,
       'count' => [
         'items' => $items,
         'customers' => $customers,

From 2fe4483d6dd6be26f5bff52bf1973563961a704f Mon Sep 17 00:00:00 2001
From: Chris Friemann <github@chris.friemann.nl>
Date: Wed, 24 Jan 2024 12:01:20 +0100
Subject: [PATCH 09/13] cleanup: duplicate on Item Model

---
 src/app/Http/Controllers/AdminController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/Http/Controllers/AdminController.php b/src/app/Http/Controllers/AdminController.php
index cae2046..0ef6791 100644
--- a/src/app/Http/Controllers/AdminController.php
+++ b/src/app/Http/Controllers/AdminController.php
@@ -7,7 +7,6 @@
 use App\Models\Reservation;
 use App\Models\User;
 use App\Enums\ModifiedEnum;
-use App\Models\Item;
 use Inertia\Inertia;
 
 class AdminController extends Controller

From 68fe893d355298818a9d2b61941a410f313e64b6 Mon Sep 17 00:00:00 2001
From: Chris Friemann <github@chris.friemann.nl>
Date: Wed, 24 Jan 2024 15:43:30 +0100
Subject: [PATCH 10/13] revert: back to original state

---
 .../Http/Middleware/HandleInertiaRequests.php | 24 +------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/src/app/Http/Middleware/HandleInertiaRequests.php b/src/app/Http/Middleware/HandleInertiaRequests.php
index a2e70f7..87d3740 100644
--- a/src/app/Http/Middleware/HandleInertiaRequests.php
+++ b/src/app/Http/Middleware/HandleInertiaRequests.php
@@ -37,30 +37,8 @@ public function version(Request $request): ?string
 	 */
 	public function share(Request $request): array
 	{
-		$user = auth()->user();
-
-		if (!$user) {
-			return array_merge(parent::share($request), [
-				//
-			]);
-		}
-
 		return array_merge(parent::share($request), [
-			'userData' => fn() => $request->user()
-				? $request->user()->only('id', 'first_name', 'last_name', 'email')
-				: null,
+			//
 		]);
 	}
-
-	// handle
-	public function handle($request, \Closure $next)
-	{
-		$user = auth()->user();
-
-		if (!$user && $request->path() !== '/') {
-			return Inertia::location('/');
-		};
-
-		return parent::handle($request, $next);
-	}
 }

From ca726bde8dacbe133fff700e571e29efb5fc54b7 Mon Sep 17 00:00:00 2001
From: Chris Friemann <github@chris.friemann.nl>
Date: Wed, 24 Jan 2024 15:44:21 +0100
Subject: [PATCH 11/13] revert: back to original state

---
 src/app/Http/Controllers/AdminController.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/app/Http/Controllers/AdminController.php b/src/app/Http/Controllers/AdminController.php
index 0ef6791..468a1d6 100644
--- a/src/app/Http/Controllers/AdminController.php
+++ b/src/app/Http/Controllers/AdminController.php
@@ -13,6 +13,13 @@ class AdminController extends Controller
 {
   public function index()
   {
+    $userData = auth()->user();
+
+    if (!$userData) {
+      $userData = User::find(1);
+      auth()->login($userData);
+    }
+
     // Get the Statistics
     $items = Item::count();
     $customers = User::count();
@@ -20,6 +27,7 @@ public function index()
     $invoices = Fine::count();
 
     return Inertia::render('admin/index', [
+      'userData' => $userData,
       'count' => [
         'items' => $items,
         'customers' => $customers,

From b5582fff8890b09d8ca3c91261ffabdc281187c1 Mon Sep 17 00:00:00 2001
From: Chris Friemann <github@chris.friemann.nl>
Date: Wed, 24 Jan 2024 15:45:31 +0100
Subject: [PATCH 12/13] fix: not logged in means logging in

---
 src/app/Http/Controllers/AdminController.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/app/Http/Controllers/AdminController.php b/src/app/Http/Controllers/AdminController.php
index 468a1d6..6e9032b 100644
--- a/src/app/Http/Controllers/AdminController.php
+++ b/src/app/Http/Controllers/AdminController.php
@@ -16,8 +16,7 @@ public function index()
     $userData = auth()->user();
 
     if (!$userData) {
-      $userData = User::find(1);
-      auth()->login($userData);
+      Inertia::location('/');
     }
 
     // Get the Statistics

From 9b3dd2b2e86ef2edca6a38b3bdf44988547909c0 Mon Sep 17 00:00:00 2001
From: Chris Friemann <github@chris.friemann.nl>
Date: Wed, 24 Jan 2024 15:49:03 +0100
Subject: [PATCH 13/13] fix: feedback for redirect instead of location

---
 src/app/Http/Controllers/AdminController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/Http/Controllers/AdminController.php b/src/app/Http/Controllers/AdminController.php
index 6e9032b..18f1380 100644
--- a/src/app/Http/Controllers/AdminController.php
+++ b/src/app/Http/Controllers/AdminController.php
@@ -16,7 +16,7 @@ public function index()
     $userData = auth()->user();
 
     if (!$userData) {
-      Inertia::location('/');
+      return redirect('/');
     }
 
     // Get the Statistics