Renamed several files and directories to improve code organization and consistency.

Author: thejmitchener

resources/views/components/modal/buttons/back-button.blade.php resources/views/components/buttons/back-button.blade.php

@@ -1,9 +1,9 @@
-<div class="mt-2">
+<div>
     <a href="#" @click="open = !open"
        class="text-blue-500 hover:text-blue-700 cursor-pointer hover:underline">
         {{ $toggleText }}
     </a>
-    <div class="flex flex-col pt-2"
+    <div class="flex flex-col py-2"
          x-show="open"
          x-transition:enter="transition ease-out duration-300"
          x-transition:enter-start="opacity-0 scale-95"
@@ -24,6 +24,6 @@ class="text-blue-500 hover:text-blue-700 cursor-pointer hover:underline">
             class="mt-2 block w-full rounded-md border-0 px-3.5 py-2 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-gray-600 sm:sm:leading-6">
             {{ old($name) }}
         </textarea>
-        @include('laravel-form::components.modal.form.error', ['errorKey' => 'message'])
+       <x-laravel-form::error :errorKey="$name" />
     </div>
 </div>

resources/views/components/modal/buttons/fake-button.blade.php resources/views/components/buttons/fake-button.blade.php

@@ -16,10 +16,10 @@ class="fixed inset-0 bg-white bg-opacity-75 flex justify-center items-center fle
                 <div class="bg-white rounded-lg p-4 shadow-lg max-w-lg w-full border" @click.stop>
                     <x-laravel-form::modal.title :title="'Your Project Info'" />
                     @if(isset($step) && $step === 1)
-                        <x-laravel-form::modal.steps.step-one :title="'Where do you need painting?'" />
+                        <x-laravel-form::steps.step-one :title="'Where do you need painting?'" />
                     @endif
                     @if(isset($step) && $step === 2)
-                        <x-laravel-form::modal.steps.step-two />
+                        <x-laravel-form::steps.step-two />
                     @endisset
                 </div>
 

resources/views/components/modal/buttons/location-button.blade.php resources/views/components/buttons/location-button.blade.php

@@ -0,0 +1,37 @@
+<form method="POST" action="{{ route('form.handle.step') }}">
+    @csrf
+    <div class="grid grid-cols-1 gap-x-6 gap-y-4 sm:grid-cols-2 py-6">
+        @isset($title)
+            <div class="col-span-2">
+                <h3 class="my-1 text-gray-900 lg:text-2xl font-extrabold">{{ $title }}</h3>
+            </div>
+        @endisset
+
+        <input type="text" name="gotcha" style="display:none"/>
+
+        <div class="sm:col-span-1">
+            <div class="flex space-x-2 pt-4">
+                <div>
+                    <x-laravel-form::buttons.location-button :location="'inside'" />
+                </div>
+                <div>
+                    <x-laravel-form::buttons.location-button :location="'outside'" />
+                </div>
+                <div>
+                    <x-laravel-form::buttons.location-button :location="'cabinets'" />
+                </div>
+            </div>
+        </div>
+
+        <div class="sm:col-span-2">
+            <x-laravel-form::error :errorKey="'location'" />
+        </div>
+    </div>
+
+    <x-laravel-form::divider />
+
+    <div class="flex justify-between items-center text-center">
+        <x-laravel-form::buttons.submit-button :buttonText="'Next'" />
+        <x-laravel-form::modal.optional-div />
+    </div>
+</form>

resources/views/components/modal/buttons/submit-button.blade.php resources/views/components/buttons/submit-button.blade.php

@@ -1,6 +1,6 @@
 <form method="POST" action="{{ route('form.handle.step') }}">
     @csrf
-    <div class="grid grid-cols-1 gap-x-6 gap-y-4 sm:grid-cols-2 pt-6">
+    <div class="grid grid-cols-1 gap-x-6 gap-y-4 sm:grid-cols-2 pt-6 pb-4">
         @isset($title))
             <div class="col-span-2">
                 <h3 class="my-1 text-gray-900 lg:text-2xl font-extrabold">{{ $title }}</h3>
@@ -9,7 +9,7 @@
         <input type="text" name="isSpam" style="display:none"/>
 
         <div class="sm:col-span-1">
