-
-
+
@@ -97,7 +97,7 @@ export default {
SunIcon,
},
computed: {
- ...mapGetters(['isVisibleNavigationBars', 'isDarkMode', 'config', 'user']),
+ ...mapGetters(['isVisibleNavigationBars', 'isDarkMode', 'config', 'user', 'isVisibleNotificationCenter', 'notificationCount']),
navigation() {
if (this.user.data.attributes.role === 'admin') {
return [
@@ -140,15 +140,10 @@ export default {
},
data() {
return {
- notificationCount: 2,
isNotificationCenter: false,
}
},
methods: {
- toggleNotificationCenter() {
- this.notificationCount = 0
- this.isNotificationCenter = ! this.isNotificationCenter
- },
isSection(section) {
return this.$route.matched[0].name === section
},
diff --git a/resources/js/store/modules/app.js b/resources/js/store/modules/app.js
index 7f2665ac..1f0f3bb3 100644
--- a/resources/js/store/modules/app.js
+++ b/resources/js/store/modules/app.js
@@ -5,6 +5,8 @@ import router from '../../router'
const defaultState = {
isVisibleNavigationBars: localStorage.getItem('is_navigation_bars') !== 'false',
+ isVisibleNotificationCenter: false,
+ notificationCount: 0,
isDarkMode: false,
isVisibleSidebar: localStorage.getItem('file_info_visibility') === 'true' || false,
itemViewType: localStorage.getItem('preview_type') || 'list',
@@ -167,10 +169,18 @@ const mutations = {
UPDATE_DARK_MODE_STATUS(state, val) {
state.isDarkMode = val
},
+ UPDATE_NOTIFICATION_COUNT(state, val) {
+ state.notificationCount = val
+ },
+ TOGGLE_NOTIFICATION_CENTER(state) {
+ state.isVisibleNotificationCenter = !state.isVisibleNotificationCenter
+ },
}
const getters = {
+ isVisibleNotificationCenter: (state) => state.isVisibleNotificationCenter,
isVisibleNavigationBars: (state) => state.isVisibleNavigationBars,
+ notificationCount: (state) => state.notificationCount,
isVisibleSidebar: (state) => state.isVisibleSidebar,
itemViewType: (state) => state.itemViewType,
requestedPlan: (state) => state.requestedPlan,
diff --git a/resources/js/store/modules/broadcasting.js b/resources/js/store/modules/broadcasting.js
index d3382e8c..fe3dccd8 100644
--- a/resources/js/store/modules/broadcasting.js
+++ b/resources/js/store/modules/broadcasting.js
@@ -3,14 +3,15 @@ const defaultState = {
}
const actions = {
- runConnection: ({ commit, getters }) => {
+ runConnection: ({ commit, getters, dispatch }) => {
commit('SET_RUNNING_COMMUNICATION')
- Echo.private(`test.${getters.user.data.id}`)
- .listen('.Domain\\Notifications\\Events\\TestUpdate', (e) => {
- console.log(e);
- });
+ Echo.private(`App.Users.Models.User.${getters.user.data.id}`)
+ .notification(() => {
+ // TODO: call sound
+ dispatch('getAppData')
+ });
},
}
diff --git a/resources/js/store/modules/userAuth.js b/resources/js/store/modules/userAuth.js
index 604c9dc7..36dd5868 100644
--- a/resources/js/store/modules/userAuth.js
+++ b/resources/js/store/modules/userAuth.js
@@ -18,6 +18,7 @@ const actions = {
resolve(response)
commit('RETRIEVE_USER', response.data)
+ commit('UPDATE_NOTIFICATION_COUNT', response.data.data.relationships.unreadNotifications.data.length)
if (! getters.isRunningConnection) {
dispatch('runConnection')
@@ -172,6 +173,13 @@ const mutations = {
}
})
},
+ PUSH_NEW_NOTIFICATION(state, notification) {
+ state.user.data.relationships.unreadNotifications.data.push(notification)
+ },
+ FLUSH_NOTIFICATIONS(state) {
+ state.user.data.relationships.readNotifications.data = []
+ state.user.data.relationships.unreadNotifications.data = []
+ },
}
const getters = {
diff --git a/routes/channels.php b/routes/channels.php
index e84d59b3..74cedfb7 100644
--- a/routes/channels.php
+++ b/routes/channels.php
@@ -11,8 +11,4 @@
|
*/
-//Broadcast::channel('App.User.{id}', fn ($user, $id) => (int) $user->id === (int) $id);
-
-Broadcast::channel('test.{id}', function ($user, $id) {
- return true;
-});
+Broadcast::channel('App.Users.Models.User.{id}', fn ($user, $id) => $user->id === $id);
diff --git a/routes/user.php b/routes/user.php
index 64eba556..0e8fed92 100644
--- a/routes/user.php
+++ b/routes/user.php
@@ -4,6 +4,9 @@ use App\Users\Controllers\Account\AccountDetailsController;
use App\Users\Controllers\Account\UpdatePasswordController;
use App\Users\Controllers\Account\StorageCapacityController;
use App\Users\Controllers\Verification\VerifyEmailController;
+use Domain\Notifications\Controllers\FlushUserNotificationsController;
+use Domain\Notifications\Controllers\GetUserNotificationsController;
+use Domain\Notifications\Controllers\MarkUserNotificationsAsReadController;
use Domain\Transactions\Controllers\GetTransactionsController;
use App\Users\Controllers\Verification\ResendVerificationEmail;
use App\Users\Controllers\Authentication\CheckAccountController;
@@ -22,7 +25,12 @@ Route::post('/email/verify/resend', ResendVerificationEmail::class)
Route::group(['middleware' => ['auth:sanctum']], function () {
// User Access Token
Route::apiResource('/tokens', AccountAccessTokenController::class);
-
+
+ // Notifications
+ Route::post('/notifications/read', MarkUserNotificationsAsReadController::class);
+ Route::delete('/notifications', FlushUserNotificationsController::class);
+ Route::get('/notifications', GetUserNotificationsController::class);
+
// Account
Route::patch('/settings', UpdateProfileSettingsController::class);
Route::get('/transactions', GetTransactionsController::class);
diff --git a/src/App/Users/Resources/UserResource.php b/src/App/Users/Resources/UserResource.php
index 86e05593..c336b001 100644
--- a/src/App/Users/Resources/UserResource.php
+++ b/src/App/Users/Resources/UserResource.php
@@ -2,6 +2,7 @@
namespace App\Users\Resources;
+use Domain\Notifications\Resources\NotificationCollection;
use Domain\Folders\Resources\FolderCollection;
use Illuminate\Http\Resources\Json\JsonResource;
use App\Users\Actions\FormatUsageEstimatesAction;
@@ -43,9 +44,11 @@ class UserResource extends JsonResource
'updated_at' => format_date($this->updated_at, 'd. M. Y'),
],
'relationships' => [
- 'settings' => new SettingsResource($this->settings),
- 'favourites' => new FolderCollection($this->favouriteFolders),
- 'creditCards' => new CreditCardCollection($this->creditCards),
+ 'readNotifications' => new NotificationCollection($this->readNotifications),
+ 'unreadNotifications' => new NotificationCollection($this->unreadNotifications),
+ 'settings' => new SettingsResource($this->settings),
+ 'favourites' => new FolderCollection($this->favouriteFolders),
+ 'creditCards' => new CreditCardCollection($this->creditCards),
$this->mergeWhen($this->hasSubscription(), fn() => [
'subscription' => new SubscriptionResource($this->subscription),
]),
diff --git a/src/Domain/Notifications/Controllers/FlushUserNotificationsController.php b/src/Domain/Notifications/Controllers/FlushUserNotificationsController.php
new file mode 100644
index 00000000..ba787b80
--- /dev/null
+++ b/src/Domain/Notifications/Controllers/FlushUserNotificationsController.php
@@ -0,0 +1,23 @@
+user()->notifications()->delete();
+
+ return response('Done', 204);
+ }
+}
\ No newline at end of file
diff --git a/src/Domain/Notifications/Controllers/GetUserNotificationsController.php b/src/Domain/Notifications/Controllers/GetUserNotificationsController.php
new file mode 100644
index 00000000..bd1f49d0
--- /dev/null
+++ b/src/Domain/Notifications/Controllers/GetUserNotificationsController.php
@@ -0,0 +1,16 @@
+user()->notifications
+ );
+ }
+}
\ No newline at end of file
diff --git a/src/Domain/Notifications/Controllers/MarkUserNotificationsAsReadController.php b/src/Domain/Notifications/Controllers/MarkUserNotificationsAsReadController.php
new file mode 100644
index 00000000..b06bb832
--- /dev/null
+++ b/src/Domain/Notifications/Controllers/MarkUserNotificationsAsReadController.php
@@ -0,0 +1,23 @@
+user()->unreadNotifications()->update(['read_at' => now()]);
+
+ return response('Done', 204);
+ }
+}
\ No newline at end of file
diff --git a/src/Domain/Notifications/Resources/NotificationCollection.php b/src/Domain/Notifications/Resources/NotificationCollection.php
new file mode 100644
index 00000000..0fc61583
--- /dev/null
+++ b/src/Domain/Notifications/Resources/NotificationCollection.php
@@ -0,0 +1,16 @@
+ $this->collection,
+ ];
+ }
+}
diff --git a/src/Domain/Notifications/Resources/NotificationResource.php b/src/Domain/Notifications/Resources/NotificationResource.php
new file mode 100644
index 00000000..f95d9018
--- /dev/null
+++ b/src/Domain/Notifications/Resources/NotificationResource.php
@@ -0,0 +1,32 @@
+ [
+ 'id' => $this->id,
+ 'type' => $this->type,
+ 'attributes' => [
+ 'type' => $this->data['type'],
+ 'title' => $this->data['title'],
+ 'description' => $this->data['description'],
+ 'action' => $this->data['action'] ?? null,
+ 'created_at' => format_date($this->created_at, 'd. M. Y h:i'),
+ 'read_at' => $this->read_at ? format_date($this->read_at, 'd. M. Y h:i') : null,
+ ],
+ ],
+ ];
+ }
+}
diff --git a/src/Domain/UploadRequest/Notifications/UploadRequestFulfilledNotification.php b/src/Domain/UploadRequest/Notifications/UploadRequestFulfilledNotification.php
index afafe0e8..9aae3c77 100644
--- a/src/Domain/UploadRequest/Notifications/UploadRequestFulfilledNotification.php
+++ b/src/Domain/UploadRequest/Notifications/UploadRequestFulfilledNotification.php
@@ -23,22 +23,16 @@ class UploadRequestFulfilledNotification extends Notification implements ShouldQ
/**
* Get the notification's delivery channels.
- *
- * @param mixed $notifiable
- * @return array
*/
- public function via($notifiable)
+ public function via(mixed $notifiable): array
{
- return ['mail', 'database'];
+ return ['mail', 'database', 'broadcast'];
}
/**
* Get the mail representation of the notification.
- *
- * @param mixed $notifiable
- * @return \Illuminate\Notifications\Messages\MailMessage
*/
- public function toMail($notifiable)
+ public function toMail(mixed $notifiable): MailMessage
{
// TODO: add to language strings
return (new MailMessage)
@@ -59,7 +53,12 @@ class UploadRequestFulfilledNotification extends Notification implements ShouldQ
'title' => 'File Request Filled',
'description' => "Your file request for '{$this->uploadRequest->parent->name}' folder was filled successfully.",
'action' => [
- 'id' => $this->uploadRequest->id,
+ 'type' => 'route',
+ 'params' => [
+ 'route' => 'Files',
+ 'button' => 'Show Files',
+ 'id' => $this->uploadRequest->id,
+ ],
],
];
}
diff --git a/tests/Domain/Notifications/NotificationsTest.php b/tests/Domain/Notifications/NotificationsTest.php
new file mode 100644
index 00000000..0f1fb42e
--- /dev/null
+++ b/tests/Domain/Notifications/NotificationsTest.php
@@ -0,0 +1,134 @@
+hasSettings()
+ ->create();
+
+ DB::table('notifications')
+ ->insert([
+ 'id' => Str::uuid(),
+ 'type' => 'Domain\UploadRequest\Notifications\UploadRequestFulfilledNotification',
+ 'notifiable_type' => 'App\Users\Models\User',
+ 'notifiable_id' => $user->id,
+ 'data' => json_encode([
+ 'type' => 'file-request',
+ 'title' => 'File Request Filled',
+ 'description' => "Your file request for 'Documents' folder was filled successfully.",
+ 'action' => [
+ 'type' => 'route',
+ 'params' => [
+ 'route' => 'Files',
+ 'button' => 'Show Files',
+ 'id' => Str::uuid(),
+ ],
+ ],
+ ]),
+ 'created_at' => now(),
+ 'updated_at' => now(),
+ ]);
+
+ $this
+ ->actingAs($user)
+ ->getJson('/api/user/notifications')
+ ->assertJsonFragment([
+ 'type' => 'file-request',
+ ])
+ ->assertStatus(200);
+ }
+
+ /**
+ * @test
+ */
+ public function it_mark_as_read_notifications()
+ {
+ $user = User::factory()
+ ->hasSettings()
+ ->create();
+
+ DB::table('notifications')
+ ->insert([
+ 'id' => Str::uuid(),
+ 'type' => 'Domain\UploadRequest\Notifications\UploadRequestFulfilledNotification',
+ 'notifiable_type' => 'App\Users\Models\User',
+ 'notifiable_id' => $user->id,
+ 'data' => json_encode([
+ 'type' => 'file-request',
+ 'title' => 'File Request Filled',
+ 'description' => "Your file request for 'Documents' folder was filled successfully.",
+ 'action' => [
+ 'type' => 'route',
+ 'params' => [
+ 'route' => 'Files',
+ 'button' => 'Show Files',
+ 'id' => Str::uuid(),
+ ],
+ ],
+ ]),
+ 'created_at' => now(),
+ 'updated_at' => now(),
+ ]);
+
+ $this
+ ->actingAs($user)
+ ->postJson('/api/user/notifications/read')
+ ->assertStatus(204);
+
+ $this->assertDatabaseHas('notifications', [
+ 'read_at' => now(),
+ ]);
+ }
+
+ /**
+ * @test
+ */
+ public function it_delete_all_notifications()
+ {
+ $user = User::factory()
+ ->hasSettings()
+ ->create();
+
+ DB::table('notifications')
+ ->insert([
+ 'id' => Str::uuid(),
+ 'type' => 'Domain\UploadRequest\Notifications\UploadRequestFulfilledNotification',
+ 'notifiable_type' => 'App\Users\Models\User',
+ 'notifiable_id' => $user->id,
+ 'data' => json_encode([
+ 'type' => 'file-request',
+ 'title' => 'File Request Filled',
+ 'description' => "Your file request for 'Documents' folder was filled successfully.",
+ 'action' => [
+ 'type' => 'route',
+ 'params' => [
+ 'route' => 'Files',
+ 'button' => 'Show Files',
+ 'id' => Str::uuid(),
+ ],
+ ],
+ ]),
+ 'created_at' => now(),
+ 'updated_at' => now(),
+ ]);
+
+ $this
+ ->actingAs($user)
+ ->deleteJson('/api/user/notifications')
+ ->assertStatus(204);
+
+ $this->assertDatabaseCount('notifications', 0);
+ }
+}
\ No newline at end of file