From 5d1feac052459ce9a5669889f75ae18ea0ad1514 Mon Sep 17 00:00:00 2001 From: recursive_tree Date: Fri, 12 Jan 2024 14:45:29 +0100 Subject: [PATCH 1/2] use bootstrap pagination templates --- src/WebServiceProvider.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/WebServiceProvider.php b/src/WebServiceProvider.php index 0d28592d1..fe24b03b5 100644 --- a/src/WebServiceProvider.php +++ b/src/WebServiceProvider.php @@ -26,6 +26,7 @@ use Illuminate\Auth\Events\Login as LoginEvent; use Illuminate\Auth\Events\Logout as LogoutEvent; use Illuminate\Foundation\AliasLoader; +use Illuminate\Pagination\Paginator; use Illuminate\Routing\Router; use Illuminate\Support\Facades\Gate; use Illuminate\Support\Facades\Validator; @@ -124,6 +125,9 @@ public function boot(Router $router) // Configure API $this->configure_api(); + + // Configure pagination settings + $this->configure_pagination(); } /** @@ -183,6 +187,14 @@ private function add_views() $this->loadViewsFrom(__DIR__ . '/resources/views', 'web'); } + /** + * Configure illuminate/pagination to use bootstrap 4 since the new default is tailwind + * See https://laravel.com/docs/10.x/pagination#using-bootstrap + */ + private function configure_pagination(): void { + Paginator::useBootstrapFour(); + } + /** * Add the view composers. This allows us * to make data available in views without From 9797675bc4fa0ce0fda4ebeca3ed997b7d9566bb Mon Sep 17 00:00:00 2001 From: recursive_tree Date: Fri, 12 Jan 2024 14:49:18 +0100 Subject: [PATCH 2/2] styleci --- src/WebServiceProvider.php | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/WebServiceProvider.php b/src/WebServiceProvider.php index fe24b03b5..844e21f16 100644 --- a/src/WebServiceProvider.php +++ b/src/WebServiceProvider.php @@ -148,28 +148,28 @@ private function add_publications() $this->publishes([ __DIR__ . '/resources/css' => public_path('web/css'), __DIR__ . '/resources/img' => public_path('web/img'), - __DIR__ . '/resources/js' => public_path('web/js'), + __DIR__ . '/resources/js' => public_path('web/js'), __DIR__ . '/resources/fonts' => public_path('web/fonts'), // Bootstrap pulled from packagist - base_path('vendor/twbs/bootstrap/dist/css/bootstrap.min.css') => public_path('web/css/bootstrap.min.css'), + base_path('vendor/twbs/bootstrap/dist/css/bootstrap.min.css') => public_path('web/css/bootstrap.min.css'), base_path('vendor/almasaeed2010/adminlte/plugins/bootstrap/js/bootstrap.bundle.min.js') => public_path('web/js/bootstrap.bundle.min.js'), // Datatables pulled from packagist - base_path('vendor/datatables.net/datatables.net/js/jquery.dataTables.min.js') => public_path('web/js/jquery.dataTables.min.js'), + base_path('vendor/datatables.net/datatables.net/js/jquery.dataTables.min.js') => public_path('web/js/jquery.dataTables.min.js'), base_path('vendor/datatables.net/datatables.net-bs4/css/dataTables.bootstrap4.min.css') => public_path('web/css/dataTables.bootstrap4.min.css'), - base_path('vendor/datatables.net/datatables.net-bs4/js/dataTables.bootstrap4.min.js') => public_path('web/js/dataTables.bootstrap4.min.js'), - base_path('vendor/datatables.net/datatables.net-buttons/js/dataTables.buttons.min.js') => public_path('web/js/dataTables.buttons.min.js'), - base_path('vendor/datatables.net/datatables.net-buttons-bs4/css/buttons.bootstrap4.min.css') => public_path('web/css/buttons.bootstrap4.min.css'), - base_path('vendor/datatables.net/datatables.net-buttons-bs4/js/buttons.bootstrap4.min.js') => public_path('web/js/buttons.bootstrap4.min.js'), + base_path('vendor/datatables.net/datatables.net-bs4/js/dataTables.bootstrap4.min.js') => public_path('web/js/dataTables.bootstrap4.min.js'), + base_path('vendor/datatables.net/datatables.net-buttons/js/dataTables.buttons.min.js') => public_path('web/js/dataTables.buttons.min.js'), + base_path('vendor/datatables.net/datatables.net-buttons-bs4/css/buttons.bootstrap4.min.css') => public_path('web/css/buttons.bootstrap4.min.css'), + base_path('vendor/datatables.net/datatables.net-buttons-bs4/js/buttons.bootstrap4.min.js') => public_path('web/js/buttons.bootstrap4.min.js'), // AdminLTE pulled from packagist base_path('vendor/almasaeed2010/adminlte/dist/css/adminlte.min.css') => public_path('web/css/adminlte.min.css'), - base_path('vendor/almasaeed2010/adminlte/dist/js/adminlte.min.js') => public_path('web/js/adminlte.min.js'), + base_path('vendor/almasaeed2010/adminlte/dist/js/adminlte.min.js') => public_path('web/js/adminlte.min.js'), // Font Awesome pulled from packagist base_path('vendor/components/font-awesome/css/all.min.css') => public_path('web/css/all.min.css'), - base_path('vendor/components/font-awesome/webfonts') => public_path('web/webfonts'), + base_path('vendor/components/font-awesome/webfonts') => public_path('web/webfonts'), ], ['public', 'seat']); // publish horizon override for queues setup @@ -189,7 +189,7 @@ private function add_views() /** * Configure illuminate/pagination to use bootstrap 4 since the new default is tailwind - * See https://laravel.com/docs/10.x/pagination#using-bootstrap + * See https://laravel.com/docs/10.x/pagination#using-bootstrap. */ private function configure_pagination(): void { Paginator::useBootstrapFour(); @@ -518,10 +518,10 @@ private function register_settings() // Default Scopes asked for SSO Authentication Seat::define('sso_scopes', [ [ - 'id' => 0, - 'name' => 'default', + 'id' => 0, + 'name' => 'default', 'default' => true, - 'scopes' => [ + 'scopes' => [ 'publicData', 'esi-alliances.read_contacts.v1', 'esi-assets.read_assets.v1',