From 7b602d3616e58c2e88fdc3d1edb33ba49d5d1e59 Mon Sep 17 00:00:00 2001
From: cp6 <cp6@users.noreply.github.com>
Date: Thu, 20 Oct 2022 11:56:35 +1100
Subject: [PATCH] Updated confirmDeleteModal action

Updated confirmDeleteModal action
Made consistency in all the index blade files to use the component
---
 .../components/modal-delete-script.blade.php  |  6 ++---
 resources/views/dns/index.blade.php           |  4 ++--
 resources/views/domains/index.blade.php       |  4 ++--
 resources/views/ips/index.blade.php           |  4 ++--
 resources/views/labels/index.blade.php        |  6 ++---
 resources/views/misc/index.blade.php          |  4 ++--
 resources/views/os/index.blade.php            |  4 ++--
 resources/views/providers/index.blade.php     |  4 ++--
 resources/views/reseller/index.blade.php      | 22 +++---------------
 resources/views/seedboxes/index.blade.php     | 23 +++----------------
 resources/views/shared/index.blade.php        | 23 +++----------------
 resources/views/yabs/index.blade.php          |  4 ++--
 12 files changed, 29 insertions(+), 79 deletions(-)

diff --git a/resources/views/components/modal-delete-script.blade.php b/resources/views/components/modal-delete-script.blade.php
index e6558a0..b640f71 100644
--- a/resources/views/components/modal-delete-script.blade.php
+++ b/resources/views/components/modal-delete-script.blade.php
@@ -8,10 +8,10 @@
             showModal: false
         },
         methods: {
-            modalForm(event) {
+            confirmDeleteModal(event) {
                 this.showModal = true;
-                this.modal_hostname = event.target.id.replace('btn-', '');
-                this.modal_id = event.target.title;
+                this.modal_hostname = event.target.title;
+                this.modal_id = event.target.id;
                 this.delete_form_action = '{{$uri}}/' + this.modal_id;
             }
         }
diff --git a/resources/views/dns/index.blade.php b/resources/views/dns/index.blade.php
index 565ee03..b3dd3e4 100644
--- a/resources/views/dns/index.blade.php
+++ b/resources/views/dns/index.blade.php
@@ -42,8 +42,8 @@
                                             <i class="fas fa-pen" title="edit"></i></a>
                                         @csrf
                                         @method('DELETE')
-                                        <i class="fas fa-trash text-danger ms-3" @click="modalForm"
-                                           id="btn-{{$dns->hostname}}" title="{{$dns->id}}"></i>
+                                        <i class="fas fa-trash text-danger ms-3" @click="confirmDeleteModal"
+                                           id="{{$dns->id}}" title="{{$dns->hostname}}"></i>
                                     </form>
                                 </td>
                             </tr>
diff --git a/resources/views/domains/index.blade.php b/resources/views/domains/index.blade.php
index d49e1d9..6e1acf7 100644
--- a/resources/views/domains/index.blade.php
+++ b/resources/views/domains/index.blade.php
@@ -48,8 +48,8 @@
                                             <i class="fas fa-pen" title="edit"></i></a>
                                         @csrf
                                         @method('DELETE')
-                                        <i class="fas fa-trash text-danger ms-3" @click="modalForm"
-                                           id="btn-{{$domain->domain}}" title="{{$domain->id}}"></i>
+                                        <i class="fas fa-trash text-danger ms-3" @click="confirmDeleteModal"
+                                           id="{{$domain->id}}" title="{{$domain->domain}}"></i>
                                     </form>
                                 </td>
                             </tr>
diff --git a/resources/views/ips/index.blade.php b/resources/views/ips/index.blade.php
index a4390ad..d142746 100644
--- a/resources/views/ips/index.blade.php
+++ b/resources/views/ips/index.blade.php
@@ -41,8 +41,8 @@
                                     <form action="{{ route('IPs.destroy', $ip->id) }}" method="POST">
                                         @csrf
                                         @method('DELETE')
-                                        <i class="fas fa-trash text-danger ms-3" @click="modalForm"
-                                           id="btn-{{$ip->hostname}}" title="{{$ip->id}}"></i>
+                                        <i class="fas fa-trash text-danger ms-3" @click="confirmDeleteModal"
+                                           id="{{$ip->id}}" title="{{$ip->hostname}}"></i>
                                     </form>
                                 </td>
                             </tr>
diff --git a/resources/views/labels/index.blade.php b/resources/views/labels/index.blade.php
index e96940b..ad3eda1 100644
--- a/resources/views/labels/index.blade.php
+++ b/resources/views/labels/index.blade.php
@@ -36,8 +36,8 @@
                                        class="text-body mx-1">
                                         <i class="fas fa-eye" title="view"></i></a>
                                     @csrf
-                                    <i class="fas fa-trash text-danger ms-3" @click="modalForm"
-                                       id="btn-{{$label->label}}" title="{{$label->id}}"></i>
+                                    <i class="fas fa-trash text-danger ms-3" @click="confirmDeleteModal"
+                                       id="{{$label->id}}" title="{{$label->label}}"></i>
                                 </form>
                             </td>
                         </tr>
@@ -75,6 +75,6 @@
         });
     </script>
     <x-modal-delete-script>
