]> _ Git - fluidbook-toolbox.git/commitdiff
wip #6066 @6:30
authorsoufiane <soufiane@cubedesigners.com>
Mon, 3 Jul 2023 15:08:44 +0000 (17:08 +0200)
committersoufiane <soufiane@cubedesigners.com>
Mon, 3 Jul 2023 15:08:44 +0000 (17:08 +0200)
app/Models/FluidbookPublication.php
composer.json
composer.lock
public/images/icons/icon-mac-app.svg
public/packages/fluidbook/toolbox/css/delivery.css
public/packages/fluidbook/toolbox/css/delivery.css.map
public/packages/fluidbook/toolbox/css/delivery.less
resources/views/fluidbook_publication/delivery.blade.php

index d4d71f46ca28817b08936b24df5c30d292a1f917..4f4c9353dfad38fb391a5a1ad5cf5a6993351d79 100644 (file)
@@ -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');
+        }
     }
 }
index f3b34eb0c010e2350b0375536aa189f57f23664b..2075e48f6acf2c26bfc7644038beab6d4fd365f0 100644 (file)
@@ -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": {
index 8d077536786dcd5c782bb6e19f9d42f42a850de3..ed892dae309fe8634cbef3ab759e73ae0dcfecc0 100644 (file)
@@ -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",
             },
             "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",
             "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",
             },
             "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",
index 5e11144e575698388dc9715d30d2a38d012d2ee2..bf7cb5842ec587a614e18991e04f373512dc1a5c 100644 (file)
@@ -4,7 +4,7 @@
       <rect id="Rectangle_450" data-name="Rectangle 450" width="42.5" height="54" fill="#467fcf"/>
     </clipPath>
   </defs>
-  <g id="Groupe_177" data-name="Groupe 177" clip-path="url(#clip-path)">
+  <g id="Groupe_177" data-name="Groupe 177">
     <path id="Tracé_82" data-name="Tracé 82" d="M13.9,54.13c-3.856,0-6.644-4-8.5-6.663-4.83-6.915-7.594-18.342-3.2-25.9a13.266,13.266,0,0,1,11.132-6.678,14.291,14.291,0,0,1,5.522,1.339,9.269,9.269,0,0,0,2.713.81,9.6,9.6,0,0,0,2.612-.8,15.234,15.234,0,0,1,7.012-1.459,12.7,12.7,0,0,1,9.817,5.3.982.982,0,0,1,.162.772.993.993,0,0,1-.457.644,10.087,10.087,0,0,0-4.9,8.544A9.887,9.887,0,0,0,41.891,39.1a.988.988,0,0,1,.561,1.213,27.935,27.935,0,0,1-3.573,7.268c-1.972,2.858-4.425,6.414-8.419,6.485a9.518,9.518,0,0,1-4.267-1,9.047,9.047,0,0,0-3.967-.954,9.653,9.653,0,0,0-4.182.988,10.429,10.429,0,0,1-3.93,1.028c-.071,0-.142,0-.212,0M13.5,16.874h-.113A11.25,11.25,0,0,0,3.941,22.55C-.049,29.41,2.566,39.924,7.047,46.34c2.051,2.942,4.267,5.807,6.856,5.807l.133,0a8.562,8.562,0,0,0,3.224-.871,11.623,11.623,0,0,1,4.966-1.147,11,11,0,0,1,4.761,1.116,7.658,7.658,0,0,0,3.437.84c2.743-.049,4.625-2.466,6.8-5.62a26,26,0,0,0,3.041-5.934,11.851,11.851,0,0,1-6.45-10.485v-.015a12.029,12.029,0,0,1,4.928-9.6,10.746,10.746,0,0,0-7.689-3.666,13.418,13.418,0,0,0-6.141,1.327,10.179,10.179,0,0,1-3.347.936,10.049,10.049,0,0,1-3.453-.951,13.113,13.113,0,0,0-4.619-1.2" transform="translate(0 -0.129)" fill="#467fcf"/>
 <path id="Tracé_83" data-name="Tracé 83" d="M21.294,13.968h-.136a1,1,0,0,1-.985-.92,11.9,11.9,0,0,1,3.033-8.782A12.745,12.745,0,0,1,31.592,0a1.029,1.029,0,0,1,.74.228.99.99,0,0,1,.353.683,12.327,12.327,0,0,1-2.956,9.01,10.854,10.854,0,0,1-8.435,4.044M30.717,2.13a10.739,10.739,0,0,0-6.012,3.448,9.933,9.933,0,0,0-2.557,6.364,8.824,8.824,0,0,0,6.021-3.261l.024-.029A10.363,10.363,0,0,0,30.717,2.13" transform="translate(0.006 0)" fill="#467fcf"/>
   </g>
