fix issues when not using user model for users

visualbuilder · Oct 27, 2023 · 7400362 · 7400362
1 parent a04f910
commit 7400362
Show file tree

Hide file tree

Showing 12 changed files with 68 additions and 26 deletions.
diff --git a/config/filament-email-templates.php b/config/filament-email-templates.php
@@ -12,7 +12,7 @@
     //Admin Panel Resource Navigation Options
     'navigation'=>[
         'sort'=>50,
-        'group'=>'Settings',
+        'group'=>'Content Management',
     ],
 
     //Email templates will be copied to resources/views/vendor/vb-email-templates/email
@@ -84,6 +84,7 @@
         'user_verified'          => true,
         'login'                  => true,
         'password_reset_success' => true,
+        'locked_out'             => true,
     ],
 
 ];
diff --git a/src/Listeners/PasswordResetListener.php b/src/Listeners/PasswordResetListener.php
@@ -26,8 +26,10 @@ public function __construct()
      */
     public function handle(PasswordReset $event)
     {
-        $user = $event->user;
-        $user->notify(new UserPasswordResetNotification());
+        if(config('filament-email-templates.send_emails.password_reset_success')) {
+            $user = $event->user;
+            $user->notify(new UserPasswordResetNotification());
+        }
 
 
     }

diff --git a/src/Listeners/UserLockoutListener.php b/src/Listeners/UserLockoutListener.php
@@ -15,8 +15,10 @@ class UserLockoutListener
      */
     public function handle(Login $event)
     {
-        $user = $event->user;
-        $user->notify(new UserLockoutNotification());
+        if(config('filament-email-templates.send_emails.locked_out')) {
+            $user = $event->user;
+            $user->notify(new UserLockoutNotification());
+        }
 
     }
 }
diff --git a/src/Listeners/UserLoginListener.php b/src/Listeners/UserLoginListener.php
@@ -16,7 +16,9 @@ class UserLoginListener
      */
     public function handle(Login $event)
     {
-        $user = $event->user;
-        $user->notify(new UserLoginNotification());
+        if(config('filament-email-templates.send_emails.login')) {
+            $user = $event->user;
+            $user->notify(new UserLoginNotification());
+        }
     }
 }
diff --git a/src/Listeners/UserVerifiedListener.php b/src/Listeners/UserVerifiedListener.php
@@ -25,9 +25,9 @@ public function __construct()
      */
     public function handle(Verified $event)
     {
-        $user = $event->user;
-        $user->notify(new UserVerifiedNotification());
-
-
+        if(config('filament-email-templates.send_emails.user_verified')) {
+            $user = $event->user;
+            $user->notify(new UserVerifiedNotification());
+        }
     }
 }
diff --git a/src/Models/EmailTemplate.php b/src/Models/EmailTemplate.php
@@ -162,7 +162,7 @@ public function getEmailPreviewData()
         $model = self::createEmailPreviewData();
 
         // preparing logo
-        $logo = $this->prepareLogo($this->logo);
+        $logo = $this->resolveLogoUrl($this->logo);
 
         return [
                 'user' => $model->user,
@@ -253,18 +253,19 @@ public function getMailableClass()
     }
 
     /**
+     * Resolve logo to a url
      * @return string
      */
-    public function prepareLogo($logo)
+    public function resolveLogoUrl($logo):string
     {
-        $preparedLogo = "";
+        if (is_null($logo)) {
+            return asset(config('filament-email-templates.logo'));
+        }
 
-        $preparedLogo = is_null($logo)
-            ? asset(config('filament-email-templates.logo'))
-            : (Str::isUrl($logo)
-                ? $logo
-                : asset('storage/' . $logo));
+        if (Str::isUrl($logo)) {
+            return $logo;
+        }
 
-        return $preparedLogo;
+        return asset($logo);
     }
 }
diff --git a/src/Nodes/ModelAttribute.php b/src/Nodes/ModelAttribute.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Visualbuilder\EmailTemplates\Nodes;
+
+use Tiptap\Core\Node;
+use Tiptap\Utils\HTML;
+
+class ModelAttribute extends Node
+{
+    public static $name = 'model-attribute';
+
+    public static $priority = 100;
+
+    public function addOptions()
+    {
+        return [
+                'HTMLAttributes' => [],
+        ];
+    }
+
+    public function parseHTML()
+    {
+        return [
+                [
+                        'tag' => 'model-attribute[data-path]',
+                ],
+
+        ];
+    }
+
+    public function renderHTML($node,$HTMLAttributes = [])
+    {
+        return ['model-attribute',   HTML::mergeAttributes($this->options['HTMLAttributes'], $HTMLAttributes), 0];
+    }
+}
diff --git a/src/Notifications/UserLoginNotification.php b/src/Notifications/UserLoginNotification.php
@@ -41,9 +41,7 @@ public function via($notifiable)
      */
     public function toMail($notifiable)
     {
-        if(config('filament-email-templates.send_emails.login')) {
             return app(UserLoginEmail::class, ['user' => $notifiable]);
-        }
     }
 
     /**

diff --git a/src/Notifications/UserVerifiedNotification.php b/src/Notifications/UserVerifiedNotification.php
@@ -39,9 +39,9 @@ public function via($notifiable)
      */
     public function toMail($notifiable)
     {
-        if(config('filament-email-templates.send_emails.user_verified')) {
+
             return app(UserVerifiedEmail::class, ['user' => $notifiable]);
-        }
+
     }
 
     /**

diff --git a/src/Resources/EmailTemplateResource.php b/src/Resources/EmailTemplateResource.php
@@ -130,6 +130,7 @@ public static function form(Form $form): Form
                                             ->hint(__('vb-email-templates::email-templates.form-fields-labels.title-hint')),
 
                                         TiptapEditor::make('content')
+                                                ->tools([])
                                             ->label(__('vb-email-templates::email-templates.form-fields-labels.content'))
                                             ->profile('default')
                                             ->default("<p>Dear ##user.firstname##, </p>"),

diff --git a/src/Resources/EmailTemplateThemeResource.php b/src/Resources/EmailTemplateThemeResource.php
@@ -41,7 +41,7 @@ public static function getPluralModelLabel(): string
 
     public static function getPreviewData()
     {
-        $emailTemplate = EmailTemplate::findEmailByKey('user-verify-email');
+        $emailTemplate = EmailTemplate::first();
 
         return $emailTemplate->getEmailPreviewData();
     }

diff --git a/src/Traits/BuildGenericEmail.php b/src/Traits/BuildGenericEmail.php
@@ -28,7 +28,7 @@ public function build()
         }
 
         // preparing logo
-        $logo = $template->prepareLogo($template->logo);
+        $logo = $template->resolveLogoUrl($template->logo);
 
         $data = [
             'content' => $template->replaceTokens($template->content, $this),