From 9405d456daf36813671c41df31b9bc222c83aca0 Mon Sep 17 00:00:00 2001 From: marco Date: Thu, 1 Aug 2024 10:01:59 +0200 Subject: [PATCH 1/9] up --- Models/Notification.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Models/Notification.php b/Models/Notification.php index b40e6bae..cc9aa139 100755 --- a/Models/Notification.php +++ b/Models/Notification.php @@ -23,7 +23,6 @@ * @property Carbon|null $updated_at * @property string|null $updated_by * @property Model|\Eloquent $notifiable - * * @method static DatabaseNotificationCollection all($columns = ['*']) * @method static DatabaseNotificationCollection get($columns = ['*']) * @method static \Illuminate\Database\Eloquent\Builder|Notification newModelQuery() @@ -43,9 +42,7 @@ * @method static \Illuminate\Database\Eloquent\Builder|Notification whereUpdatedBy($value) * @method static DatabaseNotificationCollection all($columns = ['*']) * @method static DatabaseNotificationCollection get($columns = ['*']) - * * @mixin Eloquent - * * @method static DatabaseNotificationCollection all($columns = ['*']) * @method static DatabaseNotificationCollection get($columns = ['*']) * @method static DatabaseNotificationCollection all($columns = ['*']) @@ -100,7 +97,8 @@ * @method static DatabaseNotificationCollection get($columns = ['*']) * @method static DatabaseNotificationCollection all($columns = ['*']) * @method static DatabaseNotificationCollection get($columns = ['*']) - * + * @method static DatabaseNotificationCollection all($columns = ['*']) + * @method static DatabaseNotificationCollection get($columns = ['*']) * @mixin \Eloquent */ class Notification extends DatabaseNotification From 8869661fa7ed6457da80a4c82d837e4a38b82531 Mon Sep 17 00:00:00 2001 From: marco Date: Mon, 5 Aug 2024 12:44:14 +0200 Subject: [PATCH 2/9] up --- .../Resources/ContactResource/Pages/ListContacts.php | 11 +++++++++++ .../NotificationResource/Pages/ListNotifications.php | 11 +++++++++++ .../NotifyThemeResource/Pages/ListNotifyThemes.php | 11 +++++++++++ 3 files changed, 33 insertions(+) diff --git a/Filament/Resources/ContactResource/Pages/ListContacts.php b/Filament/Resources/ContactResource/Pages/ListContacts.php index 7e7c94d9..10eb43ed 100755 --- a/Filament/Resources/ContactResource/Pages/ListContacts.php +++ b/Filament/Resources/ContactResource/Pages/ListContacts.php @@ -7,11 +7,22 @@ use Filament\Actions\CreateAction; use Filament\Resources\Pages\ListRecords; use Modules\Notify\Filament\Resources\ContactResource; +use Modules\UI\Enums\TableLayoutEnum; +use Modules\UI\Filament\Actions\Table\TableLayoutToggleTableAction; class ListContacts extends ListRecords { protected static string $resource = ContactResource::class; + public TableLayoutEnum $layoutView = TableLayoutEnum::GRID; + + protected function getTableHeaderActions(): array + { + return [ + TableLayoutToggleTableAction::make(), + ]; + } + protected function getHeaderActions(): array { return [ diff --git a/Filament/Resources/NotificationResource/Pages/ListNotifications.php b/Filament/Resources/NotificationResource/Pages/ListNotifications.php index 9eb4dde0..22ec303d 100755 --- a/Filament/Resources/NotificationResource/Pages/ListNotifications.php +++ b/Filament/Resources/NotificationResource/Pages/ListNotifications.php @@ -7,11 +7,22 @@ use Filament\Actions\CreateAction; use Filament\Resources\Pages\ListRecords; use Modules\Notify\Filament\Resources\NotificationResource; +use Modules\UI\Enums\TableLayoutEnum; +use Modules\UI\Filament\Actions\Table\TableLayoutToggleTableAction; class ListNotifications extends ListRecords { protected static string $resource = NotificationResource::class; + public TableLayoutEnum $layoutView = TableLayoutEnum::GRID; + + protected function getTableHeaderActions(): array + { + return [ + TableLayoutToggleTableAction::make(), + ]; + } + protected function getHeaderActions(): array { return [ diff --git a/Filament/Resources/NotifyThemeResource/Pages/ListNotifyThemes.php b/Filament/Resources/NotifyThemeResource/Pages/ListNotifyThemes.php index db0f8ff2..81fb967c 100755 --- a/Filament/Resources/NotifyThemeResource/Pages/ListNotifyThemes.php +++ b/Filament/Resources/NotifyThemeResource/Pages/ListNotifyThemes.php @@ -7,11 +7,22 @@ use Filament\Pages\Actions\CreateAction; use Filament\Resources\Pages\ListRecords; use Modules\Notify\Filament\Resources\NotifyThemeResource; +use Modules\UI\Enums\TableLayoutEnum; +use Modules\UI\Filament\Actions\Table\TableLayoutToggleTableAction; class ListNotifyThemes extends ListRecords { protected static string $resource = NotifyThemeResource::class; + public TableLayoutEnum $layoutView = TableLayoutEnum::GRID; + + protected function getTableHeaderActions(): array + { + return [ + TableLayoutToggleTableAction::make(), + ]; + } + protected function getHeaderActions(): array { return [ From c9239d1ccdaedfb7d6493c0e45f665990e68ff64 Mon Sep 17 00:00:00 2001 From: marco76tv Date: Fri, 19 Jul 2024 20:17:33 +0200 Subject: [PATCH 3/9] up --- Console/Commands/TelegramWebhook.php | 0 Filament/Pages/SettingPage.php | 0 Http/Controllers/TelegramNotificationController.wip | 0 Resources/views/filament/pages/setting.blade.php | 0 4 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Console/Commands/TelegramWebhook.php mode change 100644 => 100755 Filament/Pages/SettingPage.php mode change 100644 => 100755 Http/Controllers/TelegramNotificationController.wip mode change 100644 => 100755 Resources/views/filament/pages/setting.blade.php diff --git a/Console/Commands/TelegramWebhook.php b/Console/Commands/TelegramWebhook.php old mode 100644 new mode 100755 diff --git a/Filament/Pages/SettingPage.php b/Filament/Pages/SettingPage.php old mode 100644 new mode 100755 diff --git a/Http/Controllers/TelegramNotificationController.wip b/Http/Controllers/TelegramNotificationController.wip old mode 100644 new mode 100755 diff --git a/Resources/views/filament/pages/setting.blade.php b/Resources/views/filament/pages/setting.blade.php old mode 100644 new mode 100755 From f67a22c5ff095443250b452fcea8e77c9456f2ff Mon Sep 17 00:00:00 2001 From: Malebestia Date: Mon, 22 Jul 2024 12:05:22 +0200 Subject: [PATCH 4/9] . --- README.md | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3ab50fa2..6b95865c 100755 --- a/README.md +++ b/README.md @@ -1 +1,23 @@ -# module_notify \ No newline at end of file +# Module Notify +Modulo dedicato alla gestione delle notifiche (email, sms, altro) + +## Aggiungere Modulo nella base del progetto +Dentro la cartella laravel/Modules + +```bash +git submodule add https://github.com/laraxot/module_notify_fila3.git Notify +``` + +## Verificare che il modulo sia attivo +```bash +php artisan module:list +``` +in caso abilitarlo +```bash +php artisan module:enable Notify +``` + +## Eseguire le migrazioni +```bash +php artisan module:migrate Notify +``` \ No newline at end of file From d92dc97df3329485c23eb371ae36499eb6bbadd4 Mon Sep 17 00:00:00 2001 From: marco76tv Date: Wed, 24 Jul 2024 14:03:53 +0200 Subject: [PATCH 5/9] . --- composer.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 09ffb883..7333d709 100755 --- a/composer.json +++ b/composer.json @@ -74,7 +74,7 @@ "tightenco/duster": "^2.2", "vimeo/psalm": "*" }, - "repositories": [ + "repositories": [ { "type": "path", "url": "../Xot" @@ -86,10 +86,6 @@ { "type": "path", "url": "../UI" - }, - { - "type": "path", - "url": "../Media" } ], "scripts": { From e1884898c3148dd6a133440fc0c51ca95d916e56 Mon Sep 17 00:00:00 2001 From: Nicola Storgato <38526052+nicolastorgato@users.noreply.github.com> Date: Wed, 31 Jul 2024 10:44:28 +0200 Subject: [PATCH 6/9] up --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7333d709..5e861055 100755 --- a/composer.json +++ b/composer.json @@ -40,7 +40,7 @@ "illuminate/contracts": "*", "illuminate/support": "*", "irazasyed/telegram-bot-sdk": "*", - "kreait/laravel-firebase": "^5.3", + "kreait/laravel-firebase": "*", "laravel-notification-channels/telegram": "^5.0", "phpdocumentor/type-resolver": "*", "thecodingmachine/safe": "^2.5" From 6cc8a494e9d8c256c317a3e998f3f18777928800 Mon Sep 17 00:00:00 2001 From: marco76tv Date: Tue, 6 Aug 2024 08:53:18 +0200 Subject: [PATCH 7/9] =?UTF-8?q?=F0=9F=94=A7=20(Notification.php):=20resolv?= =?UTF-8?q?e=20merge=20conflict=20in=20Notification.php=20file?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Models/Notification.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Models/Notification.php b/Models/Notification.php index cc9aa139..bbef4fc8 100755 --- a/Models/Notification.php +++ b/Models/Notification.php @@ -99,6 +99,13 @@ * @method static DatabaseNotificationCollection get($columns = ['*']) * @method static DatabaseNotificationCollection all($columns = ['*']) * @method static DatabaseNotificationCollection get($columns = ['*']) +<<<<<<< HEAD +======= + * @method static DatabaseNotificationCollection all($columns = ['*']) + * @method static DatabaseNotificationCollection get($columns = ['*']) + * @method static DatabaseNotificationCollection all($columns = ['*']) + * @method static DatabaseNotificationCollection get($columns = ['*']) +>>>>>>> cfb982e (up) * @mixin \Eloquent */ class Notification extends DatabaseNotification From d0834607cf74dc5dd16e844a253ec5faf09977c2 Mon Sep 17 00:00:00 2001 From: marco76tv Date: Tue, 6 Aug 2024 08:53:36 +0200 Subject: [PATCH 8/9] =?UTF-8?q?=F0=9F=94=A7=20(Notification.php):=20resolv?= =?UTF-8?q?e=20merge=20conflict=20by=20keeping=20the=20changes=20from=20th?= =?UTF-8?q?e=20'up'=20branch=20and=20removing=20the=20conflicting=20change?= =?UTF-8?q?s=20from=20the=20'HEAD'=20branch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Models/Notification.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Models/Notification.php b/Models/Notification.php index bbef4fc8..80163b1a 100755 --- a/Models/Notification.php +++ b/Models/Notification.php @@ -105,7 +105,18 @@ * @method static DatabaseNotificationCollection get($columns = ['*']) * @method static DatabaseNotificationCollection all($columns = ['*']) * @method static DatabaseNotificationCollection get($columns = ['*']) +<<<<<<< HEAD >>>>>>> cfb982e (up) +======= + * @method static DatabaseNotificationCollection all($columns = ['*']) + * @method static DatabaseNotificationCollection get($columns = ['*']) + * @method static DatabaseNotificationCollection all($columns = ['*']) + * @method static DatabaseNotificationCollection get($columns = ['*']) + * @method static DatabaseNotificationCollection all($columns = ['*']) + * @method static DatabaseNotificationCollection get($columns = ['*']) + * @method static DatabaseNotificationCollection all($columns = ['*']) + * @method static DatabaseNotificationCollection get($columns = ['*']) +>>>>>>> e290700 (up) * @mixin \Eloquent */ class Notification extends DatabaseNotification From a33eeba20f71db42653197ad2eea539c35b20e71 Mon Sep 17 00:00:00 2001 From: marco76tv Date: Tue, 6 Aug 2024 09:14:41 +0200 Subject: [PATCH 9/9] up --- Models/Notification.php | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/Models/Notification.php b/Models/Notification.php index 80163b1a..cc9aa139 100755 --- a/Models/Notification.php +++ b/Models/Notification.php @@ -99,24 +99,6 @@ * @method static DatabaseNotificationCollection get($columns = ['*']) * @method static DatabaseNotificationCollection all($columns = ['*']) * @method static DatabaseNotificationCollection get($columns = ['*']) -<<<<<<< HEAD -======= - * @method static DatabaseNotificationCollection all($columns = ['*']) - * @method static DatabaseNotificationCollection get($columns = ['*']) - * @method static DatabaseNotificationCollection all($columns = ['*']) - * @method static DatabaseNotificationCollection get($columns = ['*']) -<<<<<<< HEAD ->>>>>>> cfb982e (up) -======= - * @method static DatabaseNotificationCollection all($columns = ['*']) - * @method static DatabaseNotificationCollection get($columns = ['*']) - * @method static DatabaseNotificationCollection all($columns = ['*']) - * @method static DatabaseNotificationCollection get($columns = ['*']) - * @method static DatabaseNotificationCollection all($columns = ['*']) - * @method static DatabaseNotificationCollection get($columns = ['*']) - * @method static DatabaseNotificationCollection all($columns = ['*']) - * @method static DatabaseNotificationCollection get($columns = ['*']) ->>>>>>> e290700 (up) * @mixin \Eloquent */ class Notification extends DatabaseNotification