-        <x-slot name="uri">locations</x-slot>
+        <x-slot name="uri">labels</x-slot>
     </x-modal-delete-script>
 </x-app-layout>
diff --git a/resources/views/misc/index.blade.php b/resources/views/misc/index.blade.php
index c91f044..fa71f93 100644
--- a/resources/views/misc/index.blade.php
+++ b/resources/views/misc/index.blade.php
@@ -51,8 +51,8 @@
                                         </a>
                                         @csrf
                                         @method('DELETE')
-                                        <i class="fas fa-trash text-danger ms-3" @click="modalForm"
-                                           id="btn-{{$m->name}}" title="{{$m->id}}"></i>
+                                        <i class="fas fa-trash text-danger ms-3" @click="confirmDeleteModal"
+                                           id="{{$m->name}}" title="{{$m->id}}"></i>
                                     </form>
                                 </td>
                             </tr>
diff --git a/resources/views/os/index.blade.php b/resources/views/os/index.blade.php
index f4d4327..256fe4f 100644
--- a/resources/views/os/index.blade.php
+++ b/resources/views/os/index.blade.php
@@ -32,8 +32,8 @@
                             <td class="text-nowrap">{{ $o->name }}</td>
                             <td class="text-nowrap">
                                 <form action="{{ route('locations.destroy', $o->id) }}" method="POST">
-                                    <i class="fas fa-trash text-danger ms-3" @click="modalForm"
-                                       id="btn-{{$o->name}}" title="{{$o->id}}"></i>
+                                    <i class="fas fa-trash text-danger ms-3" @click="confirmDeleteModal"
+                                       id="{{$o->id}}" title="{{$o->name}}"></i>
                                 </form>
                             </td>
                         </tr>
diff --git a/resources/views/providers/index.blade.php b/resources/views/providers/index.blade.php
index c8bf3db..6853abb 100644
--- a/resources/views/providers/index.blade.php
+++ b/resources/views/providers/index.blade.php
@@ -35,8 +35,8 @@
                                     <a href="{{ route('providers.show', $provider->id) }}"
                                        class="text-body mx-1">
                                         <i class="fas fa-eye" title="view"></i></a>
-                                    <i class="fas fa-trash text-danger ms-3" @click="modalForm"
-                                       id="btn-{{$provider->name}}" title="{{$provider->id}}"></i>
+                                    <i class="fas fa-trash text-danger ms-3" @click="confirmDeleteModal"
+                                       id="{{$provider->id}}" title="{{$provider->name}}"></i>
                                 </form>
                             </td>
                         </tr>
