made model naming conventions more unique to avoid collision

redbastie · Nov 24, 2020 · 52ee7cf · 52ee7cf
1 parent d244890
commit 52ee7cf
Show file tree

Hide file tree

Showing 12 changed files with 60 additions and 60 deletions.
diff --git a/resources/stubs/crud/app/Http/Livewire/DummyModels/Create.php.stub b/resources/stubs/crud/app/Http/Livewire/DummyModels/Create.php.stub
@@ -8,27 +8,27 @@ use Redbastie\Swift\Livewire\SwiftComponent;
 
 class Create extends SwiftComponent
 {
-    protected $listeners = ['showCreateModal'];
+    protected $listeners = ['showCreateDummyModelModal'];
 
     public function view()
     {
         return S::form(
-            S::modal('create-modal')->fade()
+            S::modal('create-dummy-route-modal')->fade()
                 ->heading('Create DummyTitle')
                 ->body(
                     S::input('name')->label('Name')->modelDefer(),
                 )
                 ->footer(
-                    S::button('Cancel')->secondary()->click('$emit', 'hideModal', 'create-modal'),
+                    S::button('Cancel')->secondary()->click('$emit', 'hideModal', 'create-dummy-route-modal'),
                     S::button('Save')->submit()->primary()
                 )
         )->submitPrevent('save');
     }
 
-    public function showCreateModal()
+    public function showCreateDummyModelModal()
     {
         $this->reset('model');
-        $this->emit('showModal', 'create-modal');
+        $this->emit('showModal', 'create-dummy-route-modal');
     }
 
     public function save()
@@ -39,7 +39,7 @@ class Create extends SwiftComponent
 
         DummyModel::query()->create($validatedData);
 
-        $this->emit('hideModal', 'create-modal');
+        $this->emit('hideModal', 'create-dummy-route-modal');
         $this->emit('toastSuccess', 'DummyTitle created!');
         $this->emit('$refresh');
     }

