Mise à jour Laravel 9

README.md

@@ -87,13 +87,13 @@ return [
      * Icone du nom de l'application
      * default: <i class="fa fa-puzzle-piece align-middle ml-3" style="font-size: 26px;"></i>
      */
-    'label_icon' => '<i class="fa fa-android align-middle ml-3" style="font-size: 26px;"></i>',
+    'label_icon' => '<i class="fa fa-puzzle-piece align-middle ml-3" style="font-size: 26px;"></i>',
 
     /**
      * Nom de l'application
      * default: <b>M</b>odulus
      */
-    'label_name' => '<b>G</b>odenbot',
+    'label_name' => '<b>E</b>xtranet',
 
     /**
      * Préfixe des url de Modulus
@@ -105,11 +105,16 @@ return [
      * Namespace des constroleurs à surcharger
      * default: Goldenscarab\\Modulus\\App\\Http\\Controllers
      * - DashboardController
-     * 
-     * Exemple : 'App\\Http\\Controllers' pour une route App\\Http\\Controllers\\DashboardController@index'
      */
-    'namespace_custom' => 'App\\Http\\Controllers',
+    'dashboard_action' => 'App\\Http\\Controllers\\DashboardController@index',
+
+    /**
+     * Message du footer
+     */
+    'msg_footer_right' => 'La simplicité dans le sur mesure',
+    'msg_footer_left' => '<strong>Copyright &copy; ' .  date('Y')  . ' <a href="https://www.goldenscarab.fr" target="_blanc">Goldenscarab.</a></strong> All rights reserved.'
 ];
