From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 6 Sep 2023 06:42:56 +0000 (+0200)
Subject: wip #6180 @0.25
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=637eea23342a364a83fe62f6a73cddfeecee33c3;p=fluidbook-toolbox.git

wip #6180 @0.25
---

diff --git a/app/Elearning/QuizCompiler.php b/app/Elearning/QuizCompiler.php
index b5d85d8e5..7b9f35334 100644
--- a/app/Elearning/QuizCompiler.php
+++ b/app/Elearning/QuizCompiler.php
@@ -69,7 +69,8 @@ class QuizCompiler extends Base
         $vdir->copyDirectory($this->compilePath . '/dist/js', 'js');
         $vdir->copyDirectory($this->compilePath . '/dist/assets', 'assets');
 
-        $blade = new Blade($this->_resourcesPath() . '/views', $this->_resourcesPath() . '/cache');
+
+        $blade = new Blade($this->_resourcesPath() . '/views', $this->_resourcesPath() . '/cache/'.md5(rand(100000,10000000)).'/');
         $html = $blade->make('index', ['data' => $this->data, 'quiz' => $this->quiz, 'theme' => $this->theme])->render();
 
         $vdir->file_put_contents('index.html', $html);
diff --git a/app/Http/Controllers/Admin/FluidbookCollectionCrudController.php b/app/Http/Controllers/Admin/FluidbookCollectionCrudController.php
index 213998969..e6b9c84bb 100644
--- a/app/Http/Controllers/Admin/FluidbookCollectionCrudController.php
+++ b/app/Http/Controllers/Admin/FluidbookCollectionCrudController.php
@@ -15,6 +15,7 @@ class FluidbookCollectionCrudController extends \Cubist\Backpack\Magic\Controlle
 	use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation;
 	use \App\Http\Controllers\Admin\Operations\FluidbookCollection\PreviewOperation;
 	use \App\Http\Controllers\Admin\Operations\FluidbookCollection\DownloadOperation;
+	use \App\Http\Controllers\Admin\Operations\ChangeownerOperation;
 	
 
 
