Replace Laraflash with Spatie Flash.

mikaeljorhult · Feb 9, 2024 · d931b27 · d931b27
1 parent 6330886
commit d931b27
Show file tree

Hide file tree

Showing 20 changed files with 315 additions and 333 deletions.
diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
@@ -104,11 +104,10 @@ public function store(BookingStoreRequest $request): RedirectResponse
             'user_id' => $currentUser->isAdmin() && $request->input('user_id') ? $request->input('user_id') : $currentUser->id,
         ]));
 
-        laraflash()
-            ->message()
-            ->title('Booking was created')
-            ->content('Booking was created successfully.')
-            ->success();
+        flash(json_encode([
+            'title' => 'Booking was created',
+            'message' => 'Booking was created successfully.',
+        ]), 'success');
 
         return redirect()->route('bookings.index');
     }
@@ -177,11 +176,10 @@ public function update(BookingUpdateRequest $request, Booking $booking): Redirec
             'user_id' => $currentUser->isAdmin() && $request->input('user_id') ? $request->input('user_id') : $booking->user_id,
         ]));
 
-        laraflash()
-            ->message()
-            ->title('Booking was updated')
-            ->content('Booking was updated successfully.')
-            ->success();
+        flash(json_encode([
+            'title' => 'Booking was updated',
+            'message' => 'Booking was updated successfully.',
+        ]), 'success');
 
         return redirect()->route('bookings.index');
     }
@@ -193,11 +191,10 @@ public function destroy(Booking $booking, BookingDestroyRequest $request): Redir
     {
         $booking->delete();
 
-        laraflash()
-            ->message()
-            ->title('Booking was deleted')
-            ->content('Booking was deleted successfully.')
-            ->success();
+        flash(json_encode([
+            'title' => 'Booking was deleted',
+            'message' => 'Booking was deleted successfully.',
+        ]), 'success');
 
         return redirect()->route('bookings.index');
     }

diff --git a/app/Http/Controllers/BucketController.php b/app/Http/Controllers/BucketController.php
@@ -55,11 +55,10 @@ public function store(BucketStoreRequest $request): RedirectResponse
         $bucket = Bucket::create($request->validated());
         $bucket->resources()->sync($request->get('resources'));
 
-        laraflash()
-            ->message()
-            ->title('Bucket was created')
-            ->content('Bucket "'.$bucket->name.'" was created successfully.')
-            ->success();
+        flash(json_encode([
+            'title' => 'Bucket was created',
+            'message' => 'Bucket "'.$bucket->name.'" was created successfully.',
+        ]), 'success');
 
         return redirect()->route('buckets.index');
     }
@@ -93,11 +92,10 @@ public function update(BucketUpdateRequest $request, Bucket $bucket): RedirectRe
         $bucket->update($request->validated());
         $bucket->resources()->sync($request->get('resources'));
 
-        laraflash()
-            ->message()
-            ->title('Bucket was updated')
-            ->content('Bucket was updated successfully.')
-            ->success();
+        flash(json_encode([
+            'title' => 'Bucket was updated',
+            'message' => 'Bucket was updated successfully.',
+        ]), 'success');
 
         return redirect()->route('buckets.index');
     }
@@ -109,11 +107,10 @@ public function destroy(Bucket $bucket, BucketDestroyRequest $request): Redirect
     {
         $bucket->delete();
 
-        laraflash()
-            ->message()
-            ->title('Bucket was deleted')
-            ->content('Bucket was deleted successfully.')
-            ->success();
+        flash(json_encode([
+            'title' => 'Bucket was deleted',
+            'message' => 'Bucket was deleted successfully.',
+        ]), 'success');
 
         return redirect()->route('buckets.index');
     }

diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php
@@ -71,11 +71,10 @@ public function store(CategoryStoreRequest $request): RedirectResponse
         $category = Category::create($request->validated());
         $category->groups()->sync($request->get('groups'));
 
-        laraflash()
-            ->message()
-            ->title('Category was created')
-            ->content('Category "'.$category->name.'" was created successfully.')
-            ->success();
+        flash(json_encode([
+            'title' => 'Category was created',
+            'message' => 'Category "'.$category->name.'" was created successfully.',
+        ]), 'success');
 
         return redirect()->route('categories.index');
     }
@@ -111,11 +110,10 @@ public function update(CategoryUpdateRequest $request, Category $category): Redi
         $category->update($request->validated());
         $category->groups()->sync($request->get('groups'));
 
-        laraflash()
-            ->message()
-            ->title('Category was updated')
-            ->content('Category was updated successfully.')
-            ->success();
+        flash(json_encode([
+            'title' => 'Category was updated',
+            'message' => 'Category was updated successfully.',
+        ]), 'success');
 
         return redirect()->route('categories.index');
     }
