From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 1 Dec 2023 10:04:02 +0000 (+0100)
Subject: wip #6542 @0.25
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=8b6e39f69897962557c6b9f06dd6991c193bd652;p=fluidbook-toolbox.git

wip #6542 @0.25
---

diff --git a/app/Console/Commands/CopyMediaFromDev.php b/app/Console/Commands/CopyMediaFromDev.php
new file mode 100644
index 000000000..c341a0aac
--- /dev/null
+++ b/app/Console/Commands/CopyMediaFromDev.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Console\Commands\Base\ToolboxCommand;
+
+class CopyMediaFromDev extends ToolboxCommand
+{
+    protected $signature = 'toolbox:copymediafromdev';
+    protected $description = 'Compile a fluidbook';
+
+    public function handle(){
+
+    }
+}
diff --git a/app/Http/Controllers/Admin/FluidbookExternalInstallServerCrudController.php b/app/Http/Controllers/Admin/FluidbookExternalInstallServerCrudController.php
index e3b016947..264c63703 100644
--- a/app/Http/Controllers/Admin/FluidbookExternalInstallServerCrudController.php
+++ b/app/Http/Controllers/Admin/FluidbookExternalInstallServerCrudController.php
@@ -13,7 +13,8 @@ class FluidbookExternalInstallServerCrudController extends \Cubist\Backpack\Magi
 	use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
 	use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation;
 	use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation;