index 2c61c3c9162156dbf6658bcf43f125b6fa460b69..d7c528ce08eebbd41319057a0036e819787339f0 100644 (file)
@@ -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 {
index 5ab3bd18eb521de383591b71a189ce1810bd8f7d..0b8bea901b88e7baa68de3a456371574f4e84a7f 100644 (file)
@@ -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
index 83faf897087dd263b2138cc3a64d3e7d73bd0dd2..1dcff2cdcd873ff8a73511f4c1bb8f59aa0af9bd 100644 (file)
@@ -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 {
index 4f7862909c3b3734ecb5985360ca09098cb4dd47..00853a536931871aca9a48dd686c9ab5b5e59c5c 100644 (file)
     }
 
     $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)");
             $downloadVersions[$key]['icon'] = file_get_contents(url('images/icons/icon-cd-usb.svg'));
         }
     }
+
+
 @endphp
 
 @section('after_styles')
                             <div class="preview col-md-6">
                                 <p>Version Desktop</p>
                                 <div class="block">
+                                    <a href="{{ $fluidbook->getPreviewURL() }}" target="_blank" rel="noopener" class="overlay-link"></a>
                                     <div class="preview-block">
                                         <img class="preview-desktop" src="{{ $fluidbookDesktopPreview }}" />
                                     </div>
-                                    <a href="{{ $fluidbook->getPreviewURL() }}" target="_blank" class="btn btn-primary">Voir</a>
+                                    <a href="{{ $fluidbook->getPreviewURL() }}" target="_blank" rel="noopener" class="btn btn-primary">Voir</a>
                                 </div>
                             </div>
-                            <div class="preview col-md-3">
+                            <div class="preview {{ $fluidbookMobileFirstId ? 'col-md-3' : 'col-md-6' }}">
                                 <p>Version Mobile</p>
                                 <div class="block">
+                                    <a href="" data-featherlight="#scanBoxMobile" class="overlay-link"></a>
                                     <div class="preview-block">
                                         <img class="preview-mobile" src="{{ $fluidbookMobilePreview }}" />
                                     </div>
                                 <div class="preview col-md-3">
                                     <p>Version Mobile-first</p>
                                     <div class="block">
+                                        <a href="#" data-featherlight="#scanBoxMobileFirst" class="overlay-link"></a>
                                         <div class="preview-block">
                                             <img class="preview-mobile" src="{{ $fluidbookMobileFirstPreview }}" />
                                         </div>
                             <div class="col-sm-12">
                                 <p class="fw-semibold">Tester le rendu en cliquant sur ce <a href="https://www.opengraph.xyz/url/{{ $fluidbook->getPreviewURL() }}" target="_blank" rel="noopener">lien</a></p>
                                 <ul class="list-none p-0">
-                                    <li class="pb-2 fw-semibold">Si vous votre image n'apparait pas, essayer de vider le cache en utilisant les outils suivants :</li>
+                                    <li class="pb-2 fw-semibold">Si votre image n'apparait pas, essayer de vider le cache en utilisant les outils suivants :</li>
                                     <li>Linkedin : <a href="https://www.linkedin.com/post-inspector">https://www.linkedin.com/post-inspector</a></li>
                                     <li>Facebook : <a href="https://developers.facebook.com/tools/debug/sharing/batch">https://developers.facebook.com/tools/debug/sharing/batch</a></li>
                                     <li>Twitter : <a href="https://cards-dev.twitter.com/validator">https://cards-dev.twitter.com/validator</a></li>
                                         <p>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é.</p>
