From 84ed44bba9f4bd7b99ecf188977b582fd0a13882 Mon Sep 17 00:00:00 2001 From: soufiane Date: Mon, 3 Jul 2023 17:08:44 +0200 Subject: [PATCH] wip #6066 @6:30 --- app/Models/FluidbookPublication.php | 15 +- composer.json | 1 + composer.lock | 174 +++++++++++++++++- public/images/icons/icon-mac-app.svg | 2 +- .../fluidbook/toolbox/css/delivery.css | 11 +- .../fluidbook/toolbox/css/delivery.css.map | 2 +- .../fluidbook/toolbox/css/delivery.less | 11 +- .../fluidbook_publication/delivery.blade.php | 71 +++++-- 8 files changed, 263 insertions(+), 24 deletions(-) diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php index d4d71f46c..4f4c9353d 100644 --- a/app/Models/FluidbookPublication.php +++ b/app/Models/FluidbookPublication.php @@ -872,10 +872,19 @@ class FluidbookPublication extends ToolboxSettingsModel } if($fm) { - GenerateDeliveryThumbnailsPreview::$fn($fm,320, 683, 'mobile'); + if($sync) { + GenerateDeliveryThumbnailsPreview::$fn($fm,320, 683, 'mobile'); + }else { + dispatch(new GenerateDeliveryThumbnailsPreview($fm,320, 683, 'mobile'))->onQueue('theme'); + } } - GenerateDeliveryThumbnailsPreview::$fn($this,1920, 1201); - GenerateDeliveryThumbnailsPreview::$fn($this,320, 683, 'mobile'); + if($sync) { + GenerateDeliveryThumbnailsPreview::$fn($this, 1920, 1201); + GenerateDeliveryThumbnailsPreview::$fn($this, 320, 683, 'mobile'); + }else { + dispatch(new GenerateDeliveryThumbnailsPreview($this, 1920, 1201))->onQueue('theme'); + dispatch(new GenerateDeliveryThumbnailsPreview($this, 320, 683, 'mobile'))->onQueue('theme'); + } } } diff --git a/composer.json b/composer.json index f3b34eb0c..2075e48f6 100644 --- a/composer.json +++ b/composer.json @@ -52,6 +52,7 @@ "rickselby/laravel-gate-cache": "^3.6", "rodneyrehm/plist": "^2.0", "rustici-software/scormcloud-api-v2-client-php": "^2.1.0", + "simplesoftwareio/simple-qrcode": "^4.2", "symfony/http-client": "^v6.3.0" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 8d0775367..ed892dae3 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": "9b196172d182c890c852519700107ad3", + "content-hash": "36298aad6903b79b720e855da3abd1b6", "packages": [ { "name": "archtechx/enums", @@ -492,6 +492,60 @@ }, "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.8.1", @@ -2153,6 +2207,56 @@ "abandoned": "mailerlite/laravel-elasticsearch", "time": "2023-06-12T20:55:39+00:00" }, + { + "name": "dasprid/enum", + "version": "1.0.4", + "source": { + "type": "git", + "url": "https://github.com/DASPRiD/Enum.git", + "reference": "8e6b6ea76eabbf19ea2bf5b67b98e1860474012f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/8e6b6ea76eabbf19ea2bf5b67b98e1860474012f", + "reference": "8e6b6ea76eabbf19ea2bf5b67b98e1860474012f", + "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.4" + }, + "time": "2023-03-01T18:44:03+00:00" + }, { "name": "dflydev/dot-access-data", "version": "v3.0.2", @@ -8769,6 +8873,74 @@ }, "time": "2022-09-27T16:11:03+00:00" }, + { + "name": "simplesoftwareio/simple-qrcode", + "version": "4.2.0", + "source": { + "type": "git", + "url": "https://github.com/SimpleSoftwareIO/simple-qrcode.git", + "reference": "916db7948ca6772d54bb617259c768c9cdc8d537" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/SimpleSoftwareIO/simple-qrcode/zipball/916db7948ca6772d54bb617259c768c9cdc8d537", + "reference": "916db7948ca6772d54bb617259c768c9cdc8d537", + "shasum": "" + }, + "require": { + "bacon/bacon-qr-code": "^2.0", + "ext-gd": "*", + "php": ">=7.2|^8.0" + }, + "require-dev": { + "mockery/mockery": "~1", + "phpunit/phpunit": "~9" + }, + "suggest": { + "ext-imagick": "Allows the generation of PNG QrCodes.", + "illuminate/support": "Allows for use within Laravel." + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "SimpleSoftwareIO\\QrCode\\QrCodeServiceProvider" + ], + "aliases": { + "QrCode": "SimpleSoftwareIO\\QrCode\\Facades\\QrCode" + } + } + }, + "autoload": { + "psr-4": { + "SimpleSoftwareIO\\QrCode\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Simple Software LLC", + "email": "support@simplesoftware.io" + } + ], + "description": "Simple QrCode is a QR code generator made for Laravel.", + "homepage": "https://www.simplesoftware.io/#/docs/simple-qrcode", + "keywords": [ + "Simple", + "generator", + "laravel", + "qrcode", + "wrapper" + ], + "support": { + "issues": "https://github.com/SimpleSoftwareIO/simple-qrcode/issues", + "source": "https://github.com/SimpleSoftwareIO/simple-qrcode/tree/4.2.0" + }, + "time": "2021-02-08T20:43:55+00:00" + }, { "name": "spatie/db-dumper", "version": "3.3.1", diff --git a/public/images/icons/icon-mac-app.svg b/public/images/icons/icon-mac-app.svg index 5e11144e5..bf7cb5842 100644 --- a/public/images/icons/icon-mac-app.svg +++ b/public/images/icons/icon-mac-app.svg @@ -4,7 +4,7 @@ - + diff --git a/public/packages/fluidbook/toolbox/css/delivery.css b/public/packages/fluidbook/toolbox/css/delivery.css index 2c61c3c91..d7c528ce0 100644 --- a/public/packages/fluidbook/toolbox/css/delivery.css +++ b/public/packages/fluidbook/toolbox/css/delivery.css @@ -53,13 +53,22 @@ body { align-items: center; flex-direction: column; transition: all 0.3s; + position: relative; + border-radius: 4px; } .delivery-glimpses .block:hover { background-color: #467fcf; } +.delivery-glimpses .block .overlay-link { + position: absolute; + width: 100%; + height: 100%; + top: 0; + left: 0; +} .delivery-glimpses .preview-block { border: 1px solid rgba(70, 127, 207, 0.2); - border-radius: 1px; + border-radius: 2px; overflow: hidden; } .delivery-glimpses .preview-desktop { diff --git a/public/packages/fluidbook/toolbox/css/delivery.css.map b/public/packages/fluidbook/toolbox/css/delivery.css.map index 5ab3bd18e..0b8bea901 100644 --- a/public/packages/fluidbook/toolbox/css/delivery.css.map +++ b/public/packages/fluidbook/toolbox/css/delivery.css.map @@ -1 +1 @@ -{"version":3,"sources":["delivery.less"],"names":[],"mappings":"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","file":"delivery.css"} \ No newline at end of file +{"version":3,"sources":["delivery.less"],"names":[],"mappings":"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","file":"delivery.css"} \ No newline at end of file diff --git a/public/packages/fluidbook/toolbox/css/delivery.less b/public/packages/fluidbook/toolbox/css/delivery.less index 83faf8970..1dcff2cdc 100644 --- a/public/packages/fluidbook/toolbox/css/delivery.less +++ b/public/packages/fluidbook/toolbox/css/delivery.less @@ -59,13 +59,22 @@ html,body { align-items: center; flex-direction: column; transition: all .3s; + position: relative; + border-radius: 4px; &:hover { background-color: rgba(70, 127, 207, 1); } + .overlay-link { + position: absolute; + width: 100%; + height: 100%; + top: 0; + left: 0; + } } .preview-block { border: 1px solid rgba(70,127,207,.2); - border-radius: 1px; + border-radius: 2px; overflow: hidden; } .preview-desktop { diff --git a/resources/views/fluidbook_publication/delivery.blade.php b/resources/views/fluidbook_publication/delivery.blade.php index 4f7862909..00853a536 100644 --- a/resources/views/fluidbook_publication/delivery.blade.php +++ b/resources/views/fluidbook_publication/delivery.blade.php @@ -77,23 +77,31 @@ } $downloadVersions = $fluidbook->getDownloadVersions(); + $prefixDownloadUrl = '/fluidbook-publication/'.$fluidbook->id; + $prefixDownloadUrl = $prefixDownloadUrl.'/package'; foreach ($downloadVersions as $key => $version) { if($key === "online") { $downloadVersions[$key]['text'] = __("Standard"); $downloadVersions[$key]['type'] = __("(serveur web)"); $downloadVersions[$key]['icon'] = file_get_contents(url('images/icons/icon-standard-server.svg')); + $downloadVersions[$key]['notice_fr'] = "https://docs.google.com/document/d/1MK9aswqXXYleJwmbexKiAHNeNei-zTUb7CnbjkmNur4/edit"; + $downloadVersions[$key]['notice_en'] = "https://docs.google.com/document/d/18GlmLzUqJq_1UgAasSZKN9xDHmKQr4Mt8dY9Pex-Llw/edit?usp=drive_link"; }elseif ($key === "scorm") { $downloadVersions[$key]['text'] = __("LMS Scorm"); $downloadVersions[$key]['type'] = __("(LMS / SCORM)"); $downloadVersions[$key]['icon'] = file_get_contents(url('images/icons/icon-lms-scorm.svg')); + $downloadVersions[$key]['notice_fr'] = "https://docs.google.com/document/d/1wDrOihLieSRWLiXVHE4n7Ka_qHcDde_DeU6R--mzAZM/edit?usp=drive_link"; + $downloadVersions[$key]['notice_en'] = "https://docs.google.com/document/d/1g3jXC20krSiOSFG0TqzoJ7FsB8OUnvvjoI4yOMO8xUM/edit?usp=drive_link"; }elseif ($key === "sharepoint") { $downloadVersions[$key]['text'] = __("SharePoint"); $downloadVersions[$key]['icon'] = file_get_contents(url('images/icons/icon-sharepoint.svg')); + $downloadVersions[$key]['notice_fr'] = "https://docs.google.com/document/d/15r6ajKDjLTlELhYVyIWJNzLkrsp8aqy4aRkP5vwNVQU/edit?usp=drive_link"; + $downloadVersions[$key]['notice_en'] = "https://docs.google.com/document/d/1FMh-fgMoFKPztGmexNA2h6VAbFa-OclPeYpLsv2eRtw/edit?usp=drive_link"; }elseif ($key === "mac_exe_html") { $downloadVersions[$key]['text'] = __("Version Offline"); $downloadVersions[$key]['type'] = __("(Mac App)"); - $downloadVersions[$key]['icon'] = file_get_contents(url('images/icons/icon-mac-app.svg')); + $downloadVersions[$key]['icon'] = file_get_contents(url('images/icons/icon-mac-app.svg'), true); }elseif ($key === "win_ins_html") { $downloadVersions[$key]['text'] = __("Version Offline"); $downloadVersions[$key]['type'] = __("(Windows App)"); @@ -104,6 +112,8 @@ $downloadVersions[$key]['icon'] = file_get_contents(url('images/icons/icon-cd-usb.svg')); } } + + @endphp @section('after_styles') @@ -151,15 +161,17 @@

