My notifications page

heloufir · heloufir · commit 4255e330e244 · 2022-09-14T19:47:25.000+01:00
diff --git a/app/Http/Livewire/Auth/ForgotPassword.php b/app/Http/Livewire/Auth/ForgotPassword.php
@@ -58,7 +58,7 @@ public function forgotPassword(): void
         if ($status === PasswordFacade::RESET_LINK_SENT) {
             Notification::make()
                 ->success()
-                ->title('Success')
+                ->title(__('Success'))
                 ->body(__('A password recovery email has been sent'))
                 ->send();
             $this->form->fill();
diff --git a/app/Http/Livewire/Auth/Login.php b/app/Http/Livewire/Auth/Login.php
@@ -34,7 +34,7 @@ public function render()
         if (session()->get('password_reset')) {
             Notification::make()
                 ->success()
-                ->title('Success')
+                ->title(__('Success'))
                 ->body(__('Your password is now updated'))
                 ->send();
         }
diff --git a/app/Http/Livewire/MyNotifications.php b/app/Http/Livewire/MyNotifications.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Http\Livewire;
+
+use Filament\Notifications\Notification;
+use Livewire\Component;
+
+class MyNotifications extends Component
+{
+
+    public function render()
+    {
+        $notifications = auth()->user()->notifications()->orderBy('created_at', 'desc')->paginate();
+        return view('livewire.my-notifications', compact('notifications'));
+    }
+
+    /**
+     * Mark a notification as read
+     *
+     * @param string $notification
+     * @return void
+     */
+    public function markRead(string $notification): void
+    {
+        auth()->user()->notifications()->where('id', $notification)->update([
+            'read_at' => now()
+        ]);
+        Notification::make()
+            ->success()
+            ->title(__('Notification updated'))
+            ->body(__('The notification is now marked as read'))
+            ->send();
+    }
+
+    /**
+     * Mark all unread notifications as read
+     *
+     * @return void
+     */
+    public function markAllRead(): void
+    {
+        auth()->user()->unreadNotifications()->update(['read_at' => now()]);
+        Notification::make()
+            ->success()
+            ->title(__('Notifications updated'))
+            ->body(__('All unread notifications is not marked as read'))
+            ->send();
+    }
+}
diff --git a/app/Http/Livewire/MyProfile.php b/app/Http/Livewire/MyProfile.php
@@ -47,7 +47,7 @@ private function initProfile(): void
         if (session()->has('profile_updated')) {
             Notification::make()
                 ->success()
-                ->title('Profile updated')
+                ->title(__('Profile updated'))
                 ->body(__('Your account details has been updated'))
                 ->send();
         }
diff --git a/app/Http/Livewire/Projects.php b/app/Http/Livewire/Projects.php
@@ -140,7 +140,7 @@ public function toggleFavoriteProject(Project $project) {
             FavoriteProject::where('user_id', auth()->user()->id)->where('project_id', $project->id)->delete();
             Notification::make()
                 ->success()
-                ->title('Favorite removed')
+                ->title(__('Favorite removed'))
                 ->body(__('The project has been successfully remove from your favorite projects'))
                 ->send();
         } else {
@@ -150,7 +150,7 @@ public function toggleFavoriteProject(Project $project) {
             ]);
             Notification::make()
                 ->success()
-                ->title('Favorite added')
+                ->title(__('Favorite added'))
                 ->body(__('The project has been successfully added to your favorite projects'))
                 ->send();
         }
diff --git a/app/Http/Livewire/ProjectsDialog.php b/app/Http/Livewire/ProjectsDialog.php
@@ -78,7 +78,7 @@ public function save(): void {
             ]);
             Notification::make()
                 ->success()