diff --git a/resources/stubs/crud/app/Http/Livewire/DummyModels/Index.php.stub b/resources/stubs/crud/app/Http/Livewire/DummyModels/Index.php.stub
@@ -37,7 +37,7 @@ class Index extends SwiftComponent
 
                 S::row(
                     S::col(S::input('search')->type('search')->placeholder('Search')->modelDebounce())->mdAuto()->mb(3),
-                    S::col(S::button('Create DummyTitle')->primary()->click('$emit', 'showCreateModal'))->mdAuto()->mb(3)
+                    S::col(S::button('Create DummyTitle')->primary()->click('$emit', 'showCreateDummyModelModal'))->mdAuto()->mb(3)
                 )->justifyContentBetween(),
 
                 S::listGroup(
@@ -46,8 +46,8 @@ class Index extends SwiftComponent
                             S::row(
                                 S::col(e($dummyVariable->name))->md(),
                                 S::col(
-                                    S::button(S::icon('eye'))->title('Read')->link()->p(1)->click('$emit', 'showReadModal', $dummyVariable->id),
-                                    S::button(S::icon('edit'))->title('Update')->link()->p(1)->click('$emit', 'showUpdateModal', $dummyVariable->id),
+                                    S::button(S::icon('eye'))->title('Read')->link()->p(1)->click('$emit', 'showReadDummyModelModal', $dummyVariable->id),
+                                    S::button(S::icon('edit'))->title('Update')->link()->p(1)->click('$emit', 'showUpdateDummyModelModal', $dummyVariable->id),
                                     S::button(S::icon('trash-alt'))->title('Delete')->link()->p(1)->click('delete', $dummyVariable->id)->confirm(),
                                 )->mdAuto()
                             )->alignItemsCenter()

diff --git a/resources/stubs/crud/app/Http/Livewire/DummyModels/Read.php.stub b/resources/stubs/crud/app/Http/Livewire/DummyModels/Read.php.stub
@@ -10,11 +10,11 @@ use Redbastie\Swift\Livewire\SwiftComponent;
 class Read extends SwiftComponent
 {
     public $dummyVariable;
-    protected $listeners = ['showReadModal'];
+    protected $listeners = ['showReadDummyModelModal'];
 
     public function view()
     {
-        return S::modal('read-modal')->fade()
+        return S::modal('read-dummy-route-modal')->fade()
             ->heading('DummyTitle')
             ->body(
                 S::each($this->dummyVariable ? $this->dummyVariable->toArray() : [], function ($value, $key) {
@@ -28,13 +28,13 @@ class Read extends SwiftComponent
                 })
             )
             ->footer(
-                S::button('Close')->secondary()->click('$emit', 'hideModal', 'read-modal')
+                S::button('Close')->secondary()->click('$emit', 'hideModal', 'read-dummy-route-modal')
             );
     }
 
-    public function showReadModal(DummyModel $dummyVariable)
+    public function showReadDummyModelModal(DummyModel $dummyVariable)
     {
         $this->dummyVariable = $dummyVariable;
-        $this->emit('showModal', 'read-modal');
+        $this->emit('showModal', 'read-dummy-route-modal');
     }
 }
diff --git a/resources/stubs/crud/app/Http/Livewire/DummyModels/Update.php.stub b/resources/stubs/crud/app/Http/Livewire/DummyModels/Update.php.stub
@@ -9,28 +9,28 @@ use Redbastie\Swift\Livewire\SwiftComponent;
 class Update extends SwiftComponent
 {
     public $dummyVariable;
-    protected $listeners = ['showUpdateModal'];
+    protected $listeners = ['showUpdateDummyModelModal'];
 
     public function view()
     {
         return S::form(
-            S::modal('update-modal')->fade()
+            S::modal('update-dummy-route-modal')->fade()
                 ->heading('Update DummyTitle')
                 ->body(
                     S::input('name')->label('Name')->modelDefer(),
                 )
                 ->footer(
-                    S::button('Cancel')->secondary()->click('$emit', 'hideModal', 'update-modal'),
+                    S::button('Cancel')->secondary()->click('$emit', 'hideModal', 'update-dummy-route-modal'),
                     S::button('Save')->submit()->primary()
                 )
         )->submitPrevent('save');
     }
 
-    public function showUpdateModal(DummyModel $dummyVariable)
+    public function showUpdateDummyModelModal(DummyModel $dummyVariable)
     {
         $this->dummyVariable = $dummyVariable;
         $this->model = $dummyVariable->toArray();
-        $this->emit('showModal', 'update-modal');
+        $this->emit('showModal', 'update-dummy-route-modal');
     }
 
     public function save()
@@ -41,7 +41,7 @@ class Update extends SwiftComponent
 
         $this->dummyVariable->update($validatedData);
 
-        $this->emit('hideModal', 'update-modal');
+        $this->emit('hideModal', 'update-dummy-route-modal');
         $this->emit('toastSuccess', 'DummyTitle updated!');
         $this->emit('$refresh');
     }

diff --git a/resources/stubs/crudtrait/app/Http/Livewire/DummyModels/Create.php.stub b/resources/stubs/crudtrait/app/Http/Livewire/DummyModels/Create.php.stub
@@ -10,25 +10,25 @@ class Create extends SwiftComponent
 {
     use Crud;
 
-    protected $listeners = ['showCreateModal'];
+    protected $listeners = ['showCreateDummyModelModal'];
 
     public function view()
     {
         return S::form(
-            S::modal('create-modal')->fade()
+            S::modal('create-dummy-route-modal')->fade()
                 ->heading('Create DummyTitle')
                 ->body($this->formFields())
                 ->footer(
-                    S::button('Cancel')->secondary()->click('$emit', 'hideModal', 'create-modal'),
+                    S::button('Cancel')->secondary()->click('$emit', 'hideModal', 'create-dummy-route-modal'),
                     S::button('Save')->submit()->primary()
                 )
         )->submitPrevent('save');
     }
 
-    public function showCreateModal()
+    public function showCreateDummyModelModal()
     {
         $this->reset('model');
-        $this->emit('showModal', 'create-modal');
+        $this->emit('showModal', 'create-dummy-route-modal');
     }
 
     public function save()
@@ -37,7 +37,7 @@ class Create extends SwiftComponent
 
         DummyModel::query()->create($validatedData);
 
-        $this->emit('hideModal', 'create-modal');
+        $this->emit('hideModal', 'create-dummy-route-modal');
         $this->emit('toastSuccess', 'DummyTitle created!');
         $this->emit('$refresh');
     }

diff --git a/resources/stubs/crudtrait/app/Http/Livewire/DummyModels/Index.php.stub b/resources/stubs/crudtrait/app/Http/Livewire/DummyModels/Index.php.stub
@@ -37,7 +37,7 @@ class Index extends SwiftComponent
 
                 S::row(
                     S::col(S::input('search')->type('search')->placeholder('Search')->modelDebounce())->mdAuto()->mb(3),
-                    S::col(S::button('Create DummyTitle')->primary()->click('$emit', 'showCreateModal'))->mdAuto()->mb(3)
+                    S::col(S::button('Create DummyTitle')->primary()->click('$emit', 'showCreateDummyModelModal'))->mdAuto()->mb(3)
                 )->justifyContentBetween(),
 
                 S::listGroup(
@@ -46,8 +46,8 @@ class Index extends SwiftComponent
                             S::row(
                                 S::col(e($dummyVariable->name))->md(),
                                 S::col(
-                                    S::button(S::icon('eye'))->title('Read')->link()->p(1)->click('$emit', 'showReadModal', $dummyVariable->id),
-                                    S::button(S::icon('edit'))->title('Update')->link()->p(1)->click('$emit', 'showUpdateModal', $dummyVariable->id),
+                                    S::button(S::icon('eye'))->title('Read')->link()->p(1)->click('$emit', 'showReadDummyModelModal', $dummyVariable->id),
+                                    S::button(S::icon('edit'))->title('Update')->link()->p(1)->click('$emit', 'showUpdateDummyModelModal', $dummyVariable->id),
                                     S::button(S::icon('trash-alt'))->title('Delete')->link()->p(1)->click('delete', $dummyVariable->id)->confirm(),
                                 )->mdAuto()
                             )->alignItemsCenter()

diff --git a/resources/stubs/crudtrait/app/Http/Livewire/DummyModels/Read.php.stub b/resources/stubs/crudtrait/app/Http/Livewire/DummyModels/Read.php.stub
@@ -10,11 +10,11 @@ use Redbastie\Swift\Livewire\SwiftComponent;
 class Read extends SwiftComponent
 {
     public $dummyVariable;
-    protected $listeners = ['showReadModal'];
+    protected $listeners = ['showReadDummyModelModal'];
 
     public function view()
     {
-        return S::modal('read-modal')->fade()
+        return S::modal('read-dummy-route-modal')->fade()
             ->heading('DummyTitle')
             ->body(
                 S::each($this->dummyVariable ? $this->dummyVariable->toArray() : [], function ($value, $key) {
@@ -28,13 +28,13 @@ class Read extends SwiftComponent
                 })
             )
             ->footer(
-                S::button('Close')->secondary()->click('$emit', 'hideModal', 'read-modal')
+                S::button('Close')->secondary()->click('$emit', 'hideModal', 'read-dummy-route-modal')
             );
     }
 
-    public function showReadModal(DummyModel $dummyVariable)
+    public function showReadDummyModelModal(DummyModel $dummyVariable)
     {
         $this->dummyVariable = $dummyVariable;
-        $this->emit('showModal', 'read-modal');
+        $this->emit('showModal', 'read-dummy-route-modal');
     }
 }
diff --git a/resources/stubs/crudtrait/app/Http/Livewire/DummyModels/Update.php.stub b/resources/stubs/crudtrait/app/Http/Livewire/DummyModels/Update.php.stub
@@ -10,26 +10,26 @@ class Update extends SwiftComponent
 {
     use Crud;
 
-    protected $listeners = ['showUpdateModal'];
+    protected $listeners = ['showUpdateDummyModelModal'];
 
     public function view()
     {
         return S::form(
-            S::modal('update-modal')->fade()
+            S::modal('update-dummy-route-modal')->fade()
                 ->heading('Update DummyTitle')
                 ->body($this->formFields())
                 ->footer(
-                    S::button('Cancel')->secondary()->click('$emit', 'hideModal', 'update-modal'),
+                    S::button('Cancel')->secondary()->click('$emit', 'hideModal', 'update-dummy-route-modal'),
                     S::button('Save')->submit()->primary()
                 )
         )->submitPrevent('save');
     }
 
-    public function showUpdateModal(DummyModel $dummyVariable)
+    public function showUpdateDummyModelModal(DummyModel $dummyVariable)
     {
         $this->dummyVariable = $dummyVariable;
         $this->model = $dummyVariable->toArray();
-        $this->emit('showModal', 'update-modal');
+        $this->emit('showModal', 'update-dummy-route-modal');
     }
 
     public function save()
@@ -38,7 +38,7 @@ class Update extends SwiftComponent
 
         $this->dummyVariable->update($validatedData);
 
-        $this->emit('hideModal', 'update-modal');
+        $this->emit('hideModal', 'update-dummy-route-modal');
         $this->emit('toastSuccess', 'DummyTitle updated!');
         $this->emit('$refresh');
     }

diff --git a/resources/stubs/install/app/Http/Livewire/Users/Create.php.stub b/resources/stubs/install/app/Http/Livewire/Users/Create.php.stub
@@ -8,12 +8,12 @@ use Redbastie\Swift\Livewire\SwiftComponent;
 
 class Create extends SwiftComponent
 {
-    protected $listeners = ['showCreateModal'];
+    protected $listeners = ['showCreateUserModal'];
 
     public function view()
     {
         return S::form(
-            S::modal('create-modal')->fade()
+            S::modal('create-user-modal')->fade()
                 ->heading('Create User')
                 ->body(
                     S::input('name')->label('Name')->modelDefer(),
@@ -22,16 +22,16 @@ class Create extends SwiftComponent
                     S::input('password_confirmation')->type('password')->label('Confirm Password')->modelDefer(),
                 )
                 ->footer(
-                    S::button('Cancel')->secondary()->click('$emit', 'hideModal', 'create-modal'),
+                    S::button('Cancel')->secondary()->click('$emit', 'hideModal', 'create-user-modal'),
                     S::button('Save')->submit()->primary()
                 )
         )->submitPrevent('save');
     }
 
-    public function showCreateModal()
+    public function showCreateUserModal()
     {
         $this->reset('model');
-        $this->emit('showModal', 'create-modal');
+        $this->emit('showModal', 'create-user-modal');
     }
 
     public function save()
@@ -46,7 +46,7 @@ class Create extends SwiftComponent
 
         User::query()->create($validatedData);
 
-        $this->emit('hideModal', 'create-modal');
+        $this->emit('hideModal', 'create-user-modal');
         $this->emit('toastSuccess', 'User created!');
         $this->emit('$refresh');
     }

diff --git a/resources/stubs/install/app/Http/Livewire/Users/Index.php.stub b/resources/stubs/install/app/Http/Livewire/Users/Index.php.stub
@@ -38,7 +38,7 @@ class Index extends SwiftComponent
 
                 S::row(
                     S::col(S::input('search')->type('search')->placeholder('Search')->modelDebounce())->mdAuto()->mb(3),
-                    S::col(S::button('Create User')->primary()->click('$emit', 'showCreateModal'))->mdAuto()->mb(3)
+                    S::col(S::button('Create User')->primary()->click('$emit', 'showCreateUserModal'))->mdAuto()->mb(3)
                 )->justifyContentBetween(),
 
                 S::listGroup(
@@ -50,8 +50,8 @@ class Index extends SwiftComponent
                                     S::div(e($user->email))->small()->textMuted(),
                                 )->md(),
                                 S::col(
-                                    S::button(S::icon('eye'))->title('Read')->link()->p(1)->click('$emit', 'showReadModal', $user->id),
-                                    S::button(S::icon('edit'))->title('Update')->link()->p(1)->click('$emit', 'showUpdateModal', $user->id),
+                                    S::button(S::icon('eye'))->title('Read')->link()->p(1)->click('$emit', 'showReadUserModal', $user->id),
+                                    S::button(S::icon('edit'))->title('Update')->link()->p(1)->click('$emit', 'showUpdateUserModal', $user->id),
                                     S::button(S::icon('trash-alt'))->title('Delete')->link()->p(1)->click('delete', $user->id)->confirm(),
                                 )->mdAuto()
                             )->alignItemsCenter()

diff --git a/resources/stubs/install/app/Http/Livewire/Users/Read.php.stub b/resources/stubs/install/app/Http/Livewire/Users/Read.php.stub
@@ -10,11 +10,11 @@ use Redbastie\Swift\Livewire\SwiftComponent;
 class Read extends SwiftComponent
 {
     public $user;
-    protected $listeners = ['showReadModal'];
+    protected $listeners = ['showReadUserModal'];
 
     public function view()
     {
-        return S::modal('read-modal')->fade()
+        return S::modal('read-user-modal')->fade()
             ->heading('User')
             ->body(
                 S::each($this->user ? $this->user->toArray() : [], function ($value, $key) {
@@ -28,13 +28,13 @@ class Read extends SwiftComponent
                 })
             )
             ->footer(
-                S::button('Close')->secondary()->click('$emit', 'hideModal', 'read-modal')
+                S::button('Close')->secondary()->click('$emit', 'hideModal', 'read-user-modal')
             );
     }
 
-    public function showReadModal(User $user)
+    public function showReadUserModal(User $user)
     {
         $this->user = $user;
-        $this->emit('showModal', 'read-modal');
+        $this->emit('showModal', 'read-user-modal');
     }
 }