diff --git a/resources/views/reseller/index.blade.php b/resources/views/reseller/index.blade.php
index edaae17..cc214e8 100644
--- a/resources/views/reseller/index.blade.php
+++ b/resources/views/reseller/index.blade.php
@@ -80,23 +80,7 @@
             </p>
         @endif
     </div>
-    <script>
-        let app = new Vue({
-            el: "#app",
-            data: {
-                "modal_hostname": '',
-                "modal_id": '',
-                "delete_form_action": '',
-                showModal: false
-            },
-            methods: {
-                confirmDeleteModal(event) {
-                    this.showModal = true;
-                    this.modal_hostname = event.target.title;
-                    this.modal_id = event.target.id;
-                    this.delete_form_action = 'reseller/' + this.modal_id;
-                }
-            }
-        });
-    </script>
+    <x-modal-delete-script>
+        <x-slot name="uri">reseller</x-slot>
+    </x-modal-delete-script>
 </x-app-layout>
diff --git a/resources/views/seedboxes/index.blade.php b/resources/views/seedboxes/index.blade.php
index bb254ee..bd64aee 100644
--- a/resources/views/seedboxes/index.blade.php
+++ b/resources/views/seedboxes/index.blade.php
@@ -101,24 +101,7 @@
                     v{{ Illuminate\Foundation\Application::VERSION }} (PHP v{{ PHP_VERSION }})</small></p>
         @endif
     </div>
-
-    <script>
-        let app = new Vue({
-            el: "#app",
-            data: {
-                "modal_hostname": '',
-                "modal_id": '',
-                "delete_form_action": '',
-                showModal: false
-            },
-            methods: {
-                confirmDeleteModal(event) {
-                    this.showModal = true;
-                    this.modal_hostname = event.target.title;
-                    this.modal_id = event.target.id;
-                    this.delete_form_action = 'seedboxes/' + this.modal_id;
-                }
-            }
-        });
-    </script>
+    <x-modal-delete-script>
+        <x-slot name="uri">seedboxes</x-slot>
+    </x-modal-delete-script>
 </x-app-layout>
diff --git a/resources/views/shared/index.blade.php b/resources/views/shared/index.blade.php
index 9a8111b..53ff798 100644
--- a/resources/views/shared/index.blade.php
+++ b/resources/views/shared/index.blade.php
@@ -79,24 +79,7 @@
                     v{{ Illuminate\Foundation\Application::VERSION }} (PHP v{{ PHP_VERSION }})</small></p>
         @endif
     </div>
-
-    <script>
-        let app = new Vue({
-            el: "#app",
-            data: {
-                "modal_hostname": '',
-                "modal_id": '',
-                "delete_form_action": '',
-                showModal: false
-            },
-            methods: {
-                confirmDeleteModal(event) {
-                    this.showModal = true;
-                    this.modal_hostname = event.target.title;
-                    this.modal_id = event.target.id;
-                    this.delete_form_action = 'shared/' + this.modal_id;
-                }
-            }
-        });
-    </script>
+    <x-modal-delete-script>
+        <x-slot name="uri">shared</x-slot>
+    </x-modal-delete-script>
 </x-app-layout>
diff --git a/resources/views/yabs/index.blade.php b/resources/views/yabs/index.blade.php
index 88358a8..b8e5fdc 100644
--- a/resources/views/yabs/index.blade.php
+++ b/resources/views/yabs/index.blade.php
@@ -64,8 +64,8 @@
                                                 <i class="fas fa-eye" title="view"></i>
                                             </a>
 
-                                            <i class="fas fa-trash text-danger ms-3" @click="modalForm"
-                                               id="btn-{{$yab->server->hostname}}" title="{{$yab->id}}"></i>
+                                            <i class="fas fa-trash text-danger ms-3" @click="confirmDeleteModal"
+                                               id="{{$yab->id}}" title="{{$yab->server->hostname}}"></i>
                                         </form>
                                     </td>
                                 </tr>