From a10cdad21359d738c4a9c4734e8550d5df9b9044 Mon Sep 17 00:00:00 2001
From: Dave Roverts <me@daveroverts.nl>
Date: Tue, 22 Oct 2024 21:03:30 +0200
Subject: [PATCH 01/21] fix: change logout to a post route

---
 config/blade-ui-kit.php                  |  2 +-
 resources/views/layouts/navbar.blade.php | 19 ++++++++-----------
 routes/web.php                           |  2 +-
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/config/blade-ui-kit.php b/config/blade-ui-kit.php
index b2f28516..b540bba3 100644
--- a/config/blade-ui-kit.php
+++ b/config/blade-ui-kit.php
@@ -34,7 +34,7 @@
         // 'html' => Components\Layouts\Html::class,
         // 'input' => Components\Forms\Inputs\Input::class,
         // 'label' => Components\Forms\Label::class,
-        // 'logout' => Components\Buttons\Logout::class,
+        'logout' => Components\Buttons\Logout::class,
         // 'mapbox' => Components\Maps\Mapbox::class,
         // 'markdown' => Components\Markdown\Markdown::class,
         // 'password' => Components\Forms\Inputs\Password::class,
diff --git a/resources/views/layouts/navbar.blade.php b/resources/views/layouts/navbar.blade.php
index 4714b522..20eb389a 100644
--- a/resources/views/layouts/navbar.blade.php
+++ b/resources/views/layouts/navbar.blade.php
@@ -18,8 +18,8 @@
             <ul class="navbar-nav mr-auto">
 
                 <li class="nav-item dropdown">
-                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown"
-                        aria-haspopup="true" aria-expanded="false">
+                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button"
+                        data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                         {{ __('Events') }}
                     </a>
                     <div class="dropdown-menu" aria-labelledby="navbarDropdown">
@@ -32,8 +32,7 @@
                                     href="{{ route('bookings.event.index', $event) }}">{{ $event->name }}
                                     – {{ $event->startEvent->toFormattedDateString() }}</a>
                                 @auth
-                                    @foreach ($bookings = auth()->user()->bookings->where('event_id', $event->id)
-        as $booking)
+                                    @foreach ($bookings = auth()->user()->bookings->where('event_id', $event->id) as $booking)
                                         <a class="dropdown-item {{ request()->fullUrlIs(route('bookings.show', $booking)) ? 'active' : '' }}"
                                             href="{{ route('bookings.show', $booking) }}">
                                             <i
