+
+
- @if ($unread->count() > 0)
-
- Unread Notifications
-
-
- @foreach ($unread as $announcement)
-
-
+
+ @if ($unread->count() > 0)
+
+
+ Unread Notifications
+
- @if($announcement->read_at === null)
-
+ @if ($unread->count() > 1)
+
@endif
+
+ @foreach ($unread as $announcement)
+
+
+
+ @if($announcement->read_at === null)
+
+ @endif
+
+ @endforeach
+
+ @if ($announcements->count() > 0)
+
+ Previous Notifications
+
+ @endif
+ @endif
+
+ @foreach ($announcements as $announcement)
+
+
+
@endforeach
- @if ($announcements->count() > 0)
-
- Previous Notifications
-
+ @if ($unread->count() === 0 && $announcements->count() === 0)
+
+
+
+ No new announcements
+
+
+
@endif
- @endif
-
- @foreach ($announcements as $announcement)
-
-
-
- @endforeach
-
- @if ($unread->count() === 0 && $announcements->count() === 0)
-
-
-
- No new announcements
-
-
-
- @endif
+
diff --git a/resources/views/types/base.blade.php b/resources/views/types/base.blade.php
deleted file mode 100644
index 2e329b1..0000000
--- a/resources/views/types/base.blade.php
+++ /dev/null
@@ -1,36 +0,0 @@
-
- {!! $icon ?? '' !!}
-
-
diff --git a/resources/views/types/general.blade.php b/resources/views/types/general.blade.php
index bb570ab..755bb08 100644
--- a/resources/views/types/general.blade.php
+++ b/resources/views/types/general.blade.php
@@ -1,3 +1,23 @@
-@include('megaphone::types.base', ['icon' => '
'])
+
+
+
+
+
+
+
+ {{ $announcement['title'] }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/views/types/important.blade.php b/resources/views/types/important.blade.php
index 473b398..c64cd16 100644
--- a/resources/views/types/important.blade.php
+++ b/resources/views/types/important.blade.php
@@ -1,3 +1,23 @@
-@include('megaphone::types.base', ['icon' => '
'])
+
+
+
+
+
+
+
+ {{ $announcement['title'] }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/views/types/new-feature.blade.php b/resources/views/types/new-feature.blade.php
index 45ac022..c980ff8 100644
--- a/resources/views/types/new-feature.blade.php
+++ b/resources/views/types/new-feature.blade.php
@@ -1,3 +1,23 @@
-@include('megaphone::types.base', ['icon' => '
'])
+
+
+
+
+
+
+
+ {{ $announcement['title'] }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Components/Display.php b/src/Components/Display.php
index 8ce26df..3b24553 100644
--- a/src/Components/Display.php
+++ b/src/Components/Display.php
@@ -27,7 +27,16 @@ public function render()
}
$params = [
- 'announcement' => $this->notification->data,
+ 'announcement' => array_merge(
+ [
+ 'title' => '',
+ 'body' => '',
+ 'link' => '',
+ 'linkNewWindow' => false,
+ 'linkText' => 'View',
+ ],
+ $this->notification->data
+ ),
'read_at' => $this->notification->read_at,
'created_at' => $this->notification->created_at,
];
diff --git a/src/Livewire/Megaphone.php b/src/Livewire/Megaphone.php
index 2fcd79b..b0186ce 100644
--- a/src/Livewire/Megaphone.php
+++ b/src/Livewire/Megaphone.php
@@ -26,8 +26,6 @@ public function mount(Request $request)
if (empty($this->notifiableId) && $request->user() !== null) {
$this->notifiableId = $request->user()->id;
}
-
- $this->loadAnnouncements($this->getNotifiable());
$this->showCount = config('megaphone.showCount', true);
}
@@ -51,12 +49,21 @@ public function loadAnnouncements($notifiable)
public function render()
{
+ $this->loadAnnouncements($this->getNotifiable());
return view('megaphone::megaphone');
}
public function markAsRead(DatabaseNotification $notification)
{
$notification->markAsRead();
- $this->loadAnnouncements($this->getNotifiable());
+ }
+
+ public function markAllRead()
+ {
+ DatabaseNotification::query()
+ ->where('notifiable_type', config('megaphone.model'))
+ ->where('notifiable_id', $this->notifiableId)
+ ->whereNull('read_at')
+ ->update(['read_at' => now()]);
}
}
diff --git a/src/MegaphoneServiceProvider.php b/src/MegaphoneServiceProvider.php
index 2fb24bb..ab2900d 100644
--- a/src/MegaphoneServiceProvider.php
+++ b/src/MegaphoneServiceProvider.php
@@ -11,32 +11,71 @@
class MegaphoneServiceProvider extends ServiceProvider
{
+ public function register()
+ {
+ $this->registerConfigs();
+ }
+
public function boot()
{
- if ($this->app->runningInConsole()) {
- $this->commands([
- ClearOldNotifications::class,
- ]);
- }
+ $this->bootBlade();
+ $this->bootConsole();
+ $this->bootLivewireComponents();
+ $this->bootPublishes();
+ $this->bootViews();
+ }
- $this->loadViewsFrom(__DIR__.'/../resources/views', 'megaphone');
+ protected function registerConfigs()
+ {
$this->mergeConfigFrom(
__DIR__.'/../config/megaphone.php',
'megaphone'
);
+ }
+ protected function bootBlade()
+ {
Blade::componentNamespace('MBarlow\\Megaphone\\Components', 'megaphone');
- Livewire::component(
- 'megaphone',
- Megaphone::class
+ Blade::directive(
+ 'megaphonePoll',
+ function () {
+ return '';
+ }
);
- Livewire::component(
- 'megaphone-admin',
- MegaphoneAdmin::class
+ Blade::directive(
+ 'megaphoneStyles',
+ function () {
+ return '
app->runningInConsole()) {
+ $this->commands([
+ ClearOldNotifications::class,
+ ]);
+ }
+ }
+ protected function bootLivewireComponents()
+ {
+ Livewire::component('megaphone', Megaphone::class);
+ Livewire::component('megaphone-admin', MegaphoneAdmin::class);
+ }
+
+ protected function bootPublishes()
+ {
$this->publishes([
__DIR__.'/../public' => public_path('vendor/megaphone'),
__DIR__.'/../config/megaphone.php' => config_path('megaphone.php'),
@@ -55,4 +94,9 @@ public function boot()
__DIR__.'/../resources/views' => resource_path('views/vendor/megaphone'),
], 'megaphone-views');
}
+
+ protected function bootViews()
+ {
+ $this->loadViewsFrom(__DIR__.'/../resources/views', 'megaphone');
+ }
}
diff --git a/tests/MegaphoneComponentTest.php b/tests/MegaphoneComponentTest.php
index 64e7a96..e188b70 100644
--- a/tests/MegaphoneComponentTest.php
+++ b/tests/MegaphoneComponentTest.php
@@ -30,9 +30,16 @@
$this->livewire(Megaphone::class)
->assertViewIs('megaphone::megaphone')
- ->assertSeeHtml('
- 1
- ');
+ ->assertSeeHtml('
+
+
+
+
+ 1
+
+
+
+ ');
});
it('can render the megaphone component with notification dot', function () {
@@ -51,10 +58,12 @@
$this->livewire(Megaphone::class)
->assertViewIs('megaphone::megaphone')
- ->assertSeeHtml('
')
- ->assertDontSeeHtml('
- 1
- ');
+ ->assertSeeHtml('
+
+
+
+
+ ');
});
it('can load announcements', function () {
@@ -100,6 +109,60 @@
->assertSet('announcements', $user->readNotifications);
});
+it('can mark all notifications as read', function () {
+ $this->actingAs(
+ $user = $this->createTestUser()
+ );
+
+ $this->createTestNotification(
+ $user,
+ \MBarlow\Megaphone\Types\General::class
+ );
+ $this->createTestNotification(
+ $user,
+ \MBarlow\Megaphone\Types\Important::class
+ );
+
+ $this->livewire(Megaphone::class)
+ ->call('markAllRead')
+ ->assertSet('unread', $user->announcements()->get()->whereNull('read_at'))
+ ->assertSet('announcements', $user->readNotifications);
+});
+
+it('doesn\'t shows mark all as read if only 1 or less', function () {
+ $this->actingAs(
+ $user = $this->createTestUser()
+ );
+
+ $this->createTestNotification(
+ $user,
+ \MBarlow\Megaphone\Types\General::class
+ );
+
+ $this->livewire(Megaphone::class)
+ ->assertViewIs('megaphone::megaphone')
+ ->assertDontSeeHtml('