Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update references to the Laravel Forms package to the new Forms package. #9

Merged
merged 1 commit into from
Jun 9, 2024
Merged

Update references to the Laravel Forms package to the new Forms package. #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/forms.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
],
],

'layout' => 'laravel-forms::layouts.app',
'layout' => 'forms::layouts.app',

'spam_redirects' => [
'yelp' => 'https://yelp.com',
Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/collapsible-text-area.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,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>
<x-laravel-forms::error :errorKey="$name" />
<x-forms::error :errorKey="$name" />
</div>
</div>
8 changes: 4 additions & 4 deletions resources/views/components/steps/step-one.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<form wire:submit.prevent="nextStep">
@csrf
<div class="grid grid-cols-1 gap-x-6 gap-y-4 grid-cols-2 py-6">
<x-laravel-forms::steps.title :title="$title" />
<x-forms::steps.title :title="$title" />

<input type="text" name="gotcha" style="display:none" />

<div class="col-span-2">
<div class="flex space-x-2 pt-4">
@foreach (config('forms.modal.steps.1.locations') as $location)
<div>
<x-laravel-forms::buttons.location-button :location="$location" />
<x-forms::buttons.location-button :location="$location" />
</div>
@endforeach
</div>
</div>

<div class="col-span-2">
<x-laravel-forms::error :errorKey="'location'" />
<x-forms::error :errorKey="'location'" />
</div>
</div>

<x-laravel-forms::divider />
<x-forms::divider />
</form>
20 changes: 10 additions & 10 deletions resources/views/components/steps/step-two.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<form wire:submit.prevent="nextStep">
@csrf
<div class="grid grid-cols-1 gap-x-6 gap-y-4 sm:grid-cols-2 pt-6 pb-4">
<x-laravel-forms::steps.title :title="$title" />
<x-forms::steps.title :title="$title" />

<input type="text" name="isSpam" style="display:none" />

<div class="sm:col-span-1">
<x-laravel-forms::text-input
<x-forms::text-input
label="First Name:"
type="text"
wire:model="firstName"
Expand All @@ -16,7 +16,7 @@
</div>

<div class="sm:col-span-1">
<x-laravel-forms::text-input
<x-forms::text-input
label="Last Name:"
type="text"
wire:model="lastName"
Expand All @@ -26,7 +26,7 @@
</div>

<div class="sm:col-span-2">
<x-laravel-forms::text-input
<x-forms::text-input
label="Email Address:"
type="email"
wire:model="email"
Expand All @@ -36,7 +36,7 @@
</div>

<div class="sm:col-span-1">
<x-laravel-forms::text-input
<x-forms::text-input
label="Phone:"
type="phone"
wire:model="phone"
Expand All @@ -46,7 +46,7 @@
</div>

<div class="sm:col-span-1">
<x-laravel-forms::text-input
<x-forms::text-input
label="Zip Code:"
type="zipCode"
wire:model="zipCode"
Expand All @@ -56,7 +56,7 @@
</div>

<div x-data="{ open: false }" class="sm:col-span-2">
<x-laravel-forms::collapsible-text-area
<x-forms::collapsible-text-area
toggleText="Add additional project info (optional)"
label="Message:"
id="message"
Expand All @@ -66,12 +66,12 @@
hint="Max 255 characters" />
</div>
<div class="sm:col-span-2">
<x-laravel-forms::error :errorKey="'form.submit.limit'" />
<x-forms::error :errorKey="'form.submit.limit'" />
</div>
</div>

<input type="text" name="gotcha" class="hidden" />
<x-laravel-forms::meta />
<x-forms::meta />

<x-laravel-forms::divider />
<x-forms::divider />
</form>
2 changes: 1 addition & 1 deletion resources/views/components/text-input.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,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"
/>
<x-laravel-forms::error :errorKey="$name" />
<x-forms::error :errorKey="$name" />
</div>
</div>
20 changes: 10 additions & 10 deletions resources/views/livewire/forms-modal.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,36 @@
</div>
<div wire:click="closeModal" class="absolute md:inset-0 p-4 flex justify-center items-center flex-col">
<div class="bg-white rounded-lg p-4 shadow-lg max-w-lg w-full border mx-auto" @click.stop>
<x-laravel-forms::modal.title :title="Forms::getModalTitle()" />
<x-forms::modal.title :title="Forms::getModalTitle()" />

@if($step === 1)
<x-laravel-forms::steps.step-one :title="Forms::getModalStepTitle($step)" />
<x-forms::steps.step-one :title="Forms::getModalStepTitle($step)" />
@elseif($step === 2)
<x-laravel-forms::steps.step-two :title="Forms::getModalStepTitle($step)" />
<x-forms::steps.step-two :title="Forms::getModalStepTitle($step)" />
@endif
<div class="flex justify-between">
@if($step > 1)
<div class="flex justify-start items-center text-center pr-2 lg:pr-20">
<x-laravel-forms::buttons.back-button :buttonText="'Back'" />
<x-forms::buttons.back-button :buttonText="'Back'" />
</div>
@endif
@if($step < $totalSteps)
<x-laravel-forms::buttons.next-button :buttonText="'Next'" />
<x-forms::buttons.next-button :buttonText="'Next'" />
@if($errors->has('form.submit.limit'))
<div class="sm:col-span-2">
<x-laravel-forms::error :errorKey="'form.submit.limit'" />
<x-forms::error :errorKey="'form.submit.limit'" />
</div>
@endif
@else
<div class="flex justify-start items-center text-center pr-2 lg:pr-20">
<x-laravel-forms::buttons.fake-button :buttonText="'Submit'" />
<x-laravel-forms::buttons.submit-button :buttonText="'Submit'" />
<x-forms::buttons.fake-button :buttonText="'Submit'" />
<x-forms::buttons.submit-button :buttonText="'Submit'" />
</div>
@endif
<x-laravel-forms::modal.optional-div />
<x-forms::modal.optional-div />
</div>
</div>
<x-laravel-forms::modal.tos />
<x-forms::modal.tos />
</div>
@endif
</div>
2 changes: 1 addition & 1 deletion src/FormsServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public function registeringPackage(): void
Route::get('/thank-you', function () {
$layoutsApp = Forms::getLayout();

return view('laravel-forms::components.thank-you', compact('layoutsApp'));
return view('forms::components.thank-you', compact('layoutsApp'));
})->name('thank-you');
});
}
Expand Down
2 changes: 1 addition & 1 deletion src/Livewire/FormsModal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,6 @@ public function closeModal()

public function render()
{
return view('laravel-forms::livewire.forms-modal');
return view('forms::livewire.forms-modal');
}
}
2 changes: 1 addition & 1 deletion tests/TestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public function getEnvironmentSetUp($app)
config()->set('database.default', 'testing');

/*
$migration = include __DIR__.'/../database/migrations/create_laravel-forms_table.php.stub';
$migration = include __DIR__.'/../database/migrations/create_forms_table.php.stub';
$migration->up();
*/
}
Expand Down
Loading