diff --git a/app/Http/Controllers/Admin/FluidbookPublicationCrudController.php b/app/Http/Controllers/Admin/FluidbookPublicationCrudController.php
index 26ac47312..a65312d42 100644
--- a/app/Http/Controllers/Admin/FluidbookPublicationCrudController.php
+++ b/app/Http/Controllers/Admin/FluidbookPublicationCrudController.php
@@ -5,11 +5,11 @@ namespace App\Http\Controllers\Admin;
 class FluidbookPublicationCrudController extends \Cubist\Backpack\Magic\Controllers\CubistMagicController
 {
     use \Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation;
-	use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation;
 	use \Cubist\Backpack\Magic\Operations\CreateOperation;
 	use \App\Http\Controllers\Admin\Operations\FluidbookPublication\PreviewOperation;
 	use \App\Http\Controllers\Admin\Operations\FluidbookPublication\LinksOperation;
 	use \App\Http\Controllers\Admin\Operations\FluidbookPublication\CompositionOperation;
+	use \App\Http\Controllers\Admin\Operations\FluidbookPublication\UpgradeOperation;
 	use \App\Http\Controllers\Admin\Operations\FluidbookPublication\StatsOperation;
 	use \App\Http\Controllers\Admin\Operations\FluidbookPublication\DownloadOperation;
 	use \App\Http\Controllers\Admin\Operations\FluidbookPublication\CloneOperation;
diff --git a/app/Http/Controllers/Admin/QuizCrudController.php b/app/Http/Controllers/Admin/QuizCrudController.php
index 597c2f0c1..5f4d3130c 100644
--- a/app/Http/Controllers/Admin/QuizCrudController.php
+++ b/app/Http/Controllers/Admin/QuizCrudController.php
@@ -14,7 +14,6 @@ class QuizCrudController extends \Cubist\Backpack\Magic\Controllers\CubistMagicC
 	use \App\Http\Controllers\Admin\Operations\Quiz\DownloadOperation;
 	use \App\Http\Controllers\Admin\Operations\Quiz\LogOperation;
 	use \App\Http\Controllers\Admin\Operations\Quiz\ReportOperation;
-	use \App\Http\Controllers\Admin\Operations\Quiz\ImportOperation;
 	use \App\Http\Controllers\Admin\Operations\ChangeownerOperation;
 	
 
diff --git a/app/Http/Controllers/Admin/QuizThemeCrudController.php b/app/Http/Controllers/Admin/QuizThemeCrudController.php
new file mode 100644
index 000000000..5581dbf14
--- /dev/null
+++ b/app/Http/Controllers/Admin/QuizThemeCrudController.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+class QuizThemeCrudController extends \Cubist\Backpack\Magic\Controllers\CubistMagicController
+{
+    use \Cubist\Backpack\Magic\Operations\CreateOperation;
+	use \Cubist\Backpack\Http\Controllers\Operations\CloneEditOperation;
+	use \Backpack\CRUD\app\Http\Controllers\Operations\UpdateOperation;
+	use \Backpack\CRUD\app\Http\Controllers\Operations\CloneOperation;
+	use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
+	use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation;
+	
+
+
+    /*
+	__('thème')
+	__('thèmes')
+	*/
+
+    protected $_modelNamespace = 'App\Models\QuizTheme';
+    protected $_routeURL = 'quiz-theme';
+    protected $_singular = 'thème';
+    protected $_plural = 'thèmes';
+    protected $_oneInstance= false;
+}
diff --git a/app/Http/Controllers/Admin/ToolsController.php b/app/Http/Controllers/Admin/ToolsController.php
index afa953bc6..65b4f2f20 100644
--- a/app/Http/Controllers/Admin/ToolsController.php
+++ b/app/Http/Controllers/Admin/ToolsController.php
@@ -15,7 +15,6 @@ use App\Http\Controllers\Admin\Operations\Tools\GitReposCreate;
 use App\Http\Controllers\Admin\Operations\Tools\ImagesResizer;
 use App\Http\Controllers\Admin\Operations\Tools\JSON2Excel;
 use App\Http\Controllers\Admin\Operations\Tools\PDF2SVGOperation;
-use App\Http\Controllers\Admin\Operations\Tools\SVGCleaner;
 use App\Http\Controllers\Admin\Operations\Tools\TextToSpeech;
 use App\Http\Controllers\Controller;
 
@@ -32,7 +31,6 @@ class ToolsController extends Controller
     use Favicon;
     use ImagesResizer;
     use FluidbookCopyLinks;
-    use SVGCleaner;
 
     protected function index($tool, $args = '')
     {
diff --git a/composer.json b/composer.json
index d35b259a7..865e6deee 100644
--- a/composer.json
+++ b/composer.json
@@ -45,7 +45,7 @@
         "jolicode/slack-php-api": "^v4.5.0",
         "jsvrcek/ics": "^0.8.5",
         "laravel-notification-channels/webpush": "^7.1",
-        "league/csv": "^9.9.0",
+        "league/csv": "^9.10.0",
         "mxl/laravel-job": "dev-master",
         "nyholm/psr7": "^1.8.0",
         "php-ffmpeg/php-ffmpeg": "^v1.1.0",
diff --git a/composer.lock b/composer.lock
index 703863f99..372fe1937 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "36298aad6903b79b720e855da3abd1b6",
+    "content-hash": "d8d2f6a21a78fbe888828219e4844480",
     "packages": [
         {
             "name": "archtechx/enums",
@@ -492,60 +492,6 @@
             },
             "time": "2023-02-12T09:09:37+00:00"
         },
-        {
-            "name": "bacon/bacon-qr-code",
-            "version": "2.0.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Bacon/BaconQrCode.git",
-                "reference": "8674e51bb65af933a5ffaf1c308a660387c35c22"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/8674e51bb65af933a5ffaf1c308a660387c35c22",
-                "reference": "8674e51bb65af933a5ffaf1c308a660387c35c22",
-                "shasum": ""
-            },
-            "require": {
-                "dasprid/enum": "^1.0.3",
-                "ext-iconv": "*",
-                "php": "^7.1 || ^8.0"
-            },
-            "require-dev": {
-                "phly/keep-a-changelog": "^2.1",
-                "phpunit/phpunit": "^7 | ^8 | ^9",
-                "spatie/phpunit-snapshot-assertions": "^4.2.9",
-                "squizlabs/php_codesniffer": "^3.4"
-            },
-            "suggest": {
-                "ext-imagick": "to generate QR code images"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "BaconQrCode\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-2-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Ben Scholzen 'DASPRiD'",
-                    "email": "mail@dasprids.de",
-                    "homepage": "https://dasprids.de/",
-                    "role": "Developer"
-                }
-            ],
-            "description": "BaconQrCode is a QR code generator for PHP.",
-            "homepage": "https://github.com/Bacon/BaconQrCode",
-            "support": {
-                "issues": "https://github.com/Bacon/BaconQrCode/issues",
-                "source": "https://github.com/Bacon/BaconQrCode/tree/2.0.8"
-            },
-            "time": "2022-12-07T17:46:57+00:00"
-        },
         {
             "name": "barryvdh/laravel-debugbar",
             "version": "v3.9.2",
@@ -1418,13 +1364,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubedesigners_userdatabase.git",
-                "reference": "30c5b062d7262a844c10dc5ab347368c7f9e4a40"
+                "reference": "b7e1a379de348fa59bcc6a14d056981603d53765"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubedesigners/userdatabase/cubedesigners-userdatabase-dev-backpack5-82b4df.tar",
-                "reference": "30c5b062d7262a844c10dc5ab347368c7f9e4a40",
-                "shasum": "6929e898f2f7ec4ae1ea68d44574fb960a3c4e63"
+                "url": "https://composer.cubedesigners.com/dist/cubedesigners/userdatabase/cubedesigners-userdatabase-dev-backpack5-41e85f.tar",
+                "reference": "b7e1a379de348fa59bcc6a14d056981603d53765",
+                "shasum": "7876799c0e1afdb8ec958d9a397c0211653f9e91"
             },
             "require": {
                 "cubist/cms-back": "dev-backpack5",
@@ -1456,7 +1402,7 @@
                 }
             ],
             "description": "Cubedesigners common users database",
