wip #3753 @0.5

diff --git a/composer.lock b/composer.lock
index fd5d1e510cff9b2854217e77bbe03db883ad6b28..83a2af7f77b0246543f5b987074d8b9a962b3e89 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -1025,13 +1025,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_cms-back.git",
-                "reference": "4139b765aac2ea33810695c6551b66751233a164"
+                "reference": "1edbd9ec68c3a8fd38212147ace1e8ad67b2bd48"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-44262c.tar",
-                "reference": "4139b765aac2ea33810695c6551b66751233a164",
-                "shasum": "950498f7630b0ba035f1eabe781f562e8fd0dfd2"
+                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-6df5a2.tar",
+                "reference": "1edbd9ec68c3a8fd38212147ace1e8ad67b2bd48",
+                "shasum": "1409b1cbe1b629a9ce35804c79fb020eb9f8261c"
             },
             "require": {
                 "backpack/backupmanager": "^2.0",
@@ -1106,7 +1106,7 @@
                 }
             ],
             "description": "Cubist Backpack extension",
-            "time": "2020-11-30T16:38:12+00:00"
+            "time": "2020-12-01T15:41:08+00:00"
         },
         {
             "name": "cubist/cms-front",
@@ -2749,16 +2749,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v7.29.3",
+            "version": "v7.30.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "93f6d565a07045baa0e4b941ae1f733cd5984d65"
+                "reference": "629c36a0fe87b66d8dccd3c82927950d0f59d3f9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/93f6d565a07045baa0e4b941ae1f733cd5984d65",
-                "reference": "93f6d565a07045baa0e4b941ae1f733cd5984d65",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/629c36a0fe87b66d8dccd3c82927950d0f59d3f9",
+                "reference": "629c36a0fe87b66d8dccd3c82927950d0f59d3f9",
                 "shasum": ""
             },
             "require": {
@@ -2830,7 +2830,7 @@
                 "illuminate/view": "self.version"
             },
             "require-dev": {
-                "aws/aws-sdk-php": "^3.0",
+                "aws/aws-sdk-php": "^3.155",
                 "doctrine/dbal": "^2.6",
                 "filp/whoops": "^2.8",
                 "guzzlehttp/guzzle": "^6.3.1|^7.0.1",
@@ -2844,7 +2844,7 @@
                 "symfony/cache": "^5.0"
             },
             "suggest": {
-                "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.0).",
+                "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.155).",
                 "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).",
                 "ext-ftp": "Required to use the Flysystem FTP driver.",
                 "ext-gd": "Required to use Illuminate\\Http\\Testing\\FileFactory::image().",
@@ -2903,7 +2903,7 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2020-11-03T14:12:58+00:00"
+            "time": "2020-12-01T15:01:25+00:00"
         },
         {
             "name": "lavary/laravel-menu",
@@ -4948,16 +4948,16 @@
         },
         {
             "name": "spatie/laravel-backup",
-            "version": "6.13.0",
+            "version": "6.13.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-backup.git",
-                "reference": "08a76a1366c3cc98ec3ddd4ce90a28c3b73cc8bf"
+                "reference": "a0ca6662fbc3d008fe9e17b0f74101d139aca6f1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/08a76a1366c3cc98ec3ddd4ce90a28c3b73cc8bf",
-                "reference": "08a76a1366c3cc98ec3ddd4ce90a28c3b73cc8bf",
+                "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/a0ca6662fbc3d008fe9e17b0f74101d139aca6f1",
+                "reference": "a0ca6662fbc3d008fe9e17b0f74101d139aca6f1",
                 "shasum": ""
             },
             "require": {
@@ -5019,7 +5019,7 @@
                 "laravel-backup",
                 "spatie"
             ],