-            @include('laravel-form::components.modal.form.text-input', [
+            @include('laravel-form::components.text-input', [
                 'label' => 'First Name:',
                 'type' => 'text',
                 'name' => 'firstName',
@@ -19,7 +19,7 @@
         </div>
 
         <div class="sm:col-span-1">
-            @include('laravel-form::components.modal.form.text-input', [
+            @include('laravel-form::components.text-input', [
                 'label' => 'Last Name:',
                 'type' => 'text',
                 'name' => 'lastName',
@@ -29,7 +29,7 @@
         </div>
 
         <div class="sm:col-span-2">
-            @include('laravel-form::components.modal.form.text-input', [
+            @include('laravel-form::components.text-input', [
                 'label' => 'Email Address:',
                 'type' => 'email',
                 'name' => 'email',
@@ -39,7 +39,7 @@
         </div>
 
         <div class="sm:col-span-1">
-            @include('laravel-form::components.modal.form.text-input', [
+            @include('laravel-form::components.text-input', [
                 'label' => 'Phone:',
                 'type' => 'phone',
                 'name' => 'phone',
@@ -49,7 +49,7 @@
         </div>
 
         <div class="sm:col-span-1">
-            @include('laravel-form::components.modal.form.text-input', [
+            @include('laravel-form::components.text-input', [
                 'label' => 'Zip Code:',
                 'type' => 'zipCode',
                 'name' => 'zipCode',
@@ -59,7 +59,7 @@
         </div>
 
         <div x-data="{ open: false }" class="sm:col-span-2">
-            @include('laravel-form::components.modal.form.collapsible-text-area', [
+            @include('laravel-form::components.collapsible-text-area', [
                 'toggleText' => 'Add additional project info (optional)',
                 'label' => 'Message:',
                 'id' => 'message',
@@ -68,22 +68,22 @@
                 'hint' => 'Max 255 characters'
             ])
         </div>
-        <div class="sm:col-span-2 pb-6">
-            <x-laravel-form::modal.form.error :errorKey="'form.submit.limit'" />
+        <div class="sm:col-span-2">
+            {{--<x-laravel-form::components.error :errorKey="'form.submit.limit'" />--}}
         </div>
     </div>
 
     <input type="text" name="gotcha" style="display:none"/>
     <x-laravel-form::meta />
     <input type="hidden" name="form_key" value="{{ LaravelForm::getModalFormKey() }}">
 
-    @include('laravel-form::components.modal.form.divider')
+    <x-laravel-form::divider />
 
     <div class="flex justify-between items-center w-full">
         <div class="flex space-x-4 pr-4 md:pr-0">
-            <x-laravel-form::modal.buttons.fake-button :buttonText="'Submit'" />
-            <x-laravel-form::modal.buttons.back-button :buttonText="'Back'" />
-            <x-laravel-form::modal.buttons.submit-button :buttonText="'Submit'" />
+            <x-laravel-form::buttons.fake-button :buttonText="'Submit'" />
+            <x-laravel-form::buttons.back-button :buttonText="'Back'" />
+            <x-laravel-form::buttons.submit-button :buttonText="'Submit'" />
         </div>
 
         <x-laravel-form::modal.optional-div />

resources/views/components/modal/form/collapsible-text-area.blade.php resources/views/components/collapsible-text-area.blade.php

@@ -11,6 +11,6 @@
             value="{{ old($name) }}"
             class="block w-full rounded-md border-0 px-3.5 py-2 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-gray-600 sm:sm:leading-6"
         />
-        @include('laravel-form::components.modal.form.error', ['errorKey' => $name])
+        <x-laravel-form::error :errorKey="$name" />
     </div>
 </div>

resources/views/components/modal/form/divider.blade.php resources/views/components/divider.blade.php

@@ -42,7 +42,7 @@ public function registeringPackage(): void
         });
 
         Route::get('/thank-you', function () {
-            return view('laravel-form::thank-you');
+            return view('laravel-form::components.thank-you');
         })->name('thank-you');
     }
 }

resources/views/components/modal/form/error.blade.php resources/views/components/error.blade.php

@@ -15,7 +15,6 @@ public function formSubmitLimitExceeded(Request $request): bool
     {
         if (App::environment('production') && ! config('app.debug')) {
             $lastSubmit = session('last_form_submit');
-            $request->session()->put('form_step', 2);
 
             return $lastSubmit && now()->diffInMinutes(Carbon::parse($lastSubmit)) < 60;
         }