-            "time": "2023-08-25T13:51:47+00:00"
+            "time": "2023-09-05T08:44:19+00:00"
         },
         {
             "name": "cubist/azuretts",
@@ -1507,13 +1453,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_cms-back.git",
-                "reference": "8347c8cf43d79c84d91a61ce3869182393c3b4ae"
+                "reference": "f7f0861ed532ec13b7b015c1cc40b0fe5a831c0a"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-backpack5-c43c83.tar",
-                "reference": "8347c8cf43d79c84d91a61ce3869182393c3b4ae",
-                "shasum": "f20ba867467ecb7dbf229b1fce71276edcaadb4f"
+                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-backpack5-b2fb80.tar",
+                "reference": "f7f0861ed532ec13b7b015c1cc40b0fe5a831c0a",
+                "shasum": "fd4639413e161f3f4d734b2dbb942388dfa3c4ca"
             },
             "require": {
                 "backpack/backupmanager": "^v3.0.9",
@@ -1592,7 +1538,7 @@
                 }
             ],
             "description": "Cubist Backpack extension",
-            "time": "2023-08-24T10:46:06+00:00"
+            "time": "2023-09-05T16:02:14+00:00"
         },
         {
             "name": "cubist/cms-front",
@@ -2207,56 +2153,6 @@
             "abandoned": "mailerlite/laravel-elasticsearch",
             "time": "2023-06-12T20:55:39+00:00"
         },
