From 235d98b3712e1b134da9282b065b93300ebf751b Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 19 Dec 2024 12:46:45 -0800
Subject: [PATCH 01/13] Introduce form blade component

---
 resources/views/account/change-password.blade.php |  9 +++++++--
 resources/views/blade/form.blade.php              | 15 +++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 resources/views/blade/form.blade.php

diff --git a/resources/views/account/change-password.blade.php b/resources/views/account/change-password.blade.php
index 57509e5fab5a..d344e80b8051 100755
--- a/resources/views/account/change-password.blade.php
+++ b/resources/views/account/change-password.blade.php
@@ -11,7 +11,12 @@
 
 <div class="row">
     <div class="col-md-9">
-    {{ Form::open(['method' => 'POST', 'files' => true, 'class' => 'form-horizontal', 'autocomplete' => 'off']) }}
+    <x-form
+        :route="route('account.password.index')"
+        autocomplete="off"
+        class="form-horizontal"
+        files
+    >
     <!-- CSRF Token -->
         <input type="hidden" name="_token" value="{{ csrf_token() }}" />
         <div class="box box-default">
@@ -63,7 +68,7 @@
             </div>
 
         </div> <!-- .box-default -->
-        {{ Form::close() }}
+        </x-form>
     </div> <!-- .col-md-9 -->
 </div> <!-- .row-->
 @stop
diff --git a/resources/views/blade/form.blade.php b/resources/views/blade/form.blade.php
new file mode 100644
index 000000000000..f214f51d0a66
--- /dev/null
+++ b/resources/views/blade/form.blade.php
@@ -0,0 +1,15 @@
+@props([
+    'route',
+    'method' => 'POST',
+    'files' => false,
+])
+
+<form
+    action="{{ $route }}"
+    method="{{ $method }}"
+    accept-charset="UTF-8"
+    @if($files) enctype="multipart/form-data" @endif
+    {{ $attributes }}
+>
+    {{ $slot }}
+</form>

From e849235d4ec4810f0ccd7a6a25df2c1a768294b5 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 19 Dec 2024 13:32:26 -0800
Subject: [PATCH 02/13] Add csrf token and method input to component

---
 resources/views/blade/form.blade.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/resources/views/blade/form.blade.php b/resources/views/blade/form.blade.php
index f214f51d0a66..730a53839b17 100644
--- a/resources/views/blade/form.blade.php
+++ b/resources/views/blade/form.blade.php
@@ -6,10 +6,14 @@
 
 <form
     action="{{ $route }}"
-    method="{{ $method }}"
+    method="POST"
     accept-charset="UTF-8"
     @if($files) enctype="multipart/form-data" @endif
     {{ $attributes }}
 >
+    @csrf
+    @if(in_array(strtoupper($method), ['PUT', 'PATCH', 'DELETE']))
+        <input type="hidden" name="_method" value="{{ strtoupper($method) }}">
+    @endif
     {{ $slot }}
 </form>

From 95be4184bd1d36f92b9ba701bbdbcd19034f2ff7 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 19 Dec 2024 13:32:36 -0800
Subject: [PATCH 03/13] Convert a couple forms

---
 resources/views/account/profile.blade.php         |  9 +++++++--
 .../views/custom_fields/fields/edit.blade.php     | 15 ++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/resources/views/account/profile.blade.php b/resources/views/account/profile.blade.php
index d27367192a6b..91cc76e35ff7 100755
--- a/resources/views/account/profile.blade.php
+++ b/resources/views/account/profile.blade.php
@@ -10,7 +10,12 @@
 
 <div class="row">
   <div class="col-md-9">
-  {{ Form::open(['method' => 'POST', 'files' => true, 'class' => 'form-horizontal', 'autocomplete' => 'off']) }}
+  <x-form
+      :route="route('profile')"
+      class="form-horizontal"
+      autocomplete="off"
+      files
+  >
   <!-- CSRF Token -->
     <input type="hidden" name="_token" value="{{ csrf_token() }}" />
     <div class="box box-default">
@@ -177,7 +182,7 @@
         <button type="submit" class="btn btn-primary"><x-icon type="checkmark" /> {{ trans('general.save') }}</button>
       </div>
     </div> <!-- .box-default -->
-    {{ Form::close() }}
+    </x-form>
   </div> <!-- .col-md-9 -->
 </div> <!-- .row-->
 
diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php
index 12c3a3fb735e..a5e6644a3022 100644
--- a/resources/views/custom_fields/fields/edit.blade.php
+++ b/resources/views/custom_fields/fields/edit.blade.php
@@ -22,14 +22,11 @@
 @section('content')
 
     <!-- Horizontal Form -->
-    @if ($field->id)
-        {{ Form::open(['route' => ['fields.update', $field->id], 'class'=>'form-horizontal']) }}
-        {{ method_field('PUT') }}
-    @else
-        {{ Form::open(['route' => 'fields.store', 'class'=>'form-horizontal']) }}
-    @endif
-
-    @csrf
+    <x-form
+        :route="$field->id ? route('fields.update', $field->id) : route('fields.store')"
+        :method="$field->id ? 'PUT' : 'POST'"
+        class="form-horizontal"
+    >
 <div class="row">
   <div class="col-md-12">
     <div class="box box-default">
@@ -263,7 +260,7 @@ class="fieldset"
 
 
 </div>