@@ -54,16 +53,15 @@ class="fas fa-chevron-right"></i>&nbsp;{{ $bookings->count() > 1 ? $booking->cal
                     <a class="nav-link" href="{{ route('faq') }}">{{ __('FAQ') }}</a>
                 </li>
                 <li class="nav-item">
-                    <a class="nav-link"
-                        href="mailto:{{ config('app.contact_mail') }}">{{ __('Contact Us') }}</a>
+                    <a class="nav-link" href="mailto:{{ config('app.contact_mail') }}">{{ __('Contact Us') }}</a>
                 </li>
 
                 @auth
                     @if (auth()->user()->isAdmin)
                         <li class="nav-item dropdown">
                             <a class="nav-link dropdown-toggle {{ request()->routeIs('admin*') ? 'active' : '' }}"
-                                href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true"
-                                aria-expanded="false">
+                                href="#" id="navbarDropdown" role="button" data-toggle="dropdown"
+                                aria-haspopup="true" aria-expanded="false">
                                 {{ __('Admin') }}
                             </a>
                             <div class="dropdown-menu" aria-labelledby="navbarDropdown">
@@ -93,11 +91,9 @@ class="fas fa-chevron-right"></i>&nbsp;{{ $bookings->count() > 1 ? $booking->cal
                         <li class="nav-item"><a class="nav-link"
                                 href="{{ route('login', ['event' => $event]) }}">{{ __('Login') }}</a></li>
                     @else
-                        <li class="nav-item"><a class="nav-link"
-                                href="{{ route('login') }}">{{ __('Login') }}</a></li>
+                        <li class="nav-item"><a class="nav-link" href="{{ route('login') }}">{{ __('Login') }}</a></li>
                     @endif
                 @else
-
                     <li class="nav-item dropdown">
                         <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button"
                             data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -106,6 +102,7 @@ class="fas fa-chevron-right"></i>&nbsp;{{ $bookings->count() > 1 ? $booking->cal
                         <div class="dropdown-menu" aria-labelledby="navbarDropdown">
                             <a class="dropdown-item {{ request()->routeIs('user.settings') ? 'active' : '' }}"
                                 href="{{ route('user.settings') }}">{{ __('My settings') }}</a>
+                            <x-logout class="dropdown-item" />
                             <a class="dropdown-item" href="{{ route('logout') }}">{{ __('Log out') }}</a>
                         </div>
                     </li>
diff --git a/routes/web.php b/routes/web.php
index ce870118..0e3784ed 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -27,7 +27,7 @@
 Route::get('/', HomeController::class)->name('home');
 
 Route::get('/login', [LoginController::class, 'login'])->name('login');
-Route::get('/logout', [LoginController::class, 'logout'])->name('logout');
+Route::post('/logout', [LoginController::class, 'logout'])->name('logout');
 
 // Admin routes
 Route::group(['as' => 'admin.', 'prefix' => 'admin', 'middleware' => 'auth.isAdmin'], function () {

From 23059720cf4bfbc213cb5661913a0ed043159499 Mon Sep 17 00:00:00 2001
From: Dave Roverts <me@daveroverts.nl>
Date: Wed, 23 Oct 2024 20:31:20 +0200
Subject: [PATCH 02/21] style: format all blade files

---
 resources/views/airport/admin/form.blade.php  |  28 ++-
 .../views/airport/admin/overview.blade.php    |   9 +-
 resources/views/airport/admin/show.blade.php  |   9 +-
 .../views/airportLink/admin/form.blade.php    |  42 ++--
 .../views/booking/admin/create.blade.php      |  20 +-
 resources/views/booking/admin/edit.blade.php  | 106 +++++-----
 resources/views/booking/overview.blade.php    |   2 +-
 .../views/event/admin/autoAssign.blade.php    |  14 +-
 resources/views/event/admin/form.blade.php    | 199 +++++++++---------
 .../views/event/admin/overview.blade.php      |  10 +-
 .../views/event/admin/routeAssign.blade.php   |   3 +-
 resources/views/event/admin/show.blade.php    |  54 ++---
 resources/views/event/show.blade.php          |   4 +-
 .../views/eventLink/admin/form.blade.php      |  39 ++--
 resources/views/faq/admin/form.blade.php      |  29 ++-
 resources/views/faq/overview.blade.php        |   7 +-
 resources/views/layouts/alert.blade.php       |   2 +-
 resources/views/layouts/app.blade.php         |   2 -
 resources/views/layouts/footer.blade.php      |  12 +-
 resources/views/livewire/bookings.blade.php   |  14 +-
 resources/views/user/settings.blade.php       |  27 ++-
 21 files changed, 309 insertions(+), 323 deletions(-)

diff --git a/resources/views/airport/admin/form.blade.php b/resources/views/airport/admin/form.blade.php
index d926cd41..2c49e5ae 100644
--- a/resources/views/airport/admin/form.blade.php
+++ b/resources/views/airport/admin/form.blade.php
@@ -8,24 +8,22 @@
                 <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-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-form-submit>
-                            @if ($airport->id)
-                                <i class="fa fa-check"></i> {{ __('Edit') }}
-                            @else
-                                <i class="fa fa-plus"></i> {{ __('Add') }}
-                            @endif
-                        </x-form-submit>
+                            <x-form-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-form>
                 </div>
diff --git a/resources/views/airport/admin/overview.blade.php b/resources/views/airport/admin/overview.blade.php
index 2c86f7d2..06c41cf7 100644
--- a/resources/views/airport/admin/overview.blade.php
+++ b/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
diff --git a/resources/views/airport/admin/show.blade.php b/resources/views/airport/admin/show.blade.php
index 421f9eb6..6152319a 100644
--- a/resources/views/airport/admin/show.blade.php
+++ b/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
diff --git a/resources/views/airportLink/admin/form.blade.php b/resources/views/airportLink/admin/form.blade.php
index dc42370b..cf8d00a6 100644
--- a/resources/views/airportLink/admin/form.blade.php
+++ b/resources/views/airportLink/admin/form.blade.php
@@ -9,32 +9,32 @@
                 </div>
 
                 <div class="card-body">
-                    <x-form
-                        :action="$airportLink->id ? route('admin.airportLinks.update', $airportLink) : route('admin.airportLinks.store')"
-                        :method="$airportLink->id ? 'PATCH' : 'POST'">
+                    <x-form :action="$airportLink->id
+                        ? route('admin.airportLinks.update', $airportLink)
+                        : route('admin.airportLinks.store')" :method="$airportLink->id ? 'PATCH' : 'POST'">
 
                         @bind($airportLink)
-                        <x-form-select name="airportLinkType_id" :label="__('Type')" :options="$airportLinkTypes"
-                            :placeholder="__('Choose...')" required />
-                        @if ($airportLink->id)
-                            <x-form-group :label="__('Airport')">
-                                {{ $airportLink->airport->icao }} [{{ $airportLink->airport->name }}
-                                ({{ $airportLink->airport->iata }})]
-                            </x-form-group>
-                        @else
-                            <x-form-select name="airport_id" :label="__('Airport')" :options="$airports"
-                                :placeholder="__('Choose...')" required />
-                        @endif
-                        <x-form-input name="name" :label="__('Name')" />
-                        <x-form-input name="url" :label="__('URL')" placeholder="https://example.org" required />
-
-                        <x-form-submit>
+                            <x-form-select name="airportLinkType_id" :label="__('Type')" :options="$airportLinkTypes" :placeholder="__('Choose...')"
+                                required />
                             @if ($airportLink->id)
-                                <i class="fa fa-check"></i> {{ __('Edit') }}
+                                <x-form-group :label="__('Airport')">
+                                    {{ $airportLink->airport->icao }} [{{ $airportLink->airport->name }}
+                                    ({{ $airportLink->airport->iata }})]
+                                </x-form-group>
                             @else
-                                <i class="fa fa-plus"></i> {{ __('Add') }}
+                                <x-form-select name="airport_id" :label="__('Airport')" :options="$airports" :placeholder="__('Choose...')"
+                                    required />
                             @endif
-                        </x-form-submit>
+                            <x-form-input name="name" :label="__('Name')" />
+                            <x-form-input name="url" :label="__('URL')" placeholder="https://example.org" required />
+
+                            <x-form-submit>
+                                @if ($airportLink->id)
+                                    <i class="fa fa-check"></i> {{ __('Edit') }}
+                                @else
+                                    <i class="fa fa-plus"></i> {{ __('Add') }}
+                                @endif
+                            </x-form-submit>
                         @endbind
                     </x-form>
                 </div>
diff --git a/resources/views/booking/admin/create.blade.php b/resources/views/booking/admin/create.blade.php
index 8459c099..2942aa9f 100644
--- a/resources/views/booking/admin/create.blade.php
+++ b/resources/views/booking/admin/create.blade.php
@@ -8,7 +8,7 @@
                 <div class="card-header">{{ $event->name }} | {{ $bulk ? __('Add Timeslots') : __('Add Slot') }}</div>
 
                 <div class="card-body">
-                    <x-form :action="route('admin.bookings.store',$event)" method="POST">
+                    <x-form :action="route('admin.bookings.store', $event)" method="POST">
                         <input type="hidden" name="id" value="{{ $event->id }}">
                         <input type="hidden" name="bulk" value="{{ $bulk ? 1 : 0 }}">
 
@@ -33,16 +33,15 @@
                             <x-form-input name="acType" :label="__('Aircraft code')" minlength="3" maxlength="4" />
                         @endif
 
-                        <x-form-select name="dep" :label="__('Departure airport')" :options="$airports"
-                            :placeholder="__('Choose...')" required :default="$event->dep" />
+                        <x-form-select name="dep" :label="__('Departure airport')" :options="$airports" :placeholder="__('Choose...')" required
+                            :default="$event->dep" />
 
-                        <x-form-select name="arr" :label="__('Arrival airport')" :options="$airports"
-                            :placeholder="__('Choose...')" required :default="$event->dep" />
+                        <x-form-select name="arr" :label="__('Arrival airport')" :options="$airports" :placeholder="__('Choose...')" required
+                            :default="$event->dep" />
 
                         @if ($bulk)
                             <x-form-group inline>
-                                <x-form-input name="start" type="time"
-                                    :label="'<i class=\'fa fa-clock\'></i> ' . __('Start')">
+                                <x-form-input name="start" type="time" :label="'<i class=\'fa fa-clock\'></i> ' . __('Start')">
                                     @slot('append')
                                         z
                                     @endslot
@@ -57,8 +56,7 @@
                             </x-form-group>
                         @else
                             <x-form-group inline>
-                                <x-form-input name="ctot" type="time"
-                                    :label="'<i class=\'fa fa-clock\'></i> ' . __('CTOT')">
+                                <x-form-input name="ctot" type="time" :label="'<i class=\'fa fa-clock\'></i> ' . __('CTOT')">
                                     @slot('append')
                                         z
                                     @endslot
@@ -74,13 +72,11 @@
                             <x-form-textarea name="route" :label="__('Route')" />
 
 
-                            <x-form-input name="oceanicFL"
-                                :label="$event->is_oceanic_event ? __('Oceanic Entry Level') : __('Cruise FL')">
+                            <x-form-input name="oceanicFL" :label="$event->is_oceanic_event ? __('Oceanic Entry Level') : __('Cruise FL')">
                                 @slot('prepend')
                                     FL
                                 @endslot
                             </x-form-input>
-
                         @endif
 
                         <x-form-textarea name="notes" :label="__('Notes')" />
diff --git a/resources/views/booking/admin/edit.blade.php b/resources/views/booking/admin/edit.blade.php
index 0d7e6059..a950d466 100644
--- a/resources/views/booking/admin/edit.blade.php
+++ b/resources/views/booking/admin/edit.blade.php
@@ -11,71 +11,71 @@
                 <div class="card-body">
                     <x-form :action="route('admin.bookings.update', $booking)" method="PATCH">
                         @bind($booking)
-                        <x-form-group name="is_editable" :label="__('Editable?')" inline>
-                            <x-form-radio name="is_editable" value="0" :label="__('No')" required />
-                            <x-form-radio name="is_editable" value="1" :label="__('Yes')" required />
-                            @slot('help')
-                                <small class="form-text text-muted">
-                                    {{ __('Choose if you want the booking to be editable (Callsign and Aircraft Code only) by users. This is useful when using \'import only\', but want to add extra slots') }}
-                                </small>
-                            @endslot
-                        </x-form-group>
+                            <x-form-group name="is_editable" :label="__('Editable?')" inline>
+                                <x-form-radio name="is_editable" value="0" :label="__('No')" required />
+                                <x-form-radio name="is_editable" value="1" :label="__('Yes')" required />
+                                @slot('help')
+                                    <small class="form-text text-muted">
+                                        {{ __('Choose if you want the booking to be editable (Callsign and Aircraft Code only) by users. This is useful when using \'import only\', but want to add extra slots') }}
+                                    </small>
+                                @endslot
+                            </x-form-group>
 
-                        <x-form-input name="callsign" :label="__('Callsign')" maxlength="7" />
-                        <x-form-input name="acType" :label="__('Aircraft code')" minlength="3" maxlength="4" />
+                            <x-form-input name="callsign" :label="__('Callsign')" maxlength="7" />
+                            <x-form-input name="acType" :label="__('Aircraft code')" minlength="3" maxlength="4" />
 
-                        @bind($flight)
-                        
-                        <x-form-group inline>
-                            <x-form-input name="ctot" :bind="false" value="{{ $flight->ctot?->format('H:i') }}" type="time" :label="'<i class=\'fa fa-clock\'></i> ' . __('CTOT')">
-                                @slot('append')
-                                    z
-                                @endslot
-                            </x-form-input>
-                            <x-form-input name="eta" :bind="false" value="{{ $flight->eta?->format('H:i') }}" type="time" :label="'<i class=\'fa fa-clock\'></i> ' . __('ETA')">
-                                @slot('append')
-                                    z
-                                @endslot
-                            </x-form-input>
-                        </x-form-group>
+                            @bind($flight)
+                                <x-form-group inline>
+                                    <x-form-input name="ctot" :bind="false" value="{{ $flight->ctot?->format('H:i') }}"
+                                        type="time" :label="'<i class=\'fa fa-clock\'></i> ' . __('CTOT')">
+                                        @slot('append')
+                                            z
+                                        @endslot
+                                    </x-form-input>
+                                    <x-form-input name="eta" :bind="false" value="{{ $flight->eta?->format('H:i') }}"
+                                        type="time" :label="'<i class=\'fa fa-clock\'></i> ' . __('ETA')">
+                                        @slot('append')
+                                            z
+                                        @endslot
+                                    </x-form-input>
+                                </x-form-group>
 
-                        <x-form-select name="dep" :label="__('Departure airport')" :options="$airports"
-                            :placeholder="__('Choose...')" required />
+                                <x-form-select name="dep" :label="__('Departure airport')" :options="$airports" :placeholder="__('Choose...')" required />
 
-                        <x-form-select name="arr" :label="__('Arrival airport')" :options="$airports"
-                            :placeholder="__('Choose...')" required />
+                                <x-form-select name="arr" :label="__('Arrival airport')" :options="$airports" :placeholder="__('Choose...')" required />
 
-                        <x-form-group :label="__('PIC')">
-                            {{ $booking->user ? $booking->user->pic : '-' }}
-                        </x-form-group>
+                                <x-form-group :label="__('PIC')">
+                                    {{ $booking->user ? $booking->user->pic : '-' }}
+                                </x-form-group>
 
-                        <x-form-textarea name="route" :label="__('Route')" />
+                                <x-form-textarea name="route" :label="__('Route')" />
 
-                        @if ($booking->event->is_oceanic_event)
-                            <x-form-input name="oceanicTrack" :label="__('Track')" maxlength="2" />
-                        @endif
+                                @if ($booking->event->is_oceanic_event)
+                                    <x-form-input name="oceanicTrack" :label="__('Track')" maxlength="2" />
+                                @endif
 
-                        <x-form-input name="oceanicFL"
-                            :label="$booking->event->is_oceanic_event ? __('Oceanic Entry Level') : __('Cruise FL')">
-                            @slot('prepend')
-                                FL
-                            @endslot
-                        </x-form-input>
+                                <x-form-input name="oceanicFL" :label="$booking->event->is_oceanic_event
+                                    ? __('Oceanic Entry Level')
+                                    : __('Cruise FL')">
+                                    @slot('prepend')
+                                        FL
+                                    @endslot
+                                </x-form-input>
 
-                        <x-form-textarea name="notes" :label="__('Notes')" />
-                        @endbind
+                                <x-form-textarea name="notes" :label="__('Notes')" />
+                            @endbind
 
-                        @if ($booking->user_id)
-                            <x-form-textarea name="message" :label="__('Message')" />
+                            @if ($booking->user_id)
+                                <x-form-textarea name="message" :label="__('Message')" />
 
-                            <x-form-group>
-                                <x-form-checkbox name="notify_user" checked :label="__('Notify user?')" />
-                            </x-form-group>
-                        @endif
+                                <x-form-group>
+                                    <x-form-checkbox name="notify_user" checked :label="__('Notify user?')" />
+                                </x-form-group>
+                            @endif
 
-                        <x-form-submit>
-                            <i class="fas fa-check"></i> {{ __('Update') }}
-                        </x-form-submit>
+                            <x-form-submit>
+                                <i class="fas fa-check"></i> {{ __('Update') }}
+                            </x-form-submit>
                         @endbind
                     </x-form>
                 </div>
diff --git a/resources/views/booking/overview.blade.php b/resources/views/booking/overview.blade.php
index 02dda34f..e99fdc03 100644
--- a/resources/views/booking/overview.blade.php
+++ b/resources/views/booking/overview.blade.php
@@ -1,5 +1,5 @@
 @extends('layouts.app')
 
 @section('content')
-<livewire:bookings :event="$event" />
+    <livewire:bookings :event="$event" />
 @endsection
diff --git a/resources/views/event/admin/autoAssign.blade.php b/resources/views/event/admin/autoAssign.blade.php
index 8e152bdb..ecf0093f 100644
--- a/resources/views/event/admin/autoAssign.blade.php
+++ b/resources/views/event/admin/autoAssign.blade.php
@@ -10,24 +10,22 @@
 
                 <div class="card-body">
                     <x-form :action="route('admin.bookings.autoAssign', $event)" method="POST">
-                        <x-form-input name="oceanicTrack1" :label="__('Track #:number', ['number' => 1])" required
-                            maxlength="2" />
+                        <x-form-input name="oceanicTrack1" :label="__('Track #:number', ['number' => 1])" required maxlength="2" />
                         <x-form-textarea name="route1" :label="__('Route #:number', ['number' => 1])" />
 
-                        <x-form-input name="oceanicTrack2" :label="__('Track #:number', ['number' => 2])" required
-                            maxlength="2" />
+                        <x-form-input name="oceanicTrack2" :label="__('Track #:number', ['number' => 2])" required maxlength="2" />
                         <x-form-textarea name="route2" :label="__('Route #:number', ['number' => 2])" />
 
                         <x-form-group inline>
-                            <x-form-input name="minFL" :label="__('Minimum Oceanic Entry FL')" default="320" required
-                                minlength="3" maxlength="3">
+                            <x-form-input name="minFL" :label="__('Minimum Oceanic Entry FL')" default="320" required minlength="3"
+                                maxlength="3">
                                 @slot('prepend')
                                     FL
                                 @endslot
                             </x-form-input>
 
-                            <x-form-input name="maxFL" :label="__('Maximum Oceanic Entry FL')" default="380" required
-                                minlength="3" maxlength="3">
+                            <x-form-input name="maxFL" :label="__('Maximum Oceanic Entry FL')" default="380" required minlength="3"
+                                maxlength="3">
                                 @slot('prepend')
                                     FL
                                 @endslot
diff --git a/resources/views/event/admin/form.blade.php b/resources/views/event/admin/form.blade.php
index c33212e0..8367cd00 100644
--- a/resources/views/event/admin/form.blade.php
+++ b/resources/views/event/admin/form.blade.php
@@ -8,109 +8,104 @@
                 <div class="card-header">{{ $event->id ? 'Edit' : 'Add new' }} Event</div>
 
                 <div class="card-body">
-                    <x-form :action="$event->id ? route('admin.events.update', $event) : route('admin.events.store')"
-                        :method="$event->id ? 'PATCH' : 'POST'">
+                    <x-form :action="$event->id ? route('admin.events.update', $event) : route('admin.events.store')" :method="$event->id ? 'PATCH' : 'POST'">
                         @bind($event)
-
-                        <x-form-group name="is_online" :label="__('Show online?')" inline>
-                            <x-form-radio name="is_online" value="0" :label="__('No')" required />
-                            <x-form-radio name="is_online" value="1" :label="__('Yes')" required />
-                            @slot('help')
-                                <small class="form-text text-muted">
-                                    {{ __("Choose here if you want the event to be reachable by it's generated url") }}
-                                </small>
-                            @endslot
-                        </x-form-group>
-
-                        <x-form-group name="show_on_homepage" :label="__('Show on homepage?')" inline>
-                            <x-form-radio name="show_on_homepage" value="0" :label="__('No')" required />
-                            <x-form-radio name="show_on_homepage" value="1" :label="__('Yes')" required />
-                            @slot('help')
-                                <small class="form-text text-muted">
-                                    {{ __("Choose here if you want to show the event on the homepage. If turned off, the event can only be reached by the url. NOTE: If 'Show Online' is off, the event won't be shown at all") }}
-                                </small>
-                            @endslot
-                        </x-form-group>
-
-                        <x-form-input name="name" :label="__('Name')" required />
-
-                        <x-form-select name="event_type_id" :label="__('Event type')" :options="$eventTypes"
-                            :placeholder="__('Choose...')" required />
-
-                        <x-form-group name="import_only" :label="__('Only import?')" inline>
-                            <x-form-radio name="import_only" value="0" :label="__('No')" required />
-                            <x-form-radio name="import_only" value="1" :label="__('Yes')" required />
-                            @slot('help')
-                                <small class="form-text text-muted">
-                                    {{ __('If enabled, only admins can fill in details via import script') }}
-                                </small>
-                            @endslot
-                        </x-form-group>
-
-                        <x-form-group name="uses_times" :label="__('Show times?')" inline>
-                            <x-form-radio name="uses_times" value="0" :label="__('No')" required />
-                            <x-form-radio name="uses_times" value="1" :label="__('Yes')" required />
-                            @slot('help')
-                                <small class="form-text text-muted">
-                                    {{ __('If enabled, CTOT and ETA (if set in booking) will be shown') }}
-                                </small>
-                            @endslot
-                        </x-form-group>
-
-                        <x-form-group name="multiple_bookings_allowed" :label="__('Multiple bookings allowed?')" inline>
-                            <x-form-radio name="multiple_bookings_allowed" value="0" :label="__('No')" required />
-                            <x-form-radio name="multiple_bookings_allowed" value="1" :label="__('Yes')" required />
-                            @slot('help')
-                                <small class="form-text text-muted">
-                                    {{ __('If enabled, a user is allowed to book multiple flights for this event') }}
-                                </small>
-                            @endslot
-                        </x-form-group>
-
-                        <x-form-group name="is_oceanic_event" :label="__('Oceanic event?')" inline>
-                            <x-form-radio name="is_oceanic_event" value="0" :label="__('No')" required />
-                            <x-form-radio name="is_oceanic_event" value="1" :label="__('Yes')" required />
-                            @slot('help')
-                                <small class="form-text text-muted">
-                                    {{ __('If enabled, users can fill in a SELCAL code') }}
-                                </small>
-                            @endslot
-                        </x-form-group>
-
-                        <x-form-select name="dep" :label="__('Departure airport')" :options="$airports"
-                            :placeholder="__('Choose...')" required />
-
-                        <x-form-select name="arr" :label="__('Arrival airport')" :options="$airports"
-                            :placeholder="__('Choose...')" required />
-
-                        <x-form-group :label="__('Start event (UTC)')">
-                            <x-flat-pickr name="startEvent" value="{{ old('startEvent', $event->startEvent) }}" />
-                        </x-form-group>
-
-                        <x-form-group :label="__('End event (UTC)')">
-                            <x-flat-pickr name="endEvent" value="{{ old('endEvent', $event->endEvent) }}" />
-                        </x-form-group>
-
-                        <x-form-group :label="__('Start booking (UTC)')">
-                            <x-flat-pickr name="startBooking" value="{{ old('startBooking', $event->startBooking) }}" />
-                        </x-form-group>
-
-                        <x-form-group :label="__('End booking (UTC)')">
-                            <x-flat-pickr name="endBooking" value="{{ old('endBooking', $event->endBooking) }}" />
-                        </x-form-group>
-
-                        <x-form-input name="image_url" :label="__('Image URL')" placeholder="https://example.org" />
-
-                        <x-form-textarea name="description" :label="__('Description')" class="tinymce" />
-
-                        <x-form-submit>
-                            @if ($event->id)
-                                <i class="fa fa-check"></i> {{ __('Edit') }}
-                            @else
-                                <i class="fa fa-plus"></i> {{ __('Add') }}
-                            @endif
-                        </x-form-submit>
-
+                            <x-form-group name="is_online" :label="__('Show online?')" inline>
+                                <x-form-radio name="is_online" value="0" :label="__('No')" required />
+                                <x-form-radio name="is_online" value="1" :label="__('Yes')" required />
+                                @slot('help')
+                                    <small class="form-text text-muted">
+                                        {{ __("Choose here if you want the event to be reachable by it's generated url") }}
+                                    </small>
+                                @endslot
+                            </x-form-group>
+
+                            <x-form-group name="show_on_homepage" :label="__('Show on homepage?')" inline>
+                                <x-form-radio name="show_on_homepage" value="0" :label="__('No')" required />
+                                <x-form-radio name="show_on_homepage" value="1" :label="__('Yes')" required />
+                                @slot('help')
+                                    <small class="form-text text-muted">
+                                        {{ __("Choose here if you want to show the event on the homepage. If turned off, the event can only be reached by the url. NOTE: If 'Show Online' is off, the event won't be shown at all") }}
+                                    </small>
+                                @endslot
+                            </x-form-group>
+
+                            <x-form-input name="name" :label="__('Name')" required />
+
+                            <x-form-select name="event_type_id" :label="__('Event type')" :options="$eventTypes" :placeholder="__('Choose...')"
+                                required />
+
+                            <x-form-group name="import_only" :label="__('Only import?')" inline>
+                                <x-form-radio name="import_only" value="0" :label="__('No')" required />
+                                <x-form-radio name="import_only" value="1" :label="__('Yes')" required />
+                                @slot('help')
+                                    <small class="form-text text-muted">
+                                        {{ __('If enabled, only admins can fill in details via import script') }}
+                                    </small>
+                                @endslot
+                            </x-form-group>
+
+                            <x-form-group name="uses_times" :label="__('Show times?')" inline>
+                                <x-form-radio name="uses_times" value="0" :label="__('No')" required />
+                                <x-form-radio name="uses_times" value="1" :label="__('Yes')" required />
+                                @slot('help')
+                                    <small class="form-text text-muted">
+                                        {{ __('If enabled, CTOT and ETA (if set in booking) will be shown') }}
+                                    </small>
+                                @endslot
+                            </x-form-group>
+
+                            <x-form-group name="multiple_bookings_allowed" :label="__('Multiple bookings allowed?')" inline>
+                                <x-form-radio name="multiple_bookings_allowed" value="0" :label="__('No')" required />
+                                <x-form-radio name="multiple_bookings_allowed" value="1" :label="__('Yes')" required />
+                                @slot('help')
+                                    <small class="form-text text-muted">
+                                        {{ __('If enabled, a user is allowed to book multiple flights for this event') }}
+                                    </small>
+                                @endslot
+                            </x-form-group>
+
+                            <x-form-group name="is_oceanic_event" :label="__('Oceanic event?')" inline>
+                                <x-form-radio name="is_oceanic_event" value="0" :label="__('No')" required />
+                                <x-form-radio name="is_oceanic_event" value="1" :label="__('Yes')" required />
+                                @slot('help')
+                                    <small class="form-text text-muted">
+                                        {{ __('If enabled, users can fill in a SELCAL code') }}
+                                    </small>
+                                @endslot
+                            </x-form-group>
+
+                            <x-form-select name="dep" :label="__('Departure airport')" :options="$airports" :placeholder="__('Choose...')" required />
+
+                            <x-form-select name="arr" :label="__('Arrival airport')" :options="$airports" :placeholder="__('Choose...')" required />
+
+                            <x-form-group :label="__('Start event (UTC)')">
+                                <x-flat-pickr name="startEvent" value="{{ old('startEvent', $event->startEvent) }}" />
+                            </x-form-group>
+
+                            <x-form-group :label="__('End event (UTC)')">
+                                <x-flat-pickr name="endEvent" value="{{ old('endEvent', $event->endEvent) }}" />
+                            </x-form-group>
+
+                            <x-form-group :label="__('Start booking (UTC)')">
+                                <x-flat-pickr name="startBooking" value="{{ old('startBooking', $event->startBooking) }}" />
+                            </x-form-group>
+
+                            <x-form-group :label="__('End booking (UTC)')">
+                                <x-flat-pickr name="endBooking" value="{{ old('endBooking', $event->endBooking) }}" />
+                            </x-form-group>
+
+                            <x-form-input name="image_url" :label="__('Image URL')" placeholder="https://example.org" />
+
+                            <x-form-textarea name="description" :label="__('Description')" class="tinymce" />
+
+                            <x-form-submit>
+                                @if ($event->id)
+                                    <i class="fa fa-check"></i> {{ __('Edit') }}
+                                @else
+                                    <i class="fa fa-plus"></i> {{ __('Add') }}
+                                @endif
+                            </x-form-submit>
                         @endbind
                     </x-form>
                 </div>
diff --git a/resources/views/event/admin/overview.blade.php b/resources/views/event/admin/overview.blade.php
index 5c734e8e..97194d6c 100644
--- a/resources/views/event/admin/overview.blade.php
+++ b/resources/views/event/admin/overview.blade.php
@@ -110,13 +110,17 @@ class="fa fa-edit"></i> {{ __('Assign Routes') }}</a>&nbsp;
             </td>
             </tr>
 
-            <x-form :action="route('admin.events.delete-bookings', $event)" id="delete-bookings-{{ $event->id }}"
-                method="DELETE" style="display: none;"></x-form>
+            <x-form :action="route('admin.events.delete-bookings', $event)" id="delete-bookings-{{ $event->id }}" method="DELETE"
+                style="display: none;"></x-form>
             <x-form :action="route('admin.events.destroy', $event)" id="delete-event-{{ $event->id }}" method="DELETE"
                 style="display: none;"></x-form>
         @empty
             @php
-                flashMessage('info', 'No events found', 'No events are in the system, consider adding one, using the button above');
+                flashMessage(
+                    'info',
+                    'No events found',
+                    'No events are in the system, consider adding one, using the button above',
+                );
             @endphp
             @include('layouts.alert')
         @endforelse
diff --git a/resources/views/event/admin/routeAssign.blade.php b/resources/views/event/admin/routeAssign.blade.php
index 479c325c..cc4f68af 100644
--- a/resources/views/event/admin/routeAssign.blade.php
+++ b/resources/views/event/admin/routeAssign.blade.php
@@ -9,8 +9,7 @@
                 <div class="card-header">{{ $event->name }} | {{ __('Import') }}</div>
 
                 <div class="card-body">
-                    <x-form :action="route('admin.bookings.routeAssign', $event)" method="POST"
-                        enctype="multipart/form-data">
+                    <x-form :action="route('admin.bookings.routeAssign', $event)" method="POST" enctype="multipart/form-data">
                         <x-form-input name="file" type="file" :label="__('File')" />
 
                         <x-form-group :label="__('Headers in <strong>bold</strong> are mandatory')">
diff --git a/resources/views/event/admin/show.blade.php b/resources/views/event/admin/show.blade.php
index 153e7194..d913897f 100644
--- a/resources/views/event/admin/show.blade.php
+++ b/resources/views/event/admin/show.blade.php
@@ -9,7 +9,7 @@
 
                 <div class="card-body">
 
-                    {{--Name--}}
+                    {{-- Name --}}
                     <div class="form-group row">
                         <label for="name" class="col-md-4 col-form-label text-md-right">Name</label>
 
@@ -21,7 +21,7 @@
                         </div>
                     </div>
 
-                    {{--Type--}}
+                    {{-- Type --}}
                     <div class="form-group row">
                         <label for="type" class="col-md-4 col-form-label text-md-right">Type</label>
 
@@ -31,7 +31,7 @@
                     </div>
 
                     @if ($event->event_type_id != \App\Enums\EventType::MULTIFLIGHTS->value)
-                        {{--Departure Airport--}}
+                        {{-- Departure Airport --}}
                         <div class="form-group row">
                             <label for="dep" class="col-md-4 col-form-label text-md-right">Departure Airport</label>
 
@@ -47,7 +47,7 @@
                             </div>
                         </div>
 
-                        {{--Arrival Airport--}}
+                        {{-- Arrival Airport --}}
                         <div class="form-group row">
                             <label for="arr" class="col-md-4 col-form-label text-md-right">Arrival Airport</label>
 
@@ -64,7 +64,7 @@
                         </div>
                     @endif
 
-                    {{--Event date/time--}}
+                    {{-- Event date/time --}}
                     <div class="form-group row">
                         <label for="eventDateTime" class="col-md-4 col-form-label text-md-right">Event date | time</label>
 
@@ -77,7 +77,7 @@
                         </div>
                     </div>
 
-                    {{--Booking status--}}
+                    {{-- Booking status --}}
                     <div class="form-group row">
                         <label for="bookingStatus" class="col-md-4 col-form-label text-md-right">Booking status</label>
 
@@ -89,26 +89,27 @@
                                         <u>{{ $event->startBooking->toFormattedDateString() }}
                                             {{ $event->startBooking->format('Hi') }}
                                             z</u>
-                                    @elseif($event->endBooking <= now()) <u>Bookings locked</u> since
-                                            <u>{{ $event->endBooking->toFormattedDateString() }}
-                                                {{ $event->endBooking->format('Hi') }}
-                                                z</u>
-                                        @else
-                                            <u>Bookings open</u> since
-                                            <u>{{ $event->startBooking->toFormattedDateString() }}
-                                                {{ $event->startBooking->format('Hi') }}
-                                                z</u><br>
-                                            Closes
-                                            at {{ $event->endBooking->toFormattedDateString() }}
+                                    @elseif($event->endBooking <= now())
+                                        <u>Bookings locked</u> since
+                                        <u>{{ $event->endBooking->toFormattedDateString() }}
                                             {{ $event->endBooking->format('Hi') }}
-                                            z
+                                            z</u>
+                                    @else
+                                        <u>Bookings open</u> since
+                                        <u>{{ $event->startBooking->toFormattedDateString() }}
+                                            {{ $event->startBooking->format('Hi') }}
+                                            z</u><br>
+                                        Closes
+                                        at {{ $event->endBooking->toFormattedDateString() }}
+                                        {{ $event->endBooking->format('Hi') }}
+                                        z
                                     @endif
                                 </strong>
                             </div>
                         </div>
                     </div>
 
-                    {{--Import only?--}}
+                    {{-- Import only? --}}
                     <div class="form-group row">
                         <label for="importOnly" class="col-md-4 col-form-label text-md-right">
                             <abbr title="If enabled, only admins can fill in details via import script">
@@ -125,7 +126,7 @@
                         </div>
                     </div>
 
-                    {{--Show times?--}}
+                    {{-- Show times? --}}
                     <div class="form-group row">
                         <label for="usesTimes" class="col-md-4 col-form-label text-md-right">
                             <abbr title="If enabled, CTOT and ETA (if set in booking) will be shown">
@@ -142,7 +143,7 @@
                         </div>
                     </div>
 
-                    {{--Multiple bookings allowed?--}}
+                    {{-- Multiple bookings allowed? --}}
                     <div class="form-group row">
                         <label for="multipleBookingsAllowed" class="col-md-4 col-form-label text-md-right">
                             <abbr title="If enabled, a user is allowed to book multiple flights for this event">
@@ -159,7 +160,7 @@
                         </div>
                     </div>
 
-                    {{--Is oceanic event?--}}
+                    {{-- Is oceanic event? --}}
                     <div class="form-group row">
                         <label for="isOceanicEvent" class="col-md-4 col-form-label text-md-right">
                             <abbr
@@ -177,15 +178,14 @@
                         </div>
                     </div>
 
-                    @foreach($event->links as $link)
+                    @foreach ($event->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
diff --git a/resources/views/event/show.blade.php b/resources/views/event/show.blade.php
index ca9bc9b8..e01926db 100644
--- a/resources/views/event/show.blade.php
+++ b/resources/views/event/show.blade.php
@@ -3,11 +3,11 @@
 @section('content')
     @include('layouts.alert')
     <h3>Welcome to the {{ $event->name }} – {{ $event->startEvent->toFormattedDateString() }}</h3>
-    @if($event->image_url)
+    @if ($event->image_url)
         <img src="{{ $event->image_url }}" class="img-fluid rounded">
     @endif
     {!! $event->description !!}
-    <div class="text-center"><a href="{{ route('bookings.event.index',$event) }}" class="btn btn-primary">Open Booking
+    <div class="text-center"><a href="{{ route('bookings.event.index', $event) }}" class="btn btn-primary">Open Booking
             Table</a></div>
     <hr>
 @endsection
diff --git a/resources/views/eventLink/admin/form.blade.php b/resources/views/eventLink/admin/form.blade.php
index 4a20ce7d..8c72099a 100644
--- a/resources/views/eventLink/admin/form.blade.php
+++ b/resources/views/eventLink/admin/form.blade.php
@@ -8,31 +8,30 @@
                 <div class="card-header">{{ $eventLink->id ? 'Edit' : 'Add new' }} Event Link</div>
 
                 <div class="card-body">
-                    <x-form
-                        :action="$eventLink->id ? route('admin.eventLinks.update', $eventLink) : route('admin.eventLinks.store')"
-                        :method="$eventLink->id ? 'PATCH' : 'POST'">
+                    <x-form :action="$eventLink->id
+                        ? route('admin.eventLinks.update', $eventLink)
+                        : route('admin.eventLinks.store')" :method="$eventLink->id ? 'PATCH' : 'POST'">
 
                         @bind($eventLink)
-                        <x-form-select name="event_link_type_id" :label="__('Type')" :options="$eventLinkTypes"
-                            :placeholder="__('Choose...')" required />
-                        @if ($eventLink->id)
-                            <x-form-group :label="__('Event')">
-                                {{ $eventLink->event->name }} [{{ $eventLink->event->startEvent->format('d-m-Y') }}]
-                            </x-form-group>
-                        @else
-                            <x-form-select name="event_id" :label="__('Event')" :options="$events"
-                                :placeholder="__('Choose...')" required />
-                        @endif
-                        <x-form-input name="name" :label="__('Name')" />
-                        <x-form-input name="url" :label="__('URL')" placeholder="https://example.org" required />
-
-                        <x-form-submit>
+                            <x-form-select name="event_link_type_id" :label="__('Type')" :options="$eventLinkTypes" :placeholder="__('Choose...')"
+                                required />
                             @if ($eventLink->id)
-                                <i class="fa fa-check"></i> {{ __('Edit') }}
+                                <x-form-group :label="__('Event')">
+                                    {{ $eventLink->event->name }} [{{ $eventLink->event->startEvent->format('d-m-Y') }}]
+                                </x-form-group>
                             @else
-                                <i class="fa fa-plus"></i> {{ __('Add') }}
+                                <x-form-select name="event_id" :label="__('Event')" :options="$events" :placeholder="__('Choose...')" required />
                             @endif
-                        </x-form-submit>
+                            <x-form-input name="name" :label="__('Name')" />
+                            <x-form-input name="url" :label="__('URL')" placeholder="https://example.org" required />
+
+                            <x-form-submit>
+                                @if ($eventLink->id)
+                                    <i class="fa fa-check"></i> {{ __('Edit') }}
+                                @else
+                                    <i class="fa fa-plus"></i> {{ __('Add') }}
+                                @endif
+                            </x-form-submit>
                         @endbind
                     </x-form>
                 </div>
diff --git a/resources/views/faq/admin/form.blade.php b/resources/views/faq/admin/form.blade.php
index 52492c7a..ebc93e21 100644
--- a/resources/views/faq/admin/form.blade.php
+++ b/resources/views/faq/admin/form.blade.php
@@ -28,25 +28,24 @@
                 <div class="card-header">{{ $faq->id ? 'Edit' : 'Add new' }} FAQ</div>
 
                 <div class="card-body">
-                    <x-form :action="$faq->id ? route('admin.faq.update', $faq) : route('admin.faq.store')"
-                        :method="$faq->id ? 'PATCH' : 'POST'">
+                    <x-form :action="$faq->id ? route('admin.faq.update', $faq) : route('admin.faq.store')" :method="$faq->id ? 'PATCH' : 'POST'">
                         @bind($faq)
-                        <x-form-group name="is_online" :label="__('Is online')" inline>
-                            <x-form-radio name="is_online" value="0" :label="__('No')" required />
-                            <x-form-radio name="is_online" value="1" :label="__('Yes')" required />
-                        </x-form-group>
+                            <x-form-group name="is_online" :label="__('Is online')" inline>
+                                <x-form-radio name="is_online" value="0" :label="__('No')" required />
+                                <x-form-radio name="is_online" value="1" :label="__('Yes')" required />
+                            </x-form-group>
 
-                        <x-form-input name="question" :label="__('Question')" required />
+                            <x-form-input name="question" :label="__('Question')" required />
 
-                        <x-form-textarea name="answer" :label="__('Answer')" class="tinymce" />
+                            <x-form-textarea name="answer" :label="__('Answer')" class="tinymce" />
 
-                        <x-form-submit>
-                            @if ($faq->id)
-                                <i class="fa fa-check"></i> {{ __('Edit') }}
-                            @else
-                                <i class="fa fa-plus"></i> {{ __('Add') }}
-                            @endif
-                        </x-form-submit>
+                            <x-form-submit>
+                                @if ($faq->id)
+                                    <i class="fa fa-check"></i> {{ __('Edit') }}
+                                @else
+                                    <i class="fa fa-plus"></i> {{ __('Add') }}
+                                @endif
+                            </x-form-submit>
                         @endbind
                     </x-form>
 
diff --git a/resources/views/faq/overview.blade.php b/resources/views/faq/overview.blade.php
index de5e6329..7686939c 100644
--- a/resources/views/faq/overview.blade.php
+++ b/resources/views/faq/overview.blade.php
@@ -1,12 +1,11 @@
 @extends('layouts.app')
 
 @section('content')
-
-    @foreach(nextEventsForFaq() as $event)
-        @if($event->faqs->isNotEmpty())
+    @foreach (nextEventsForFaq() as $event)
+        @if ($event->faqs->isNotEmpty())
             <h3>FAQ for {{ $event->name }}</h3>
             <hr>
-            @foreach($event->faqs as $faq)
+            @foreach ($event->faqs as $faq)
                 <p>
                     <strong>{{ $faq->question }}</strong>
                     <br>
diff --git a/resources/views/layouts/alert.blade.php b/resources/views/layouts/alert.blade.php
index 8d4f01fe..e09a8b58 100644
--- a/resources/views/layouts/alert.blade.php
+++ b/resources/views/layouts/alert.blade.php
@@ -1,4 +1,4 @@
-@if(session('text'))
+@if (session('text'))
     @push('scripts')
         <script>
             Swal.fire({
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index faf84f35..221e9791 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -42,7 +42,6 @@
 
                 <ol class="breadcrumb">
                     @foreach (Breadcrumbs::current() as $crumbs)
-
                         @if ($crumbs->url() && !$loop->last)
                             <li class="breadcrumb-item">
                                 <a href="{{ $crumbs->url() }}">{{ $crumbs->title() }}</a>
@@ -50,7 +49,6 @@
                         @else
                             <li class="breadcrumb-item active">{{ $crumbs->title() }}</li>
                         @endif
-
                     @endforeach
                 </ol>
 
diff --git a/resources/views/layouts/footer.blade.php b/resources/views/layouts/footer.blade.php
index be6e5616..779e6048 100644
--- a/resources/views/layouts/footer.blade.php
+++ b/resources/views/layouts/footer.blade.php
@@ -1,8 +1,10 @@
 <footer><span class="fa fa-copyright"></span> <?php
-    //An script to generate the copyright date using the server's year
-    $fromYear = 2018;
-    $thisYear = (int) date('Y');
-    echo $fromYear . (($fromYear != $thisYear) ? '-' . $thisYear : '');?> Booking System by Dave Roverts (1186831). Used and maintained by <a href="{{ config('app.division_url') }}" target="_blank">{{ config('app.division') }}</a>
+//An script to generate the copyright date using the server's year
+$fromYear = 2018;
+$thisYear = (int) date('Y');
+echo $fromYear . ($fromYear != $thisYear ? '-' . $thisYear : ''); ?> Booking System by Dave Roverts (1186831). Used and
+    maintained by <a href="{{ config('app.division_url') }}" target="_blank">{{ config('app.division') }}</a>
     <br>
-    <a class="navbar-brand" href="{{ config('app.division_url') }}"><img src="{{ asset('images/division-horizontal.png') }}" height="45"></a>
+    <a class="navbar-brand" href="{{ config('app.division_url') }}"><img
+            src="{{ asset('images/division-horizontal.png') }}" height="45"></a>
 </footer>
diff --git a/resources/views/livewire/bookings.blade.php b/resources/views/livewire/bookings.blade.php
index cdc757d3..0db4f99f 100644
--- a/resources/views/livewire/bookings.blade.php
+++ b/resources/views/livewire/bookings.blade.php
@@ -2,7 +2,7 @@
     <h3>{{ $event->name }} | {{ $filter ? ucfirst($filter) : 'Slot Table' }}</h3>
     <hr>
     <p>
-        @if($event->hasOrderButtons())
+        @if ($event->hasOrderButtons())
             <button wire:model="filter" wire:click="filter(null)"
                 class="btn {{ !$filter ? 'btn-success' : 'btn-primary' }}">Show
                 All</button>&nbsp;
@@ -13,10 +13,10 @@ class="btn {{ $filter == 'departures' ? 'btn-success' : 'btn-primary' }}">Show
                 class="btn {{ $filter == 'arrivals' ? 'btn-success' : 'btn-primary' }}">Show
                 Arrivals</button>&nbsp;
         @endif
-        @if(auth()->check() && auth()->user()->isAdmin && $event->endBooking >= now())
+        @if (auth()->check() && auth()->user()->isAdmin && $event->endBooking >= now())
             @push('scripts')
                 <script>
-                    $('.delete-booking').on('click', function (e) {
+                    $('.delete-booking').on('click', function(e) {
                         e.preventDefault();
                         Swal.fire({
                             title: 'Are you sure',
@@ -33,20 +33,20 @@ class="btn {{ $filter == 'arrivals' ? 'btn-success' : 'btn-primary' }}">Show
                     });
                 </script>
             @endpush
-            <a href="{{ route('admin.bookings.create',$event) }}" class="btn btn-primary"><i class="fa fa-plus"></i>
+            <a href="{{ route('admin.bookings.create', $event) }}" class="btn btn-primary"><i class="fa fa-plus"></i>
                 Add
                 Booking</a>&nbsp;
-            <a href="{{ route('admin.bookings.create',$event) }}/bulk" class="btn btn-primary"><i
+            <a href="{{ route('admin.bookings.create', $event) }}/bulk" class="btn btn-primary"><i
                     class="fa fa-plus"></i>
                 Add
                 Timeslots</a>&nbsp;
         @endif
     </p>
     @include('layouts.alert')
-    @if($event->startBooking <= now() || auth()->check() && auth()->user()->isAdmin)
+    @if ($event->startBooking <= now() || (auth()->check() && auth()->user()->isAdmin))
         Flights available: {{ strval($total - $booked) }} / {{ $total }}
         <table class="table table-hover table-responsive">
-            @if($event->event_type_id == \App\Enums\EventType::MULTIFLIGHTS->value)
+            @if ($event->event_type_id == \App\Enums\EventType::MULTIFLIGHTS->value)
                 @include('booking.overview.multiflights')
             @else
                 @include('booking.overview.default')
diff --git a/resources/views/user/settings.blade.php b/resources/views/user/settings.blade.php
index 53eb873b..1ae7f91f 100644
--- a/resources/views/user/settings.blade.php
+++ b/resources/views/user/settings.blade.php
@@ -11,23 +11,20 @@
                 <div class="card-body">
                     <x-form :action="route('user.saveSettings')" method="PATCH">
                         @bind($user)
-                        <x-form-group name="airport_view" :label="__('Default airport view')">
-                            <x-form-radio name="airport_view" value="0"
-                                :label="__('Name') . ': Amsterdam Airport Schiphol - EHAM | [AMS]'" required />
-                            <x-form-radio name="airport_view" value="1"
-                                :label="__('ICAO') . ': EHAM - Amsterdam Airport Schiphol | [AMS]'" required />
-                            <x-form-radio name="airport_view" value="2"
-                                :label="__('IATA') . ': AMS - Amsterdam Airport Schiphol | [EHAM]'" required />
-                        </x-form-group>
+                            <x-form-group name="airport_view" :label="__('Default airport view')">
+                                <x-form-radio name="airport_view" value="0" :label="__('Name') . ': Amsterdam Airport Schiphol - EHAM | [AMS]'" required />
+                                <x-form-radio name="airport_view" value="1" :label="__('ICAO') . ': EHAM - Amsterdam Airport Schiphol | [AMS]'" required />
+                                <x-form-radio name="airport_view" value="2" :label="__('IATA') . ': AMS - Amsterdam Airport Schiphol | [EHAM]'" required />
+                            </x-form-group>
 
-                        <x-form-group name="use_monospace_font" :label="__('Use monospace font')" inline>
-                            <x-form-radio name="use_monospace_font" value="0" :label="__('No')" required />
-                            <x-form-radio name="use_monospace_font" value="1" :label="__('Yes')" required />
-                        </x-form-group>
+                            <x-form-group name="use_monospace_font" :label="__('Use monospace font')" inline>
+                                <x-form-radio name="use_monospace_font" value="0" :label="__('No')" required />
+                                <x-form-radio name="use_monospace_font" value="1" :label="__('Yes')" required />
+                            </x-form-group>
 
-                        <x-form-submit>
-                            <i class="fas fa-save"></i> Save settings
-                        </x-form-submit>
+                            <x-form-submit>
+                                <i class="fas fa-save"></i> Save settings
+                            </x-form-submit>
                         @endbind
                     </x-form>
                 </div>

From bc622c8694103610298b5ced9519d1c900bc6f1d Mon Sep 17 00:00:00 2001
From: Dave Roverts <me@daveroverts.nl>
Date: Sat, 26 Oct 2024 19:40:27 +0200
Subject: [PATCH 03/21] chore: add input + label + button components

---
 app/View/Components/Forms/Label.php           | 32 +++++++++++++++++++
 config/blade-ui-kit.php                       | 19 ++++++-----
 .../views/components/forms/button.blade.php   | 18 +++++++++++
 .../views/components/forms/input.blade.php    | 27 ++++++++++++++++
 .../views/components/forms/label.blade.php    |  3 ++
 5 files changed, 89 insertions(+), 10 deletions(-)
 create mode 100644 app/View/Components/Forms/Label.php
 create mode 100644 resources/views/components/forms/button.blade.php
 create mode 100644 resources/views/components/forms/input.blade.php
 create mode 100644 resources/views/components/forms/label.blade.php

diff --git a/app/View/Components/Forms/Label.php b/app/View/Components/Forms/Label.php
new file mode 100644
index 00000000..692bd373
--- /dev/null
+++ b/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));
+    }
+}
diff --git a/config/blade-ui-kit.php b/config/blade-ui-kit.php
index b540bba3..48eecd04 100644
--- a/config/blade-ui-kit.php
+++ b/config/blade-ui-kit.php
@@ -1,6 +1,5 @@
 <?php
 
-use App\View\Components\FlatPickr;
 use BladeUIKit\Components;
 
 return [
@@ -17,7 +16,7 @@
     */
 
     '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,
@@ -27,20 +26,20 @@
         // '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,
+        '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' => 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,
diff --git a/resources/views/components/forms/button.blade.php b/resources/views/components/forms/button.blade.php
new file mode 100644
index 00000000..0bbf0fe9
--- /dev/null
+++ b/resources/views/components/forms/button.blade.php
@@ -0,0 +1,18 @@
+@props([
+    'variant' => 'primary',
+])
+
+{{-- btn-primary --}}
+{{-- btn-secondary --}}
+{{-- btn-success --}}
+{{-- btn-info --}}
+{{-- btn-warning --}}
+{{-- btn-danger --}}
+{{-- btn-link --}}
+
+<button {!! $attributes->merge([
+    'class' => 'btn btn-' . $variant,
+    'type' => 'submit',
+]) !!}>
+    {!! trim($slot) ?: __('Submit') !!}
+</button>
diff --git a/resources/views/components/forms/input.blade.php b/resources/views/components/forms/input.blade.php
new file mode 100644
index 00000000..b7bd56c0
--- /dev/null
+++ b/resources/views/components/forms/input.blade.php
@@ -0,0 +1,27 @@
+@props(['name', 'label' => null, 'prepend', 'append'])
+
+<div class="form-group">
+    <x-forms.label :for="$name" :label="$label" />
+
+    <div class="input-group has-validation">
+        @isset($prepend)
+            <div class="input-group-prepend">
+                <div class="input-group-text">
+                    {!! $prepend !!}
+                </div>
+            </div>
+        @endisset
+        <x-input :name="$name" {{ $attributes->class(['form-control', 'is-invalid' => $errors->has($name)]) }} />
+
+
+        <x-error :field="$name" class="invalid-feedback" />
+
+        @isset($append)
+            <div class="input-group-append">
+                <div class="input-group-text">
+                    {!! $append !!}
+                </div>
+            </div>
+        @endisset
+    </div>
+</div>
diff --git a/resources/views/components/forms/label.blade.php b/resources/views/components/forms/label.blade.php
new file mode 100644
index 00000000..87faca95
--- /dev/null
+++ b/resources/views/components/forms/label.blade.php
@@ -0,0 +1,3 @@
+<label for="{{ $for }}" {{ $attributes }}>
+    {{ $label ?? $fallback }}
+</label>

From 7d468471f9fb0e4854514b8e4946d5fae22fad9d Mon Sep 17 00:00:00 2001
From: Dave Roverts <me@daveroverts.nl>
Date: Sun, 27 Oct 2024 16:18:35 +0100
Subject: [PATCH 04/21] chore: add select and form-group - Ensure we can pass
 in a initial value

---
 resources/views/components/forms/form-group.blade.php |  9 +++++++++
 resources/views/components/forms/input.blade.php      | 11 +++++------
 resources/views/components/forms/select.blade.php     | 11 +++++++++++
 3 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 resources/views/components/forms/form-group.blade.php
 create mode 100644 resources/views/components/forms/select.blade.php

diff --git a/resources/views/components/forms/form-group.blade.php b/resources/views/components/forms/form-group.blade.php
new file mode 100644
index 00000000..a3c4cc5b
--- /dev/null
+++ b/resources/views/components/forms/form-group.blade.php
@@ -0,0 +1,9 @@
+@props(['name', 'label' => null, 'inline' => false])
+
+<div class="form-group">
+    <x-forms.label :for="$name" :label="$label" />
+
+    <div>
+        {!! $slot !!}
+    </div>
+</div>
diff --git a/resources/views/components/forms/input.blade.php b/resources/views/components/forms/input.blade.php
index b7bd56c0..ce26226b 100644
--- a/resources/views/components/forms/input.blade.php
+++ b/resources/views/components/forms/input.blade.php
@@ -1,8 +1,6 @@
-@props(['name', 'label' => null, 'prepend', 'append'])
-
-<div class="form-group">
-    <x-forms.label :for="$name" :label="$label" />
+@props(['name', 'label' => null, 'value' => null, 'prepend', 'append'])
 
+<x-forms.form-group :name="$name" :label="$label">
     <div class="input-group has-validation">
         @isset($prepend)
             <div class="input-group-prepend">
@@ -11,7 +9,8 @@
                 </div>
             </div>
         @endisset
-        <x-input :name="$name" {{ $attributes->class(['form-control', 'is-invalid' => $errors->has($name)]) }} />
+        <x-input :name="$name" :value="$value"
+            {{ $attributes->class(['form-control', 'is-invalid' => $errors->has($name)]) }} />
 
 
         <x-error :field="$name" class="invalid-feedback" />
@@ -24,4 +23,4 @@
             </div>
         @endisset
     </div>
-</div>
+</x-forms.form-group>
diff --git a/resources/views/components/forms/select.blade.php b/resources/views/components/forms/select.blade.php
new file mode 100644
index 00000000..179f3c7d
--- /dev/null
+++ b/resources/views/components/forms/select.blade.php
@@ -0,0 +1,11 @@
+@props(['name', 'label' => null, 'value' => null, 'options'])
+<x-forms.form-group :name="$name" :label="$label">
+    <select name="{{ $name }}" {{ $attributes->class(['custom-select', 'is-invalid' => $errors->has($name)]) }}>
+
+
+        @foreach ($options as $key => $option)
+            <option value="{{ $key }}" @selected(old($name, $value) == $key)>{{ $option }}</option>
+        @endforeach
+    </select>
+
+</x-forms.form-group>

From c29472fda5a105b720317ee0f931132e5349f2e2 Mon Sep 17 00:00:00 2001
From: Dave Roverts <me@daveroverts.nl>
Date: Sun, 27 Oct 2024 16:21:25 +0100
Subject: [PATCH 05/21] chore: convert airport admin form

---
 resources/views/airport/admin/form.blade.php | 26 +++++++++-----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/resources/views/airport/admin/form.blade.php b/resources/views/airport/admin/form.blade.php
index 2c49e5ae..a668794f 100644
--- a/resources/views/airport/admin/form.blade.php
+++ b/resources/views/airport/admin/form.blade.php
@@ -10,21 +10,19 @@
                 <div class="card-body">
                     <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>
-                                @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 type="submit">
+                            @if ($airport->id)
+                                <i class="fa fa-check"></i> {{ __('Edit') }}
+                            @else
+                                <i class="fa fa-plus"></i> {{ __('Add') }}
+                            @endif
+                        </x-forms.button>
                     </x-form>
                 </div>
             </div>

From 64a1d3655be552bf0bed5dccb7b6f646ea628c8b Mon Sep 17 00:00:00 2001
From: Dave Roverts <me@daveroverts.nl>
Date: Sun, 27 Oct 2024 16:24:59 +0100
Subject: [PATCH 06/21] chore: convert airport + event link forms

---
 .../views/airportLink/admin/form.blade.php    | 36 +++++++++----------
 .../views/eventLink/admin/form.blade.php      | 35 +++++++++---------
 2 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/resources/views/airportLink/admin/form.blade.php b/resources/views/airportLink/admin/form.blade.php
index cf8d00a6..cb86ad53 100644
--- a/resources/views/airportLink/admin/form.blade.php
+++ b/resources/views/airportLink/admin/form.blade.php
@@ -13,29 +13,27 @@
                         ? route('admin.airportLinks.update', $airportLink)
                         : route('admin.airportLinks.store')" :method="$airportLink->id ? 'PATCH' : 'POST'">
 
-                        @bind($airportLink)
-                            <x-form-select name="airportLinkType_id" :label="__('Type')" :options="$airportLinkTypes" :placeholder="__('Choose...')"
+                        <x-forms.select name="airportLinkType_id" :label="__('Type')" :options="$airportLinkTypes" :placeholder="__('Choose...')"
+                            required :value="$airportLink->airportLinkType_id" />
+                        @if ($airportLink->id)
+                            <x-forms.form-group name="airport_id" label="Airport">
+                                {{ $airportLink->airport->icao }} [{{ $airportLink->airport->name }}
+                                ({{ $airportLink->airport->iata }})]
+                            </x-forms.form-group>
+                        @else
+                            <x-forms.select name="airport_id" :label="__('Airport')" :options="$airports" :placeholder="__('Choose...')"
                                 required />
+                        @endif
+                        <x-forms.input name="name" :label="__('Name')" />
+                        <x-forms.input name="url" :label="__('URL')" placeholder="https://example.org" required />
+
+                        <x-forms.button type="submit">
                             @if ($airportLink->id)
-                                <x-form-group :label="__('Airport')">
-                                    {{ $airportLink->airport->icao }} [{{ $airportLink->airport->name }}
-                                    ({{ $airportLink->airport->iata }})]
-                                </x-form-group>
+                                <i class="fa fa-check"></i> {{ __('Edit') }}
                             @else
-                                <x-form-select name="airport_id" :label="__('Airport')" :options="$airports" :placeholder="__('Choose...')"
-                                    required />
+                                <i class="fa fa-plus"></i> {{ __('Add') }}
                             @endif
-                            <x-form-input name="name" :label="__('Name')" />
-                            <x-form-input name="url" :label="__('URL')" placeholder="https://example.org" required />
-
-                            <x-form-submit>
-                                @if ($airportLink->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>
diff --git a/resources/views/eventLink/admin/form.blade.php b/resources/views/eventLink/admin/form.blade.php
index 8c72099a..ca8443a7 100644
--- a/resources/views/eventLink/admin/form.blade.php
+++ b/resources/views/eventLink/admin/form.blade.php
@@ -12,27 +12,26 @@
                         ? route('admin.eventLinks.update', $eventLink)
                         : route('admin.eventLinks.store')" :method="$eventLink->id ? 'PATCH' : 'POST'">
 
-                        @bind($eventLink)
-                            <x-form-select name="event_link_type_id" :label="__('Type')" :options="$eventLinkTypes" :placeholder="__('Choose...')"
-                                required />
+                        <x-forms.select name="event_link_type_id" :label="__('Type')" :options="$eventLinkTypes" :placeholder="__('Choose...')"
+                            required :value="$eventLink->event_link_type_id" />
+                        @if ($eventLink->id)
+                            <x-forms.form-group name="event_id" :label="__('Event')">
+                                {{ $eventLink->event->name }} [{{ $eventLink->event->startEvent->format('d-m-Y') }}]
+                            </x-forms.form-group>
+                        @else
+                            <x-forms.select name="event_id" :label="__('Event')" :options="$events" :placeholder="__('Choose...')" required />
+                        @endif
+                        <x-forms.input name="name" :label="__('Name')" :value="$eventLink->name" />
+                        <x-forms.input name="url" :label="__('URL')" :value="$eventLink->url" placeholder="https://example.org"
+                            required />
+
+                        <x-forms.button type="submit">
                             @if ($eventLink->id)
-                                <x-form-group :label="__('Event')">
-                                    {{ $eventLink->event->name }} [{{ $eventLink->event->startEvent->format('d-m-Y') }}]
-                                </x-form-group>
+                                <i class="fa fa-check"></i> {{ __('Edit') }}
                             @else
-                                <x-form-select name="event_id" :label="__('Event')" :options="$events" :placeholder="__('Choose...')" required />
+                                <i class="fa fa-plus"></i> {{ __('Add') }}
                             @endif
-                            <x-form-input name="name" :label="__('Name')" />
-                            <x-form-input name="url" :label="__('URL')" placeholder="https://example.org" required />
-
-                            <x-form-submit>
-                                @if ($eventLink->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>

From 23f4b9c2d43506ee26959ef672c42846f4ffc922 Mon Sep 17 00:00:00 2001
From: Dave Roverts <me@daveroverts.nl>
Date: Sun, 27 Oct 2024 16:43:40 +0100
Subject: [PATCH 07/21] fix: add help text to airport/event link that name is
 optional

---
 resources/views/airportLink/admin/form.blade.php  | 2 +-
 resources/views/components/forms/input.blade.php  | 9 +++++++--
 resources/views/components/forms/select.blade.php | 8 +++++++-
 resources/views/eventLink/admin/form.blade.php    | 2 +-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/resources/views/airportLink/admin/form.blade.php b/resources/views/airportLink/admin/form.blade.php
index cb86ad53..383658f4 100644
--- a/resources/views/airportLink/admin/form.blade.php
+++ b/resources/views/airportLink/admin/form.blade.php
@@ -24,7 +24,7 @@
                             <x-forms.select name="airport_id" :label="__('Airport')" :options="$airports" :placeholder="__('Choose...')"
                                 required />
                         @endif
-                        <x-forms.input name="name" :label="__('Name')" />
+                        <x-forms.input name="name" :label="__('Name')" :help="__('Leave empty to use the type as name')" />
                         <x-forms.input name="url" :label="__('URL')" placeholder="https://example.org" required />
 
                         <x-forms.button type="submit">
diff --git a/resources/views/components/forms/input.blade.php b/resources/views/components/forms/input.blade.php
index ce26226b..b88fb88f 100644
--- a/resources/views/components/forms/input.blade.php
+++ b/resources/views/components/forms/input.blade.php
@@ -1,4 +1,4 @@
-@props(['name', 'label' => null, 'value' => null, 'prepend', 'append'])
+@props(['name', 'label' => null, 'value' => null, 'prepend', 'append', 'help'])
 
 <x-forms.form-group :name="$name" :label="$label">
     <div class="input-group has-validation">
@@ -12,7 +12,6 @@
         <x-input :name="$name" :value="$value"
             {{ $attributes->class(['form-control', 'is-invalid' => $errors->has($name)]) }} />
 
-
         <x-error :field="$name" class="invalid-feedback" />
 
         @isset($append)
@@ -22,5 +21,11 @@
                 </div>
             </div>
         @endisset
+
     </div>
+    @isset($help)
+        <small id="{{ $name }}-help" class="form-text text-muted">
+            {!! $help !!}
+        </small>
+    @endisset
 </x-forms.form-group>
diff --git a/resources/views/components/forms/select.blade.php b/resources/views/components/forms/select.blade.php
index 179f3c7d..ad202047 100644
--- a/resources/views/components/forms/select.blade.php
+++ b/resources/views/components/forms/select.blade.php
@@ -1,4 +1,4 @@
-@props(['name', 'label' => null, 'value' => null, 'options'])
+@props(['name', 'label' => null, 'value' => null, 'options', 'help'])
 <x-forms.form-group :name="$name" :label="$label">
     <select name="{{ $name }}" {{ $attributes->class(['custom-select', 'is-invalid' => $errors->has($name)]) }}>
 
@@ -8,4 +8,10 @@
         @endforeach
     </select>
 
+    @isset($help)
+        <small id="{{ $name }}-help" class="form-text text-muted">
+            {!! $help !!}
+        </small>
+    @endisset
+
 </x-forms.form-group>
diff --git a/resources/views/eventLink/admin/form.blade.php b/resources/views/eventLink/admin/form.blade.php
index ca8443a7..229e0d69 100644
--- a/resources/views/eventLink/admin/form.blade.php
+++ b/resources/views/eventLink/admin/form.blade.php
@@ -21,7 +21,7 @@
                         @else
                             <x-forms.select name="event_id" :label="__('Event')" :options="$events" :placeholder="__('Choose...')" required />
                         @endif
-                        <x-forms.input name="name" :label="__('Name')" :value="$eventLink->name" />
+                        <x-forms.input name="name" :label="__('Name')" :value="$eventLink->name" :help="__('Leave empty to use the type as name')" />
                         <x-forms.input name="url" :label="__('URL')" :value="$eventLink->url" placeholder="https://example.org"
                             required />
 

From 66139d37155239d9f6ea03d16f59165da1962757 Mon Sep 17 00:00:00 2001
From: Dave Roverts <me@daveroverts.nl>
Date: Mon, 28 Oct 2024 19:14:36 +0100
Subject: [PATCH 08/21] chore: add help text and inline support for form-group

---
 resources/views/components/forms/form-group.blade.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/resources/views/components/forms/form-group.blade.php b/resources/views/components/forms/form-group.blade.php
index a3c4cc5b..ce64a9c1 100644
--- a/resources/views/components/forms/form-group.blade.php
+++ b/resources/views/components/forms/form-group.blade.php
@@ -1,9 +1,15 @@
-@props(['name', 'label' => null, 'inline' => false])
+@props(['name', 'label' => null, 'inline' => false, 'help'])
 
 <div class="form-group">
     <x-forms.label :for="$name" :label="$label" />
 
-    <div>
+    <div {{ $attributes->class(['form-inline' => $inline]) }}>
         {!! $slot !!}
     </div>
+
+    @isset($help)
+        <small id="{{ $name }}-help" class="form-text text-muted">
+            {!! $help !!}
+        </small>
+    @endisset
 </div>

From a8da6650d425745ba437a97257f8d8a60b770834 Mon Sep 17 00:00:00 2001
From: Dave Roverts <me@daveroverts.nl>
Date: Mon, 28 Oct 2024 19:45:16 +0100
Subject: [PATCH 09/21] chore: add radio

---
 resources/views/components/forms/radio.blade.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 resources/views/components/forms/radio.blade.php

diff --git a/resources/views/components/forms/radio.blade.php b/resources/views/components/forms/radio.blade.php
new file mode 100644
index 00000000..11bdb35e
--- /dev/null
+++ b/resources/views/components/forms/radio.blade.php
@@ -0,0 +1,15 @@
+@props(['name', 'label', 'value', 'inline' => false, 'checked' => false])
+
+@php
+    $id = $name . '-' . $value;
+@endphp
+
+<div @class([
+    'custom-control custom-radio',
+    'custom-control-inline' => $inline,
+])>
+    <x-input type="radio" :name="$name" :value="$value" :id="$id"
+        {{ $attributes->class(['custom-control-input', 'is-invalid' => $errors->has($name)])->merge(['checked' => old($name, $checked) == $value]) }} />
+
+    <x-forms.label :for="$id" :label="$label" class="custom-control-label" />
+</div>

From 786d09d04a3be143367bdf53701867956e9387b1 Mon Sep 17 00:00:00 2001
From: Dave Roverts <me@daveroverts.nl>
Date: Sat, 2 Nov 2024 14:25:32 +0100
Subject: [PATCH 10/21] chore: override input to better support radio's

---
 app/View/Components/Forms/Inputs/Input.php      | 17 +++++++++++++++++
 config/blade-ui-kit.php                         |  2 +-
 .../views/components/forms/radio.blade.php      |  4 ++--
 .../components/forms/inputs/input.blade.php     |  2 ++
 4 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 app/View/Components/Forms/Inputs/Input.php
 create mode 100644 resources/views/vendor/blade-ui-kit/components/forms/inputs/input.blade.php

diff --git a/app/View/Components/Forms/Inputs/Input.php b/app/View/Components/Forms/Inputs/Input.php
new file mode 100644
index 00000000..2c1035d0
--- /dev/null
+++ b/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 ?? '');
+    }
+}
diff --git a/config/blade-ui-kit.php b/config/blade-ui-kit.php
index 48eecd04..c1a0ebeb 100644
--- a/config/blade-ui-kit.php
+++ b/config/blade-ui-kit.php
@@ -31,7 +31,7 @@
         'form' => Components\Forms\Form::class,
         'form-button' => Components\Buttons\FormButton::class,
         'html' => Components\Layouts\Html::class,
-        'input' => Components\Forms\Inputs\Input::class,
+        'input' => App\View\Components\Forms\Inputs\Input::class,
         'label' => Components\Forms\Label::class,
         'logout' => Components\Buttons\Logout::class,
         // 'mapbox' => Components\Maps\Mapbox::class,
diff --git a/resources/views/components/forms/radio.blade.php b/resources/views/components/forms/radio.blade.php
index 11bdb35e..bf36b456 100644
--- a/resources/views/components/forms/radio.blade.php
+++ b/resources/views/components/forms/radio.blade.php
@@ -1,4 +1,4 @@
-@props(['name', 'label', 'value', 'inline' => false, 'checked' => false])
+@props(['name', 'label', 'value', 'inline' => false])
 
 @php
     $id = $name . '-' . $value;
@@ -9,7 +9,7 @@
     'custom-control-inline' => $inline,
 ])>
     <x-input type="radio" :name="$name" :value="$value" :id="$id"
-        {{ $attributes->class(['custom-control-input', 'is-invalid' => $errors->has($name)])->merge(['checked' => old($name, $checked) == $value]) }} />
+        {{ $attributes->class(['custom-control-input', 'is-invalid' => $errors->has($name)])->merge(['checked' => '']) }} />
 
     <x-forms.label :for="$id" :label="$label" class="custom-control-label" />
 </div>
diff --git a/resources/views/vendor/blade-ui-kit/components/forms/inputs/input.blade.php b/resources/views/vendor/blade-ui-kit/components/forms/inputs/input.blade.php
new file mode 100644
index 00000000..aff89f49
--- /dev/null
+++ b/resources/views/vendor/blade-ui-kit/components/forms/inputs/input.blade.php
@@ -0,0 +1,2 @@
+<input name="{{ $name }}" type="{{ $type }}" id="{{ $id }}"
+    @isset($value) value="{{ $value }}" @endisset {{ $attributes }} />

From b1dcd08dcc8542bb06c3f0bbed2282070f9737ff Mon Sep 17 00:00:00 2001
From: Dave Roverts <me@daveroverts.nl>
Date: Sat, 2 Nov 2024 14:43:57 +0100
Subject: [PATCH 11/21] chore: add placeholder to select

---
 resources/views/components/forms/select.blade.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/resources/views/components/forms/select.blade.php b/resources/views/components/forms/select.blade.php
index ad202047..5979bf81 100644
--- a/resources/views/components/forms/select.blade.php
+++ b/resources/views/components/forms/select.blade.php
@@ -1,7 +1,9 @@
-@props(['name', 'label' => null, 'value' => null, 'options', 'help'])
+@props(['name', 'label' => null, 'value' => null, 'options', 'placeholder' => null, 'help'])
 <x-forms.form-group :name="$name" :label="$label">
     <select name="{{ $name }}" {{ $attributes->class(['custom-select', 'is-invalid' => $errors->has($name)]) }}>
-
+        @if ($placeholder)
+            <option value="" disabled selected>{{ $placeholder }}</option>
+        @endif
 
         @foreach ($options as $key => $option)
             <option value="{{ $key }}" @selected(old($name, $value) == $key)>{{ $option }}</option>

From f63ee41c9f16e70c33c86a4dc757cb18c623001e Mon Sep 17 00:00:00 2001
From: Dave Roverts <me@daveroverts.nl>
Date: Sat, 2 Nov 2024 14:44:42 +0100
Subject: [PATCH 12/21] chore: add textarea

---
 .../views/components/forms/textarea.blade.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 resources/views/components/forms/textarea.blade.php

diff --git a/resources/views/components/forms/textarea.blade.php b/resources/views/components/forms/textarea.blade.php
new file mode 100644
index 00000000..b555f7ff
--- /dev/null
+++ b/resources/views/components/forms/textarea.blade.php
@@ -0,0 +1,19 @@
+@props(['name', 'label' => null, 'value' => null, 'help', 'tinymce' => true])
+
+<x-forms.form-group :name="$name" :label="$label">
+    <textarea name="{{ $name }}" id="{{ $name }}" @class([
+        'form-control',
+        'tinymce' => $tinymce,
+        'is-invalid' => $errors->has($name),
+    ])>
+        {{ old($name, $value) }}
+    </textarea>
+
+    <x-error :field="$name" class="invalid-feedback" />
+
+    @isset($help)
+        <small id="{{ $name }}-help" class="form-text text-muted">
+            {!! $help !!}
+        </small>
+    @endisset
+</x-forms.form-group>

From 80b8f7c044e2a24472deaa931543d20889e064bb Mon Sep 17 00:00:00 2001
From: Dave Roverts <me@daveroverts.nl>
Date: Sat, 2 Nov 2024 14:45:02 +0100
Subject: [PATCH 13/21] chore: convert event admin form

---
 resources/views/event/admin/form.blade.php | 196 +++++++++++----------
 1 file changed, 99 insertions(+), 97 deletions(-)

diff --git a/resources/views/event/admin/form.blade.php b/resources/views/event/admin/form.blade.php
index 8367cd00..98ce50e7 100644
--- a/resources/views/event/admin/form.blade.php
+++ b/resources/views/event/admin/form.blade.php
@@ -9,104 +9,106 @@
 
                 <div class="card-body">
                     <x-form :action="$event->id ? route('admin.events.update', $event) : route('admin.events.store')" :method="$event->id ? 'PATCH' : 'POST'">
-                        @bind($event)
-                            <x-form-group name="is_online" :label="__('Show online?')" inline>
-                                <x-form-radio name="is_online" value="0" :label="__('No')" required />
-                                <x-form-radio name="is_online" value="1" :label="__('Yes')" required />
-                                @slot('help')
-                                    <small class="form-text text-muted">
-                                        {{ __("Choose here if you want the event to be reachable by it's generated url") }}
-                                    </small>
-                                @endslot
-                            </x-form-group>
-
-                            <x-form-group name="show_on_homepage" :label="__('Show on homepage?')" inline>
-                                <x-form-radio name="show_on_homepage" value="0" :label="__('No')" required />
-                                <x-form-radio name="show_on_homepage" value="1" :label="__('Yes')" required />
-                                @slot('help')
-                                    <small class="form-text text-muted">
-                                        {{ __("Choose here if you want to show the event on the homepage. If turned off, the event can only be reached by the url. NOTE: If 'Show Online' is off, the event won't be shown at all") }}
-                                    </small>
-                                @endslot
-                            </x-form-group>
-
-                            <x-form-input name="name" :label="__('Name')" required />
-
-                            <x-form-select name="event_type_id" :label="__('Event type')" :options="$eventTypes" :placeholder="__('Choose...')"
-                                required />
-
-                            <x-form-group name="import_only" :label="__('Only import?')" inline>
-                                <x-form-radio name="import_only" value="0" :label="__('No')" required />
-                                <x-form-radio name="import_only" value="1" :label="__('Yes')" required />
-                                @slot('help')
-                                    <small class="form-text text-muted">
-                                        {{ __('If enabled, only admins can fill in details via import script') }}
-                                    </small>
-                                @endslot
-                            </x-form-group>
-
-                            <x-form-group name="uses_times" :label="__('Show times?')" inline>
-                                <x-form-radio name="uses_times" value="0" :label="__('No')" required />
-                                <x-form-radio name="uses_times" value="1" :label="__('Yes')" required />
-                                @slot('help')
-                                    <small class="form-text text-muted">
-                                        {{ __('If enabled, CTOT and ETA (if set in booking) will be shown') }}
-                                    </small>
-                                @endslot
-                            </x-form-group>
-
-                            <x-form-group name="multiple_bookings_allowed" :label="__('Multiple bookings allowed?')" inline>
-                                <x-form-radio name="multiple_bookings_allowed" value="0" :label="__('No')" required />
-                                <x-form-radio name="multiple_bookings_allowed" value="1" :label="__('Yes')" required />
-                                @slot('help')
-                                    <small class="form-text text-muted">
-                                        {{ __('If enabled, a user is allowed to book multiple flights for this event') }}
-                                    </small>
-                                @endslot
-                            </x-form-group>
-
-                            <x-form-group name="is_oceanic_event" :label="__('Oceanic event?')" inline>
-                                <x-form-radio name="is_oceanic_event" value="0" :label="__('No')" required />
-                                <x-form-radio name="is_oceanic_event" value="1" :label="__('Yes')" required />
-                                @slot('help')
-                                    <small class="form-text text-muted">
-                                        {{ __('If enabled, users can fill in a SELCAL code') }}
-                                    </small>
-                                @endslot
-                            </x-form-group>
-
-                            <x-form-select name="dep" :label="__('Departure airport')" :options="$airports" :placeholder="__('Choose...')" required />
-
-                            <x-form-select name="arr" :label="__('Arrival airport')" :options="$airports" :placeholder="__('Choose...')" required />
-
-                            <x-form-group :label="__('Start event (UTC)')">
-                                <x-flat-pickr name="startEvent" value="{{ old('startEvent', $event->startEvent) }}" />
-                            </x-form-group>
-
-                            <x-form-group :label="__('End event (UTC)')">
-                                <x-flat-pickr name="endEvent" value="{{ old('endEvent', $event->endEvent) }}" />
-                            </x-form-group>
-
-                            <x-form-group :label="__('Start booking (UTC)')">
-                                <x-flat-pickr name="startBooking" value="{{ old('startBooking', $event->startBooking) }}" />
-                            </x-form-group>
-
-                            <x-form-group :label="__('End booking (UTC)')">
-                                <x-flat-pickr name="endBooking" value="{{ old('endBooking', $event->endBooking) }}" />
-                            </x-form-group>
-
-                            <x-form-input name="image_url" :label="__('Image URL')" placeholder="https://example.org" />
-
-                            <x-form-textarea name="description" :label="__('Description')" class="tinymce" />
-
-                            <x-form-submit>
-                                @if ($event->id)
-                                    <i class="fa fa-check"></i> {{ __('Edit') }}
-                                @else
-                                    <i class="fa fa-plus"></i> {{ __('Add') }}
-                                @endif
+                        <x-forms.form-group name="is_online" :label="__('Show online?')" inline>
+                            <x-forms.radio name="is_online" value="0" :label="__('No')" inline required
+                                :checked="!$event->is_online" />
+                            <x-forms.radio name="is_online" value="1" :label="__('Yes')" inline required
+                                :checked="$event->is_online" />
+                            <x-slot:help>
+                                {{ __("Choose here if you want the event to be reachable by it's generated url") }}
+                            </x-slot:help>
+                        </x-forms.form-group>
+
+                        <x-forms.form-group name="show_on_homepage" :label="__('Show on homepage?')" inline>
+                            <x-forms.radio name="show_on_homepage" value="0" :label="__('No')" inline required
+                                :checked="!$event->show_on_homepage" />
+                            <x-forms.radio name="show_on_homepage" value="1" :label="__('Yes')" inline required
+                                :checked="$event->show_on_homepage" />
+                            <x-slot:help>
+                                {{ __("Choose here if you want to show the event on the homepage. If turned off, the event can only be reached by the url. NOTE: If 'Show Online' is off, the event won't be shown at all") }}
+                            </x-slot:help>
+                        </x-forms.form-group>
+
+                        <x-forms.input name="name" :label="__('Name')" required :value="$event->name" />
+
+                        <x-forms.select name="event_type_id" :label="__('Event type')" :value="$event->event_type_id" :options="$eventTypes"
+                            :placeholder="__('Choose...')" required />
+
+                        <x-forms.form-group name="import_only" :label="__('Only import?')" inline>
+                            <x-forms.radio name="import_only" value="0" :label="__('No')" inline required
+                                :checked="!$event->import_only" />
+                            <x-forms.radio name="import_only" value="1" :label="__('Yes')" inline required
+                                :checked="$event->import_only" />
+                            <x-slot:help>
+                                {{ __('If enabled, only admins can fill in details via import script') }}
+                            </x-slot:help>
+                        </x-forms.form-group>
+
+                        <x-forms.form-group name="uses_times" :label="__('Show times?')" inline>
+                            <x-forms.radio name="uses_times" value="0" :label="__('No')" inline required
+                                :checked="!$event->uses_times" />
+                            <x-forms.radio name="uses_times" value="1" :label="__('Yes')" inline required
+                                :checked="$event->uses_times" />
+                            <x-slot:help>
+                                {{ __('If enabled, CTOT and ETA (if set in booking) will be shown') }}
+                            </x-slot:help>
+                        </x-forms.form-group>
+
+                        <x-forms.form-group name="multiple_bookings_allowed" :label="__('Multiple bookings allowed?')" inline>
+                            <x-forms.radio name="multiple_bookings_allowed" value="0" :label="__('No')" inline
+                                required :checked="!$event->multiple_bookings_allowed" />
+                            <x-forms.radio name="multiple_bookings_allowed" value="1" :label="__('Yes')" inline
+                                required :checked="$event->multiple_bookings_allowed" />
+                            <x-slot:help>
+                                {{ __('If enabled, a user is allowed to book multiple flights for this event') }}
+                            </x-slot:help>
+                        </x-forms.form-group>
+
+                        <x-forms.form-group name="is_oceanic_event" :label="__('Oceanic event?')" inline>
+                            <x-forms.radio name="is_oceanic_event" value="0" :label="__('No')" inline required
+                                :checked="!$event->is_oceanic_event" />
+                            <x-forms.radio name="is_oceanic_event" value="1" :label="__('Yes')" inline required
+                                :checked="$event->is_oceanic_event" />
+                            <x-slot:help>
+                                {{ __('If enabled, users can fill in a SELCAL code') }}
+                            </x-slot:help>
+
+                            <x-error field="is_oceanic_event" class="invalid-feedback" />
+                        </x-forms.form-group>
+
+                        <x-forms.select name="dep" :label="__('Departure airport')" :value="$event->dep" :options="$airports"
+                            :placeholder="__('Choose...')" required />
+
+                        <x-forms.select name="arr" :label="__('Arrival airport')" :value="$event->arr" :options="$airports"
+                            :placeholder="__('Choose...')" required />
+
+                        <x-forms.form-group name="startEvent" :label="__('Start event (UTC)')">
+                            <x-flat-pickr name="startEvent" value="{{ old('startEvent', $event->startEvent) }}" />
+                        </x-forms.form-group>
+
+                        <x-forms.form-group name="endEvent" :label="__('End event (UTC)')">
+                            <x-flat-pickr name="endEvent" value="{{ old('endEvent', $event->endEvent) }}" />
+                        </x-forms.form-group>
+
+                        <x-forms.form-group name="startBooking" :label="__('Start booking (UTC)')">
+                            <x-flat-pickr name="startBooking" value="{{ old('startBooking', $event->startBooking) }}" />
+                        </x-forms.form-group>
+
+                        <x-forms.form-group name="endBooking" :label="__('End booking (UTC)')">
+                            <x-flat-pickr name="endBooking" value="{{ old('endBooking', $event->endBooking) }}" />
+                        </x-forms.form-group>
+
+                        <x-forms.input name="image_url" :label="__('Image URL')" placeholder="https://example.org" />
+
+                        <x-forms.textarea name="description" :label="__('Description')" :value="$event->description" />
+
+                        <x-forms.button type="submit">
+                            @if ($event->id)
+                                <i class="fa fa-check"></i> {{ __('Edit') }}
+                            @else
+                                <i class="fa fa-plus"></i> {{ __('Add') }}
+                            @endif
                             </x-form-submit>
-                        @endbind
                     </x-form>
                 </div>
             </div>

From 26da2a7afe96bf8ca156e861a6c28b1f5352b08c Mon Sep 17 00:00:00 2001
From: Dave Roverts <me@daveroverts.nl>
Date: Sat, 2 Nov 2024 16:24:50 +0100
Subject: [PATCH 14/21] chore: make name optional for from-group

---
 resources/views/components/forms/form-group.blade.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/resources/views/components/forms/form-group.blade.php b/resources/views/components/forms/form-group.blade.php
index ce64a9c1..29793a2f 100644
--- a/resources/views/components/forms/form-group.blade.php
+++ b/resources/views/components/forms/form-group.blade.php
@@ -1,9 +1,11 @@
-@props(['name', 'label' => null, 'inline' => false, 'help'])
+@props(['name' => null, 'label' => null, 'inline' => false, 'help'])
 
 <div class="form-group">
-    <x-forms.label :for="$name" :label="$label" />
+    @if ($name || $label)
+        <x-forms.label :for="$name" :label="$label" />
+    @endif
 
-    <div {{ $attributes->class(['form-inline' => $inline]) }}>
+    <div {{ $attributes->class(['d-flex flex-row flex-wrap inline-space' => $inline]) }}>
         {!! $slot !!}
     </div>
 

From 006a6daa3886ac9e06268d90a299110ca09e825f Mon Sep 17 00:00:00 2001
From: Dave Roverts <me@daveroverts.nl>
Date: Sat, 2 Nov 2024 16:25:32 +0100
Subject: [PATCH 15/21] chore: add ability to add classes in input group

---
 resources/views/components/forms/input.blade.php | 15 ++++++++++++---
 resources/views/components/forms/label.blade.php |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/resources/views/components/forms/input.blade.php b/resources/views/components/forms/input.blade.php
index b88fb88f..325bc19e 100644
--- a/resources/views/components/forms/input.blade.php
+++ b/resources/views/components/forms/input.blade.php
@@ -1,7 +1,16 @@
-@props(['name', 'label' => null, 'value' => null, 'prepend', 'append', 'help'])
+@props([
+    'name',
+    'type' => 'text',
+    'label' => null,
+    'value' => null,
+    'prepend',
+    'append',
+    'help',
+    'inputGroupClass' => '',
+])
 
 <x-forms.form-group :name="$name" :label="$label">
-    <div class="input-group has-validation">
+    <div {{ $attributes->class(['input-group has-validation', $inputGroupClass]) }}>
         @isset($prepend)
             <div class="input-group-prepend">
                 <div class="input-group-text">
@@ -9,7 +18,7 @@
                 </div>
             </div>
         @endisset
-        <x-input :name="$name" :value="$value"
+        <x-input :name="$name" :value="$value" :type="$type"
             {{ $attributes->class(['form-control', 'is-invalid' => $errors->has($name)]) }} />
 
         <x-error :field="$name" class="invalid-feedback" />
diff --git a/resources/views/components/forms/label.blade.php b/resources/views/components/forms/label.blade.php
index 87faca95..6040aa65 100644
--- a/resources/views/components/forms/label.blade.php
+++ b/resources/views/components/forms/label.blade.php
@@ -1,3 +1,3 @@
 <label for="{{ $for }}" {{ $attributes }}>
-    {{ $label ?? $fallback }}
+    {!! $label ?? $fallback !!}
 </label>

From bbf0224a300670f09622e798c5ed77137c148ca9 Mon Sep 17 00:00:00 2001
From: Dave Roverts <me@daveroverts.nl>
Date: Sat, 2 Nov 2024 16:26:32 +0100
Subject: [PATCH 16/21] chore: don't use tinymce by default on textarea

---
 resources/views/components/forms/textarea.blade.php | 6 ++----
 resources/views/event/admin/form.blade.php          | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/resources/views/components/forms/textarea.blade.php b/resources/views/components/forms/textarea.blade.php
index b555f7ff..bb03bc01 100644
--- a/resources/views/components/forms/textarea.blade.php
+++ b/resources/views/components/forms/textarea.blade.php
@@ -1,13 +1,11 @@
-@props(['name', 'label' => null, 'value' => null, 'help', 'tinymce' => true])
+@props(['name', 'label' => null, 'value' => null, 'help', 'tinymce' => false])
 
 <x-forms.form-group :name="$name" :label="$label">
     <textarea name="{{ $name }}" id="{{ $name }}" @class([
         'form-control',
         'tinymce' => $tinymce,
         'is-invalid' => $errors->has($name),
-    ])>
-        {{ old($name, $value) }}
-    </textarea>
+    ])>{{ old($name, $value) }}</textarea>
 
     <x-error :field="$name" class="invalid-feedback" />
 
diff --git a/resources/views/event/admin/form.blade.php b/resources/views/event/admin/form.blade.php
index 98ce50e7..55d95dde 100644
--- a/resources/views/event/admin/form.blade.php
+++ b/resources/views/event/admin/form.blade.php
@@ -100,7 +100,7 @@
 
                         <x-forms.input name="image_url" :label="__('Image URL')" placeholder="https://example.org" />
 
-                        <x-forms.textarea name="description" :label="__('Description')" :value="$event->description" />
+                        <x-forms.textarea name="description" :label="__('Description')" :value="$event->description" tinymce />
 
                         <x-forms.button type="submit">
                             @if ($event->id)

From cb2169d58c9f9c973007adcd9da78bafdf68e137 Mon Sep 17 00:00:00 2001
From: Dave Roverts <me@daveroverts.nl>
Date: Sat, 2 Nov 2024 17:05:40 +0100
Subject: [PATCH 17/21] chore: add checkbox component

---
 resources/views/components/forms/checkbox.blade.php | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 resources/views/components/forms/checkbox.blade.php

diff --git a/resources/views/components/forms/checkbox.blade.php b/resources/views/components/forms/checkbox.blade.php
new file mode 100644
index 00000000..638501f2
--- /dev/null
+++ b/resources/views/components/forms/checkbox.blade.php
@@ -0,0 +1,8 @@
+@props(['name', 'label', 'value' => null])
+
+<div class="custom-control custom-checkbox">
+    <x-checkbox :name="$name" :value="$value"
+        {{ $attributes->class(['custom-control-input', 'is-invalid' => $errors->has($name)]) }} />
+
+    <x-forms.label :for="$name" :label="$label" class="custom-control-label" />
+</div>

From 3e0c5a0203e29a62d8352d70c18ed44892e23b76 Mon Sep 17 00:00:00 2001
From: Dave Roverts <me@daveroverts.nl>
Date: Sat, 2 Nov 2024 17:08:38 +0100
Subject: [PATCH 18/21] chore: convert create and edit booking admin views

---
 .../views/booking/admin/create.blade.php      | 105 +++++++++--------
 resources/views/booking/admin/edit.blade.php  | 110 +++++++++---------
 2 files changed, 111 insertions(+), 104 deletions(-)

diff --git a/resources/views/booking/admin/create.blade.php b/resources/views/booking/admin/create.blade.php
index 2942aa9f..a96a2b41 100644
--- a/resources/views/booking/admin/create.blade.php
+++ b/resources/views/booking/admin/create.blade.php
@@ -12,84 +12,91 @@
                         <input type="hidden" name="id" value="{{ $event->id }}">
                         <input type="hidden" name="bulk" value="{{ $bulk ? 1 : 0 }}">
 
-                        <x-form-group :label="__('Event')">
+                        <x-forms.form-group name="event" :label="__('Event')">
                             {{ $event->name }} [{{ $event->startEvent->format('d-m-Y') }} |
                             {{ $event->startEvent->format('Hi') }}z -
                             {{ $event->endEvent->format('Hi') }}z]
-                        </x-form-group>
+                        </x-forms.form-group>
 
-                        <x-form-group name="is_editable" :label="__('Editable?')" inline>
-                            <x-form-radio name="is_editable" value="0" :label="__('No')" required />
-                            <x-form-radio name="is_editable" value="1" :label="__('Yes')" required />
-                            @slot('help')
-                                <small class="form-text text-muted">
-                                    {{ __('Choose if you want the booking to be editable (Callsign and Aircraft Code only) by users. This is useful when using \'import only\', but want to add extra slots') }}
-                                </small>
-                            @endslot
-                        </x-form-group>
+                        <x-forms.form-group name="is_editable" :label="__('Editable?')" inline>
+                            <x-forms.radio name="is_editable" value="0" :label="__('No')" inline required />
+                            <x-forms.radio name="is_editable" value="1" :label="__('Yes')" inline required />
+                            <x-slot:help>
+                                {{ __('Choose if you want the booking to be editable (Callsign and Aircraft Code only) by users. This is useful when using \'import only\', but want to add extra slots') }}
+                            </x-slot:help>
+                        </x-forms.form-group>
 
                         @if (!$bulk)
-                            <x-form-input name="callsign" :label="__('Callsign')" maxlength="7" />
-                            <x-form-input name="acType" :label="__('Aircraft code')" minlength="3" maxlength="4" />
+                            <x-forms.input name="callsign" :label="__('Callsign')" maxlength="7" />
+                            <x-forms.input name="acType" :label="__('Aircraft code')" minlength="3" maxlength="4" />
                         @endif
 
-                        <x-form-select name="dep" :label="__('Departure airport')" :options="$airports" :placeholder="__('Choose...')" required
-                            :default="$event->dep" />
+                        <x-forms.select name="dep" :label="__('Departure airport')" :options="$airports" :placeholder="__('Choose...')" required
+                            :value="$event->dep" />
 
-                        <x-form-select name="arr" :label="__('Arrival airport')" :options="$airports" :placeholder="__('Choose...')" required
-                            :default="$event->dep" />
+                        <x-forms.select name="arr" :label="__('Arrival airport')" :options="$airports" :placeholder="__('Choose...')" required
+                            :value="$event->dep" />
 
                         @if ($bulk)
-                            <x-form-group inline>
-                                <x-form-input name="start" type="time" :label="'<i class=\'fa fa-clock\'></i> ' . __('Start')">
-                                    @slot('append')
+                            <x-forms.form-group inline>
+                                <x-forms.input name="start" type="time" input-group-class="pr-2">
+                                    <x-slot:label>
+                                        <i class="fa fa-clock"></i> Start
+                                    </x-slot:label>
+                                    <x-slot:append>
                                         z
-                                    @endslot
-                                </x-form-input>
-                                <x-form-input name="end" type="time" :label="'<i class=\'fa fa-clock\'></i> ' . __('End')">
-                                    @slot('append')
+                                    </x-slot:append>
+                                </x-forms.input>
+                                <x-forms.input name="end" type="time" input-group-class="pr-2">
+                                    <x-slot:label>
+                                        <i class="fa fa-clock"></i> End
+                                    </x-slot:label>
+                                    <x-slot:append>
                                         z
-                                    @endslot
-                                </x-form-input>
+                                    </x-slot:append>
+                                </x-forms.input>
 
-                                <x-form-input name="separation" type="number" :label="__('Separation (in minutes)')" />
-                            </x-form-group>
+                                <x-forms.input name="separation" type="number" :label="__('Separation (in minutes)')" />
+                            </x-forms.form-group>
                         @else
-                            <x-form-group inline>
-                                <x-form-input name="ctot" type="time" :label="'<i class=\'fa fa-clock\'></i> ' . __('CTOT')">
-                                    @slot('append')
+                            <x-forms.form-group inline>
+                                <x-forms.input name="ctot" type="time" input-group-class="pr-2">
+                                    <x-slot:label>
+                                        <i class="fa fa-clock"></i> CTOT
+                                    </x-slot:label>
+                                    <x-slot:append>
                                         z
-                                    @endslot
-                                </x-form-input>
-                                <x-form-input name="eta" type="time" :label="'<i class=\'fa fa-clock\'></i> ' . __('ETA')">
-                                    @slot('append')
+                                    </x-slot:append>
+                                </x-forms.input>
+                                <x-forms.input name="eta" type="time">
+                                    <x-slot:label>
+                                        <i class="fa fa-clock"></i> ETA
+                                    </x-slot:label>
+                                    <x-slot:append>
                                         z
-                                    @endslot
-                                </x-form-input>
+                                    </x-slot:append>
+                                </x-forms.input>
+                            </x-forms.form-group>
 
-                            </x-form-group>
+                            <x-forms.textarea name="route" :label="__('Route')" />
 
-                            <x-form-textarea name="route" :label="__('Route')" />
-
-
-                            <x-form-input name="oceanicFL" :label="$event->is_oceanic_event ? __('Oceanic Entry Level') : __('Cruise FL')">
-                                @slot('prepend')
+                            <x-forms.input name="oceanicFL" :label="$event->is_oceanic_event ? __('Oceanic Entry Level') : __('Cruise FL')">
+                                <x-slot:prepend>
                                     FL
-                                @endslot
-                            </x-form-input>
+                                </x-slot:prepend>
+                            </x-forms.input>
                         @endif
 
-                        <x-form-textarea name="notes" :label="__('Notes')" />
+                        <x-forms.textarea name="notes" :label="__('Notes')" />
 
-                        <x-form-submit>
+                        <x-forms.button type="submit">
                             @if ($bulk)
                                 <i class="fa fa-plus"></i> {{ __('Add timeslots') }}
                             @else
                                 <i class="fa fa-plus"></i> {{ __('Add slot') }}
                             @endif
-                        </x-form-submit>
+                        </x-forms.button>
                     </x-form>
-
                 </div>
             </div>
         </div>
diff --git a/resources/views/booking/admin/edit.blade.php b/resources/views/booking/admin/edit.blade.php
index a950d466..8bcca300 100644
--- a/resources/views/booking/admin/edit.blade.php
+++ b/resources/views/booking/admin/edit.blade.php
@@ -10,73 +10,73 @@
 
                 <div class="card-body">
                     <x-form :action="route('admin.bookings.update', $booking)" method="PATCH">
-                        @bind($booking)
-                            <x-form-group name="is_editable" :label="__('Editable?')" inline>
-                                <x-form-radio name="is_editable" value="0" :label="__('No')" required />
-                                <x-form-radio name="is_editable" value="1" :label="__('Yes')" required />
-                                @slot('help')
-                                    <small class="form-text text-muted">
-                                        {{ __('Choose if you want the booking to be editable (Callsign and Aircraft Code only) by users. This is useful when using \'import only\', but want to add extra slots') }}
-                                    </small>
-                                @endslot
-                            </x-form-group>
+                        <x-forms.form-group name="is_editable" :label="__('Editable?')" inline>
+                            <x-forms.radio name="is_editable" value="0" :label="__('No')" inline required
+                                :checked="!$booking->is_editable" />
+                            <x-forms.radio name="is_editable" value="1" :label="__('Yes')" inline required
+                                :checked="$booking->is_editable" />
+                            <x-slot:help>
+                                {{ __('Choose if you want the booking to be editable (Callsign and Aircraft Code only) by users. This is useful when using \'import only\', but want to add extra slots') }}
+                            </x-slot:help>
+                        </x-forms.form-group>
 
-                            <x-form-input name="callsign" :label="__('Callsign')" maxlength="7" />
-                            <x-form-input name="acType" :label="__('Aircraft code')" minlength="3" maxlength="4" />
+                        <x-forms.input name="callsign" :label="__('Callsign')" maxlength="7" :value="$booking->callsign" />
+                        <x-forms.input name="acType" :label="__('Aircraft code')" minlength="3" maxlength="4" :value="$booking->acType" />
 
-                            @bind($flight)
-                                <x-form-group inline>
-                                    <x-form-input name="ctot" :bind="false" value="{{ $flight->ctot?->format('H:i') }}"
-                                        type="time" :label="'<i class=\'fa fa-clock\'></i> ' . __('CTOT')">
-                                        @slot('append')
-                                            z
-                                        @endslot
-                                    </x-form-input>
-                                    <x-form-input name="eta" :bind="false" value="{{ $flight->eta?->format('H:i') }}"
-                                        type="time" :label="'<i class=\'fa fa-clock\'></i> ' . __('ETA')">
-                                        @slot('append')
-                                            z
-                                        @endslot
-                                    </x-form-input>
-                                </x-form-group>
+                        <x-forms.form-group inline>
+                            <x-forms.input name="ctot" type="time" :value="$flight->ctot?->format('H:i')" input-group-class="pr-2">
+                                <x-slot:label>
+                                    <i class="fa fa-clock"></i> CTOT
+                                </x-slot:label>
+                                <x-slot:append>
+                                    z
+                                </x-slot:append>
+                            </x-forms.input>
+                            <x-forms.input name="eta" type="time" :value="$flight->eta?->format('H:i')">
+                                <x-slot:label>
+                                    <i class="fa fa-clock"></i> ETA
+                                </x-slot:label>
+                                <x-slot:append>
+                                    z
+                                </x-slot:append>
+                            </x-forms.input>
+                        </x-forms.form-group>
 
-                                <x-form-select name="dep" :label="__('Departure airport')" :options="$airports" :placeholder="__('Choose...')" required />
+                        <x-forms.select name="dep" :label="__('Departure airport')" :options="$airports" :placeholder="__('Choose...')" required
+                            :value="$flight->dep" />
 
-                                <x-form-select name="arr" :label="__('Arrival airport')" :options="$airports" :placeholder="__('Choose...')" required />
+                        <x-forms.select name="arr" :label="__('Arrival airport')" :options="$airports" :placeholder="__('Choose...')" required
+                            :value="$flight->arr" />
 
-                                <x-form-group :label="__('PIC')">
-                                    {{ $booking->user ? $booking->user->pic : '-' }}
-                                </x-form-group>
+                        <x-forms.form-group name="pic" :label="__('PIC')">
+                            {{ $booking->user ? $booking->user->pic : '-' }}
+                        </x-forms.form-group>
 
-                                <x-form-textarea name="route" :label="__('Route')" />
+                        <x-forms.textarea name="route" :label="__('Route')" :value="$flight->route" />
 
-                                @if ($booking->event->is_oceanic_event)
-                                    <x-form-input name="oceanicTrack" :label="__('Track')" maxlength="2" />
-                                @endif
+                        @if ($booking->event->is_oceanic_event)
+                            <x-forms.input name="oceanicTrack" :label="__('Track')" maxlength="2" :value="$flight->oceanicTrack" />
+                        @endif
 
-                                <x-form-input name="oceanicFL" :label="$booking->event->is_oceanic_event
-                                    ? __('Oceanic Entry Level')
-                                    : __('Cruise FL')">
-                                    @slot('prepend')
-                                        FL
-                                    @endslot
-                                </x-form-input>
+                        <x-forms.input name="oceanicFL" :label="$booking->event->is_oceanic_event ? __('Oceanic Entry Level') : __('Cruise FL')" :value="$flight->oceanicFL">
+                            <x-slot:prepend>
+                                FL
+                            </x-slot:prepend>
+                        </x-forms.input>
 
-                                <x-form-textarea name="notes" :label="__('Notes')" />
-                            @endbind
+                        <x-forms.textarea name="notes" :label="__('Notes')" :value="$flight->notes" />
 
-                            @if ($booking->user_id)
-                                <x-form-textarea name="message" :label="__('Message')" />
+                        @if ($booking->user_id)
+                            <x-forms.textarea name="message" :label="__('Message')" />
 
-                                <x-form-group>
-                                    <x-form-checkbox name="notify_user" checked :label="__('Notify user?')" />
-                                </x-form-group>
-                            @endif
+                            <x-forms.form-group>
+                                <x-forms.checkbox name="notify_user" :label="__('Notify user?')" />
+                            </x-forms.form-group>
+                        @endif
 
-                            <x-form-submit>
-                                <i class="fas fa-check"></i> {{ __('Update') }}
-                            </x-form-submit>
-                        @endbind
+                        <x-forms.button type="submit">
+                            <i class="fas fa-check"></i> {{ __('Update') }}
+                        </x-forms.button>
                     </x-form>
                 </div>
             </div>

From 9bb6f8210837a19b4a0a3f30876968be956299a1 Mon Sep 17 00:00:00 2001
From: Dave Roverts <me@daveroverts.nl>
Date: Sun, 9 Feb 2025 14:38:46 +0100
Subject: [PATCH 19/21] chore: ensure link forms use old value when needed

---
 resources/views/airportLink/admin/form.blade.php | 4 ++--
 resources/views/eventLink/admin/form.blade.php   | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/resources/views/airportLink/admin/form.blade.php b/resources/views/airportLink/admin/form.blade.php
index 383658f4..c24b5790 100644
--- a/resources/views/airportLink/admin/form.blade.php
+++ b/resources/views/airportLink/admin/form.blade.php
@@ -24,8 +24,8 @@
                             <x-forms.select name="airport_id" :label="__('Airport')" :options="$airports" :placeholder="__('Choose...')"
                                 required />
                         @endif
-                        <x-forms.input name="name" :label="__('Name')" :help="__('Leave empty to use the type as name')" />
-                        <x-forms.input name="url" :label="__('URL')" placeholder="https://example.org" required />
+                        <x-forms.input name="name" :label="__('Name')" :help="__('Leave empty to use the type as name')" :value="old('name', $airportLink->name)" />
+                        <x-forms.input name="url" :label="__('URL')" placeholder="https://example.org" required :value="old('url', $airportLink->url)" />
 
                         <x-forms.button type="submit">
                             @if ($airportLink->id)
diff --git a/resources/views/eventLink/admin/form.blade.php b/resources/views/eventLink/admin/form.blade.php
index 229e0d69..5e71b700 100644
--- a/resources/views/eventLink/admin/form.blade.php
+++ b/resources/views/eventLink/admin/form.blade.php
@@ -21,9 +21,8 @@
                         @else
                             <x-forms.select name="event_id" :label="__('Event')" :options="$events" :placeholder="__('Choose...')" required />
                         @endif
-                        <x-forms.input name="name" :label="__('Name')" :value="$eventLink->name" :help="__('Leave empty to use the type as name')" />
-                        <x-forms.input name="url" :label="__('URL')" :value="$eventLink->url" placeholder="https://example.org"
-                            required />
+                        <x-forms.input name="name" :label="__('Name')" :value="$eventLink->name" :help="__('Leave empty to use the type as name')" :value="old('name', $eventLink->name)" />
+                        <x-forms.input name="url" :label="__('URL')" :value="$eventLink->url" placeholder="https://example.org" required :value="old('name', $eventLink->url)" />
 
                         <x-forms.button type="submit">
                             @if ($eventLink->id)

From 7debaea9c55ecf5fbca008c07c7eb3d8b85264d5 Mon Sep 17 00:00:00 2001
From: Dave Roverts <me@daveroverts.nl>
Date: Sun, 9 Feb 2025 14:39:41 +0100
Subject: [PATCH 20/21] chore: remove old package already

---
 composer.json                            |  3 +-
 composer.lock                            | 86 +-----------------------
 config/blade-ui-kit.php                  |  2 +-
 config/form-components.php               | 79 ----------------------
 resources/views/faq/admin/form.blade.php | 19 +++---
 5 files changed, 12 insertions(+), 177 deletions(-)
 delete mode 100644 config/form-components.php

diff --git a/composer.json b/composer.json
index 2121cee7..12dbc2c8 100644
--- a/composer.json
+++ b/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
-}
\ No newline at end of file
+}
diff --git a/composer.lock b/composer.lock
index 921221c3..046fbacf 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a80ebe66ead4d608c34af83388cac46c",
+    "content-hash": "8a123cb174fcfbc32904fbdaa85077e0",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -5054,90 +5054,6 @@
             ],
             "time": "2023-09-13T16:42:03+00:00"
         },
-        {
-            "name": "protonemedia/laravel-form-components",
-            "version": "3.8.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/protonemedia/laravel-form-components.git",
-                "reference": "d4bf426a7ce6c0789b6dc895e5192ccbfe0e1393"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/protonemedia/laravel-form-components/zipball/d4bf426a7ce6c0789b6dc895e5192ccbfe0e1393",
-                "reference": "d4bf426a7ce6c0789b6dc895e5192ccbfe0e1393",
-                "shasum": ""
-            },
-            "require": {
-                "illuminate/support": "^9.0 || ^10.0",
-                "php": "^8.1 || ^8.2",
-                "symfony/http-foundation": "^6.0"
-            },
-            "require-dev": {
-                "livewire/livewire": "^2.12",
-                "mockery/mockery": "^1.4.4",
-                "nesbot/carbon": "^2.66",
-                "orchestra/testbench-browser-kit": "^7.0 || ^8.0",
-                "phpunit/phpunit": "^9.5",
-                "spatie/laravel-translatable": "^6.0",
-                "symfony/dom-crawler": "^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "laravel": {
-                    "providers": [
-                        "ProtoneMedia\\LaravelFormComponents\\Support\\ServiceProvider"
-                    ]
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "ProtoneMedia\\LaravelFormComponents\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Pascal Baljet",
-                    "email": "pascal@protone.media",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Blade components to rapidly build forms with Tailwind CSS Custom Forms and Bootstrap 4.",
-            "homepage": "https://github.com/protonemedia/laravel-form-components",
-            "keywords": [
-                "Forms",
-                "bootstrap",
-                "bootstrap-4",
-                "bootstrap-5",
-                "bootstrap4",
-                "bootstrap5",
-                "form",
-                "form-builder",
-                "form-components",
-                "laravel",
-                "laravel-form-builder",
-                "laravel-form-components",
-                "protonemedia",
-                "tailwind",
-                "tailwindcss"
-            ],
-            "support": {
-                "issues": "https://github.com/protonemedia/laravel-form-components/issues",
-                "source": "https://github.com/protonemedia/laravel-form-components/tree/3.8.0"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/pascalbaljet",
-                    "type": "github"
-                }
-            ],
-            "abandoned": true,
-            "time": "2023-02-21T21:25:14+00:00"
-        },
         {
             "name": "psr/cache",
             "version": "3.0.0",
diff --git a/config/blade-ui-kit.php b/config/blade-ui-kit.php
index c1a0ebeb..ad4e80d4 100644
--- a/config/blade-ui-kit.php
+++ b/config/blade-ui-kit.php
@@ -19,7 +19,7 @@
         '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,
diff --git a/config/form-components.php b/config/form-components.php
deleted file mode 100644
index 6138db3c..00000000
--- a/config/form-components.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-use ProtoneMedia\LaravelFormComponents\Components;
-
-return [
-    'prefix' => '',
-
-    /** tailwind | tailwind-2 | bootstrap-4 | bootstrap-5 */
-    'framework' => 'bootstrap-4',
-
-    'use_eloquent_date_casting' => false,
-
-    'components' => [
-        'form' => [
-            'view'  => 'form-components::{framework}.form',
-            'class' => Components\Form::class,
-        ],
-
-        'form-checkbox' => [
-            'view'  => 'form-components::{framework}.form-checkbox',
-            'class' => Components\FormCheckbox::class,
-        ],
-
-        'form-errors' => [
-            'view'  => 'form-components::{framework}.form-errors',
-            'class' => Components\FormErrors::class,
-        ],
-
-        'form-group' => [
-            'view'  => 'form-components::{framework}.form-group',
-            'class' => Components\FormGroup::class,
-        ],
-
-        'form-input' => [
-            'view'  => 'form-components::{framework}.form-input',
-            'class' => Components\FormInput::class,
-        ],
-
-        'form-input-group' => [
-            'view'  => 'form-components::{framework}.form-input-group',
-            'class' => Components\FormInputGroup::class,
-        ],
-
-        'form-input-group-text' => [
-            'view'  => 'form-components::{framework}.form-input-group-text',
-            'class' => Components\FormInputGroupText::class,
-        ],
-
-        'form-label' => [
-            'view'  => 'form-components::{framework}.form-label',
-            'class' => Components\FormLabel::class,
-        ],
-
-        'form-radio' => [
-            'view'  => 'form-components::{framework}.form-radio',
-            'class' => Components\FormRadio::class,
-        ],
-
-        'form-range' => [
-            'view'  => 'form-components::{framework}.form-range',
-            'class' => Components\FormRange::class,
-        ],
-
-        'form-select' => [
-            'view'  => 'form-components::{framework}.form-select',
-            'class' => Components\FormSelect::class,
-        ],
-
-        'form-submit' => [
-            'view'  => 'form-components::{framework}.form-submit',
-            'class' => Components\FormSubmit::class,
-        ],
-
-        'form-textarea' => [
-            'view'  => 'form-components::{framework}.form-textarea',
-            'class' => Components\FormTextarea::class,
-        ],
-    ],
-];
diff --git a/resources/views/faq/admin/form.blade.php b/resources/views/faq/admin/form.blade.php
index ebc93e21..71fbefcf 100644
--- a/resources/views/faq/admin/form.blade.php
+++ b/resources/views/faq/admin/form.blade.php
@@ -29,24 +29,23 @@
 
                 <div class="card-body">
                     <x-form :action="$faq->id ? route('admin.faq.update', $faq) : route('admin.faq.store')" :method="$faq->id ? 'PATCH' : 'POST'">
-                        @bind($faq)
-                            <x-form-group name="is_online" :label="__('Is online')" inline>
-                                <x-form-radio name="is_online" value="0" :label="__('No')" required />
-                                <x-form-radio name="is_online" value="1" :label="__('Yes')" required />
-                            </x-form-group>
 
-                            <x-form-input name="question" :label="__('Question')" required />
+                            <x-forms.form-group name="is_online" :label="__('Is online')" inline>
+                                <x-forms.radio name="is_online" value="0" :label="__('No')" required />
+                                <x-forms.radio name="is_online" value="1" :label="__('Yes')" required />
+                            </x-forms.form-group>
 
-                            <x-form-textarea name="answer" :label="__('Answer')" class="tinymce" />
+                            <x-forms.input name="question" :label="__('Question')" required />
 
-                            <x-form-submit>
+                            <x-forms.textarea name="answer" :label="__('Answer')" class="tinymce" />
+
+                        <x-forms.button type="submit">
                                 @if ($faq->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>

From c18d28ed6cc5320f4e2f3530c0a152bcf8062096 Mon Sep 17 00:00:00 2001
From: Dave Roverts <me@daveroverts.nl>
Date: Sun, 9 Feb 2025 15:49:35 +0100
Subject: [PATCH 21/21] chore: fix radio on faq form

---
 resources/views/components/forms/radio.blade.php |  5 +++--
 resources/views/faq/admin/form.blade.php         | 10 ++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/resources/views/components/forms/radio.blade.php b/resources/views/components/forms/radio.blade.php
index bf36b456..acfa0238 100644
--- a/resources/views/components/forms/radio.blade.php
+++ b/resources/views/components/forms/radio.blade.php
@@ -1,4 +1,4 @@
-@props(['name', 'label', 'value', 'inline' => false])
+@props(['name', 'label', 'value', 'inline' => false, 'shouldBeChecked' => false])
 
 @php
     $id = $name . '-' . $value;
@@ -9,7 +9,8 @@
     'custom-control-inline' => $inline,
 ])>
     <x-input type="radio" :name="$name" :value="$value" :id="$id"
-        {{ $attributes->class(['custom-control-input', 'is-invalid' => $errors->has($name)])->merge(['checked' => '']) }} />
+        {{ $attributes->class(['custom-control-input', 'is-invalid' => $errors->has($name)])->merge(['checked' => $shouldBeChecked]) }}
+    />
 
     <x-forms.label :for="$id" :label="$label" class="custom-control-label" />
 </div>
diff --git a/resources/views/faq/admin/form.blade.php b/resources/views/faq/admin/form.blade.php
index 71fbefcf..92688a32 100644
--- a/resources/views/faq/admin/form.blade.php
+++ b/resources/views/faq/admin/form.blade.php
@@ -31,13 +31,15 @@
                     <x-form :action="$faq->id ? route('admin.faq.update', $faq) : route('admin.faq.store')" :method="$faq->id ? 'PATCH' : 'POST'">
 
                             <x-forms.form-group name="is_online" :label="__('Is online')" inline>
-                                <x-forms.radio name="is_online" value="0" :label="__('No')" required />
-                                <x-forms.radio name="is_online" value="1" :label="__('Yes')" required />
+
+                                <x-forms.radio inline name="is_online" value="0" :label="__('No')" required :should-be-checked="old('is_online' === 0, !$faq->is_online )" />
+                                <x-forms.radio inline name="is_online" value="1" :label="__('Yes')" required :should-be-checked="old('is_online' === 1, $faq->is_online )" />
+
                             </x-forms.form-group>
 
-                            <x-forms.input name="question" :label="__('Question')" required />
+                            <x-forms.input name="question" :label="__('Question')" required value="{!! old('question', $faq->question) !!}" />
 
-                            <x-forms.textarea name="answer" :label="__('Answer')" class="tinymce" />
+                            <x-forms.textarea tinymce name="answer" :label="__('Answer')" value="{!! old('answer', $faq->answer) !!}" />
 
                         <x-forms.button type="submit">
                                 @if ($faq->id)