Replace form components

app/View/Components/Forms/Inputs/Input.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\View\Components\Forms\Inputs;
+
+use BladeUIKit\Components\Forms\Inputs\Input as OriginalInput;
+
+class Input extends OriginalInput
+{
+    public function __construct(string $name, string $id = null, string $type = 'text', ?string $value = '')
+    {
+        $this->name = $name;
+        $this->id = $id ?? $name;
+        $this->type = $type;
+
+        $this->value = old($name, $value ?? '');
+    }
+}

app/View/Components/Forms/Label.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\View\Components\Forms;
+
+use Closure;
+use Illuminate\Support\Str;
+use Illuminate\View\Component;
+use Illuminate\Contracts\View\View;
+
+class Label extends Component
+{
+    public function __construct(public string $for, public ?string $label = null)
+    {
+        //
+    }
+
+    /**
+     * Get the view / contents that represent the component.
+     */
+    public function render(): View
+    {
+        return view('components.forms.label', [
+            'for' => $this->for,
+            'fallback' => $this->fallback(),
+        ]);
+    }
+
+    public function fallback(): string
+    {
+        return Str::ucfirst(str_replace('_', ' ', $this->for));
+    }
+}

composer.json

@@ -23,7 +23,6 @@
         "livewire/livewire": "^2.12.8",
         "maatwebsite/excel": "^3.1",
         "predis/predis": "^2.0",
-        "protonemedia/laravel-form-components": "^3.8",
         "sentry/sentry-laravel": "^3.2",
         "spatie/laravel-activitylog": "^4.7",
         "spatie/laravel-ignition": "^2.0",
@@ -97,4 +96,4 @@
     },
     "minimum-stability": "stable",
     "prefer-stable": true
-}
+}

config/blade-ui-kit.php

@@ -1,6 +1,5 @@
 <?php
 