-                ->title('Project created')
+                ->title(__('Project created'))
                 ->body(__('The project has been successfully created'))
                 ->send();
         } else {
@@ -88,7 +88,7 @@ public function save(): void {
             $this->project->save();
             Notification::make()
                 ->success()
-                ->title('Project updated')
+                ->title(__('Project updated'))
                 ->body(__('The project\'s details has been updated'))
                 ->send();
         }
@@ -106,7 +106,7 @@ public function doDeleteProject(): void {
         $this->emit('projectDeleted');
         Notification::make()
             ->success()
-            ->title('Project deleted')
+            ->title(__('Project deleted'))
             ->body(__('The project has been deleted'))
             ->send();
     }
@@ -130,7 +130,7 @@ public function deleteProject(): void {
         $this->deleteConfirmationOpened = true;
         Notification::make()
             ->warning()
-            ->title('Project deletion')
+            ->title(__('Project deletion'))
             ->body(__('Are you sure you want to delete this project?'))
             ->actions([
                 Action::make('confirm')
diff --git a/app/Http/Livewire/TicketDetails/Content.php b/app/Http/Livewire/TicketDetails/Content.php
@@ -71,7 +71,7 @@ public function save(): void
         $this->ticket->save();
         Notification::make()
             ->success()
-            ->title('Content updated')
+            ->title(__('Content updated'))
             ->body(__('The ticket content has been successfully updated'))
             ->send();
         $this->form->fill([
diff --git a/app/Http/Livewire/TicketDetails/Priority.php b/app/Http/Livewire/TicketDetails/Priority.php
@@ -71,7 +71,7 @@ public function save(): void
         $this->ticket->save();
         Notification::make()
             ->success()
-            ->title('Priority updated')
+            ->title(__('Priority updated'))
             ->body(__('The ticket priority has been successfully updated'))
             ->send();
         $this->form->fill([
diff --git a/app/Http/Livewire/TicketDetails/Responsible.php b/app/Http/Livewire/TicketDetails/Responsible.php
@@ -71,7 +71,7 @@ public function save(): void
         $this->ticket->save();
         Notification::make()
             ->success()
-            ->title('Responsible updated')
+            ->title(__('Responsible updated'))
             ->body(__('The ticket responsible has been successfully updated'))
             ->send();
         $this->form->fill([
diff --git a/app/Http/Livewire/TicketDetails/Status.php b/app/Http/Livewire/TicketDetails/Status.php
@@ -70,7 +70,7 @@ public function save(): void
         $this->ticket->save();
         Notification::make()
             ->success()
-            ->title('Status updated')
+            ->title(__('Status updated'))
             ->body(__('The ticket status has been successfully updated'))
             ->send();
         $this->form->fill([
diff --git a/app/Http/Livewire/TicketDetails/Title.php b/app/Http/Livewire/TicketDetails/Title.php
@@ -69,7 +69,7 @@ public function save(): void
         $this->ticket->save();
         Notification::make()
             ->success()
-            ->title('Title updated')
+            ->title(__('Title updated'))
             ->body(__('The ticket title has been successfully updated'))
             ->send();
         $this->form->fill([
diff --git a/app/Http/Livewire/TicketDetails/Type.php b/app/Http/Livewire/TicketDetails/Type.php
@@ -70,7 +70,7 @@ public function save(): void
         $this->ticket->save();
         Notification::make()
             ->success()
-            ->title('Type updated')
+            ->title(__('Type updated'))
             ->body(__('The ticket type has been successfully updated'))
             ->send();
         $this->form->fill([
diff --git a/app/Http/Livewire/TicketDetailsComments.php b/app/Http/Livewire/TicketDetailsComments.php
@@ -96,7 +96,7 @@ public function comment(): void
         ]);
         Notification::make()
             ->success()
-            ->title('Comment created')
+            ->title(__('Comment created'))
             ->body(__('Your comment has been successfully added to the ticket'))
             ->send();
         $this->form->fill();
diff --git a/app/Http/Livewire/TicketDetailsCommentsContent.php b/app/Http/Livewire/TicketDetailsCommentsContent.php
@@ -87,7 +87,7 @@ public function save(): void
         $this->updating = false;
         Notification::make()
             ->success()
-            ->title('Comment updated')
+            ->title(__('Comment updated'))
             ->body(__('The comment has been updated'))
             ->send();
     }
@@ -106,7 +106,7 @@ public function doDeleteComment(int $commentId): void
             $this->emit('commentDeleted');
             Notification::make()
                 ->success()
-                ->title('Comment deleted')
+                ->title(__('Comment deleted'))
                 ->body(__('The comment has been deleted'))
                 ->send();
         }
@@ -135,7 +135,7 @@ public function deleteComment(Comment $comment): void
         $this->deleteConfirmationOpened = true;
         Notification::make()
             ->warning()
-            ->title('Comment deletion')
+            ->title(__('Comment deletion'))
             ->body(__('Are you sure you want to delete this comment?'))
             ->actions([
                 Action::make('confirm')
diff --git a/app/Http/Livewire/TicketsDialog.php b/app/Http/Livewire/TicketsDialog.php
@@ -107,7 +107,7 @@ public function save(): void
         ]);
         Notification::make()
             ->success()
-            ->title('Ticket created')
+            ->title(__('Ticket created'))
             ->body(__('The ticket has been successfully created'))
             ->send();
         $this->emit('ticketSaved');
diff --git a/app/Http/Livewire/Users.php b/app/Http/Livewire/Users.php
@@ -130,7 +130,7 @@ public function resendActivationEmail(User $user) {
             $user->notify(new UserCreatedNotification($user));
             Notification::make()
                 ->success()
-                ->title('Success')
+                ->title(__('Success'))
                 ->body(__('An email has been sent to the user'))
                 ->send();
         }
diff --git a/app/Http/Livewire/UsersDialog.php b/app/Http/Livewire/UsersDialog.php
@@ -81,7 +81,7 @@ public function save(): void {
             $user->notify(new UserCreatedNotification($user));
             Notification::make()
                 ->success()
-                ->title('User created')
+                ->title(__('User created'))
                 ->body(__('An email has been sent to the user'))
                 ->send();
         } else {
@@ -91,7 +91,7 @@ public function save(): void {
             $this->user->save();
             Notification::make()
                 ->success()
-                ->title('User updated')
+                ->title(__('User updated'))
                 ->body(__('The user\'s details has been updated'))
                 ->send();
         }
@@ -109,7 +109,7 @@ public function doDeleteUser(): void {
         $this->emit('userDeleted');
         Notification::make()
             ->success()
-            ->title('User deleted')
+            ->title(__('User deleted'))
             ->body(__('The user has been deleted'))
             ->send();
     }
@@ -133,7 +133,7 @@ public function deleteUser(): void {
         $this->deleteConfirmationOpened = true;
         Notification::make()
             ->warning()
-            ->title('User deletion')
+            ->title(__('User deletion'))
             ->body(__('Are you sure you want to delete this user?'))
             ->actions([
                 Action::make('confirm')
diff --git a/app/Notifications/CommentCreateNotification.php b/app/Notifications/CommentCreateNotification.php
@@ -37,7 +37,7 @@ public function __construct(Comment $comment, User $user)
      */
     public function via($notifiable)
     {
-        return ['mail'];
+        return ['mail', 'database'];
     }
 
     /**
@@ -69,7 +69,9 @@ public function toMail($notifiable)
     public function toArray($notifiable)
     {
         return [
-            //
+            'ticket' => $this->comment->ticket,
+            'comment' => $this->comment,
+            'user' => $this->user,
         ];
     }
 }
diff --git a/app/Notifications/TicketCreatedNotification.php b/app/Notifications/TicketCreatedNotification.php
@@ -36,7 +36,7 @@ public function __construct(Ticket $ticket, User $user)
      */
     public function via($notifiable)
     {
-        return ['mail'];
+        return ['mail', 'database'];
     }
 
     /**
@@ -68,7 +68,8 @@ public function toMail($notifiable)
     public function toArray($notifiable)
     {
         return [
-            //
+            'ticket' => $this->ticket,
+            'user' => $this->user,
         ];
     }
 }
diff --git a/app/Notifications/TicketUpdatedNotification.php b/app/Notifications/TicketUpdatedNotification.php
@@ -42,7 +42,7 @@ public function __construct(Ticket $ticket, string $field, string $before, strin
      */
     public function via($notifiable)
     {
-        return ['mail'];
+        return ['mail', 'database'];
     }
 
     /**
@@ -74,7 +74,11 @@ public function toMail($notifiable)
     public function toArray($notifiable)
     {
         return [
-            //
+            'ticket' => $this->ticket,
+            'field' => $this->field,
+            'before' => $this->before,
+            'after' => $this->after,
+            'user' => $this->user,
         ];
     }
 }
diff --git a/app/View/Components/MainMenu.php b/app/View/Components/MainMenu.php
@@ -22,10 +22,36 @@ public function __construct()
          *  'route name' => 'menu item label'
          */
         $this->menu = [
-            'home' => ['title' => 'Overview', 'icon' => 'fa-table-columns', 'always_shown' => true],
-            'analytics' => ['title' => 'Analytics', 'icon' => 'fa-chart-bar', 'always_shown' => false],
-            'tickets' => ['title' => 'Tickets', 'icon' => 'fa-ticket', 'always_shown' => false],
-            'administration' => ['title' => 'Administration', 'icon' => 'fa-cogs', 'always_shown' => false],
+            'home' => [
+                'title' => 'Overview',
+                'icon' => 'fa-table-columns',
+                'always_shown' => true,
+                'show_notification_indicator' => false
+            ],
+            'analytics' => [
+                'title' => 'Analytics',
+                'icon' => 'fa-chart-bar',
+                'always_shown' => false,
+                'show_notification_indicator' => false
+            ],
+            'tickets' => [
+                'title' => 'Tickets',
+                'icon' => 'fa-ticket',
+                'always_shown' => false,
+                'show_notification_indicator' => false
+            ],
+            'administration' => [
+                'title' => 'Administration',
+                'icon' => 'fa-cogs',
+                'always_shown' => false,
+                'show_notification_indicator' => false
+            ],
+            'notifications' => [
+                'title' => 'Notifications',
+                'icon' => 'fa-bell',
+                'always_shown' => true,
+                'show_notification_indicator' => true
+            ],
         ];
     }
 
diff --git a/app/View/Components/NotificationType.php b/app/View/Components/NotificationType.php
diff --git a/database/migrations/2022_09_14_175349_create_notifications_table.php b/database/migrations/2022_09_14_175349_create_notifications_table.php
diff --git a/resources/views/components/main-menu.blade.php b/resources/views/components/main-menu.blade.php
diff --git a/resources/views/components/notification-type.blade.php b/resources/views/components/notification-type.blade.php
diff --git a/resources/views/livewire/my-notifications.blade.php b/resources/views/livewire/my-notifications.blade.php
diff --git a/resources/views/notifications.blade.php b/resources/views/notifications.blade.php
diff --git a/routes/web.php b/routes/web.php

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function render()`
`34`	`34`	`if (session()->get('password_reset')) {`
`35`	`35`	`Notification::make()`
`36`	`36`	`->success()`
`37`		`- ->title('Success')`
	`37`	`+ ->title(__('Success'))`
`38`	`38`	`->body(__('Your password is now updated'))`
`39`	`39`	`->send();`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ private function initProfile(): void`
`47`	`47`	`if (session()->has('profile_updated')) {`
`48`	`48`	`Notification::make()`
`49`	`49`	`->success()`
`50`		`- ->title('Profile updated')`
	`50`	`+ ->title(__('Profile updated'))`
`51`	`51`	`->body(__('Your account details has been updated'))`
`52`	`52`	`->send();`
`53`	`53`	`}`