-        {
-            "name": "dasprid/enum",
-            "version": "1.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/DASPRiD/Enum.git",
-                "reference": "6faf451159fb8ba4126b925ed2d78acfce0dc016"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/6faf451159fb8ba4126b925ed2d78acfce0dc016",
-                "reference": "6faf451159fb8ba4126b925ed2d78acfce0dc016",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1 <9.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7 | ^8 | ^9",
-                "squizlabs/php_codesniffer": "*"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "DASPRiD\\Enum\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-2-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Ben Scholzen 'DASPRiD'",
-                    "email": "mail@dasprids.de",
-                    "homepage": "https://dasprids.de/",
-                    "role": "Developer"
-                }
-            ],
-            "description": "PHP 7.1 enum implementation",
-            "keywords": [
-                "enum",
-                "map"
-            ],
-            "support": {
-                "issues": "https://github.com/DASPRiD/Enum/issues",
-                "source": "https://github.com/DASPRiD/Enum/tree/1.0.5"
-            },
-            "time": "2023-08-25T16:18:39+00:00"
-        },
         {
             "name": "dflydev/dot-access-data",
             "version": "v3.0.2",
@@ -3671,13 +3567,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/fluidbook_tools.git",
-                "reference": "6403402f862efe484adafb2f5649dc49c776e9e5"
+                "reference": "aaa0b5c484d5031861b8809d20415fed7cc735b3"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-915608.tar",
-                "reference": "6403402f862efe484adafb2f5649dc49c776e9e5",
-                "shasum": "e67381f76823c113bb38dcca8e92ad5fc6f2d6dd"
+                "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-ba3c0f.tar",
+                "reference": "aaa0b5c484d5031861b8809d20415fed7cc735b3",
+                "shasum": "62479d08ee23e07a46d2d020ab810f0c0cdf8d88"
             },
             "require": {
                 "barryvdh/laravel-debugbar": "*",
@@ -3711,7 +3607,7 @@
                 }
             ],
             "description": "Fluidbook Tools",
-            "time": "2023-09-01T15:06:53+00:00"
+            "time": "2023-09-05T08:16:32+00:00"
         },
         {
             "name": "fruitcake/php-cors",
@@ -4947,16 +4843,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v10.21.1",
+            "version": "v10.22.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "ae93199f5349fd8a02364424249aad2a90185a95"
+                "reference": "9234388a895206d4e1df37342b61adc67e5c5d31"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/ae93199f5349fd8a02364424249aad2a90185a95",
-                "reference": "ae93199f5349fd8a02364424249aad2a90185a95",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/9234388a895206d4e1df37342b61adc67e5c5d31",
+                "reference": "9234388a895206d4e1df37342b61adc67e5c5d31",
                 "shasum": ""
             },
             "require": {
@@ -5143,7 +5039,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2023-09-04T14:34:36+00:00"
+            "time": "2023-09-05T13:20:01+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -8976,46 +8872,34 @@
             "time": "2022-09-27T16:11:03+00:00"
         },
         {
-            "name": "simplesoftwareio/simple-qrcode",
-            "version": "4.2.0",
+            "name": "ryangjchandler/standalone-blade",
+            "version": "v0.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/SimpleSoftwareIO/simple-qrcode.git",
-                "reference": "916db7948ca6772d54bb617259c768c9cdc8d537"
+                "url": "https://github.com/ryangjchandler/standalone-blade.git",
+                "reference": "a146e1b82461c942aec7486df7a0bf7ad62f8078"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/SimpleSoftwareIO/simple-qrcode/zipball/916db7948ca6772d54bb617259c768c9cdc8d537",
-                "reference": "916db7948ca6772d54bb617259c768c9cdc8d537",
+                "url": "https://api.github.com/repos/ryangjchandler/standalone-blade/zipball/a146e1b82461c942aec7486df7a0bf7ad62f8078",
+                "reference": "a146e1b82461c942aec7486df7a0bf7ad62f8078",
                 "shasum": ""
             },
             "require": {
-                "bacon/bacon-qr-code": "^2.0",
-                "ext-gd": "*",
-                "php": ">=7.2|^8.0"
+                "illuminate/config": "^10.0",
+                "illuminate/support": "^10.0",
+                "illuminate/view": "^10.0",
+                "php": "^8.1"
             },
             "require-dev": {
-                "mockery/mockery": "~1",
-                "phpunit/phpunit": "~9"
-            },
-            "suggest": {
-                "ext-imagick": "Allows the generation of PNG QrCodes.",
-                "illuminate/support": "Allows for use within Laravel."
+                "friendsofphp/php-cs-fixer": "^3.0",
+                "pestphp/pest": "^1.20",
+                "spatie/ray": "^1.28"
             },
             "type": "library",