-use App\View\Components\FlatPickr;
 use BladeUIKit\Components;
 
 return [
@@ -17,30 +16,30 @@
     */
 
     'components' => [
-        // 'alert' => Components\Alerts\Alert::class,
+        'alert' => Components\Alerts\Alert::class,
         // 'avatar' => Components\Support\Avatar::class,
         // 'carbon' => Components\DateTime\Carbon::class,
-        // 'checkbox' => Components\Forms\Inputs\Checkbox::class,
+        'checkbox' => Components\Forms\Inputs\Checkbox::class,
         // 'color-picker' => Components\Forms\Inputs\ColorPicker::class,
         // 'countdown' => Components\DateTime\Countdown::class,
         // 'cron' => Components\Support\Cron::class,
         // 'dropdown' => Components\Navigation\Dropdown::class,
         // 'easy-mde' => Components\Editors\EasyMDE::class,
         // 'email' => Components\Forms\Inputs\Email::class,
-        // 'error' => Components\Forms\Error::class,
-        'flat-pickr' => FlatPickr::class,
-        // 'form' => Components\Forms\Form::class,
-        // 'form-button' => Components\Buttons\FormButton::class,
-        // 'html' => Components\Layouts\Html::class,
-        // 'input' => Components\Forms\Inputs\Input::class,
-        // 'label' => Components\Forms\Label::class,
-        // 'logout' => Components\Buttons\Logout::class,
+        'error' => Components\Forms\Error::class,
+        'flat-pickr' => App\View\Components\FlatPickr::class,
+        'form' => Components\Forms\Form::class,
+        'form-button' => Components\Buttons\FormButton::class,
+        'html' => Components\Layouts\Html::class,
+        'input' => App\View\Components\Forms\Inputs\Input::class,
+        'label' => Components\Forms\Label::class,
+        'logout' => Components\Buttons\Logout::class,
         // 'mapbox' => Components\Maps\Mapbox::class,
         // 'markdown' => Components\Markdown\Markdown::class,
         // 'password' => Components\Forms\Inputs\Password::class,
         // 'pikaday' => Components\Forms\Inputs\Pikaday::class,
         // 'social-meta' => Components\Layouts\SocialMeta::class,
-        // 'textarea' => Components\Forms\Inputs\Textarea::class,
+        'textarea' => Components\Forms\Inputs\Textarea::class,
         // 'toc' => Components\Markdown\ToC::class,
         // 'trix' => Components\Editors\Trix::class,
         // 'unsplash' => Components\Support\Unsplash::class,

resources/views/airport/admin/form.blade.php

@@ -8,25 +8,21 @@
                 <div class="card-header">{{ $airport->id ? __('Edit') : __('Add new') }} {{ __('Airport') }}</div>
 
                 <div class="card-body">
-                    <x-form
-                        :action="$airport->id ? route('admin.airports.update', $airport) : route('admin.airports.store')"
-                        :method="$airport->id ? 'PATCH' : 'POST'">
+                    <x-form :action="$airport->id ? route('admin.airports.update', $airport) : route('admin.airports.store')" :method="$airport->id ? 'PATCH' : 'POST'">
 
-                        @bind($airport)
-                        <x-form-input name="icao" :label="__('ICAO')" required maxlength="4" />
-                        <x-form-input name="iata" :label="__('IATA')" required maxlength="3" />
-                        <x-form-input name="name" :label="__('Name')" required />
-                        <x-form-input name="latitude" :label="__('Latitude')" />
-                        <x-form-input name="longitude" :label="__('Longitude')" />
+                        <x-forms.input name="icao" :label="__('ICAO')" :value="$airport->icao" required maxlength="4" />
+                        <x-forms.input name="iata" :label="__('IATA')" :value="$airport->iata" required maxlength="3" />
+                        <x-forms.input name="name" :label="__('Name')" :value="$airport->name" required />
+                        <x-forms.input name="latitude" :value="$airport->latitude" />
+                        <x-forms.input name="longitude" :label="__('Longitude')" :value="$airport->longitude" />
 
-                        <x-form-submit>
+                        <x-forms.button type="submit">
                             @if ($airport->id)
                                 <i class="fa fa-check"></i> {{ __('Edit') }}
                             @else
                                 <i class="fa fa-plus"></i> {{ __('Add') }}
                             @endif
-                        </x-form-submit>
-                        @endbind
+                        </x-forms.button>
                     </x-form>
                 </div>
             </div>

resources/views/airport/admin/overview.blade.php

@@ -70,7 +70,11 @@
                     </a>
                 </td>
                 <td>
-                    @if ($airport->flightsDep->isEmpty() && $airport->flightsArr->isEmpty() && $airport->eventDep->isEmpty() && $airport->eventArr->isEmpty())
+                    @if (
+                        $airport->flightsDep->isEmpty() &&
+                            $airport->flightsArr->isEmpty() &&
+                            $airport->eventDep->isEmpty() &&
+                            $airport->eventArr->isEmpty())
                         <form action="{{ route('admin.airports.destroy', $airport) }}" method="post">
                             @method('DELETE')
                             <button class="btn btn-danger delete-airport"><i class="fa fa-trash"></i> Remove Airport
@@ -87,6 +91,5 @@
         {{ $airports->links() }}
     </table>
     {{ $airports->links() }}
-    <x-form :action="route('admin.airports.destroyUnused')" id="delete-unused-airports" method="POST"
-        style="display: none;"></x-form>
+    <x-form :action="route('admin.airports.destroyUnused')" id="delete-unused-airports" method="POST" style="display: none;"></x-form>
 @endsection

resources/views/airport/admin/show.blade.php

@@ -8,15 +8,14 @@
                 <div class="card-header">{{ $airport->name }} [{{ $airport->icao }} | {{ $airport->iata }}]</div>
 
                 <div class="card-body">
-                    @foreach($airport->links as $link)
+                    @foreach ($airport->links as $link)
                         <div class="form-group row">
                             <label for="{{ $link->type->name . '-' . $loop->index }}"
-                                   class="col-md-4 col-form-label text-md-right">{{ $link->name ?? $link->type->name }}</label>
+                                class="col-md-4 col-form-label text-md-right">{{ $link->name ?? $link->type->name }}</label>
 
                             <div class="col-md-6">
-                                <div class="form-control-plaintext"><a
-                                        href="{{ $link->url }}"
-                                        target="_blank">Link</a></div>
+                                <div class="form-control-plaintext"><a href="{{ $link->url }}" target="_blank">Link</a>
+                                </div>
                             </div>
                         </div>
                     @endforeach