Version Desktop

+
- Voir + Voir
-
+

Version Mobile

+
@@ -171,6 +183,7 @@

Version Mobile-first

+
@@ -264,7 +277,7 @@

Tester le rendu en cliquant sur ce lien

    -
  • Si vous votre image n'apparait pas, essayer de vider le cache en utilisant les outils suivants :
    • +
  • Si votre image n'apparait pas, essayer de vider le cache en utilisant les outils suivants :
  • Linkedin : https://www.linkedin.com/post-inspector
  • Facebook : https://developers.facebook.com/tools/debug/sharing/batch
  • Twitter : https://cards-dev.twitter.com/validator
    • @@ -320,7 +333,7 @@

    Fluidbook est conçu pour fonctionner avec Google Analytics et Google Tag Manager (GTM) pour vous donner accès à l'un des outils de statistiques gratuits les plus puissants du marché.

    - Voir la notice + Voir la notice

    Vous souhaitez activer Google Analytics dans votre Fluidbook ?

    Contactez votre chef de projet @@ -349,18 +362,42 @@

    Publiez votre Fluidbook

    L’adresse d’hébergement a déjà été configurée, vous pouvez mettre votre Fluidbook directement en ligne en cliquant ci-dessous :

    - - Installer sur le serveur d’hébergement - +
    + + Installer sur le serveur d’hébergement + +

    {{ $installServerUrl }}

    +
    {{ __('Téléchargez et installez votre Fluidbook') }}
    + @php + $activeVersions = array_filter($downloadVersions, function($n) { + return $n['install']; + }); + $winVersion = array_filter(array_keys($downloadVersions), function($n) { + return str_contains($n, "win"); + }); + $winActiveVersion = array_filter(array_keys($activeVersions), function($n) { + return str_contains($n, "win"); + }); + + if(sizeof($winVersion) > 1 && sizeof($winActiveVersion) === 0) + unset($downloadVersions['win_cd_html']) + @endphp @foreach($downloadVersions as $key => $version) + @php + $downloadUrl = $prefixDownloadUrl.'/download/'; + $downloadUrl .= $key === 'scorm/' ?'scorm/'.$key : $key; + if(str_contains(key($activeVersions), "win")) { + if(str_contains($key, "win")) $version['install'] = true; + } + @endphp @isset($version['text']) -
    +
    0 ) ? 'active' : '' }}">
    {!! $version['icon'] !!}
    @@ -368,14 +405,16 @@

    {{ $version['text'] }}

    - @isset($version['type']) -

    - {{ $version['type'] }} -

    - @endisset + @if((sizeof($winActiveVersion) === sizeof($winVersion) && str_contains($key, "win")) || (sizeof($winActiveVersion) > 1 && str_contains($key, "win") ) || !str_contains($key, "win")) + @isset($version['type']) +

    + {{ $version['type'] }} +

    + @endisset + @endif
    - @if($version['install']) + @if($version['install'] || (str_contains($key, "win") && sizeof($winActiveVersion) > 0)) @@ -385,7 +424,7 @@ - + -- 2.39.5