@@ -132,11 +130,10 @@ public function destroy(Category $category, CategoryDestroyRequest $request): Re
 
         $category->delete();
 
-        laraflash()
-            ->message()
-            ->title('Category was deleted')
-            ->content('Category was deleted successfully.')
-            ->success();
+        flash(json_encode([
+            'title' => 'Category was deleted',
+            'message' => 'Category was deleted successfully.',
+        ]), 'success');
 
         return redirect()->route('categories.index');
     }

diff --git a/app/Http/Controllers/CheckinController.php b/app/Http/Controllers/CheckinController.php
@@ -27,11 +27,10 @@ public function store(CheckinStoreRequest $request): RedirectResponse
         $booking = Booking::findOrFail($request->get('booking_id'));
         $booking->state->transitionTo(CheckedIn::class);
 
-        laraflash()
-            ->message()
-            ->title('Booking was checked in')
-            ->content('Booking was checked in successfully.')
-            ->success();
+        flash(json_encode([
+            'title' => 'Booking was checked in',
+            'message' => 'Booking was checked in successfully.',
+        ]), 'success');
 
         return redirect()->back();
     }

diff --git a/app/Http/Controllers/CheckoutController.php b/app/Http/Controllers/CheckoutController.php
@@ -27,11 +27,10 @@ public function store(CheckoutStoreRequest $request): RedirectResponse
         $booking = Booking::findOrFail($request->get('booking_id'));
         $booking->state->transitionTo(CheckedOut::class);
 
-        laraflash()
-            ->message()
-            ->title('Booking was checked out')
-            ->content('Booking was checked out successfully.')
-            ->success();
+        flash(json_encode([
+            'title' => 'Booking was checked out',
+            'message' => 'Booking was checked out successfully.',
+        ]), 'success');
 
         return redirect()->back();
     }

diff --git a/app/Http/Controllers/GroupController.php b/app/Http/Controllers/GroupController.php
@@ -55,11 +55,10 @@ public function store(GroupStoreRequest $request): RedirectResponse
         $group = Group::create($request->validated());
         $group->approvers()->sync($request->get('approvers'));
 
-        laraflash()
-            ->message()
-            ->title('Group was created')
-            ->content('Group "'.$group->name.'" was created successfully.')
-            ->success();
+        flash(json_encode([
+            'title' => 'Group was created',
+            'message' => 'Group "'.$group->name.'" was created successfully.',
+        ]), 'success');
 
         return redirect()->route('groups.index');
     }
@@ -93,11 +92,10 @@ public function update(GroupUpdateRequest $request, Group $group): RedirectRespo
         $group->update($request->validated());
         $group->approvers()->sync($request->get('approvers'));
 
-        laraflash()
-            ->message()
-            ->title('Group was updated')
-            ->content('Group was updated successfully.')
-            ->success();
+        flash(json_encode([
+            'title' => 'Group was updated',
+            'message' => 'Group was updated successfully.',
+        ]), 'success');
 
         return redirect()->route('groups.index');
     }
@@ -109,11 +107,10 @@ public function destroy(Group $group, GroupDestroyRequest $reqest): RedirectResp
     {
         $group->delete();
 
-        laraflash()
-            ->message()
-            ->title('Group was deleted')
-            ->content('Group was deleted successfully.')
-            ->success();
+        flash(json_encode([
+            'title' => 'Group was deleted',
+            'message' => 'Group was deleted successfully.',
+        ]), 'success');
 
         return redirect()->route('groups.index');
     }

diff --git a/app/Http/Controllers/ResourceController.php b/app/Http/Controllers/ResourceController.php
@@ -81,11 +81,10 @@ public function store(ResourceStoreRequest $request): RedirectResponse
         $resource->categories()->sync($request->get('categories'));
         $resource->groups()->sync($request->get('groups'));
 
-        laraflash()
-            ->message()
-            ->title('Resource was created')
-            ->content('Resource "'.$resource->name.'" was created successfully.')
-            ->success();
+        flash(json_encode([
+            'title' => 'Resource was created',
+            'message' => 'Resource "'.$resource->name.'" was created successfully.',
+        ]), 'success');
 
         return redirect()->route('resources.index');
     }
@@ -131,11 +130,10 @@ public function update(ResourceUpdateRequest $request, Resource $resource): Redi
         $resource->categories()->sync($request->get('categories'));
         $resource->groups()->sync($request->get('groups'));
 
-        laraflash()
-            ->message()
-            ->title('Resource was updated')
-            ->content('Resource was updated successfully.')
-            ->success();
+        flash(json_encode([
+            'title' => 'Resource was updated',
+            'message' => 'Resource was updated successfully.',
+        ]), 'success');
 
         return redirect()->route('resources.index');
     }
