From: Vincent Vanwaelscappel Date: Tue, 16 Jun 2020 18:18:58 +0000 (+0200) Subject: wip #3712 @0.5 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=e6efb33b84d158562aab008151d7005e4761a532;p=extranet.git wip #3712 @0.5 --- diff --git a/app/Console/Commands/ExtranetMigration.php b/app/Console/Commands/ExtranetMigration.php index ccf36ff..51f28b5 100644 --- a/app/Console/Commands/ExtranetMigration.php +++ b/app/Console/Commands/ExtranetMigration.php @@ -10,6 +10,7 @@ use Cubist\Backpack\app\Console\Commands\CubistCommand; use Illuminate\Console\Command; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Hash; +use Illuminate\Support\Str; class ExtranetMigration extends CubistCommand { @@ -102,7 +103,8 @@ class ExtranetMigration extends CubistCommand $extgrades = ['0' => 2, '0.5' => 5, '1' => 3, '2' => 1, '3' => 13]; $wsgrades = ['1' => 7, '2' => 8, '3' => 10, '4' => 11, '5' => 9]; - //$hf=[12]; + $hf = [12]; + $cube = [14]; $roles = []; @@ -113,9 +115,15 @@ class ExtranetMigration extends CubistCommand } if ($e->entreprise == 1880) { - $roles[] = ['model_id' => $e->utilisateur_id, 'role_id' => 12, 'model_type' => 'App\Models\User']; - }else if($e->entreprise==7){ - $roles[] = ['model_id' => $e->utilisateur_id, 'role_id' => 14, 'model_type' => 'App\Models\User']; + foreach ($hf as $item) { + $roles[] = ['model_id' => $e->utilisateur_id, 'role_id' => $item, 'model_type' => 'App\Models\User']; + } + + } else if ($e->entreprise == 7) { + foreach ($cube as $item) { + $roles[] = ['model_id' => $e->utilisateur_id, 'role_id' => $item, 'model_type' => 'App\Models\User']; + } + } if ($this->_wsRanks[$e->entreprise] > 0) { $roles[] = ['model_id' => $e->utilisateur_id, 'role_id' => $wsgrades[$this->_wsRanks[$e->entreprise]], 'model_type' => 'App\Models\User']; @@ -126,6 +134,7 @@ class ExtranetMigration extends CubistCommand foreach ($map as $old => $new) { $u->setAttribute($new, $e->$old); } + $u->setAttribute('api_token', Str::random(60)); $u->setAttribute('address', ['address' => $e->adresse, 'postcode' => $e->code_postal, 'city' => $e->ville, 'country' => $e->pays]); $u->setAttribute('password', Hash::make($e->password)); $u->setAttribute('created_at', new \DateTime('@' . $e->date_creation)); diff --git a/app/Http/Controllers/Admin/UserCrudController.php b/app/Http/Controllers/Admin/UserCrudController.php deleted file mode 100644 index 6e98303..0000000 --- a/app/Http/Controllers/Admin/UserCrudController.php +++ /dev/null @@ -1,14 +0,0 @@ - env('DEBUGBAR_ENABLED', null), + 'except' => [ + 'telescope*' + ], + + /* + |-------------------------------------------------------------------------- + | Storage settings + |-------------------------------------------------------------------------- + | + | DebugBar stores data for session/ajax requests. + | You can disable this, so the debugbar stores data in headers/session, + | but this can cause problems with large data collectors. + | By default, file storage (in the storage folder) is used. Redis and PDO + | can also be used. For PDO, run the package migrations first. + | + */ + 'storage' => [ + 'enabled' => true, + 'driver' => 'file', // redis, file, pdo, custom + 'path' => storage_path('debugbar'), // For file driver + 'connection' => null, // Leave null for default connection (Redis/PDO) + 'provider' => '' // Instance of StorageInterface for custom driver + ], + + /* + |-------------------------------------------------------------------------- + | Vendors + |-------------------------------------------------------------------------- + | + | Vendor files are included by default, but can be set to false. + | This can also be set to 'js' or 'css', to only include javascript or css vendor files. + | Vendor files are for css: font-awesome (including fonts) and highlight.js (css files) + | and for js: jquery and and highlight.js + | So if you want syntax highlighting, set it to true. + | jQuery is set to not conflict with existing jQuery scripts. + | + */ + + 'include_vendors' => true, + + /* + |-------------------------------------------------------------------------- + | Capture Ajax Requests + |-------------------------------------------------------------------------- + | + | The Debugbar can capture Ajax requests and display them. If you don't want this (ie. because of errors), + | you can use this option to disable sending the data through the headers. + | + | Optionally, you can also send ServerTiming headers on ajax requests for the Chrome DevTools. + */ + + 'capture_ajax' => true, + 'add_ajax_timing' => false, + + /* + |-------------------------------------------------------------------------- + | Custom Error Handler for Deprecated warnings + |-------------------------------------------------------------------------- + | + | When enabled, the Debugbar shows deprecated warnings for Symfony components + | in the Messages tab. + | + */ + 'error_handler' => false, + + /* + |-------------------------------------------------------------------------- + | Clockwork integration + |-------------------------------------------------------------------------- + | + | The Debugbar can emulate the Clockwork headers, so you can use the Chrome + | Extension, without the server-side code. It uses Debugbar collectors instead. + | + */ + 'clockwork' => false, + + /* + |-------------------------------------------------------------------------- + | DataCollectors + |-------------------------------------------------------------------------- + | + | Enable/disable DataCollectors + | + */ + + 'collectors' => [ + 'phpinfo' => true, // Php version + 'messages' => true, // Messages + 'time' => true, // Time Datalogger + 'memory' => true, // Memory usage + 'exceptions' => true, // Exception displayer + 'log' => true, // Logs from Monolog (merged in messages if enabled) + 'db' => true, // Show database (PDO) queries and bindings + 'views' => true, // Views with their data + 'route' => true, // Current route information + 'auth' => false, // Display Laravel authentication status + 'gate' => true, // Display Laravel Gate checks + 'session' => true, // Display session data + 'symfony_request' => true, // Only one can be enabled.. + 'mail' => true, // Catch mail messages + 'laravel' => false, // Laravel version and environment + 'events' => false, // All events fired + 'default_request' => false, // Regular or special Symfony request logger + 'logs' => false, // Add the latest log messages + 'files' => false, // Show the included files + 'config' => false, // Display config settings + 'cache' => false, // Display cache events + 'models' => true, // Display models + ], + + /* + |-------------------------------------------------------------------------- + | Extra options + |-------------------------------------------------------------------------- + | + | Configure some DataCollectors + | + */ + + 'options' => [ + 'auth' => [ + 'show_name' => true, // Also show the users name/email in the debugbar + ], + 'db' => [ + 'with_params' => true, // Render SQL with the parameters substituted + 'backtrace' => true, // Use a backtrace to find the origin of the query in your files. + 'timeline' => false, // Add the queries to the timeline + 'explain' => [ // Show EXPLAIN output on queries + 'enabled' => false, + 'types' => ['SELECT'], // // workaround ['SELECT'] only. https://github.com/barryvdh/laravel-debugbar/issues/888 ['SELECT', 'INSERT', 'UPDATE', 'DELETE']; for MySQL 5.6.3+ + ], + 'hints' => true, // Show hints for common mistakes + ], + 'mail' => [ + 'full_log' => false + ], + 'views' => [ + 'data' => false, //Note: Can slow down the application, because the data can be quite large.. + ], + 'route' => [ + 'label' => true // show complete route on bar + ], + 'logs' => [ + 'file' => null + ], + 'cache' => [ + 'values' => true // collect cache values + ], + ], + + /* + |-------------------------------------------------------------------------- + | Inject Debugbar in Response + |-------------------------------------------------------------------------- + | + | Usually, the debugbar is added just before , by listening to the + | Response after the App is done. If you disable this, you have to add them + | in your template yourself. See http://phpdebugbar.com/docs/rendering.html + | + */ + + 'inject' => true, + + /* + |-------------------------------------------------------------------------- + | DebugBar route prefix + |-------------------------------------------------------------------------- + | + | Sometimes you want to set route prefix to be used by DebugBar to load + | its resources from. Usually the need comes from misconfigured web server or + | from trying to overcome bugs like this: http://trac.nginx.org/nginx/ticket/97 + | + */ + 'route_prefix' => '_debugbar', + + /* + |-------------------------------------------------------------------------- + | DebugBar route domain + |-------------------------------------------------------------------------- + | + | By default DebugBar route served from the same domain that request served. + | To override default domain, specify it as a non-empty value. + */ + 'route_domain' => null, +]; diff --git a/resources/views/vendor/backpack/base/inc/scripts.blade.php b/resources/views/vendor/backpack/base/inc/scripts.blade.php new file mode 100644 index 0000000..2cf1dfe --- /dev/null +++ b/resources/views/vendor/backpack/base/inc/scripts.blade.php @@ -0,0 +1,44 @@ +@if (config('backpack.base.scripts') && count(config('backpack.base.scripts'))) + @foreach (config('backpack.base.scripts') as $path) + + @endforeach +@endif + +@if (config('backpack.base.mix_scripts') && count(config('backpack.base.mix_scripts'))) + @foreach (config('backpack.base.mix_scripts') as $path => $manifest) + + @endforeach +@endif + +@include('backpack::inc.alerts') + + + +@if(config('app.debug')) + +@endif diff --git a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php index 07fb54d..4f78d57 100644 --- a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php +++ b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php @@ -3,15 +3,15 @@ class="fa fa-dashboard nav-icon"> {{ trans('backpack::base.dashboard') }} -
  • Quiz - -
    • +{{--
  • Quiz--}} +{{-- --}} +{{--
    • --}} @can('maintenance')
  • Maintenance diff --git a/routes/api.php b/routes/api.php index c641ca5..0fb2494 100644 --- a/routes/api.php +++ b/routes/api.php @@ -16,3 +16,4 @@ use Illuminate\Http\Request; Route::middleware('auth:api')->get('/user', function (Request $request) { return $request->user(); }); +Route::apiResource('extranetv1/user', \App\Http\Controllers\Api\ExtranetV1UserController::class); diff --git a/routes/backpack/custom.php b/routes/backpack/custom.php index 7c43ebf..ef5df03 100644 --- a/routes/backpack/custom.php +++ b/routes/backpack/custom.php @@ -1,16 +1,16 @@ config('backpack.base.route_prefix', 'admin'), + 'prefix' => config('backpack.base.route_prefix', 'admin'), 'middleware' => ['web', config('backpack.base.middleware_key', 'admin')], - 'namespace' => 'App\Http\Controllers\Admin', + 'namespace' => 'App\Http\Controllers\Admin', ], function () { // custom admin routes try { - Route::crud('locale', 'LocaleCrudController'); - Route::crud('settings', 'SettingsCrudController'); - Route::crud('page', 'PageCrudController'); - Route::crud('company', 'CompanyCrudController'); - Route::crud('users', 'UsersCrudController'); - } catch (\Throwable $e) { + Route::crud('company', 'CompanyCrudController'); + Route::crud('locale', 'LocaleCrudController'); + Route::crud('page', 'PageCrudController'); + Route::crud('settings', 'SettingsCrudController'); + Route::crud('users', 'UsersCrudController'); + } catch(\Throwable $e) { } }); diff --git a/routes/backpack/permissionmanager.php b/routes/backpack/permissionmanager.php index 4577d6d..f771a68 100644 --- a/routes/backpack/permissionmanager.php +++ b/routes/backpack/permissionmanager.php @@ -17,5 +17,4 @@ Route::group([ ], function () { Route::crud('permission', 'PermissionCrudController'); Route::crud('role', 'RoleCrudController'); - Route::crud('user', 'UserCrudController'); });