-{{ Form::close() }}
+</x-form>
 @stop
 
 @section('moar_scripts')

From 4a76471ea6ff4c6427d1541e8432f98b0988fbbb Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 19 Dec 2024 14:18:43 -0800
Subject: [PATCH 04/13] Convert additional forms

---
 .../views/custom_fields/fieldsets/view.blade.php  | 11 ++++++-----
 resources/views/custom_fields/index.blade.php     |  8 ++++++--
 resources/views/depreciations/view.blade.php      | 14 ++++++--------
 resources/views/hardware/audit.blade.php          | 12 ++++++------
 .../views/hardware/quickscan-checkin.blade.php    |  9 +++++++--
 resources/views/hardware/quickscan.blade.php      |  9 +++++++--
 resources/views/hardware/requested.blade.php      | 15 ++++-----------
 7 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/resources/views/custom_fields/fieldsets/view.blade.php b/resources/views/custom_fields/fieldsets/view.blade.php
index b73ae708c669..9e93d8df43bc 100644
--- a/resources/views/custom_fields/fieldsets/view.blade.php
+++ b/resources/views/custom_fields/fieldsets/view.blade.php
@@ -88,10 +88,11 @@
           <tfoot>
             <tr>
               <td colspan="8">
-                {{ Form::open(['route' =>
-                ["fieldsets.associate",$custom_fieldset->id],
-                'class'=>'form-inline',
-                'id' => 'ordering']) }}
+                <x-form
+                  :route="route('fieldsets.associate', $custom_fieldset->id)"
+                  class="form-inline"
+                  id="ordering"
+                >
 
 
                 <div class="form-group">
@@ -118,7 +119,7 @@
                   <button type="submit" class="btn btn-primary"> {{ trans('general.save') }}</button>
                 </span>
 
-                {{ Form::close() }}
+                </x-form>
 
               </td>
             </tr>
diff --git a/resources/views/custom_fields/index.blade.php b/resources/views/custom_fields/index.blade.php
index d8eeae1d5658..5b4947a09b80 100644
--- a/resources/views/custom_fields/index.blade.php
+++ b/resources/views/custom_fields/index.blade.php
@@ -87,13 +87,17 @@ class="table table-striped snipe-table"
                 @endcan
 
                 @can('delete', $fieldset)
-                {{ Form::open(['route' => array('fieldsets.destroy', $fieldset->id), 'method' => 'delete','style' => 'display:inline-block']) }}
+                <x-form
+                    :route="route('fieldsets.destroy', $fieldset->id)"
+                    method="delete"
+                    style="display:inline-block"
+                >
                   @if($fieldset->models->count() > 0)
                   <button type="submit" class="btn btn-danger btn-sm disabled" data-tooltip="true" title="{{ trans('general.cannot_be_deleted') }}" disabled><i class="fas fa-trash"></i></button>
                   @else
                   <button type="submit" class="btn btn-danger btn-sm" data-tooltip="true" title="{{ trans('general.delete') }}"><i class="fas fa-trash"></i></button>
                   @endif
-                {{ Form::close() }}
+                </x-form>
                 @endcan
                   </nobr>
               </td>
diff --git a/resources/views/depreciations/view.blade.php b/resources/views/depreciations/view.blade.php
index b49bf0b9e156..e3dc1c037fc9 100644
--- a/resources/views/depreciations/view.blade.php
+++ b/resources/views/depreciations/view.blade.php
@@ -129,13 +129,11 @@ class="table table-striped snipe-table"
                     <div class="tab-pane" id="models">
 
                         <div class="row">
-                            {{ Form::open(
-                                      [
-                                     'method' => 'POST',
-                                     'route' => ['models.bulkedit.index'],
-                                     'class' => 'form-inline',
-                                     'id' => 'bulkForm']
-                                      ) }}
+                            <x-form
+                                :route="route('models.bulkedit.index')"
+                                class="form-inline"
+                                id="bulkForm"
+                            >
                             <div class="col-md-12">
                                 <div id="toolbar">
                                     <label for="bulk_actions" class="sr-only">{{ trans('general.bulk_actions') }}</label>
@@ -176,7 +174,7 @@ class="table table-striped snipe-table"
                                 </div>
 
                             </div>
-                            {{ Form::close() }}
+                            </x-form>
 
                         </div> <!--/.row-->
                     </div> <!-- /.tab-pane -->
diff --git a/resources/views/hardware/audit.blade.php b/resources/views/hardware/audit.blade.php
index 2a88e171bc43..8604df7dbaea 100644
--- a/resources/views/hardware/audit.blade.php
+++ b/resources/views/hardware/audit.blade.php
@@ -21,11 +21,11 @@
         <div class="col-md-8 col-md-offset-2">
             <div class="box box-default">
 
-                {{ Form::open([
-                  'method' => 'POST',
-                  'route' => ['asset.audit.store', $asset->id],
-                  'files' => true,
-                  'class' => 'form-horizontal' ]) }}
+                <x-form
+                    :route="route('asset.audit.store', $asset->id)"
+                    files
+                    class="form-horizontal"
+                >
 
                     <div class="box-header with-border">
                         <h2 class="box-title"> {{ trans('admin/hardware/form.tag') }} {{ $asset->asset_tag }}</h2>
@@ -140,7 +140,7 @@
                             {{ trans('general.audit') }}
                         </button>
                     </div>
-                </form>
+                </x-form>
             </div>
         </div> <!--/.col-md-7-->
     </div>