@@ -147,11 +145,10 @@ public function destroy(Resource $resource, ResourceDestroyRequest $request): Re
     {
         $resource->delete();
 
-        laraflash()
-            ->message()
-            ->title('Resource was deleted')
-            ->content('Resource was deleted successfully.')
-            ->success();
+        flash(json_encode([
+            'title' => 'Resource was deleted',
+            'message' => 'Resource was deleted successfully.',
+        ]), 'success');
 
         return redirect()->route('resources.index');
     }

diff --git a/app/Http/Controllers/ResourceIdentifierController.php b/app/Http/Controllers/ResourceIdentifierController.php
@@ -50,11 +50,10 @@ public function store(IdentifierStoreRequest $request, Resource $resource): Redi
     {
         $resource->identifiers()->create($request->validated());
 
-        laraflash()
-            ->message()
-            ->title('Identifier was added')
-            ->content('Identifier was added for "'.$resource->name.'" successfully.')
-            ->success();
+        flash(json_encode([
+            'title' => 'Identifier was added',
+            'message' => 'Identifier was added for "'.$resource->name.'" successfully.',
+        ]), 'success');
 
         // Redirect to index if sent from create form, otherwise redirect back.
         if (Str::contains($request->headers->get('referer'), '/create')) {
@@ -94,11 +93,10 @@ public function update(IdentifierUpdateRequest $request, Resource $resource, Ide
     {
         $identifier->update($request->validated());
 
-        laraflash()
-            ->message()
-            ->title('Identifier was updated')
-            ->content('Identifier was updated successfully.')
-            ->success();
+        flash(json_encode([
+            'title' => 'Identifier was updated',
+            'message' => 'Identifier was updated successfully.',
+        ]), 'success');
 
         // Redirect to index if sent from edit form, otherwise redirect back.
         if (Str::contains($request->headers->get('referer'), '/edit')) {
@@ -115,11 +113,10 @@ public function destroy(Resource $resource, Identifier $identifier, IdentifierDe
     {
         $identifier->delete();
 
-        laraflash()
-            ->message()
-            ->title('Identifier was removed')
-            ->content('Identifier was removed successfully.')
-            ->success();
+        flash(json_encode([
+            'title' => 'Identifier was removed',
+            'message' => 'Identifier was removed successfully.',
+        ]), 'success');
 
         return redirect()->back();
     }

diff --git a/app/Http/Controllers/SubscriptionController.php b/app/Http/Controllers/SubscriptionController.php
@@ -38,11 +38,10 @@ public function store(SubscriptionStoreRequest $request): RedirectResponse
             'subscribable_id' => $request->get('subscribable_id'),
         ]);
 
-        laraflash()
-            ->message()
-            ->title('Subscription was added')
-            ->content('Subscription was added successfully.')
-            ->success();
+        flash(json_encode([
+            'title' => 'Subscription was added',
+            'message' => 'Subscription was added successfully.',
+        ]), 'success');
 
         return redirect()->back();
     }
@@ -54,11 +53,10 @@ public function destroy(Subscription $subscription, SubscriptionDestroyRequest $
     {
         $subscription->delete();
 
-        laraflash()
-            ->message()
-            ->title('Subscription was removed')
-            ->content('Subscription was removed successfully.')
-            ->success();
+        flash(json_encode([
+            'title' => 'Subscription was removed',
+            'message' => 'Subscription was removed successfully.',
+        ]), 'success');
 
         return redirect()->back();
     }

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -68,11 +68,10 @@ public function store(UserStoreRequest $request): RedirectResponse
         $user = User::create($input);
         $user->groups()->sync($request->get('groups'));
 
-        laraflash()
-            ->message()
-            ->title('User was created')
-            ->content('User "'.$user->email.'" was created successfully.')
-            ->success();
+        flash(json_encode([
+            'title' => 'User was created',
+            'message' => 'User "'.$user->email.'" was created successfully.',
+        ]), 'success');
 
         return redirect()->route('users.index');
     }
@@ -118,11 +117,10 @@ public function update(UserUpdateRequest $request, User $user): RedirectResponse
         $user->update($input);
         $user->groups()->sync($request->get('groups'));
 
-        laraflash()
-            ->message()
-            ->title('User was updated')
-            ->content('User was updated successfully.')
-            ->success();
+        flash(json_encode([
+            'title' => 'User was updated',
+            'message' => 'User was updated successfully.',
+        ]), 'success');
 
         return redirect()->route('users.index');
     }
@@ -134,11 +132,10 @@ public function destroy(User $user, UserDestroyRequest $request): RedirectRespon
     {
         $user->delete();
 
-        laraflash()
-            ->message()
-            ->title('User was deleted')
-            ->content('User was deleted successfully.')
-            ->success();
+        flash(json_encode([
+            'title' => 'User was deleted',
+            'message' => 'User was deleted successfully.',
+        ]), 'success');
 
         return redirect()->route('users.index');
     }