wip #6170 @0.75

diff --git a/app/Http/Controllers/Admin/Operations/QuizTheme/PreviewOperation.php b/app/Http/Controllers/Admin/Operations/QuizTheme/PreviewOperation.php
new file mode 100644 (file)
index 0000000..16352a5
--- /dev/null
+++ b/app/Http/Controllers/Admin/Operations/QuizTheme/PreviewOperation.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Http\Controllers\Admin\Operations\QuizTheme;
+
+use App\Http\Controllers\Admin\Operations\FluidbookPreviewOperation;
+use App\Jobs\GenerateQuizThemePreview;
+use App\Models\QuizTheme;
+use Cubist\Backpack\Http\Controllers\Base\XSendFileController;
+use Illuminate\Support\Facades\Route;
+
+// __('!! e-Learning')
+
+trait PreviewOperation
+{
+    use FluidbookPreviewOperation;
+
+    protected function setupPreviewRoutes($segment, $routeName, $controller)
+    {
+        Route::match(['get'], 'quizthemepreview/{id}/{type}.jpg', $controller . '@previewImage')
+            ->whereIn('type', ['intro', 'outro', 'standard', 'draganddrop'])
+            ->whereNumber('id');
+    }
+
+    protected function previewImage($id, $type)
+    {
+        if (!QuizTheme::hasPermission($id, 'read')) {
+            abort(401);
+        }
+
+        /** @var QuizTheme $theme */
+        $theme = QuizTheme::withoutGlobalScopes()->find($id);
+        $path = $theme->getPreviewImagePath($type);
+        if (!file_exists($path)) {
+            $job = new GenerateQuizThemePreview($theme);
+            $job->handle();
+        }
+        if (!file_exists($path)) {
+            abort(404, 'Unable to generate theme ' . $theme->id . ' preview :' . $path);
+        }
+        return XSendFileController::sendfileNoCache($path);
+    }
+}

diff --git a/app/Jobs/GenerateQuizThemePreview.php b/app/Jobs/GenerateQuizThemePreview.php
index ef40c18b6c822096608cb43ad17e88e1b2bb3433..0735655e61100cc3c7a0cc25b0e4b002740bc3f8 100644 (file)
--- a/app/Jobs/GenerateQuizThemePreview.php
+++ b/app/Jobs/GenerateQuizThemePreview.php
@@ -42,18 +42,18 @@ class GenerateQuizThemePreview extends Base
         $cl->setArg('height', 680);
         $cl->setArg('delay', 2);
         $cl->setArg('scale', 1);
-        $cl->setArg('intro', self::getPreviewPath($this->theme->getIdValue(), 'intro'));
-        $cl->setArg('standard', self::getPreviewPath($this->theme->getIdValue(), 'standard'));
-        $cl->setArg('draganddrop', self::getPreviewPath($this->theme->getIdValue(), 'draganddrop'));
-        $cl->setArg('outro', self::getPreviewPath($this->theme->getIdValue(), 'outro'));
+        $cl->setArg('intro', $this->getPreviewPath('intro'));
+        $cl->setArg('standard', $this->getPreviewPath('standard'));
+        $cl->setArg('draganddrop', $this->getPreviewPath('draganddrop'));
+        $cl->setArg('outro', $this->getPreviewPath('outro'));
         $url = $this->theme->getPreviewURL(['shortLoading' => 1, 'transition' => 1, 'puppeteer' => 1]);
         $cl->setArg('url', $url);
         $cl->execute();
         $cl->debug();
     }
 
-    public static function getPreviewPath($themeId, $variant = '')
+    public function getPreviewPath($type)
     {
-        return Files::mkdir(storage_path('quizthemes') . '/' . $themeId) . $variant . '.jpg';
+        return $this->theme->getPreviewImagePath($type);
     }
 }

diff --git a/app/Models/FluidbookTheme.php b/app/Models/FluidbookTheme.php
index 74ca20064c51eaac460747003df56fd584d4c898..4db0b64734f8ff6a6d58d1a64ae77886bf0ebe13 100644 (file)
--- a/app/Models/FluidbookTheme.php
+++ b/app/Models/FluidbookTheme.php
@@ -9,7 +9,7 @@ use App\Fields\HorizontalAlign;
 use App\Fields\ThemeBackgroundSize;
 use App\Fields\VerticalAlign;
 use App\Http\Controllers\Admin\Operations\ChangeownerOperation;
-use App\Jobs\GenerateSecondPagePreview;
+use App\Http\Controllers\Admin\Operations\QuizTheme\PreviewOperation;
 use App\Jobs\GenerateThemePreview;
 use App\Jobs\UpdateWS2ThemeTable;
 use App\Models\Base\ToolboxSettingsModel;
