Example views
+ @endsection \ No newline at end of file diff --git a/app/Modules/Notice/Config/config.php b/app/Modules/Notice/Config/config.php new file mode 100644 index 0000000..ce09543 --- /dev/null +++ b/app/Modules/Notice/Config/config.php @@ -0,0 +1,5 @@ + 'NewRecomendationNotice', +]; \ No newline at end of file diff --git a/app/Modules/Notice/Database/Migrations/2025_05_08_160549_create_notifications_table.php b/app/Modules/Notice/Database/Migrations/2025_05_08_160549_create_notifications_table.php new file mode 100644 index 0000000..7eba854 --- /dev/null +++ b/app/Modules/Notice/Database/Migrations/2025_05_08_160549_create_notifications_table.php @@ -0,0 +1,40 @@ +id(); + $table->foreignId('user_id')->constrained( + table: 'users', indexName: 'notifications_user_id_foreign_key' + )->onDelete('cascade'); + $table->string('action'); + $table->string('object_name'); + $table->unsignedInteger('object_id'); + $table->date('read_at')->nullable(); + $table->date('sended_to_email_at')->nullable(); + $table->date('disabled_at')->nullable(); + $table->timestamps(); + }); + + Schema::table('notifications', function (Blueprint $table) { + $table->unique(['user_id', 'action', 'object_name', 'object_id']); + });*/ + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + //Schema::dropIfExists('notifications'); + } +}; diff --git a/app/Modules/Notice/Http/Controllers/NoticeController.php b/app/Modules/Notice/Http/Controllers/NoticeController.php new file mode 100644 index 0000000..a6a2c43 --- /dev/null +++ b/app/Modules/Notice/Http/Controllers/NoticeController.php @@ -0,0 +1,25 @@ +run(); + } +} \ No newline at end of file diff --git a/app/Modules/Notice/Http/Livewire/UserNotices.php b/app/Modules/Notice/Http/Livewire/UserNotices.php new file mode 100644 index 0000000..0f3fdc4 --- /dev/null +++ b/app/Modules/Notice/Http/Livewire/UserNotices.php @@ -0,0 +1,23 @@ +markAsRead(); + } + + public function render() + { + $currentDate = date("Y-m-d"); + $startDate = date("Y-m-d", strtotime($currentDate . " -2 months")); + return view('notice::user-notifications', [ + 'notifications' => auth()->user()->notifications + ]); + } +} diff --git a/app/Modules/Notice/Http/Livewire/UserNoticesButton.php b/app/Modules/Notice/Http/Livewire/UserNoticesButton.php new file mode 100644 index 0000000..3a58a27 --- /dev/null +++ b/app/Modules/Notice/Http/Livewire/UserNoticesButton.php @@ -0,0 +1,23 @@ + + auth()->user()->unreadNotifications + ->count() + ]); + } +} diff --git a/app/Modules/Notice/Models/NewWayMeetingNotice.php b/app/Modules/Notice/Models/NewWayMeetingNotice.php new file mode 100644 index 0000000..41437b7 --- /dev/null +++ b/app/Modules/Notice/Models/NewWayMeetingNotice.php @@ -0,0 +1,22 @@ +object_id); + if (!$wayMeeting) + return false; + return [ + 'id' => $wayMeeting->id, + 'name' => $wayMeeting->meeting->name, + 'action' => route('way.index', ['way' => $wayMeeting->way->id]), + ]; + } +} \ No newline at end of file diff --git a/app/Modules/Notice/Models/Notice.php b/app/Modules/Notice/Models/Notice.php new file mode 100644 index 0000000..94b5e18 --- /dev/null +++ b/app/Modules/Notice/Models/Notice.php @@ -0,0 +1,39 @@ +action $this->object_name"; + $noticeClass = __DIR__ . '/' . config('notice.types.' . $noticeName); + if (file_exists($noticeClass . '.php')) { + $noticeClass = 'Modules\\Notice\\Models\\' . config('notice.types.' . $noticeName); + if ($parameters = $noticeClass::getParameters($this)) { + return __("notification.$this->action $this->object_name", $parameters); + }; + }; + return FALSE; + // + } + + public function created_at() + { + return date_format(date_create($this->created_at), env('DATETIME_FORMAT')); + } + +} diff --git a/app/Modules/Notice/Models/NoticesMailer.php b/app/Modules/Notice/Models/NoticesMailer.php new file mode 100644 index 0000000..0a86e7e --- /dev/null +++ b/app/Modules/Notice/Models/NoticesMailer.php @@ -0,0 +1,72 @@ +subDays(1); + $date = $date->toDateTimeString(); + $latest_notice = Notice::where('created_at', '<=', $date) + ->whereNull('sended_to_email_at') + ->whereNull('read_at') + ->orderBy('created_at', 'desc'); + if ($latest_notice = $latest_notice->first()) { + $this->user = User::findOrFail($latest_notice->user_id); + $this->notices = Notice::where('user_id', $this->user->id) + ->whereNull('sended_to_email_at') + ->whereNull('read_at') + ->orderBy('object_name') + ->orderBy('created_at')->get(); + }; + return; + } + + public function run() + { + if (!$this->user) { + Log::error('Has no notices for mailing'); + return; + }; + + if ($this->notices->count() == 0) { + return false; + }; + + + $notification = new NoticesMailerNotification($this->notices); + + Notification::route('mail', $this->user->email) + ->notify($notification); + + $botMessage = $notification->buildBotMessage(); + BotNotificationSender::routeMessage($this->user->id, $botMessage); + + foreach ($this->notices as $notice) { + $notice->sended_to_email_at = now(); + $notice->save(); + }; + } +} diff --git a/app/Modules/Notice/Models/UnreadMessagesMailer.php b/app/Modules/Notice/Models/UnreadMessagesMailer.php new file mode 100644 index 0000000..0482ac8 --- /dev/null +++ b/app/Modules/Notice/Models/UnreadMessagesMailer.php @@ -0,0 +1,69 @@ +whereNull('read_at') + ->where('object_name', 'Chat') + ->orderBy('created_at'); + if ($newChatNotice = $newChatNotice->first()) { + $this->user = User::findOrFail($newChatNotice->user_id); + $this->notices = Notice::where('user_id', $this->user->id) + ->whereNull('sended_to_email_at') + ->whereNull('read_at') + ->where('object_name', 'Chat') + ->orderBy('created_at')->get(); + //$this->senders = ChatMessageRead::where('receiver_id', $this->user->id)->where('message.sender_id'); + }; + return; + } + + + public function run() + { + if (!$this->user) { + //Log::error('Has no notices for mailing'); + return; + }; + + if ($this->notices->count() == 0) { + return false; + }; + + $notification = new NewChatMessageNoticesMailerNotification(); + + Notification::route('mail', $this->user->email) + ->notify($notification); + + $botMessage = $notification->buildBotMessage(); + BotNotificationSender::routeMessage($this->user->id, $botMessage); + + foreach ($this->notices as $notice) { + $notice->sended_to_email_at = now(); + $notice->save(); + }; + } +} diff --git a/app/Modules/Notice/Providers/ModuleServiceProvider.php b/app/Modules/Notice/Providers/ModuleServiceProvider.php new file mode 100644 index 0000000..49f42fa --- /dev/null +++ b/app/Modules/Notice/Providers/ModuleServiceProvider.php @@ -0,0 +1,78 @@ +app->register(RouteServiceProvider::class); + } + + public function boot() + { + $this->registerViews(); + $this->registerLivewireViews(); + $this->registerMigrations(); + $this->registerConfig(); + $this->registerComponent(); + $this->registerLivewire(); + } + + protected function registerViews() + { + $moduleViewsPath = __DIR__ . '/../Views'; + $this->loadViewsFrom( + $moduleViewsPath, + strtolower($this->moduleName) + ); + } + + protected function registerLivewireViews() + { + $moduleViewsPath = __DIR__ . '/../Views/livewire'; + $this->loadViewsFrom( + $moduleViewsPath, + strtolower($this->moduleName) + ); + } + + protected function registerMigrations() + { + $this->loadMigrationsFrom( + app_path('Modules/' . $this->moduleName . '/Database/Migrations') + ); + } + + protected function registerConfig() + { + $path = app_path('Modules/' . $this->moduleName . '/Config/config.php'); + $this->mergeConfigFrom( + $path, + strtolower($this->moduleName) + ); + + $path = app_path('Modules/' . $this->moduleName . '/Config/notices.php'); + $this->mergeConfigFrom( + $path, + 'notice.types' + ); + } + + protected function registerLivewire() + { + Livewire::component('notices.user-notices', \Modules\Notice\Http\Livewire\UserNotices::class); + Livewire::component('notices.user-notices-button', \Modules\Notice\Http\Livewire\UserNoticesButton::class); + } + + protected function registerComponent() + { + //Blade::component('
+
diff --git a/app/Modules/Notice/Views/user-notices-button.blade.php b/app/Modules/Notice/Views/user-notices-button.blade.php
new file mode 100644
index 0000000..066c6c1
--- /dev/null
+++ b/app/Modules/Notice/Views/user-notices-button.blade.php
@@ -0,0 +1,29 @@
+
+
+
+
+ Уведомления
+ +
+
+
+ @livewireStyles
+
+
+
+ {{-- --}}
+
diff --git a/app/Modules/Notice/Views/user-notifications.blade.php b/app/Modules/Notice/Views/user-notifications.blade.php
new file mode 100644
index 0000000..6213474
--- /dev/null
+++ b/app/Modules/Notice/Views/user-notifications.blade.php
@@ -0,0 +1,38 @@
+
+ @if ($notifications->count() == 0)
+
diff --git a/app/Notifications/UniqueContact.php b/app/Notifications/UniqueContact.php
new file mode 100644
index 0000000..ddcabe1
--- /dev/null
+++ b/app/Notifications/UniqueContact.php
@@ -0,0 +1,62 @@
+status != DealStatus::UNIQUE)
+ {
+ //throw new \Exception('Notification sending: deal is not unique');
+ }
+ $this->deal = $deal;
+ }
+
+ /**
+ * Get the notification's delivery channels.
+ *
+ * @return array
+
+ @else
+
+
+ {{ __('notification.has no notifications') }}
+
+ -
+ @foreach ($notifications as $notification)
+ @if (array_key_exists('text', $notification->data))
+
-
+ ++
+ {{ $notification->data['text'] }} +
++ {{ $notification->created_at }} + @if ($notification->read_at) + + + + @else + + + + @endif +
+
+ @endif
+ @endforeach
+
- @isset($title)
- {{ $title }}
- @endisset
+
+ @include('notice::index')
+ @vite(['resources/sass/app.scss', 'resources/js/app.js', 'resources/css/app.css', 'resources/css/docs.css'])