-                                        <a href="" class="btn bg-default" target="_blank" rel="noopener">Voir la notice</a>
+                                        <a href="https://docs.google.com/document/d/1HRNueaaoWs-RPmkN0F_KmXD8B-BzwzF90KhC5XV4x4s/edit" class="btn bg-default" target="_blank" rel="noopener">Voir la notice</a>
                                         <div class="mt-3">
                                             <p class="m-0">Vous souhaitez activer Google Analytics dans votre Fluidbook ?</p>
                                             <a href="mailto:">Contactez votre chef de projet</a>
                         <h2>Publiez votre Fluidbook</h2>
                         <p>L’adresse d’hébergement a déjà été configurée, vous pouvez mettre votre Fluidbook directement en ligne en
                             cliquant ci-dessous :</p>
-                        <a href="{{ $installServerUrl }}" class="btn btn-primary btn-install" target="_blank" rel="noopener">
-                            Installer sur le serveur d’hébergement
-                        </a>
+                        <div class="btn-install">
+                            <a href="{{ $installServerUrl }}" class="btn btn-primary" target="_blank" rel="noopener">
+                                Installer sur le serveur d’hébergement
+                            </a>
+                            <p class="m-0 mt-1 font-xs">{{ $installServerUrl }}</p>
+                        </div>
                         <div class="delivery-dropdown position-relative">
                             <div class="dropdown-control d-flex justify-content-between">
                                 <span>{{ __('Téléchargez et installez votre Fluidbook') }}</span>
                                 <img src="{{ url('images/icons/icon-arrow-down.svg') }}" />
                             </div>
                             <div class="dropdown-content position-relative">
+                                @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'])
-                                        <div class="dropdown-element d-flex align-items-center {{ $version['install'] ? 'active' : '' }}">
+                                        <div class="dropdown-element d-flex align-items-center {{ $version['install'] || ( str_contains($key, "win") && sizeof($winActiveVersion) > 0 ) ? 'active' : '' }}">
                                             <div class="icon">
                                                 {!! $version['icon'] !!}
                                             </div>
                                                 <p class="version m-0">
                                                     {{ $version['text'] }}
                                                 </p>
-                                                @isset($version['type'])
-                                                    <p class="type m-0">
-                                                        {{ $version['type'] }}
-                                                    </p>
-                                                @endisset
+                                                @if((sizeof($winActiveVersion) === sizeof($winVersion) && str_contains($key, "win")) || (sizeof($winActiveVersion) > 1 && str_contains($key, "win") ) || !str_contains($key, "win"))
+                                                    @isset($version['type'])
+                                                        <p class="type m-0">
+                                                            {{ $version['type'] }}
+                                                        </p>
+                                                    @endisset
+                                                @endif
                                             </div>
                                             <div class="tools d-flex align-center ml-auto">
-                                                @if($version['install'])
+                                                @if($version['install'] || (str_contains($key, "win") && sizeof($winActiveVersion) > 0))
                                                 <a href="" class="mr-1 instruction">
                                                     <svg id="Instruction" xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 30 30">
                                                         <circle id="Ellipse_24" data-name="Ellipse 24" cx="15" cy="15" r="15" fill="rgba(70,127,207,0.1)"/>
                                                         </g>
                                                     </svg>
                                                 </a>
-                                                <a href="" class="download">
+                                                <a href="{{ $downloadUrl }}" class="download">
                                                     <svg id="Groupe_268" data-name="Groupe 268" xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 30 30">
                                                         <rect id="Rectangle_480" data-name="Rectangle 480" width="30" height="30" rx="15" fill="#467fcf"/>
                                                         <g id="Groupe_265" data-name="Groupe 265" transform="translate(8.5 8)">