diff --git a/resources/views/hardware/quickscan-checkin.blade.php b/resources/views/hardware/quickscan-checkin.blade.php
index de892399cc3a..e84878da47fb 100644
--- a/resources/views/hardware/quickscan-checkin.blade.php
+++ b/resources/views/hardware/quickscan-checkin.blade.php
@@ -19,7 +19,12 @@
     
 
     <div class="row">
-    {{ Form::open(['method' => 'POST', 'class' => 'form-horizontal', 'role' => 'form', 'id' => 'checkin-form' ]) }}
+    <x-form
+        :route="route('hardware/quickscancheckin')"
+        class="form-horizontal"
+        role="form"
+        id="checkin-form"
+    >
         <!-- left column -->
         <div class="col-md-6">
             <div class="box box-default">
@@ -78,7 +83,7 @@
 
 
 
-            {{Form::close()}}
+            </x-form>
         </div> <!--/.col-md-6-->
 
         <div class="col-md-6">
diff --git a/resources/views/hardware/quickscan.blade.php b/resources/views/hardware/quickscan.blade.php
index 867eeaa2b098..9b1253133cba 100644
--- a/resources/views/hardware/quickscan.blade.php
+++ b/resources/views/hardware/quickscan.blade.php
@@ -19,7 +19,12 @@
     
 
     <div class="row">
-    {{ Form::open(['method' => 'POST', 'class' => 'form-horizontal', 'role' => 'form', 'id' => 'audit-form' ]) }}
+    <x-form
+        :route="route('assets.bulkaudit')"
+        class="form-horizontal"
+        role="form"
+        id="audit-form"
+    >
         <!-- left column -->
         <div class="col-md-6">
             <div class="box box-default">
@@ -92,7 +97,7 @@
 
 
 
-            {{Form::close()}}
+            </x-form>
         </div> <!--/.col-md-6-->
 
         <div class="col-md-6">
diff --git a/resources/views/hardware/requested.blade.php b/resources/views/hardware/requested.blade.php
index 969bf991a674..7506a7c55160 100644
--- a/resources/views/hardware/requested.blade.php
+++ b/resources/views/hardware/requested.blade.php
@@ -100,18 +100,11 @@ class="table table-striped snipe-table"
                             </td>
                             <td>{{ App\Helpers\Helper::getFormattedDateObject($request->created_at, 'datetime', false) }}</td>
                             <td>
-                                {{ Form::open([
-                                    'method' => 'POST',
-                                    'route' => [
-                                        'account/request-item',
-                                        $request->itemType(),
-                                        $request->requestable->id,
-                                        true,
-                                        $request->requestingUser()->id
-                                    ],
-                                    ]) }}
+                                <x-form
+                                    :route="route('account/request-item', [$request->itemType(), $request->requestable->id, true, $request->requestingUser()->id])"
+                                >
                                     <button class="btn btn-warning btn-sm" data-tooltip="true" title="{{ trans('general.cancel_request') }}">{{ trans('button.cancel') }}</button>
-                                {{ Form::close() }}
+                                </x-form>
                             </td>
                             <td>
                                 @if ($request->itemType() == "asset")

From face925434bcba7641170b85543d81989e07989d Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 19 Dec 2024 14:32:59 -0800
Subject: [PATCH 05/13] Convert additional forms

---
 resources/views/hardware/view.blade.php      | 28 ++++++++++----------
 resources/views/modals/upload-file.blade.php | 13 +++++----
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index b9875ddb5457..5bd61ea4a965 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -239,18 +239,18 @@
                                 @endcan
 
                                 <div class="col-md-12 hidden-print" style="padding-top: 5px;">
