]> _ Git - odl.git/commitdiff
wip #5002 @1
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 4 Jan 2022 17:46:16 +0000 (18:46 +0100)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 4 Jan 2022 17:46:16 +0000 (18:46 +0100)
app/Http/Controllers/FrontController.php
resources/views/front/media-library.blade.php
resources/views/front/resources.blade.php

index a531ee82406d235c745b2a9e65ee878666bcf06b..7a34456a83937afde079bc49178627e5400b18c4 100644 (file)
@@ -59,7 +59,7 @@ class FrontController extends Controller
 
     protected function _getDataFromCMS()
     {
-        return ['resources' => $this->_getResourcesFromCMS(), 'home' => $this->_getHomeFromCMS(), 'medialibrary' => $this->_getMediaLibraryFromCMS()];
+        return ['resources' => $this->_getResourcesFromCMS(), 'home' => $this->_getHomeFromCMS(), 'medialibrary' => $this->_getMediaLibraryFromCMS(), 'resources_pdf' => $this->_getResourcesPDFFromCMS()];
     }
 
     protected function _getHomeFromCMS()
@@ -72,6 +72,11 @@ class FrontController extends Controller
         return ['themes' => PageData::fromEntities(AssetTheme::all()), 'assets' => PageData::fromEntities(Asset::whereNotNull('theme')->get())];
     }
 
+    protected function _getResourcesPDFFromCMS()
+    {
+        return PageData::fromEntities(Asset::where('type', 'pdf')->get());
+    }
+
     protected function _getResourcesFromCMS()
     {
         return Resource::find('1')->getPageData();
index 8f9575e74d18d6ad24a9560fe79e250868e203ef..cb5106659e003ff28c451f5b585d10ca7237c32e 100644 (file)
@@ -3,8 +3,6 @@
 @section('content')
 
     @php
-
-
         $media_types = [
             'video' => 'Vidéos',
             'audio' => 'Podcast',
index aa04db07b9c24fb52187f52e6b9c1563e1678fa6..809d20689356c07392f906865a25516bfd0f39bf 100644 (file)
@@ -28,7 +28,7 @@
             }
 
             this.PDFOpen = true;
-            $nextTick(() => { $refs.PDFViewer.setAttribute('src', this.viewerURL + URL) });
+            $nextTick(() => { $refs.PDFViewer.setAttribute('src', this.viewerURL + PDF_URL) });
         },
 
         closePDF() {
             {{-- DOCUMENTS --}}
             <div class="grid lg:grid-cols-2 gap-6">
                 @foreach($resources->documents as $doc)
+                    @if(!$doc['document_pdf'])
+                        @continue
+                    @endif
+                    @if(!isset($resources_pdf[$doc['document_pdf']]))
+                        @continue
+                    @endif
+                    @php
+                        /** @var \Cubist\Backpack\Magic\PageData $pdf */
+                        $pdf=$resources_pdf[$doc['document_pdf']];
+                        $pdfurl=$pdf->getImageURLbyCollection($pdf->get('file_upload'));
+                        $thumb=null===$pdf->get('file_thumb')?$pdf->getImageURLbyCollection($pdf->get('file_upload'),'poster'):$pdf->getImageURLbyCollection($pdf->get('file_thumb'));
+                    @endphp
                     {{--<a href="{{ $doc['document_pdf'] }}" @click.prevent="openPDF($el.attributes.href.value)" class="group">--}}
-                    <a href="/storage/242/fluidbook.pdf" @click.prevent="openPDF($el.attributes.href.value)"
+                    <a href="{{$pdfurl}}" @click.prevent="openPDF($el.attributes.href.value)"
                        class="group">
                         <div class="bg-blue h-full flex items-center p-10 text-white rounded-md">
                             <img class="w-1/2 pr-6"
-                                 src="{{ ($resources->getImageURLbyCollection($doc['document_image'])?:'/storage/107/groupe-133-at-2x.png') }}"
+                                 src="{{ $thumb }}"
                                  alt="{{ $doc['document_title'] }}">
                             {{--                            <img class="w-1/2 pr-6" src="{{ $doc['document_image'] }}" alt="{{ $doc['document_title'] }}">--}}
                             <div class="-mr-5 space-y-4">
                         {{-- MEMOS --}}
                         <div class="grid grid-cols-2 gap-5 mt-8">
                             @foreach ($subchapter['subchapter_memos'] as $memo)
+                                @if(!$memo['memo_pdf'])
+                                    @continue
+                                @endif
+                                @if(!isset($resources_pdf[$memo['memo_pdf']]))
+                                    @continue
+                                @endif
+                                @php
+                                    /** @var \Cubist\Backpack\Magic\PageData $pdf */
+                                    $pdf=$resources_pdf[$memo['memo_pdf']];
+                                    $pdfurl=$pdf->getImageURLbyCollection($pdf->get('file_upload'));
+                                    $thumb=null===$pdf->get('file_thumb')?$pdf->getImageURLbyCollection($pdf->get('file_upload'),'poster'):$pdf->getImageURLbyCollection($pdf->get('file_thumb'));
+                                @endphp
+
                                 {{--<a href="{{ $memo['memo_pdf'] }}" @click.prevent="openPDF($el.attributes.href.value)" class="group">--}}
-                                <a href="/storage/242/fluidbook.pdf" @click.prevent="openPDF($el.attributes.href.value)"
+                                <a href="{{$pdfurl}}" @click.prevent="openPDF($el.attributes.href.value)"
                                    class="group">
                                     <div class="bg-grey-50 flex items-center p-8 rounded-md">
                                         <img class="w-1/4 pr-4"
-                                             src="{{ ($resources->getImageURLbyCollection($memo['memo_image'])?:'/storage/108/groupe-134-at-2x.png') }}"
+                                             src="{{ $thumb }}"
                                              alt="{{ $memo['memo_title'] }}">
                                         <div class="space-y-2.5">
                                             <h3 class="text-base font-semibold">{{ $memo['memo_title'] }}</h3>