-            "time": "2020-11-25T12:24:28+00:00"
+            "time": "2020-12-01T07:29:53+00:00"
         },
         {
             "name": "spatie/laravel-googletagmanager",
@@ -9427,16 +9427,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "8.5.12",
+            "version": "8.5.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "f40cf5be80a7d177494592ad1b2db3f64ea1dee3"
+                "reference": "8e86be391a58104ef86037ba8a846524528d784e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f40cf5be80a7d177494592ad1b2db3f64ea1dee3",
-                "reference": "f40cf5be80a7d177494592ad1b2db3f64ea1dee3",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8e86be391a58104ef86037ba8a846524528d784e",
+                "reference": "8e86be391a58104ef86037ba8a846524528d784e",
                 "shasum": ""
             },
             "require": {
@@ -9506,7 +9506,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2020-11-30T12:23:30+00:00"
+            "time": "2020-12-01T04:53:52+00:00"
         },
         {
             "name": "psy/psysh",

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 da9b5169150f9b72160f5d02801f944ea59c5a05..9648e1b5c139890161244bf9cb3296701b21f32d 100644 (file)
--- a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php
+++ b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php
@@ -1,17 +1,16 @@
-<!-- This file is used to store sidebar items, starting with Backpack\Base 0.9.0 -->
 <li class="nav-item"><a class="nav-link" href="{{ backpack_url('dashboard') }}"><i
             class='nav-icon la la-dashboard'></i>{{ trans('backpack::base.dashboard') }}
     </a></li>
 
-@canany(['toolbox:quiz','toolbox:quiz:translate'])
+@canany(['quiz:read','quiztranslation:read'])
     <li class='nav-item nav-dropdown open'><a class='nav-link nav-dropdown-toggle' href='#'><i
                 class='nav-icon la la-question'></i>Quiz</a>
         <ul class='nav-dropdown-items'>
-            @can('toolbox:quiz')
+            @can('quiz:read')
                 <li class="nav-item"><a class="nav-link" href="{{ backpack_url('quiz') }}"><i
                             class="la la-table nav-icon"></i> Quizzes</a></li>
             @endcan
-            @can('toolbox:quiz:translate')
+            @can('quiztranslation:read')
                 <li class="nav-item"><a class="nav-link" href="{{ backpack_url('quiztranslation') }}"><i
                             class="la la-language nav-icon"></i> Translations</a></li>
             @endcan
@@ -19,15 +18,15 @@
     </li>
 @endcanany
 
-@canany(['fluidbook:admin','fluidbook:quote'])
+@canany(['fluidbook-quote:read','signature:read'])
     <li class='nav-item nav-dropdown open'><a class='nav-link nav-dropdown-toggle' href='#'><i
                 class="nav-icon la"><img src="/images/icons/icon-fluidbook.svg"/></i>Fluidbook</a>
         <ul class='nav-dropdown-items'>
-            @can('fluidbook:admin')
+            @can('signature:read')
                 <li class="nav-item"><a class="nav-link" href="{{ backpack_url('signature') }}"><i
                             class="la la-signature nav-icon"></i> Signatures</a></li>
             @endcan
-            @can('fluidbook:quote')
+            @can('fluidbook-quote:read')
                 <li class="nav-item"><a class="nav-link" href="{{ backpack_url('fluidbook-quote') }}"><i
                             class="la la-wpforms nav-icon"></i> Demandes de devis</a></li>
             @endcan
@@ -35,8 +34,31 @@
     </li>
 @endcanany
 
+@canany(['users:read','company:read'])
+    <li class='nav-item nav-dropdown'><a class='nav-link nav-dropdown-toggle' href='#'><i
+                class='nav-icon la la-group'></i>Clients</a>
+        <ul class='nav-dropdown-items'>
+            @can('users:read')
+                <li class='nav-item'><a class='nav-link' href='{{ backpack_url('users') }}'><i
+                            class='nav-icon la la-user'></i><span>Users</span></a></li>
+            @endcan
+            @can('company:read')
+                <li class='nav-item'><a class='nav-link' href='{{ backpack_url('company') }}'><i
+                            class='nav-icon la la-building'></i>
+                        <span>Companies</span></a></li>
+            @endcan
+            @can('managerolesandpersmissions')
+                <li class='nav-item'><a class='nav-link' href='{{ backpack_url('role') }}'><i
+                            class='nav-icon la la-group'></i>
+                        <span>Roles</span></a></li>
+                <li class='nav-item'><a class='nav-link' href='{{ backpack_url('permission') }}'><i
+                            class='nav-icon la la-key'></i><span>Permissions</span></a></li>
+            @endcan
+        </ul>
+    </li>
+@endcan
 
-@can('toolbox:maintenance')
+@can('maintenance')
     <li class='nav-item nav-dropdown'><a class='nav-link nav-dropdown-toggle' href='#'><i
                 class='nav-icon la la-cogs'></i>Maintenance</a>
         <ul class='nav-dropdown-items'>
@@ -49,29 +71,3 @@
         </ul>
     </li>
 @endcan
-
-@can('manageusers')
-    <li class='nav-item nav-dropdown'><a class='nav-link nav-dropdown-toggle' href='#'><i
-                class='nav-icon la la-group'></i>Clients</a>
-        <ul class='nav-dropdown-items'>
-            <li class='nav-item'><a class='nav-link' href='{{ backpack_url('users') }}'><i
-                        class='nav-icon la la-user'></i><span>Users</span></a></li>
-            <li class='nav-item'><a class='nav-link' href='{{ backpack_url('company') }}'><i
-                        class='nav-icon la la-building'></i>
-                    <span>Companies</span></a></li>
-        </ul>
-    </li>
-@endcan
-@can('managerolesandpersmissions')
-    <li class='nav-item nav-dropdown'><a class='nav-link nav-dropdown-toggle' href='#'><i
-                class='nav-icon la la-lock'></i>Authentication</a>
-        <ul class='nav-dropdown-items'>
-            <li class='nav-item'><a class='nav-link' href='{{ backpack_url('role') }}'><i
-                        class='nav-icon la la-group'></i>
-                    <span>Roles</span></a></li>
-            <li class='nav-item'><a class='nav-link' href='{{ backpack_url('permission') }}'><i
-                        class='nav-icon la la-key'></i><span>Permissions</span></a></li>
-        </ul>
-    </li>
-@endcan
-