diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 903dc93..8d03982 100755 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -7,6 +7,8 @@ use Illuminate\Support\ServiceProvider; use Illuminate\Pagination\Paginator; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\View; +use Livewire\Livewire; +use Illuminate\Support\Facades\Route; class AppServiceProvider extends ServiceProvider { @@ -27,7 +29,10 @@ class AppServiceProvider extends ServiceProvider */ public function boot() { + // Use Bootstrap for pagination Paginator::useBootstrap(); + + // Custom validation rule: isunique Validator::extend('isunique', function ($attribute, $value, $parameters, $validator) { $value = strtolower($value); $query = DB::table($parameters[0])->whereRaw("LOWER({$attribute}) = ?", [$value]); @@ -38,10 +43,19 @@ class AppServiceProvider extends ServiceProvider return $query->count() === 0; }); + + // Custom validation rule: exturl Validator::extend('exturl', function ($attribute, $value, $parameters, $validator) { $allowed_schemes = ['http', 'https', 'mailto', 'tel']; return in_array(parse_url($value, PHP_URL_SCHEME), $allowed_schemes, true); }); + + // Add namespace for blocks View::addNamespace('blocks', base_path('blocks')); + + // Customize Livewire script route + Livewire::setScriptRoute(function ($handle) { + return Route::get(asset('assets/vendor/livewire/livewire.js'), $handle); + }); } } diff --git a/app/Providers/LivewireServiceProvider.php b/app/Providers/LivewireServiceProvider.php index c09c807..266cb27 100644 --- a/app/Providers/LivewireServiceProvider.php +++ b/app/Providers/LivewireServiceProvider.php @@ -6,9 +6,9 @@ use Illuminate\Support\ServiceProvider; class LivewireServiceProvider extends ServiceProvider { - public function register() - { - $assetUrl = url(''); - config(['livewire.asset_url' => $assetUrl]); - } + // public function register() + // { + // $assetUrl = asset('/vendor/livewire/livewire/dist/livewire.js'); + // config(['livewire.asset_url' => $assetUrl]); + // } } \ No newline at end of file diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php index b4eaa4a..2197fab 100755 --- a/resources/views/layouts/sidebar.blade.php +++ b/resources/views/layouts/sidebar.blade.php @@ -21,7 +21,6 @@ - {{-- --}} @include('layouts.analytics') @@ -508,7 +507,6 @@ MODAL; // <-- Indentation breaks my code editor :/ {{-- --}} @if(auth()->user()->role == 'admin') - @push('sidebar-scripts') - @if (env('JOIN_BETA') == true) - - @else - + @else + - @endif - - @endpush + } + + document.addEventListener('DOMContentLoaded', updateVersionIcons); + document.addEventListener('livewire:navigated', updateVersionIcons); + })(); + + @endif