wip #4914 @0.75

diff --git a/app/Http/Controllers/FrontController.php b/app/Http/Controllers/FrontController.php
index 851ae79a9cb5236cb2a8f922db063ea82e8838c7..885d71c6bf539123a9b8d425c187f6b665654de3 100644 (file)
--- a/app/Http/Controllers/FrontController.php
+++ b/app/Http/Controllers/FrontController.php
@@ -53,8 +53,7 @@ class FrontController extends Controller {
     }
 
     protected function _getResourcesFromCMS() {
-        /** @var PageData $d */
-        $d = Resource::find('1')->getPageData();
-        return $d->getRawData();
+        $res= Resource::find('1')->getPageData();
+        return $res;
     }
 }

diff --git a/resources/views/front/resources.blade.php b/resources/views/front/resources.blade.php
index cf796844b784fbdb3d0048b4d21572c2cdeff7a4..aa04db07b9c24fb52187f52e6b9c1563e1678fa6 100644 (file)
--- a/resources/views/front/resources.blade.php
+++ b/resources/views/front/resources.blade.php
@@ -1,5 +1,6 @@
 @extends('layouts.app')
 
+
 @push('extra_body_classes')
     overflow-y-scroll {{-- We already know this will be a long page so this avoids the header jumping on load --}}
 @endpush
@@ -67,12 +68,15 @@
 
             {{-- DOCUMENTS --}}
             <div class="grid lg:grid-cols-2 gap-6">
-                @foreach($resources['documents'] as $doc)
+                @foreach($resources->documents as $doc)
                     {{--<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)" class="group">
+                    <a href="/storage/242/fluidbook.pdf" @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="/storage/107/groupe-133-at-2x.png" alt="{{ $doc['document_title'] }}">
-{{--                            <img class="w-1/2 pr-6" src="{{ $doc['document_image'] }}" alt="{{ $doc['document_title'] }}">--}}
+                            <img class="w-1/2 pr-6"
+                                 src="{{ ($resources->getImageURLbyCollection($doc['document_image'])?:'/storage/107/groupe-133-at-2x.png') }}"
+                                 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">
                                 <h3 class="text-4xl font-semibold">{{ $doc['document_title'] }}</h3>
                                 <p>{{ $doc['document_subtitle'] }}</p>
@@ -111,15 +115,16 @@
                         <div class="grid grid-cols-2 gap-5 mt-8">
                             @foreach ($subchapter['subchapter_memos'] as $memo)
                                 {{--<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)" class="group">
+                                <a href="/storage/242/fluidbook.pdf" @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="{{ $memo['memo_image'] }}"--}}
-                                             src="/storage/108/groupe-134-at-2x.png"
+                                             src="{{ ($resources->getImageURLbyCollection($memo['memo_image'])?:'/storage/108/groupe-134-at-2x.png') }}"
                                              alt="{{ $memo['memo_title'] }}">
                                         <div class="space-y-2.5">
                                             <h3 class="text-base font-semibold">{{ $memo['memo_title'] }}</h3>
-                                            <span class="circle-arrow transform transition group-hover:scale-110"></span>
+                                            <span
+                                                class="circle-arrow transform transition group-hover:scale-110"></span>
                                         </div>
                                     </div>
                                 </a>
@@ -146,7 +151,8 @@
 
             <x-header>
                 <x-slot name="right">
-                    <div x-show="PDFOpen && !menuOpen" x-transition:enter.opacity.duration.500ms.delay.300ms x-transition:leave.opacity.duration.0ms.delay.0ms>
+                    <div x-show="PDFOpen && !menuOpen" x-transition:enter.opacity.duration.500ms.delay.300ms
+                         x-transition:leave.opacity.duration.0ms.delay.0ms>
                         <x-close
                             x-show="PDFOpen"
                             @click.prevent="closePDF()"