From 6b8700101b90d3bb8ff937a6572ae7668f2ffd2d Mon Sep 17 00:00:00 2001 From: Allan Kong Date: Tue, 30 Dec 2025 14:58:11 -0700 Subject: [PATCH 1/3] changes --- app/Http/Controllers/ResourceEditsController.php | 6 ++++-- app/Http/Middleware/HandleInertiaRequests.php | 1 + app/Models/ResourceEdits.php | 2 +- resources/js/Components/Navigation/BackButton.vue | 2 +- resources/js/Components/ToastHandler.vue | 8 ++++++++ resources/js/Pages/ResourceEdits/Create.vue | 4 +++- 6 files changed, 18 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/ResourceEditsController.php b/app/Http/Controllers/ResourceEditsController.php index b69fe3fd..6969b6dc 100644 --- a/app/Http/Controllers/ResourceEditsController.php +++ b/app/Http/Controllers/ResourceEditsController.php @@ -48,6 +48,8 @@ public function store(ComputerScienceResource $computerScienceResource, StoreRes 'edit_title' => $resourceEdit->edit_title, ]); + throw "tet"; + return redirect()->route('resource_edits.show', ['slug' => $resourceEdit->slug]) ->with('success', 'Edits Created!'); } catch (\InvalidArgumentException $e) { @@ -67,7 +69,7 @@ public function store(ComputerScienceResource $computerScienceResource, StoreRes 'data' => $validatedData, ]); - return redirect()->back()->withErrors(['error' => 'Failed to create resource edit. Please try again.']); + return redirect()->back()->with('error', 'Failed to create resource edit. Please try again.'); } } @@ -137,7 +139,7 @@ public function merge(ResourceEdits $resourceEdits) 'user_id' => Auth::id(), ]); - return redirect()->back()->withErrors(['error' => 'Failed to merge resource edits. Please try again.']); + return redirect()->back()->with('error', 'Failed to merge resource edits. Please try again.'); } } } diff --git a/app/Http/Middleware/HandleInertiaRequests.php b/app/Http/Middleware/HandleInertiaRequests.php index b0395db1..01fc61e6 100644 --- a/app/Http/Middleware/HandleInertiaRequests.php +++ b/app/Http/Middleware/HandleInertiaRequests.php @@ -39,6 +39,7 @@ public function share(Request $request): array 'flash' => [ 'success' => $request->session()->get('success'), 'warning' => $request->session()->get('warning'), + 'error' => $request->session()->get('error'), ], 'config' => [ 'COMMENT_MAX_DEPTH' => config('comment.max_depth'), diff --git a/app/Models/ResourceEdits.php b/app/Models/ResourceEdits.php index f7ac8c8f..3a3ce7fd 100644 --- a/app/Models/ResourceEdits.php +++ b/app/Models/ResourceEdits.php @@ -60,7 +60,7 @@ public function sluggable(): array { return [ 'slug' => [ - 'source' => ['edit_title', 'id'], + 'source' => ['edit_title'], 'unique' => true, ], ]; diff --git a/resources/js/Components/Navigation/BackButton.vue b/resources/js/Components/Navigation/BackButton.vue index 5955674b..7599a795 100644 --- a/resources/js/Components/Navigation/BackButton.vue +++ b/resources/js/Components/Navigation/BackButton.vue @@ -18,6 +18,6 @@ const props = defineProps({ -
+
diff --git a/resources/js/Components/ToastHandler.vue b/resources/js/Components/ToastHandler.vue index 8fc4afa8..0d8ab73d 100644 --- a/resources/js/Components/ToastHandler.vue +++ b/resources/js/Components/ToastHandler.vue @@ -28,6 +28,14 @@ watch( detail: flash.warning, life: TOAST_LIFETIME, }); + + } else if (flash.error) { + toast.add({ + severity: "error", + summary: "Error", + detail: flash.error, + life: TOAST_LIFETIME, + }); } }, { deep: true }, diff --git a/resources/js/Pages/ResourceEdits/Create.vue b/resources/js/Pages/ResourceEdits/Create.vue index d8a9ffdb..cd22ff64 100644 --- a/resources/js/Pages/ResourceEdits/Create.vue +++ b/resources/js/Pages/ResourceEdits/Create.vue @@ -155,7 +155,9 @@ const submit = async () => { tab: 'edits', }) " - /> + > + Back to {{ props.resource.name }} + Date: Tue, 30 Dec 2025 21:58:31 +0000 Subject: [PATCH 2/3] Apply automatic changes --- app/Http/Controllers/ResourceEditsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/ResourceEditsController.php b/app/Http/Controllers/ResourceEditsController.php index 6969b6dc..5f8d60cb 100644 --- a/app/Http/Controllers/ResourceEditsController.php +++ b/app/Http/Controllers/ResourceEditsController.php @@ -48,7 +48,7 @@ public function store(ComputerScienceResource $computerScienceResource, StoreRes 'edit_title' => $resourceEdit->edit_title, ]); - throw "tet"; + throw 'tet'; return redirect()->route('resource_edits.show', ['slug' => $resourceEdit->slug]) ->with('success', 'Edits Created!'); From e35a614459c935ed700ecdd95841d3d9f2239309 Mon Sep 17 00:00:00 2001 From: Allan Kong <74692833+AllanKoder@users.noreply.github.com> Date: Tue, 30 Dec 2025 15:13:09 -0700 Subject: [PATCH 3/3] Update app/Http/Controllers/ResourceEditsController.php Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- app/Http/Controllers/ResourceEditsController.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/Http/Controllers/ResourceEditsController.php b/app/Http/Controllers/ResourceEditsController.php index 5f8d60cb..f7390628 100644 --- a/app/Http/Controllers/ResourceEditsController.php +++ b/app/Http/Controllers/ResourceEditsController.php @@ -48,8 +48,6 @@ public function store(ComputerScienceResource $computerScienceResource, StoreRes 'edit_title' => $resourceEdit->edit_title, ]); - throw 'tet'; - return redirect()->route('resource_edits.show', ['slug' => $resourceEdit->slug]) ->with('success', 'Edits Created!'); } catch (\InvalidArgumentException $e) {