From: Vincent Vanwaelscappel Date: Thu, 13 Jan 2022 19:55:25 +0000 (+0100) Subject: wait #5028 @1 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=cc1814ccfe49fd834870c26144fd6997311dfa48;p=odl.git wait #5028 @1 --- diff --git a/app/Http/Controllers/FrontController.php b/app/Http/Controllers/FrontController.php index 3dbc838..84ded06 100644 --- a/app/Http/Controllers/FrontController.php +++ b/app/Http/Controllers/FrontController.php @@ -74,10 +74,10 @@ class FrontController extends Controller foreach (Menu::all() as $item) { $link = ['title' => $item->title]; if (str_starts_with($item->link, 'asset_')) { - $link['type'] = $item->type; $assetId = substr($item->link, 6); /** @var Asset $asset */ $asset = Asset::find($assetId); + $link['type'] = $asset->type; $link['url'] = $asset->getFirstMediaUrl($asset->file_upload); } else { $link['type'] = 'page'; diff --git a/resources/views/front/resources.blade.php b/resources/views/front/resources.blade.php index f012c33..518ee24 100644 --- a/resources/views/front/resources.blade.php +++ b/resources/views/front/resources.blade.php @@ -8,39 +8,7 @@ @@ -85,53 +53,53 @@ x-show="shown" x-transition:enter-start="opacity-0 translate-y-[50px]"> - {{-- DOCUMENTS --}} - @if (count($resources->documents) > 0) -
- @foreach($resources->documents as $doc) - @if (!$doc['document_pdf'] || !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 - {{----}} - -
- {{ $doc['document_title'] }} - {{--{{ $doc['document_title'] }}--}} -
-

{{ $doc['document_title'] }}

-

{{ $doc['document_subtitle'] }}

- - Visualiser - -
-
- - @endforeach -
- @endif - - {{-- MEMOS TITLE --}} -

- - Les mémos - -

+{{-- --}}{{-- DOCUMENTS --}} +{{-- @if (count($resources->documents) > 0)--}} +{{--
--}} +{{-- @foreach($resources->documents as $doc)--}} +{{-- @if (!$doc['document_pdf'] || !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--}} +{{-- --}}{{----}} +{{-- --}} +{{--
--}} +{{-- {{ $doc['document_title'] }}--}} +{{-- --}}{{--{{ $doc['document_title'] }}--}} +{{--
--}} +{{--

{{ $doc['document_title'] }}

--}} +{{--

{{ $doc['document_subtitle'] }}

--}} +{{-- --}} +{{-- Visualiser--}} +{{-- --}} +{{--
--}} +{{--
--}} +{{-- --}} +{{-- @endforeach--}} +{{--
--}} +{{-- @endif--}} + +{{-- --}}{{-- MEMOS TITLE --}} +{{--

--}} +{{-- --}} +{{-- Les mémos--}} +{{-- --}} +{{--

--}} {{-- MAIN SECTION WITH SIDEBAR --}}
@@ -153,95 +121,67 @@ @foreach ($resources['chapters'] as $index => $chapter) {{-- CHAPTER BLOCK --}}
- {{-- - Opposing top padding (pt-4) + negative top margin (-mt-4) gives - space above scroll anchor position without misaligning anything - --}} -

- {{ $index + 1 }}. {{ $chapter['chapter_title'] }} -

- - {{-- SUB-CHAPTERS --}} - @foreach ($chapter['subchapters'] as $subchapter_index => $subchapter) - @if (empty($subchapter['subchapter_title'])) - @continue - @endif - -

{{ $index + 1 }}.{{ $subchapter_index + 1 }} {{ $subchapter['subchapter_title'] }}

-

{{ $subchapter['subchapter_subtitle'] }}

- - {{-- MEMOS --}} -
- @foreach ($subchapter['subchapter_memos'] as $memo) - @if (!$memo['memo_pdf'] || !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 = !$pdf->get('file_thumb') || !$pdf->getImageURLbyCollection($pdf->get('file_thumb')) - ? $pdf->getImageURLbyCollection($pdf->get('file_upload'),'poster') - : $pdf->getImageURLbyCollection($pdf->get('file_thumb')); - @endphp - - {{----}} - -
- {{ $memo['memo_title'] }} -
- @if ($memo['memo_number']) -

{{ $memo['memo_number'] }}

- @endif -

{{ $memo['memo_title'] }}

-
{{ $memo['memo_subtitle'] }}
- -
+ {{-- + Opposing top padding (pt-4) + negative top margin (-mt-4) gives + space above scroll anchor position without misaligning anything + --}} +

+ {{ $index + 1 }}. {{ $chapter['chapter_title'] }} +

+ + {{-- SUB-CHAPTERS --}} + @foreach ($chapter['subchapters'] as $subchapter_index => $subchapter) + @if (empty($subchapter['subchapter_title'])) + @continue + @endif + +

{{ $index + 1 }} + .{{ $subchapter_index + 1 }} {{ $subchapter['subchapter_title'] }}

+

{{ $subchapter['subchapter_subtitle'] }}

+ + {{-- MEMOS --}} +
+ @foreach ($subchapter['subchapter_memos'] as $memo) + @if (!$memo['memo_pdf'] || !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 = !$pdf->get('file_thumb') || !$pdf->getImageURLbyCollection($pdf->get('file_thumb')) + ? $pdf->getImageURLbyCollection($pdf->get('file_upload'),'poster') + : $pdf->getImageURLbyCollection($pdf->get('file_thumb')); + @endphp + + {{----}} + +
+ {{ $memo['memo_title'] }} +
+ @if ($memo['memo_number']) +

{{ $memo['memo_number'] }}

+ @endif +

{{ $memo['memo_title'] }}

+
{{ $memo['memo_subtitle'] }}
+
- - @endforeach -
- @endforeach +
+ + @endforeach +
+ @endforeach
@endforeach
- - {{-- PDF Viewer Overlay --}} -
- - {{-- PDF Viewer iframe --}} - - - - -
- -
- - -
- @endsection diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 1468dd6..f444795 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -22,6 +22,12 @@ document.body.classList.remove('overlay-open'); } }); + + // Open PDF viewer if querystring is already set + let querystring = new URLSearchParams(location.search); + if (querystring.get('file')) { + this.openPDF(querystring.get('file'), false); + } }, get overlayOpen() { @@ -48,6 +54,33 @@ closeSearch() { this.searchOpen = false; }, + + viewerURL: '/front/coeur/pdfjs/web/viewer.html?file=', // Base URL for viewer + + openPDF(PDF_URL, updateQuerystring = true) { + PDF_URL = PDF_URL.replace('./storage', '../../../storage'); + + if (updateQuerystring) { + const location = new URL(window.location.href); + location.searchParams.set('file', PDF_URL); + history.replaceState(null, document.title, location.toString()); + } + + this.PDFOpen = true; + this.$nextTick(() => { + this.$refs.PDFViewer.setAttribute('src', this.viewerURL + PDF_URL) + }); + }, + + closePDF() { + this.PDFOpen = false; + this.$refs.PDFViewer.setAttribute('src', ''); + + // Update the page URL to remove querystring + const location = new URL(window.location.href); + location.searchParams.delete('file'); + history.replaceState(null, document.title, location.toString()); + }, } } @@ -73,8 +106,10 @@ + + {{-- MENU OVERLAY --}} -
@foreach ($menu as $link) + + @php + $prevent='menuOpen = false; setTimeout(() => window.location = $event.target.href, 200);'; + if($link['type']==='pdf'){ + $prevent='menuOpen = false;openPDF($el.attributes.href.value)'; + } + @endphp {{-- Overflow is hidden for text entrance animation. --}} {{-- Extra padding and negative margin added so hover scale effect isn't clipped --}}
  • @@ -100,8 +142,7 @@ x-transition:leave-end="translate-y-[100px]"> + + {{-- PDF Viewer iframe --}} + + + + +
    + +
    +     +     +
    • + @endsection