-
+	use \App\Http\Controllers\Admin\Operations\ServerOperation;
+	
 
 
     /*
diff --git a/app/Http/Controllers/Admin/FluidbookTranslateCrudController.php b/app/Http/Controllers/Admin/FluidbookTranslateCrudController.php
index dd14e8d59..9f99bd0da 100644
--- a/app/Http/Controllers/Admin/FluidbookTranslateCrudController.php
+++ b/app/Http/Controllers/Admin/FluidbookTranslateCrudController.php
@@ -14,7 +14,7 @@ class FluidbookTranslateCrudController extends \Cubist\Backpack\Magic\Controller
 	use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation;
 	use \App\Http\Controllers\Admin\Operations\ContentTranslate\ExcelExportOperation;
 	use \App\Http\Controllers\Admin\Operations\ContentTranslate\ExcelImportOperation;
-
+	
 
 
     /*
diff --git a/app/Models/Base/ToolboxContentTranslate.php b/app/Models/Base/ToolboxContentTranslate.php
index 70171040e..f28d0835e 100644
--- a/app/Models/Base/ToolboxContentTranslate.php
+++ b/app/Models/Base/ToolboxContentTranslate.php
@@ -15,8 +15,6 @@ class ToolboxContentTranslate extends Translate
 
     protected static $_allTranslations = null;
 
-    protected static string $_name = 'content';
-
     protected static $_basePath = '';
 
     protected $_operations = [ExcelExportOperation::class, ExcelImportOperation::class];
diff --git a/app/Models/ElearningTranslate.php b/app/Models/ElearningTranslate.php
index 5d84a2803..aff48873c 100644
--- a/app/Models/ElearningTranslate.php
+++ b/app/Models/ElearningTranslate.php
@@ -6,6 +6,7 @@ namespace App\Models;
 use App\Http\Controllers\Admin\Operations\ContentTranslate\ExcelExportOperation;
 use App\Http\Controllers\Admin\Operations\ContentTranslate\ExcelImportOperation;
 use App\Models\Base\ToolboxContentTranslate;
+use App\Models\Traits\FluidbookPlayerBranches;
 use App\Models\Traits\QuizBranches;
 use Cubist\Backpack\Facades\App;
 use Cubist\Util\PHP;
@@ -13,7 +14,6 @@ use Cubist\Util\PHP;
 // __('!!Traduction des contenus e-learning')
 class ElearningTranslate extends ToolboxContentTranslate
 {
-
     use QuizBranches;
 
     protected $table = 'elearning_translate';
diff --git a/app/Models/QuizTheme.php b/app/Models/QuizTheme.php
index 6cea5da01..b78b72ace 100644
--- a/app/Models/QuizTheme.php
+++ b/app/Models/QuizTheme.php
@@ -301,7 +301,7 @@ class QuizTheme extends ToolboxModel
 
     public static function getThemePreviewURL($id, $params = [])
     {
-        $defaultParams = ['id' => '1061-' . $id, 'hash' => 'a549a6f6da4fba85cd47e2871e0153a8', 'time' => time(), 'path' => 'index.html', 'force' => 0, 'shortLoading' => 1, 'puppeteer' => 0];
+        $defaultParams = ['id' => '1-' . $id, 'hash' => '4dc036174cdc05c1810b482ed28aa5f5', 'time' => time(), 'path' => 'index.html', 'force' => 0, 'shortLoading' => 1, 'puppeteer' => 0];
         return route('quiz_preview_with_time', array_merge($defaultParams, $params));
     }
 
diff --git a/app/Models/Traits/ToolboxPlayerBranches.php b/app/Models/Traits/ToolboxPlayerBranches.php
index ba726ee25..9f3023629 100644
--- a/app/Models/Traits/ToolboxPlayerBranches.php
+++ b/app/Models/Traits/ToolboxPlayerBranches.php
@@ -10,7 +10,7 @@ trait ToolboxPlayerBranches
 {
     protected static function reposDirectory()
     {
-        return self::getPlayerBaseDirectory() . 'repos/' . self::$reposName;
+        return Files::mkdir(self::getPlayerBaseDirectory() . 'repos/' . self::$reposName);
     }
 
     /**
diff --git a/routes/backpack/custom.php b/routes/backpack/custom.php
index e1adae276..8f97b4e7e 100644
--- a/routes/backpack/custom.php
+++ b/routes/backpack/custom.php
@@ -6,29 +6,29 @@ Route::group([
 ], function () { // custom admin routes
      Route::crud('elearning-media', 'ElearningMediaCrudController');
      Route::crud('toolbox-translate', 'ToolboxTranslateCrudController');
-     Route::crud('quiztranslation', 'QuiztranslationCrudController');
-     Route::crud('quiz-theme', 'QuizThemeCrudController');
      Route::crud('team-emails', 'TeamEmailsCrudController');
      Route::crud('fluidbook-quote', 'FluidbookQuoteCrudController');
      Route::crud('locale', 'LocaleCrudController');
      Route::crud('tool-sprite', 'ToolSpriteCrudController');
      Route::crud('users', 'UsersCrudController');
      Route::crud('users', 'UsersCrudController');
-     Route::crud('quiz', 'QuizCrudController');
      Route::crud('page', 'PageCrudController');
      Route::crud('settings', 'SettingsCrudController');
      Route::crud('team-leave', 'TeamLeaveCrudController');
      Route::crud('team-overtime', 'TeamOvertimeCrudController');
      Route::crud('fluidbook-external-install-server', 'FluidbookExternalInstallServerCrudController');
      Route::crud('file', 'FileCrudController');
+     Route::crud('fluidbook-health', 'FluidbookHealthCrudController');
+     Route::crud('ysl-survey', 'YslSurveyCrudController');
      Route::crud('fluidbook-collection', 'FluidbookCollectionCrudController');
      Route::crud('fluidbook-document', 'FluidbookDocumentCrudController');
      Route::crud('fluidbook-publication', 'FluidbookPublicationCrudController');
      Route::crud('quizatttempt', 'QuizatttemptCrudController');
-     Route::crud('elearning-package', 'ElearningPackageCrudController');
      Route::crud('fluidbook-theme', 'FluidbookThemeCrudController');
      Route::crud('company', 'CompanyCrudController');
+     Route::crud('team-servers', 'TeamServersCrudController');
      Route::crud('signature', 'SignatureCrudController');
      Route::crud('fluidbook-iconset', 'FluidbookIconsetCrudController');
+     Route::crud('fluidbook-reference-url', 'FluidbookReferenceUrlCrudController');
      Route::crud('fluidbook-translate', 'FluidbookTranslateCrudController');
 });