From 3ab084d550d00983c34124d4f0c2de3336be5bb3 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Thu, 2 Sep 2021 13:06:29 +0200 Subject: [PATCH] wip #4662 @1 --- app/Models/Page.php | 10 ++ app/Models/Settings.php | 90 +++++++++++++++++ app/Models/User.php | 4 + composer.lock | 46 ++++----- config/app.php | 8 +- .../vendor/backpack/base/dashboard.blade.php | 37 +++---- .../base/inc/sidebar_content.blade.php | 98 ++++--------------- .../buttons/fluidbook_quote/assign.blade.php | 82 ---------------- .../confirm_assignment.blade.php | 8 -- .../crud/buttons/quiz/download.blade.php | 2 - .../crud/buttons/quiz/import.blade.php | 25 ----- .../crud/buttons/quiz/preview.blade.php | 3 - .../crud/buttons/quiz/report.blade.php | 4 - .../crud/buttons/user/loginas.blade.php | 2 - routes/backpack/custom.php | 8 +- 15 files changed, 166 insertions(+), 261 deletions(-) create mode 100644 app/Models/Page.php create mode 100644 app/Models/Settings.php delete mode 100644 resources/views/vendor/backpack/crud/buttons/fluidbook_quote/assign.blade.php delete mode 100644 resources/views/vendor/backpack/crud/buttons/fluidbook_quote/confirm_assignment.blade.php delete mode 100644 resources/views/vendor/backpack/crud/buttons/quiz/download.blade.php delete mode 100644 resources/views/vendor/backpack/crud/buttons/quiz/import.blade.php delete mode 100644 resources/views/vendor/backpack/crud/buttons/quiz/preview.blade.php delete mode 100644 resources/views/vendor/backpack/crud/buttons/quiz/report.blade.php delete mode 100644 resources/views/vendor/backpack/crud/buttons/user/loginas.blade.php diff --git a/app/Models/Page.php b/app/Models/Page.php new file mode 100644 index 0000000..1775a51 --- /dev/null +++ b/app/Models/Page.php @@ -0,0 +1,10 @@ +addField(['name' => 'email', + 'type' => 'Email', + 'label' => 'E-mail', + 'tab' => 'Informations de contact']); + + $this->addField(['name' => 'phone', + 'type' => 'Text', + 'label' => 'Téléphone', + 'translatable' => true, + 'tab' => 'Informations de contact']); + + $this->addField(['name' => 'address', + 'type' => 'Textarea', + 'label' => 'Adresse', + 'translatable' => false, + 'tab' => 'Informations de contact']); + + //=== Social Networks + $this->addField([ + 'name' => 'social', + 'type' => 'BunchOfFields', + 'bunch' => 'App\SubForms\SocialNetworks', + 'label' => 'Réseaux Sociaux', + 'tab' => 'Réseaux Sociaux', + ]); + + //=== Forms + $this->addField([ + 'name' => 'form_default_recipients', + 'type' => 'Tags', + 'label' => 'Destinataires par défaut des formulaires', + 'tab' => 'Formulaires', + ]); + + $this->addField([ + 'name' => 'form_privacy', + 'type' => 'Markdown', + 'label' => 'Mention légale vie privée affichée sous les formulaires', + 'tab' => 'Formulaires', + ]); + + + //=== Footer + $this->addField([ + 'name' => 'footer_text', + 'type' => 'Textarea', + 'label' => 'Texte de footer', + 'attributes' => [ + 'rows' => 4, + ], + 'tab' => 'Footer', + ]); + + $this->addField([ + 'name' => 'footer_heading_contact', + 'type' => 'Text', + 'label' => 'Titre de colonne « Nous contacter »', + 'tab' => 'Footer', + ]); + + $this->addField([ + 'name' => 'footer_heading_strengths', + 'type' => 'Text', + 'label' => 'Titre de colonne « PMI à votre service »', + 'tab' => 'Footer' + ]); + + //=== Strengths / Points Forts + $this->addField([ + 'name' => 'strengths', + 'type' => 'BunchOfFieldsMultiple', + 'bunch' => 'App\SubForms\Strength', + 'label' => 'Points Forts', + 'tab' => 'Footer', + 'translatable' => true, + ]); + } +} diff --git a/app/Models/User.php b/app/Models/User.php index acd9d2e..ce59b28 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -7,4 +7,8 @@ use Cubist\Backpack\Magic\Models\CubistMagicAuthenticatable; class User extends CubistMagicAuthenticatable { protected $table = 'users'; + protected $_options = ['name' => 'users', + 'singular' => 'utilisateur', + 'plural' => 'utilisateurs', + 'oneinstance' => false]; } diff --git a/composer.lock b/composer.lock index 3aeed3d..ef03726 100644 --- a/composer.lock +++ b/composer.lock @@ -131,16 +131,16 @@ }, { "name": "backpack/crud", - "version": "4.1.50", + "version": "4.1.51", "source": { "type": "git", "url": "https://github.com/Laravel-Backpack/CRUD.git", - "reference": "09cf360f2c1d1ad40d054c6c36e16c3c44f2e461" + "reference": "756173cf6593c3d530fca0e54831763c796e24d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Laravel-Backpack/CRUD/zipball/09cf360f2c1d1ad40d054c6c36e16c3c44f2e461", - "reference": "09cf360f2c1d1ad40d054c6c36e16c3c44f2e461", + "url": "https://api.github.com/repos/Laravel-Backpack/CRUD/zipball/756173cf6593c3d530fca0e54831763c796e24d8", + "reference": "756173cf6593c3d530fca0e54831763c796e24d8", "shasum": "" }, "require": { @@ -218,9 +218,9 @@ ], "support": { "issues": "https://github.com/Laravel-Backpack/CRUD/issues", - "source": "https://github.com/Laravel-Backpack/CRUD/tree/4.1.50" + "source": "https://github.com/Laravel-Backpack/CRUD/tree/4.1.51" }, - "time": "2021-08-02T07:15:23+00:00" + "time": "2021-09-02T06:20:26+00:00" }, { "name": "backpack/logmanager", @@ -1152,13 +1152,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_cms-back.git", - "reference": "bfc6508510fbfd1c29c7e40189724dc738f2e304" + "reference": "e171e566d742696ca4a1b9f48faf602bb1ca72e9" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-74c4c7.tar", - "reference": "bfc6508510fbfd1c29c7e40189724dc738f2e304", - "shasum": "cd501c11df175c11a38c9be1e8a937a893fbce4d" + "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-a520cd.tar", + "reference": "e171e566d742696ca4a1b9f48faf602bb1ca72e9", + "shasum": "57074a4c19045c56760c0166101007ebc21ff495" }, "require": { "backpack/backupmanager": "^3.0", @@ -1235,7 +1235,7 @@ } ], "description": "Cubist Backpack extension", - "time": "2021-08-31T15:31:06+00:00" + "time": "2021-09-02T10:05:06+00:00" }, { "name": "cubist/cms-front", @@ -5729,16 +5729,16 @@ }, { "name": "spatie/laravel-backup", - "version": "6.16.2", + "version": "6.16.3", "source": { "type": "git", "url": "https://github.com/spatie/laravel-backup.git", - "reference": "409acef61feedb47bf47da961740217071d22107" + "reference": "d923991b8790954bdd7b1ffc99b997fe8b82309a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/409acef61feedb47bf47da961740217071d22107", - "reference": "409acef61feedb47bf47da961740217071d22107", + "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/d923991b8790954bdd7b1ffc99b997fe8b82309a", + "reference": "d923991b8790954bdd7b1ffc99b997fe8b82309a", "shasum": "" }, "require": { @@ -5803,7 +5803,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-backup/issues", - "source": "https://github.com/spatie/laravel-backup/tree/6.16.2" + "source": "https://github.com/spatie/laravel-backup/tree/6.16.3" }, "funding": [ { @@ -5815,7 +5815,7 @@ "type": "other" } ], - "time": "2021-08-11T21:09:11+00:00" + "time": "2021-09-01T14:55:00+00:00" }, { "name": "spatie/laravel-googletagmanager", @@ -6118,16 +6118,16 @@ }, { "name": "spatie/laravel-permission", - "version": "4.4.0", + "version": "4.4.1", "source": { "type": "git", "url": "https://github.com/spatie/laravel-permission.git", - "reference": "7257756725c8e28706db1dc444e88558cc39d377" + "reference": "3c9d7ae7683081ee90a4e2297f4e58aff3492a1e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/7257756725c8e28706db1dc444e88558cc39d377", - "reference": "7257756725c8e28706db1dc444e88558cc39d377", + "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/3c9d7ae7683081ee90a4e2297f4e58aff3492a1e", + "reference": "3c9d7ae7683081ee90a4e2297f4e58aff3492a1e", "shasum": "" }, "require": { @@ -6184,7 +6184,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-permission/issues", - "source": "https://github.com/spatie/laravel-permission/tree/4.4.0" + "source": "https://github.com/spatie/laravel-permission/tree/4.4.1" }, "funding": [ { @@ -6192,7 +6192,7 @@ "type": "github" } ], - "time": "2021-08-28T23:24:45+00:00" + "time": "2021-09-01T17:40:58+00:00" }, { "name": "spatie/laravel-translatable", diff --git a/config/app.php b/config/app.php index 2bd464c..671f03f 100644 --- a/config/app.php +++ b/config/app.php @@ -169,11 +169,11 @@ return [ /* * Application Service Providers... */ - App\Providers\AppServiceProvider::class, - App\Providers\AuthServiceProvider::class, + Cubist\Backpack\Providers\AppServiceProvider::class, + Cubist\Backpack\Providers\AuthServiceProvider::class, // App\Providers\BroadcastServiceProvider::class, - App\Providers\EventServiceProvider::class, - App\Providers\RouteServiceProvider::class, + Cubist\Backpack\Providers\EventServiceProvider::class, + Cubist\Backpack\Providers\RouteServiceProvider::class, ], diff --git a/resources/views/vendor/backpack/base/dashboard.blade.php b/resources/views/vendor/backpack/base/dashboard.blade.php index fc37306..c1b0ddf 100644 --- a/resources/views/vendor/backpack/base/dashboard.blade.php +++ b/resources/views/vendor/backpack/base/dashboard.blade.php @@ -1,29 +1,20 @@ @extends(backpack_view('blank')) -@php - \App\Widgets::fluidbookQuoteWidgets(); - $widgets['before_content'][] = [ - 'type' => 'jumbotron', - 'heading' => trans('backpack::base.welcome'), - 'content' => trans('backpack::base.use_sidebar'), - 'button_link' => backpack_url('logout'), - 'button_text' => trans('backpack::base.logout'), - ]; -@endphp + @section('content') - {{--
--}} - {{--
--}} - {{--
--}} - {{--
--}} - {{--
{{ trans('backpack::base.login_status') }}
--}} - {{--
--}} +
+
+
+
+
{{ trans('backpack::base.login_status') }}
+
- {{--
{{ trans('backpack::base.logged_in') }}
--}} - {{--
--}} - {{-- Permissions: {{ backpack_user()->getAllPermissions()}}
--}} - {{--
Roles: {{ backpack_user()->getRoleNames()->implode('name',', ') }}
--}} - {{--
--}} - {{--
--}} - {{--
--}} +
{{ trans('backpack::base.logged_in') }}
+
+ Permissions: {{ backpack_user()->getAllPermissions()}}
+
Roles: {{ backpack_user()->getRoleNames()->implode('name',', ') }}
+
+
+
@endsection 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 e403e14..7044a70 100644 --- a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php +++ b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php @@ -2,93 +2,29 @@ class='nav-icon la la-dashboard'>{{ trans('backpack::base.dashboard') }} -@canany(['quiz:read','quiztranslation:read']) +@can('cms')
  • {{__('Quiz')}} + class='nav-icon la la-edit'>Mini-site
    • -@endcanany - -@canany(['fluidbook-quote:read','signature:read','fluidbook-theme:read','fluibook-translate:write']) -
  • {{__('Fluidbook')}} - -
    • -@endcanany -@include('tools.sidebar') -@canany(['users:read','company:read','managerolesandpersmissions']) +@endcan +@canany(['managerolesandpersmissions'])
  • Clients + class='nav-icon la la-group'>Utilisateurs
    • @endcan - -@canany('maintenance','toolbox-translate:admin') -
  • {{__('Administration')}} - -
    • -@endcanany - diff --git a/resources/views/vendor/backpack/crud/buttons/fluidbook_quote/assign.blade.php b/resources/views/vendor/backpack/crud/buttons/fluidbook_quote/assign.blade.php deleted file mode 100644 index 7e5330c..0000000 --- a/resources/views/vendor/backpack/crud/buttons/fluidbook_quote/assign.blade.php +++ /dev/null @@ -1,82 +0,0 @@ -@once - @php - $showjs=false; - if($crud->getValue('seenAssignJS')===null){ - $showjs =true; - $crud->setValue('seenAssignJS',true); - } - @endphp - @if($showjs) - - - @endif -@endonce - -@if($entry->status==0) - {{__('Confier')}} - - - -@endif diff --git a/resources/views/vendor/backpack/crud/buttons/fluidbook_quote/confirm_assignment.blade.php b/resources/views/vendor/backpack/crud/buttons/fluidbook_quote/confirm_assignment.blade.php deleted file mode 100644 index 75e964e..0000000 --- a/resources/views/vendor/backpack/crud/buttons/fluidbook_quote/confirm_assignment.blade.php +++ /dev/null @@ -1,8 +0,0 @@ -@if($entry->status==1 && $entry->reseller==backpack_user()->id) - {{__('Marquer comme traitée')}} - - -@endif diff --git a/resources/views/vendor/backpack/crud/buttons/quiz/download.blade.php b/resources/views/vendor/backpack/crud/buttons/quiz/download.blade.php deleted file mode 100644 index 377cf9b..0000000 --- a/resources/views/vendor/backpack/crud/buttons/quiz/download.blade.php +++ /dev/null @@ -1,2 +0,0 @@ - {{__('Télécharger')}} diff --git a/resources/views/vendor/backpack/crud/buttons/quiz/import.blade.php b/resources/views/vendor/backpack/crud/buttons/quiz/import.blade.php deleted file mode 100644 index 5d3e973..0000000 --- a/resources/views/vendor/backpack/crud/buttons/quiz/import.blade.php +++ /dev/null @@ -1,25 +0,0 @@ - - {{__('Importer')}} - - -@push('after_scripts') - -@endpush diff --git a/resources/views/vendor/backpack/crud/buttons/quiz/preview.blade.php b/resources/views/vendor/backpack/crud/buttons/quiz/preview.blade.php deleted file mode 100644 index f43529d..0000000 --- a/resources/views/vendor/backpack/crud/buttons/quiz/preview.blade.php +++ /dev/null @@ -1,3 +0,0 @@ - {{__('Prévisualiser')}} diff --git a/resources/views/vendor/backpack/crud/buttons/quiz/report.blade.php b/resources/views/vendor/backpack/crud/buttons/quiz/report.blade.php deleted file mode 100644 index ab3e78d..0000000 --- a/resources/views/vendor/backpack/crud/buttons/quiz/report.blade.php +++ /dev/null @@ -1,4 +0,0 @@ -@if($entry->getAttribute('logattempts')) - {{__('Rapport')}} -@endif diff --git a/resources/views/vendor/backpack/crud/buttons/user/loginas.blade.php b/resources/views/vendor/backpack/crud/buttons/user/loginas.blade.php deleted file mode 100644 index f7ec6d4..0000000 --- a/resources/views/vendor/backpack/crud/buttons/user/loginas.blade.php +++ /dev/null @@ -1,2 +0,0 @@ - {{__('Se connecter comme')}} diff --git a/routes/backpack/custom.php b/routes/backpack/custom.php index 2bd36c9..a1beba6 100644 --- a/routes/backpack/custom.php +++ b/routes/backpack/custom.php @@ -1,12 +1,12 @@ 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 { - - } catch (\Throwable $e) { + Route::crud('', 'CrudController'); + } catch(\Throwable $e) { } }); -- 2.39.5