@@ -56,7 +56,7 @@ class FluidbookTheme extends ToolboxSettingsModel
     public static $updateWS2ViewOnChange = true;
     public static $updateWS2SyncViewOnChange = false;
 
-    protected $_operations = [ChangeownerOperation::class];
+    protected $_operations = [ChangeownerOperation::class, PreviewOperation::class];
 
     public function setFields()
     {
@@ -86,7 +86,7 @@ class FluidbookTheme extends ToolboxSettingsModel
         ]);
 
         $this->addField(['name' => 'interfaceFont',
-                'type'=>FluidbookFont::class,
+                'type' => FluidbookFont::class,
                 'default' => 'OpenSans',
                 'label' => __('Police de caractères'),
                 'translatable' => false,

diff --git a/app/Models/QuizTheme.php b/app/Models/QuizTheme.php
index 0a1e932d027c50ddc59de9d527609211256909c3..ce5b935c83d89ef67fcc3296e6e07f8725d47e1d 100644 (file)
--- a/app/Models/QuizTheme.php
+++ b/app/Models/QuizTheme.php
@@ -7,6 +7,7 @@ use App\Fields\FluidbookThemeImage;
 use App\Fields\HorizontalAlign;
 use App\Fields\ThemeBackgroundSize;
 use App\Fields\VerticalAlign;
+use App\Jobs\GenerateQuizThemePreview;
 use App\Models\Base\ToolboxModel;
 use Cubist\Backpack\Magic\Fields\Checkbox;
 use Cubist\Backpack\Magic\Fields\Color;
@@ -15,7 +16,6 @@ use Cubist\Backpack\Magic\Fields\FormSectionDescription;
 use Cubist\Backpack\Magic\Fields\FormSeparator;
 use Cubist\Backpack\Magic\Fields\Hidden;
 use Cubist\Backpack\Magic\Fields\SelectFromArray;
-use Cubist\Backpack\Magic\Fields\Text;
 use Cubist\Util\CommandLine\Imagemagick;
 use Cubist\Util\Files\Files;
 use Cubist\Util\Graphics\Resizer;
@@ -190,7 +190,6 @@ class QuizTheme extends ToolboxModel
             return $theme->id;
         }
 
-
         $theme = new QuizTheme();
         $theme->hash = $hash;
         $theme->name = $quiz->client . ' - ' . $quiz->title;
@@ -256,9 +255,9 @@ class QuizTheme extends ToolboxModel
         return $blur;
     }
 
-    public function getPreviewURL($params = [], $page = 2)
+    public function getPreviewURL($params = [])
     {
-        return self::getThemePreviewURL($this->getIdValue(), $params, $page);
+        return self::getThemePreviewURL($this->getIdValue(), $params);
     }
 
     public static function getThemePreviewURL($id, $params = [])
@@ -268,10 +267,24 @@ class QuizTheme extends ToolboxModel
     }
 
 
-    public function getPreviewImage()
+    public function getPreviewImage($type = 'intro')
+    {
+        return clean('<img src="' . backpack_url('quizthemepreview/' . $this->getIdValue() . '/' . $type . '.jpg') . '" width="200" height="113" alt="" />');
+    }
+
+    public function getPreviewImagePath($type)
     {
-        return clean('<img src="' . backpack_url('quizthemepreview/' . $this->getIdValue() . '-intro.jpg') . '" width="200" height="140" alt="" />');
+        return \Cubist\Util\Files\Files::mkdir(storage_path('quizthemes') . '/' . $this->id) . $type . '.jpg';
     }
 
+    public function postSave()
+    {
+        parent::postSave();
+        $this->_generateThemePreview();
+    }
 
+    protected function _generateThemePreview($sync = false)
+    {
+        dispatch(new GenerateQuizThemePreview($this))->onQueue('theme');
+    }
 }

diff --git a/resources/quiztheme/theme_preview/theme_preview.js b/resources/quiztheme/theme_preview/theme_preview.js
index fd540133da17ac25add622268e691e72d3089573..1720ea5bbbcd042c60ed3a6382b886e22914c30f 100644 (file)
--- a/resources/quiztheme/theme_preview/theme_preview.js
+++ b/resources/quiztheme/theme_preview/theme_preview.js
@@ -14,7 +14,6 @@ const optionDefinitions = [
 ];
 
 (async () => {
-    const {installMouseHelper} = require('./install-mouse-helper');
     const options = commandLineArgs(optionDefinitions);
     const browser = await puppeteer.launch({
         headless: 'new',