+
 ```
 
 ### Routes

assets_install.sh

@@ -29,7 +29,7 @@ npm install --save numeral@2.0.6
 npm install --save vue@2.6.12
 
 # Dépendance de dev
-npm install --save-dev @babel/core@7.12.16
+npm install --save-dev @babel/core@7.18.13
 npm install --save-dev @babel/preset-env@7.12.16
 npm install --save-dev @tailwindcss/forms@0.2.1
 npm install --save-dev @vue/test-utils@1.1.3
@@ -37,7 +37,7 @@ npm install --save-dev @vue/composition-api@1.0.0-rc.9
 npm install --save-dev sass@1.32.7
 npm install --save-dev sass-loader@8.0.2
 npm install --save-dev vue-jest@3.0.7
-npm install --save-dev vue-loader
+npm install --save-dev vue-loader@15.9.8
 npm install --save-dev vue-template-compiler@2.6.12
 npm install --save-dev resolve-url-loader@4.0.0
 npm install --save-dev laravel-vue-pagination@2.3.1

src/app/Http/Controllers/App/ModuleController.php

@@ -92,6 +92,7 @@ class ModuleController extends Controller
     {
         $module = Module::findOrFail($alias);
 
+
         // Le module n'est pas activé on recharge pour prendre en compte la config du module
         if ($module->isStatus(0)) {
             $module->enable();
@@ -99,8 +100,8 @@ class ModuleController extends Controller
         }
 
         // On recherche les autoloads
-        system('composer dump-autoload -d ' . base_path());
-        Artisan::call('config:cache');
+        //system('composer dump-autoload -d ' . base_path());
+        Artisan::call('config:clear');
 
         // Migrations des tables du module et semence
         Artisan::call('module:migrate', ['module' => $module->getName()]);
@@ -128,7 +129,6 @@ class ModuleController extends Controller
     {
         // Récupération du module
         $module = Module::findOrFail($alias);
-
         // Suppression des migrations des tables du module
         Artisan::call('module:migrate-rollback', ['module' => $module->getName()]);
 
@@ -141,7 +141,7 @@ class ModuleController extends Controller
         // On désactive le module
         $module->disable();
 
-        Artisan::call('config:cache');
+        Artisan::call('config:clear');
 
         Session::flash('success', "Module désinstallé avec succès");
 
@@ -152,8 +152,8 @@ class ModuleController extends Controller
     {
         $module = Module::findOrFail($alias);
 
-        system('composer dump-autoload -d ' . base_path());
-        Artisan::call('config:cache');
+        //system('composer dump-autoload -d ' . base_path());
+        Artisan::call('config:clear');
 
         // Suppression de la configuration back office
         $this->module_repo->destroy($module->getAlias());

src/app/Http/Services/Permission/PermissionService.php

@@ -63,9 +63,9 @@ class PermissionService
 
 	public function deletePermissionsGroup($display_name)
 	{
-		// On récupère le role admin pour supprimer les permissions
+        // On récupère le role admin pour supprimer les permissions
 		$role_admin = $this->role_repo->findOrFailBy('name', 'admin');
-		$role_edit  = $this->role_repo->findOrFailBy('name', 'editeur');
+		//$role_edit  = $this->role_repo->findOrFailBy('name', 'client');
 
 		// Pour chaque élements du groupe
 		foreach ($this->types as $type => $human_type) {

src/config/modulus.php

@@ -27,9 +27,15 @@ return [
     'url_prefix' => '/backend',
 
     /**
-     * Namespace des constroleurs à surcharger
-     * default: Goldenscarab\\Modulus\\App\\Http\\Controllers
-     * - DashboardController
+     * Route vers le controleur Dashboad pour personnalisation
+     * default: Goldenscarab\\Modulus\\App\\Http\\Controllers\\App\\DashboardController@index
+     * exemple : App\\Http\\Controllers\\DashboardController@index
      */
-    'namespace_custom' => 'Goldenscarab\\Modulus\\App\\Http\\Controllers\\App',
+    'dashboard_action' => 'Goldenscarab\\Modulus\\App\\Http\\Controllers\\App\\DashboardController@index',
+
+    /**
+     * Messages du footer
+     */
+    'msg_footer_left' => '<strong>Copyright &copy; ' .  date('Y')  . ' <a href="https://www.goldenscarab.fr" target="_blanc">Goldenscarab.</a></strong> All rights reserved.',
+    'msg_footer_right' => 'La simplicité dans le sur mesure',
 ];

src/database/seeders/ModulesTableSeeder.php

@@ -15,46 +15,13 @@ class ModulesTableSeeder extends Seeder
      */
     public function run()
     {
-        $datas = [
-            [
-                'name' => 'Building',
-                'slug' => 'building' ,
-                'menu' => '{"icon":"fa fa-building-o","label":"B\u00e2timents","route":"module.building.index"}',
-                'priority' => 90
-            ],[
-                'name' => 'Device',
-                'slug' => 'device' ,
-                'menu' => '{"icon":"fa fa-microchip","label":"Mat\u00e9riel","route":"#","childs":[{"icon":"fa fa-briefcase","label":"Valises","route":"module.device.briefcases.index"},{"icon":"fa fa-microchip","label":"Capteurs","route":"module.device.sensors.index"},{"icon":"fa fa-thermometer-half","label":"Messages","route":"module.device.messages.index"}]}',
-                'priority' => 80
-            ],[
-                'name' => 'Campaign',
-                'slug' => 'campaign' ,
-                'menu' => '{"icon":"fa fa-bar-chart","label":"Campagnes","route":"back.module.campaign.index"}',
-                'priority' => 70
-            ]
+        $modules = [
+            'Module1', 'Module2', 'Modules3'
         ];
 
-        foreach ($datas as $data) {
-            DB::table('modules')->insert([
-                'name'       => $data['name'],
-                'slug'       => $data['slug'],
-                'menu'       => $data['menu'],
-                'priority'   => $data['priority'],
-                'updated_at' => \Carbon\Carbon::now(),
-                'created_at' => \Carbon\Carbon::now(),
-            ]);
-
+        foreach ($modules as $module) {
+            Artisan::call('module:enable', ['module' => $module]);
+            app(ModuleController::class)->install(strtolower($module));
         }
-
-        // Activation des modules installés par défaut
-        Artisan::call('module:enable', ['module' => 'Building']);
-        Artisan::call('module:enable', ['module' => 'Device']);
-        Artisan::call('module:enable', ['module' => 'Campaign']);
-
-
-        // Seed des modules installés par défaut
-        Artisan::call('module:seed', ['module' => 'Building']);
-        Artisan::call('module:seed', ['module' => 'Device']);
-        Artisan::call('module:seed', ['module' => 'Campaign']);
     }
 }

Helpers @ 9c1f3baa

-Subproject commit e36af6a11300e71d364fe8fabdfa731ee9aff7da
+Subproject commit 9c1f3baaa7fa03aa84859e9c9eea782a76eb7dcc

src/resources/views/app/user/list.blade.php

@@ -60,7 +60,7 @@
                 'sortable' => 'active'
             ],[
                 'label'    => 'Date',
-                'value'    => ":updated_at->format('d/m/Y H:i:s')",
+                'value'    => ":updated_at",
                 'sortable' => 'updated_at',
                 'class'    => 'd-none d-md-table-cell'
             ]

src/resources/views/layouts/app/adminlte.blade.php

@@ -8,7 +8,7 @@
     <!-- CSRF Token -->
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
-    <title>Isidiag - {{ strip_tags($title ?? '') }}</title>
+    <title>{{ config('app.name') }} - {{ strip_tags($title ?? '') }}</title>
 
     <!-- Theme style -->
     <link rel="stylesheet" href="{{ mix('css/app.css') }}">
@@ -54,7 +54,7 @@
 </div>
 
 <!-- Start Cookie consent -->
-@include('cookieConsent::index')
+@include('cookie-consent::index')
 <!-- End Cookie consent -->
 
 

src/resources/views/layouts/app/login.blade.php

@@ -39,7 +39,7 @@
     @stack('scripts')
 
     <!-- Start Cookie consent -->
-    @include('cookieConsent::index')
+    @include('cookie-consent::index')
     <!-- End Cookie consent -->
 </body>
 </html>

src/resources/views/layouts/app/partials/footer.blade.php

 <!-- To the right -->
-<div class="float-right d-sm-block-down">
-
-</div>
+<div class="float-right d-sm-block-down">{!! config('modulus.msg_footer_right') !!}</div>
 <!-- Default to the left -->
-<strong>Copyright &copy; {{ date('Y') }} Woosoft.</strong> All rights reserved.
+{!! config('modulus.msg_footer_left') !!}

src/routes/custom.php

@@ -2,5 +2,13 @@
 
 use Illuminate\Support\Facades\Route;
 
-// Dashboard
-Route::get('/', 'DashboardController@index')->name('modulus.dashboard');
+
+Route::group(
+    [
+        'middleware' => ['auth', 'auth.active', 'role:admin|client'],
+        'as'         => 'modulus.'
+    ], function ($router) {
+
+        // Dashboard
+    Route::get('/', config('modulus.dashboard_action'))->name('dashboard');
+});