-            "extra": {
-                "laravel": {
-                    "providers": [
-                        "SimpleSoftwareIO\\QrCode\\QrCodeServiceProvider"
-                    ],
-                    "aliases": {
-                        "QrCode": "SimpleSoftwareIO\\QrCode\\Facades\\QrCode"
-                    }
-                }
-            },
             "autoload": {
                 "psr-4": {
-                    "SimpleSoftwareIO\\QrCode\\": "src"
+                    "RyanChandler\\Blade\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -9024,24 +8908,28 @@
             ],
             "authors": [
                 {
-                    "name": "Simple Software LLC",
-                    "email": "support@simplesoftware.io"
+                    "name": "Ryan Chandler",
+                    "email": "support@ryangjchandler.co.uk",
+                    "role": "Developer"
                 }
             ],
-            "description": "Simple QrCode is a QR code generator made for Laravel.",
-            "homepage": "https://www.simplesoftware.io/#/docs/simple-qrcode",
+            "description": "Use Laravel's Blade templating engine outside of Laravel.",
+            "homepage": "https://github.com/ryangjchandler/standalone-blade",
             "keywords": [
-                "Simple",
-                "generator",
-                "laravel",
-                "qrcode",
-                "wrapper"
+                "ryangjchandler",
+                "standalone-blade"
             ],
             "support": {
-                "issues": "https://github.com/SimpleSoftwareIO/simple-qrcode/issues",
-                "source": "https://github.com/SimpleSoftwareIO/simple-qrcode/tree/4.2.0"
+                "issues": "https://github.com/ryangjchandler/standalone-blade/issues",
+                "source": "https://github.com/ryangjchandler/standalone-blade/tree/v0.2.0"
             },
-            "time": "2021-02-08T20:43:55+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/ryangjchandler",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-24T15:16:34+00:00"
         },
         {
             "name": "spatie/db-dumper",
@@ -9475,16 +9363,16 @@
         },
         {
             "name": "spatie/laravel-medialibrary",
-            "version": "10.12.1",
+            "version": "10.12.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-medialibrary.git",
-                "reference": "0e97c0f8b8ad1f1601669cedc456e72436fe67db"
+                "reference": "38af83a445a9ccffede87b7251102580b6f3883f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/0e97c0f8b8ad1f1601669cedc456e72436fe67db",
-                "reference": "0e97c0f8b8ad1f1601669cedc456e72436fe67db",
+                "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/38af83a445a9ccffede87b7251102580b6f3883f",
+                "reference": "38af83a445a9ccffede87b7251102580b6f3883f",
                 "shasum": ""
             },
             "require": {
@@ -9567,7 +9455,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/laravel-medialibrary/issues",
-                "source": "https://github.com/spatie/laravel-medialibrary/tree/10.12.1"
+                "source": "https://github.com/spatie/laravel-medialibrary/tree/10.12.2"
             },
             "funding": [
                 {
@@ -9579,7 +9467,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-09-04T07:56:53+00:00"
+            "time": "2023-09-05T07:56:04+00:00"
         },
         {
             "name": "spatie/laravel-package-tools",
@@ -17041,5 +16929,5 @@
         "ext-zlib": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.3.0"
 }