-                                    {{ Form::open([
-                                                     'method' => 'POST',
-                                                     'route' => ['hardware/bulkedit'],
-                                                     'class' => 'form-inline',
-                                                      'target'=>'_blank',
-                                                      'id' => 'bulkForm']) }}
+                                    <x-form
+                                        :route="route('hardware/bulkedit')"
+                                        class="form-inline"
+                                        target="_blank"
+                                        id="bulkForm"
+                                    >
                                     <input type="hidden" name="bulk_actions" value="labels" />
                                     <input type="hidden" name="ids[{{$asset->id}}]" value="{{ $asset->id }}" />
                                     <button class="btn btn-block btn-social btn-sm btn-default" id="bulkEdit"{{ (!$asset->model ? ' disabled' : '') }}{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid').'"' : '') !!}>
                                         <x-icon type="assets" />
                                         {{ trans_choice('button.generate_labels', 1) }}</button>
-                                        {{ Form::close() }}
+                                        </x-form>
                                 </div>
 
                                 @can('delete', $asset)
@@ -1217,11 +1217,11 @@
                                 @if ($asset->assignedAssets->count() > 0)
 
 
-                                    {{ Form::open([
-                                              'method' => 'POST',
-                                              'route' => ['hardware/bulkedit'],
-                                              'class' => 'form-inline',
-                                               'id' => 'bulkForm']) }}
+                                    <x-form
+                                        :route="route('hardware/bulkedit')"
+                                        class="form-inline"
+                                        id="bulkForm"
+                                    >
                                     <div id="toolbar">
                                         <label for="bulk_actions"><span class="sr-only">{{ trans('general.bulk_actions')}}</span></label>
                                         <select name="bulk_actions" class="form-control select2" style="width: 150px;" aria-label="bulk_actions">
@@ -1259,7 +1259,7 @@ class="table table-striped snipe-table"
                                         </table>
 
 
-                                        {{ Form::close() }}
+                                        </x-form>
                                     </div>
 
                                 @else
@@ -1408,4 +1408,4 @@ class="table table-striped snipe-table"
                 </script>
     @include ('partials.bootstrap-table')
 
-@stop
\ No newline at end of file
+@stop
diff --git a/resources/views/modals/upload-file.blade.php b/resources/views/modals/upload-file.blade.php
index c5816bf175f4..e28fecee390c 100644
--- a/resources/views/modals/upload-file.blade.php
+++ b/resources/views/modals/upload-file.blade.php
@@ -6,12 +6,11 @@
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                 <h4 class="modal-title" id="uploadFileModalLabel">{{ trans('general.file_upload') }}</h4>
             </div>
-            {{ Form::open([
-            'method' => 'POST',
-            'route' => ['upload/'.$item_type, $item_id],
-            'files' => true,
-            'class' => 'form-horizontal' ]) }}
-            <input type="hidden" name="_token" value="{{ csrf_token() }}" />
+            <x-form
+                :route="route('upload/' . $item_type, $item_id)"
+                files
+                class="form-horizontal"
+            >
             <div class="modal-body">
 
                 <div class="row">
@@ -40,7 +39,7 @@
                 <a href="#" class="pull-left" data-dismiss="modal">{{ trans('button.cancel') }}</a>
                 <button type="submit" class="btn btn-primary">{{ trans('button.upload') }}</button>
             </div>
-            {{ Form::close() }}
+            </x-form>
         </div>
     </div>
 </div>

From 9de483f2341aab2ef436395b377b241c56855dd9 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 19 Dec 2024 14:51:01 -0800
Subject: [PATCH 06/13] Convert additional forms

---
 resources/views/reports/activity.blade.php          | 6 +++---
 resources/views/reports/custom.blade.php            | 5 ++---
 resources/views/reports/unaccepted_assets.blade.php | 5 ++---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/resources/views/reports/activity.blade.php b/resources/views/reports/activity.blade.php
index d2e0107649f5..f9737fbc7231 100644
--- a/resources/views/reports/activity.blade.php
+++ b/resources/views/reports/activity.blade.php
@@ -7,13 +7,13 @@
 @stop
 
 @section('header_right')
-    {{ Form::open(['method' => 'post', 'class' => 'form-horizontal']) }}
-    {{csrf_field()}}
+    <x-form :route="route('reports.activity')" class="form-horizontal">
+
     <button type="submit" class="btn btn-default">
         <x-icon type="download" />
         {{ trans('general.download_all') }}
     </button>
-    {{ Form::close() }}
+    </x-form>
 @stop
 
 {{-- Page content --}}
diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php
index b25e3736c181..9bb88a75b904 100644
--- a/resources/views/reports/custom.blade.php
+++ b/resources/views/reports/custom.blade.php
@@ -18,8 +18,7 @@
 <div class="row">
   <div class="col-md-8 col-md-offset-2">
 
-    {{ Form::open(['method' => 'post', 'class' => 'form-horizontal']) }}
-    {{csrf_field()}}
+    <x-form :route="route('reports/custom')" class="form-horizontal">
 
     <!-- Horizontal Form -->
       <div class="box box-default">
@@ -513,7 +512,7 @@
           </button>
         </div>
       </div> <!--/.box.box-default-->
-    {{ Form::close() }}
+    </x-form>
   </div>
 </div>
 
diff --git a/resources/views/reports/unaccepted_assets.blade.php b/resources/views/reports/unaccepted_assets.blade.php
index 80d151fd422f..139f01473df7 100644
--- a/resources/views/reports/unaccepted_assets.blade.php
+++ b/resources/views/reports/unaccepted_assets.blade.php
@@ -19,10 +19,9 @@
             @endif
         </div>
         <div class="btn-group mr-2" role="group">
-            {{ Form::open(['method' => 'post', 'class' => 'form-horizontal']) }}
-            {{csrf_field()}}
+            <x-form :route="route('reports/unaccepted_assets')" class="form-horizontal">
             <button type="submit" class="btn btn-default"><i class="fa fa-download icon-white" aria-hidden="true"></i> {{ trans('general.download_all') }}</button>
-            {{ Form::close() }}
+            </x-form>
         </div>
     </div>
 @stop

From eaa6659c34a70ca44e0b916fde9b9b34bd85d6bf Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 19 Dec 2024 15:03:42 -0800
Subject: [PATCH 07/13] Convert additional forms

---
 resources/views/settings/asset_tags.blade.php | 11 +++++++----
 resources/views/settings/backups.blade.php    | 17 ++++++++---------
 resources/views/settings/branding.blade.php   | 14 ++++++++++----
 resources/views/settings/google.blade.php     | 11 +++++++----
 4 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/resources/views/settings/asset_tags.blade.php b/resources/views/settings/asset_tags.blade.php
index 020d97a7561a..df704cfe1371 100644
--- a/resources/views/settings/asset_tags.blade.php
+++ b/resources/views/settings/asset_tags.blade.php
@@ -21,9 +21,12 @@
     </style>
 
 
-    {{ Form::open(['method' => 'POST', 'files' => false, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form' ]) }}
-    <!-- CSRF Token -->
-    {{csrf_field()}}
+    <x-form
+        :route="route('settings.asset_tags.save')"
+        autocomplete="off"
+        class="form-horizontal"
+        role="form"
+    >
 
     <div class="row">
         <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2">
@@ -106,6 +109,6 @@
         </div> <!-- /.col-md-8-->
     </div> <!-- /.row-->
 
-    {{Form::close()}}
+    </x-form>
 
 @stop
diff --git a/resources/views/settings/backups.blade.php b/resources/views/settings/backups.blade.php
index 6313a6e404ee..3648311b74f8 100644
--- a/resources/views/settings/backups.blade.php
+++ b/resources/views/settings/backups.blade.php
@@ -158,13 +158,12 @@ class="btn btn-warning btn-sm restore-backup {{ (config('app.lock_passwords')) ?
         @if (config('app.lock_passwords')===true)
         <p class="alert alert-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
           @else
-              
-      {{ Form::open([
-        'method' => 'POST',
-        'route' => 'settings.backups.upload',
-        'files' => true,
-        'class' => 'form-horizontal' ]) }}
-        @csrf
+
+        <x-form
+            :route="route('settings.backups.upload')"
+            files
+            class="form-horizontal"
+        >
 
         
       <div class="form-group {{ $errors->has((isset($fieldname) ? $fieldname : 'file')) ? 'has-error' : '' }}" style="margin-bottom: 0px;">
@@ -193,8 +192,8 @@ class="btn btn-warning btn-sm restore-backup {{ (config('app.lock_passwords')) ?
         </div>  
             
     </div>
-    
-    {{ Form::close() }}
+
+    </x-form>
     @endif  
       </div>
     </div>
diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php
index c586917ef534..eeabe42888f4 100644
--- a/resources/views/settings/branding.blade.php
+++ b/resources/views/settings/branding.blade.php
@@ -21,9 +21,15 @@
     </style>
 
 
-    {{ Form::open(['method' => 'POST', 'files' => true, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form', 'id' => 'create-form' ]) }}
-    <!-- CSRF Token -->
-    {{csrf_field()}}
+
+    <x-form
+        :route="route('settings.branding.save')"
+        files
+        autocomplete="off"
+        class="form-horizontal"
+        role="form"
+        id="create-form"
+    >
 
     <div class="row">
         <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2">
@@ -319,7 +325,7 @@
         </div> <!-- /.col-md-8-->
     </div> <!-- /.row-->
 
-    {{Form::close()}}
+    </x-form>
 
 @stop
 
diff --git a/resources/views/settings/google.blade.php b/resources/views/settings/google.blade.php
index 83e88b936f13..f19d3eef485f 100644
--- a/resources/views/settings/google.blade.php
+++ b/resources/views/settings/google.blade.php
@@ -16,9 +16,12 @@
 
 
 
-    {{ Form::open(['method' => 'POST', 'files' => false, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form' ]) }}
-    <!-- CSRF Token -->
-    {{csrf_field()}}
+    <x-form
+        :route="route('settings.google.save')"
+        autocomplete="off"
+        class="form-horizontal"
+        role="form"
+    >
 
     <div class="row">
         <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2">
@@ -113,6 +116,6 @@
         </div> <!-- /.col-md-8-->
     </div> <!-- /.row-->
 
-    {{Form::close()}}
+    </x-form>
 
 @stop

From ff85f003fcd2f9711338a2ffaae73e38da2dca07 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 19 Dec 2024 15:17:07 -0800
Subject: [PATCH 08/13] Convert additional forms

---
 resources/views/settings/localization.blade.php | 11 +++++++----
 resources/views/settings/purge-form.blade.php   | 11 +++++++----
 resources/views/settings/saml.blade.php         | 12 ++++++++----
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/resources/views/settings/localization.blade.php b/resources/views/settings/localization.blade.php
index d8f3e436e30e..da7dd8be531e 100644
--- a/resources/views/settings/localization.blade.php
+++ b/resources/views/settings/localization.blade.php
@@ -21,9 +21,12 @@
     </style>
 
 
-    {{ Form::open(['method' => 'POST', 'files' => false, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form' ]) }}
-    <!-- CSRF Token -->
-    {{csrf_field()}}
+    <x-form
+        :route="route('settings.localization.save')"
+        autocomplete="off"
+        class="form-horizontal"
+        role="form"
+    >
 
     <div class="row">
         <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2">
@@ -113,7 +116,7 @@
         </div> <!-- /.col-md-8-->
     </div> <!-- /.row-->
 
-    {{Form::close()}}
+    </x-form>
 
 @stop
 
diff --git a/resources/views/settings/purge-form.blade.php b/resources/views/settings/purge-form.blade.php
index 86ad28fc5068..f2df65fb77a6 100644
--- a/resources/views/settings/purge-form.blade.php
+++ b/resources/views/settings/purge-form.blade.php
@@ -22,9 +22,12 @@
                         <x-icon type="warning"/>
                         {{ trans('admin/settings/general.purge') }}</h2>
                 </div>
-            {{ Form::open(['method' => 'POST', 'files' => false, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form' ]) }}
-            <!-- CSRF Token -->
-                {{csrf_field()}}
+            <x-form
+                :route="route('settings.purge.save')"
+                autocomplete="off"
+                class="form-horizontal"
+                role="form"
+            >
                 <div class="box-body">
                     <p>{{ trans('admin/settings/general.confirm_purge_help') }}</p>
                     <div class="col-md-3{{ $errors->has('confirm_purge') ? 'error' : '' }}">
@@ -50,6 +53,6 @@
         </div><!-- /.col-md-8-->
     </div><!--/.row-->
 
-    {{Form::close()}}
+    </x-form>
 
 @stop
diff --git a/resources/views/settings/saml.blade.php b/resources/views/settings/saml.blade.php
index 9349023fc814..f770d37fae1b 100644
--- a/resources/views/settings/saml.blade.php
+++ b/resources/views/settings/saml.blade.php
@@ -21,9 +21,13 @@
     </style>
 
 
-    {{ Form::open(['method' => 'POST', 'files' => false, 'autocomplete' => 'false', 'class' => 'form-horizontal', 'role' => 'form']) }}
-    <!-- CSRF Token -->
-    {{csrf_field()}}
+
+    <x-form
+        :route="route('settings.saml.save')"
+        autocomplete="off"
+        class="form-horizontal"
+        role="form"
+    >
 
     <!-- this is a hack to prevent Chrome from trying to autocomplete fields -->
     <input type="text" name="prevent_autofill" id="prevent_autofill" value="" style="display:none;" />
@@ -187,7 +191,7 @@
         </div> <!-- /.col-md-8-->
     </div> <!-- /.row-->
 
-    {{Form::close()}}
+    </x-form>
 
 
 @stop

From b0dc5a68affac73131b137b3946982bcc7e081fd Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 19 Dec 2024 15:32:54 -0800
Subject: [PATCH 09/13] Convert additional forms

---
 resources/views/custom_fields/index.blade.php |  8 ++++++--
 resources/views/settings/labels.blade.php     | 12 ++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/resources/views/custom_fields/index.blade.php b/resources/views/custom_fields/index.blade.php
index 5b4947a09b80..edb4a6f920a5 100644
--- a/resources/views/custom_fields/index.blade.php
+++ b/resources/views/custom_fields/index.blade.php
@@ -197,7 +197,11 @@ class="table table-striped snipe-table"
               </td>
               <td>
                 <nobr>
-                  {{ Form::open(array('route' => array('fields.destroy', $field->id), 'method' => 'delete', 'style' => 'display:inline-block')) }}
+                  <x-form
+                    :route="route('fields.destroy', $field->id)"
+                    method="delete"
+                    style="display:inline-block"
+                  >
                   @can('update', $field)
                     <a href="{{ route('fields.edit', $field->id) }}" class="btn btn-warning btn-sm" data-tooltip="true" title="{{ trans('general.update') }}">
                       <i class="fas fa-pencil-alt" aria-hidden="true"></i>
@@ -219,7 +223,7 @@ class="table table-striped snipe-table"
                   @endif
 
                 @endcan
-                  {{ Form::close() }}
+                  </x-form>
                 </nobr>
               </td>
             </tr>
diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php
index 46212b790daf..f9c1a217ae30 100644
--- a/resources/views/settings/labels.blade.php
+++ b/resources/views/settings/labels.blade.php
@@ -20,9 +20,13 @@
         }
     </style>
 
-    {{ Form::open(['id' => 'settingsForm', 'method' => 'POST', 'files' => false, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form' ]) }}
-    <!-- CSRF Token -->
-    {{csrf_field()}}
+    <x-form
+        :route="route('settings.labels.save')"
+        id="settingsForm"
+        autocomplete="off"
+        class="form-horizontal"
+        role="form"
+    >
 
     <div class="row">
         <div class="col-sm-10 col-sm-offset-1 col-md-10">
@@ -509,7 +513,7 @@ class="table table-striped snipe-table"
         </div> <!-- /.col-md-8-->
     </div> <!-- /.row-->
 
-    {{Form::close()}}
+    </x-form>
 
 @stop
 

From d1a369072befb55ccbe6c4fd00f6e68d88936a6c Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 19 Dec 2024 15:43:57 -0800
Subject: [PATCH 10/13] Convert additional forms

---
 .../views/partials/asset-bulk-actions.blade.php     | 13 ++++++-------
 .../views/partials/locations-bulk-actions.blade.php | 12 ++++++------
 .../views/partials/models-bulk-actions.blade.php    | 12 ++++++------
 .../views/partials/users-bulk-actions.blade.php     | 12 ++++++------
 4 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/resources/views/partials/asset-bulk-actions.blade.php b/resources/views/partials/asset-bulk-actions.blade.php
index 992fb52bba10..ae1155131c42 100644
--- a/resources/views/partials/asset-bulk-actions.blade.php
+++ b/resources/views/partials/asset-bulk-actions.blade.php
@@ -1,10 +1,9 @@
 <div id="{{ (isset($id_divname)) ? $id_divname : 'assetsBulkEditToolbar' }}" style="min-width:400px">
-{{ Form::open([
-      'method' => 'POST',
-      'route' => ['hardware/bulkedit'],
-      'class' => 'form-inline',
-      'id' => (isset($id_formname)) ? $id_formname : 'assetsBulkForm',
- ]) }}
+<x-form
+    :route="route('hardware/bulkedit')"
+    class="form-inline"
+    :id="(isset($id_formname)) ? $id_formname : 'assetsBulkForm'"
+>
 
     {{-- The sort and order will only be used if the cookie is actually empty (like on first-use) --}}
     <input name="sort" type="hidden" value="assets.id">
@@ -34,5 +33,5 @@
     </select>
 
     <button class="btn btn-primary" id="{{ (isset($id_button)) ? $id_button : 'bulkAssetEditButton' }}" disabled>{{ trans('button.go') }}</button>
-    {{ Form::close() }}
+    </x-form>
 </div>
diff --git a/resources/views/partials/locations-bulk-actions.blade.php b/resources/views/partials/locations-bulk-actions.blade.php
index 228a68dfbab6..8cc9bf9a4c74 100644
--- a/resources/views/partials/locations-bulk-actions.blade.php
+++ b/resources/views/partials/locations-bulk-actions.blade.php
@@ -1,10 +1,10 @@
 @can('delete', \App\Models\Location::class)
     <div id="locationsBulkEditToolbar">
-    {{ Form::open([
-              'method' => 'POST',
-              'route' => ['locations.bulkdelete.show'],
-              'class' => 'form-inline',
-              'id' => 'locationsBulkForm']) }}
+    <x-form
+        :route="route('locations.bulkdelete.show')"
+        class="form-inline"
+        id="locationsBulkForm"
+    >
 
             <div id="locations-toolbar">
                 <label for="bulk_actions" class="sr-only">{{ trans('general.bulk_actions') }}</label>
@@ -14,7 +14,7 @@
                 <button class="btn btn-primary" id="bulkLocationsEditButton" disabled>{{ trans('button.go') }}</button>
             </div>
 
-    {{ Form::close() }}
+    </x-form>
     </div>
 @endcan
 
diff --git a/resources/views/partials/models-bulk-actions.blade.php b/resources/views/partials/models-bulk-actions.blade.php
index 8fca921ae1b7..340fa1fd6b92 100644
--- a/resources/views/partials/models-bulk-actions.blade.php
+++ b/resources/views/partials/models-bulk-actions.blade.php
@@ -1,9 +1,9 @@
 <div id="modelsBulkEditToolbar">
-    {{ Form::open([
-              'method' => 'POST',
-              'route' => ['models.bulkedit.index'],
-              'class' => 'form-inline',
-              'id' => 'modelsBulkForm']) }}
+    <x-form
+        :route="route('models.bulkedit.index')"
+        class="form-inline"
+        id="modelsBulkForm"
+    >
 
     @if (request('status')!='deleted')
         @can('delete', \App\Models\AssetModel::class)
@@ -17,7 +17,7 @@
             </div>
         @endcan
     @endif
-    {{ Form::close() }}
+    </x-form>
 </div>
 
 
diff --git a/resources/views/partials/users-bulk-actions.blade.php b/resources/views/partials/users-bulk-actions.blade.php
index 2d371157dbd6..821c212d995d 100644
--- a/resources/views/partials/users-bulk-actions.blade.php
+++ b/resources/views/partials/users-bulk-actions.blade.php
@@ -3,11 +3,11 @@
 
         @if (request('status')!='deleted')
 
-            {{ Form::open([
-              'method' => 'POST',
-              'route' => ['users/bulkedit'],
-              'class' => 'form-inline',
-              'id' => 'usersBulkForm']) }}
+            <x-form
+                :route="route('users/bulkedit')"
+                class="form-inline"
+                id="usersBulkForm"
+            >
 
 
             <div id="users-toolbar" style="width:100% !important;">
@@ -28,7 +28,7 @@
                 </select>
                 <button class="btn btn-primary" id="bulkUserEditButton" disabled>{{ trans('button.go') }}</button>
             </div>
-            {{ Form::close() }}
+            </x-form>
         @endif
 
     </div>

From 1017d85e455e12f49522af5753cf17d88c29f494 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 19 Dec 2024 15:46:02 -0800
Subject: [PATCH 11/13] Remove stray form::open in label settings

---
 resources/views/settings/labels.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php
index f9c1a217ae30..5b64fa970e5e 100644
--- a/resources/views/settings/labels.blade.php
+++ b/resources/views/settings/labels.blade.php
@@ -342,7 +342,7 @@ class="table table-striped snipe-table"
                     </style>
 
 
-                    {{ Form::open(['method' => 'POST', 'files' => false, 'autocomplete' => 'off', 'class' => 'form-horizontal', 'role' => 'form' ]) }}
+
                     <!-- CSRF Token -->
                     {{csrf_field()}}
 

From f3433c58b596e559803b360fee09a40ff47eefef Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 19 Dec 2024 15:57:51 -0800
Subject: [PATCH 12/13] Remove or replace Form::close() tags

---
 resources/views/models/index.blade.php        | 1 -
 resources/views/models/view.blade.php         | 1 -
 resources/views/settings/alerts.blade.php     | 2 +-
 resources/views/settings/general.blade.php    | 2 +-
 resources/views/settings/ldap.blade.php       | 2 +-
 resources/views/settings/purge-form.blade.php | 3 +--
 resources/views/settings/security.blade.php   | 2 +-
 resources/views/statuslabels/view.blade.php   | 1 -
 resources/views/users/index.blade.php         | 3 +--
 9 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/resources/views/models/index.blade.php b/resources/views/models/index.blade.php
index eff6a5dfe5cf..27f24aa3c0ad 100755
--- a/resources/views/models/index.blade.php
+++ b/resources/views/models/index.blade.php
@@ -65,7 +65,6 @@ class="table table-striped snipe-table"
           </div>
         </div>
         </div>
-        {{ Form::close() }}
       </div><!-- /.box-body -->
     </div><!-- /.box -->
   </div>
diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php
index f26b9babd4b1..3d53745513af 100755
--- a/resources/views/models/view.blade.php
+++ b/resources/views/models/view.blade.php
@@ -98,7 +98,6 @@ class="table table-striped snipe-table"
                 "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                 }'>
                     </table>
-                    {{ Form::close() }}
                 </div> <!-- /.tab-pane assets -->
 
 
diff --git a/resources/views/settings/alerts.blade.php b/resources/views/settings/alerts.blade.php
index ddca5c8158f4..cdb22e7abfe1 100644
--- a/resources/views/settings/alerts.blade.php
+++ b/resources/views/settings/alerts.blade.php
@@ -176,7 +176,7 @@
         </div> <!-- /.col-md-8-->
     </div> <!-- /.row-->
 
-    {{Form::close()}}
+    </form>
 
 @stop
 
diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php
index 1de5d4035d85..82f8e2c1baba 100644
--- a/resources/views/settings/general.blade.php
+++ b/resources/views/settings/general.blade.php
@@ -422,7 +422,7 @@
     </div> <!-- /.col-md-8-->
 
 
-    {{ Form::close() }}
+    </form>
 
 @stop
 
diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php
index 5b483f48a2ea..999d8fa49ff5 100644
--- a/resources/views/settings/ldap.blade.php
+++ b/resources/views/settings/ldap.blade.php
@@ -829,7 +829,7 @@
         </div> <!-- /.col-md-8-->
     </div> <!-- /.row-->
 
-    {{Form::close()}}
+    </form>
 
 
 @endsection
diff --git a/resources/views/settings/purge-form.blade.php b/resources/views/settings/purge-form.blade.php
index f2df65fb77a6..7ba65b91199d 100644
--- a/resources/views/settings/purge-form.blade.php
+++ b/resources/views/settings/purge-form.blade.php
@@ -48,11 +48,10 @@ class="form-horizontal"
                 <div class="box-footer text-right">
                     <button type="submit" class="btn btn-danger" {{ (config('app.lock_passwords')===true) ? ' disabled' : '' }}>{{ trans('admin/settings/general.purge') }}</button>
                 </div> <!--/box-footer-->
-                {{ Form::close() }}
+            </x-form>
             </div> <!--/.box-solid-->
         </div><!-- /.col-md-8-->
     </div><!--/.row-->
 
-    </x-form>
 
 @stop
diff --git a/resources/views/settings/security.blade.php b/resources/views/settings/security.blade.php
index a51c86fccbd5..f254be88b4a1 100644
--- a/resources/views/settings/security.blade.php
+++ b/resources/views/settings/security.blade.php
@@ -190,6 +190,6 @@
         </div> <!-- /.col-md-8-->
     </div> <!-- /.row-->
 
-    {{Form::close()}}
+    </form>
 
 @stop
diff --git a/resources/views/statuslabels/view.blade.php b/resources/views/statuslabels/view.blade.php
index a15fc8edd183..a86fa8234ed6 100644
--- a/resources/views/statuslabels/view.blade.php
+++ b/resources/views/statuslabels/view.blade.php
@@ -40,7 +40,6 @@ class="table table-striped snipe-table"
                                 </table>
                         </div><!-- /.col -->
                     </div><!-- /.row -->
-                    {{ Form::close() }}
                 </div><!-- ./box-body -->
             </div><!-- /.box -->
         </div>
diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index 28cbc30f70a6..a26a8d0882f4 100755
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -68,7 +68,6 @@ class="table table-striped snipe-table"
                     </table>
 
 
-                    {{ Form::close() }}
                 </div><!-- /.box-body -->
             </div><!-- /.box -->
         </div>
@@ -82,4 +81,4 @@ class="table table-striped snipe-table"
 @include ('partials.bootstrap-table')
 
 
-@stop
\ No newline at end of file
+@stop

From 3dfe3ab1302d32b65f5179a71a3ccd8395306af3 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 14 Jan 2025 15:12:17 -0800
Subject: [PATCH 13/13] Update form tag

---
 resources/views/reports/custom.blade.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php
index 3ab43ed6b3b5..48a9254639da 100644
--- a/resources/views/reports/custom.blade.php
+++ b/resources/views/reports/custom.blade.php
@@ -35,13 +35,11 @@
 <div class="row">
     <div class="col-md-8 col-md-offset-1">
 
-        {{ Form::open([
-            'method' => 'post',
-            'class' => 'form-horizontal',
-            'id' => 'custom-report-form',
-            'url' => request()->routeIs('report-templates.edit') ? route('report-templates.update', $template) : '/reports/custom',
-        ]) }}
-        {{csrf_field()}}
+        <x-form
+            :route="request()->routeIs('report-templates.edit') ? route('report-templates.update', $template) : '/reports/custom'"
+            class="form-horizontal"
+            id="custom-report-form"
+        >
 
     <!-- Horizontal Form -->
         <div class="box box-default">
@@ -610,7 +608,7 @@ class="btn btn-sm btn-danger delete-asset"
                 @endif
             </div>
         </div> <!--/.box.box-default-->
-    {{ Form::close() }}
+        </x-form>
     </div>
 
     <!-- Saved Reports right column -->