From 2a6667a5133368beb8813fe5183850fba9b6a39d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Wed, 21 Jul 2021 13:01:53 +0200
Subject: [PATCH] Extract pdf-viewer into component & make it show iframe on
 non-android devices

---
 .../ninja2020/components/pdf-viewer.blade.php | 97 +++++++++++++++++++
 .../portal/ninja2020/credits/show.blade.php   | 76 +--------------
 .../portal/ninja2020/invoices/show.blade.php  | 85 +---------------
 .../portal/ninja2020/quotes/show.blade.php    | 60 +-----------
 4 files changed, 100 insertions(+), 218 deletions(-)
 create mode 100644 resources/views/portal/ninja2020/components/pdf-viewer.blade.php

diff --git a/resources/views/portal/ninja2020/components/pdf-viewer.blade.php b/resources/views/portal/ninja2020/components/pdf-viewer.blade.php
new file mode 100644
index 000000000000..ec97ae97e34b
--- /dev/null
+++ b/resources/views/portal/ninja2020/components/pdf-viewer.blade.php
@@ -0,0 +1,97 @@
+@php
+    $android = stripos($_SERVER['HTTP_USER_AGENT'], 'Android');
+@endphp
+
+@push('head')
+    <meta name="pdf-url" content="{{ $entity->pdf_file_path(null, 'url', true) }}">
+    <script src="{{ asset('js/vendor/pdf.js/pdf.min.js') }}"></script>
+@endpush
+
+<div class="flex items-center justify-between mt-4">
+    <section class="flex items-center">
+        <div class="items-center" style="{{ $android ? '' : 'display: none' }}" id="pagination-button-container">
+            <button class="input-label focus:outline-none hover:text-blue-600 transition ease-in-out duration-300"
+                id="previous-page-button" title="Previous page">
+                <svg class="w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7" />
+                </svg>
+            </button>
+            <button class="input-label focus:outline-none hover:text-blue-600 transition ease-in-out duration-300"
+                id="next-page-button" title="Next page">
+                <svg class="w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7" />
+                </svg>
+            </button>
+        </div>
+        <span class="text-sm text-gray-700 ml-2 {{ $android ? 'block' : 'hidden' }}">{{ ctrans('texts.page') }}:
+            <span id="current-page-container"></span>
+            <span>{{ strtolower(ctrans('texts.of')) }}</span>
+            <span id="total-page-container"></span>
+        </span>
+    </section>
+    <section class="flex items-center space-x-1">
+        <div class="flex items-center mr-4 space-x-1 {{ $android ? 'block' : 'hidden' }}">
+            <span class="text-gray-600 mr-2" id="zoom-level">100%</span>
+            <a href="#" id="zoom-in">
+                <svg class="text-gray-400 hover:text-gray-600 focus:outline-none focus:text-gray-600 cursor-pointer"
+                    xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
+                    stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+                    <circle cx="11" cy="11" r="8"></circle>
+                    <line x1="21" y1="21" x2="16.65" y2="16.65"></line>
+                    <line x1="11" y1="8" x2="11" y2="14"></line>
+                    <line x1="8" y1="11" x2="14" y2="11"></line>
+                </svg>
+            </a>
+            <a href="#" id="zoom-out">
+                <svg class="text-gray-400 hover:text-gray-600 focus:outline-none focus:text-gray-600 cursor-pointer"
+                    xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
+                    stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+                    <circle cx="11" cy="11" r="8"></circle>
+                    <line x1="21" y1="21" x2="16.65" y2="16.65"></line>
+                    <line x1="8" y1="11" x2="14" y2="11"></line>
+                </svg>
+            </a>
+        </div>
+        <div x-data="{ open: false }" @keydown.escape="open = false" @click.away="open = false"
+            class="relative inline-block text-left">
+            <div>
+                <button @click="open = !open"
+                    class="flex items-center text-gray-400 hover:text-gray-600 focus:outline-none focus:text-gray-600">
+                    <svg class="h-5 w-5" fill="currentColor" viewBox="0 0 20 20">
+                        <path
+                            d="M10 6a2 2 0 110-4 2 2 0 010 4zM10 12a2 2 0 110-4 2 2 0 010 4zM10 18a2 2 0 110-4 2 2 0 010 4z" />
+                    </svg>
+                </button>
+            </div>
+            <div x-show="open" x-transition:enter="transition ease-out duration-100"
+                x-transition:enter-start="transform opacity-0 scale-95"
+                x-transition:enter-end="transform opacity-100 scale-100"
+                x-transition:leave="transition ease-in duration-75"
+                x-transition:leave-start="transform opacity-100 scale-100"
+                x-transition:leave-end="transform opacity-0 scale-95"
+                class="origin-top-right absolute right-0 mt-2 w-56 rounded-md shadow-lg">
+                <div class="rounded-md bg-white shadow-xs">
+                    <div class="py-1">
+                        <a target="_blank" href="?mode=fullscreen"
+                            class="block px-4 py-2 text-sm leading-5 text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900">{{ ctrans('texts.open_in_new_tab') }}</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </section>
+</div>
+
+@if($android)
+    <div class="flex justify-center">
+        <canvas id="pdf-placeholder" class="shadow rounded-lg bg-white mt-4 p-4"></canvas>
+    </div>
+@else
+    <iframe src="{{ $entity->pdf_file_path(null, 'url', true) }}" class="h-screen w-full border-0 mt-4"></iframe>
+@endif
+
+
+@if($android)
+    @push('footer')
+        <script src="{{ asset('js/clients/shared/pdf.js') }}" defer></script>
+    @endpush
+@endif
\ No newline at end of file
diff --git a/resources/views/portal/ninja2020/credits/show.blade.php b/resources/views/portal/ninja2020/credits/show.blade.php
index 11bfcf3d4b1a..1b914210e85e 100644
--- a/resources/views/portal/ninja2020/credits/show.blade.php
+++ b/resources/views/portal/ninja2020/credits/show.blade.php
@@ -9,81 +9,7 @@
 @section('body')
     @include('portal.ninja2020.components.entity-documents', ['entity' => $credit])
 
-    <div class="flex items-center justify-between">
-        <section class="flex items-center">
-            <div class="items-center" style="display: none" id="pagination-button-container">
-                <button class="input-label focus:outline-none hover:text-blue-600 transition ease-in-out duration-300"
-                        id="previous-page-button" title="Previous page">
-                    <svg class="w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7"/>
-                    </svg>
-                </button>
-                <button class="input-label focus:outline-none hover:text-blue-600 transition ease-in-out duration-300"
-                        id="next-page-button" title="Next page">
-                    <svg class="w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7"/>
-                    </svg>
-                </button>
-            </div>
-            <span class="text-sm text-gray-700 ml-2 lg:hidden">{{ ctrans('texts.page') }}:
-                <span id="current-page-container"></span>
-                <span>{{ strtolower(ctrans('texts.of')) }}</span>
-                <span id="total-page-container"></span>
-            </span>
-        </section>
-        <section class="flex items-center space-x-1">
-            <div class="flex items-center mr-4 space-x-1 lg:hidden">
-                <span class="text-gray-600 mr-2" id="zoom-level">100%</span>
-                <a href="#" id="zoom-in">
-                    <svg class="text-gray-400 hover:text-gray-600 focus:outline-none focus:text-gray-600 cursor-pointer"
-                         xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
-                         stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                        <circle cx="11" cy="11" r="8"></circle>
-                        <line x1="21" y1="21" x2="16.65" y2="16.65"></line>
-                        <line x1="11" y1="8" x2="11" y2="14"></line>
-                        <line x1="8" y1="11" x2="14" y2="11"></line>
-                    </svg>
-                </a>
-                <a href="#" id="zoom-out">
-                    <svg class="text-gray-400 hover:text-gray-600 focus:outline-none focus:text-gray-600 cursor-pointer"
-                         xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
-                         stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                        <circle cx="11" cy="11" r="8"></circle>
-                        <line x1="21" y1="21" x2="16.65" y2="16.65"></line>
-                        <line x1="8" y1="11" x2="14" y2="11"></line>
-                    </svg>
-                </a>
-            </div>
-            <div x-data="{ open: false }" @keydown.escape="open = false" @click.away="open = false"
-                 class="relative inline-block text-left">
-                <div>
-                    <button @click="open = !open"
-                            class="flex items-center text-gray-400 hover:text-gray-600 focus:outline-none focus:text-gray-600">
-                        <svg class="h-5 w-5" fill="currentColor" viewBox="0 0 20 20">
-                            <path
-                                d="M10 6a2 2 0 110-4 2 2 0 010 4zM10 12a2 2 0 110-4 2 2 0 010 4zM10 18a2 2 0 110-4 2 2 0 010 4z"/>
-                        </svg>
-                    </button>
-                </div>
-                <div x-show="open" x-transition:enter="transition ease-out duration-100"
-                     x-transition:enter-start="transform opacity-0 scale-95"
-                     x-transition:enter-end="transform opacity-100 scale-100"
-                     x-transition:leave="transition ease-in duration-75"
-                     x-transition:leave-start="transform opacity-100 scale-100"
-                     x-transition:leave-end="transform opacity-0 scale-95"
-                     class="origin-top-right absolute right-0 mt-2 w-56 rounded-md shadow-lg">
-                    <div class="rounded-md bg-white shadow-xs">
-                        <div class="py-1">
-                            <a target="_blank" href="?mode=fullscreen"
-                               class="block px-4 py-2 text-sm leading-5 text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900">{{ ctrans('texts.open_in_new_tab') }}</a>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </section>
-    </div>
-
-    <iframe src="{{ $credit->pdf_file_path(null, 'url', true) }}" class="h-screen w-full border-0 hidden lg:block mt-4"></iframe>
+    @include('portal.ninja2020.components.pdf-viewer', ['entity' => $credit])
 
     <div class="flex justify-center">
         <canvas id="pdf-placeholder" class="shadow rounded-lg bg-white lg:hidden mt-4 p-4"></canvas>
diff --git a/resources/views/portal/ninja2020/invoices/show.blade.php b/resources/views/portal/ninja2020/invoices/show.blade.php
index c26c3c9a71e5..aeaee1553fc5 100644
--- a/resources/views/portal/ninja2020/invoices/show.blade.php
+++ b/resources/views/portal/ninja2020/invoices/show.blade.php
@@ -2,10 +2,8 @@
 @section('meta_title', ctrans('texts.view_invoice'))
 
 @push('head')
-    <meta name="pdf-url" content="{{ $invoice->pdf_file_path(null, 'url', true) }}">
     <meta name="show-invoice-terms" content="{{ $settings->show_accept_invoice_terms ? true : false }}">
     <meta name="require-invoice-signature" content="{{ $client->user->account->hasFeature(\App\Models\Account::FEATURE_INVOICE_SETTINGS) && $settings->require_invoice_signature }}">
-    <script src="{{ asset('js/vendor/pdf.js/pdf.min.js') }}"></script>
     <script src="https://cdn.jsdelivr.net/npm/signature_pad@2.3.2/dist/signature_pad.min.js"></script>
 @endpush
 
@@ -71,92 +69,11 @@
     @endif
 
     @include('portal.ninja2020.components.entity-documents', ['entity' => $invoice])
-
-    <div class="flex items-center justify-between mt-4">
-        <section class="flex items-center">
-            <div class="items-center" style="display: none" id="pagination-button-container">
-                <button class="input-label focus:outline-none hover:text-blue-600 transition ease-in-out duration-300"
-                        id="previous-page-button" title="Previous page">
-                    <svg class="w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7"/>
-                    </svg>
-                </button>
-                <button class="input-label focus:outline-none hover:text-blue-600 transition ease-in-out duration-300"
-                        id="next-page-button" title="Next page">
-                    <svg class="w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7"/>
-                    </svg>
-                </button>
-            </div>
-            <span class="text-sm text-gray-700 ml-2 lg:hidden">{{ ctrans('texts.page') }}:
-                <span id="current-page-container"></span>
-                <span>{{ strtolower(ctrans('texts.of')) }}</span>
-                <span id="total-page-container"></span>
-            </span>
-        </section>
-        <section class="flex items-center space-x-1">
-            <div class="flex items-center mr-4 space-x-1 lg:hidden">
-                <span class="text-gray-600 mr-2" id="zoom-level">100%</span>
-                <a href="#" id="zoom-in">
-                    <svg class="text-gray-400 hover:text-gray-600 focus:outline-none focus:text-gray-600 cursor-pointer"
-                         xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
-                         stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                        <circle cx="11" cy="11" r="8"></circle>
-                        <line x1="21" y1="21" x2="16.65" y2="16.65"></line>
-                        <line x1="11" y1="8" x2="11" y2="14"></line>
-                        <line x1="8" y1="11" x2="14" y2="11"></line>
-                    </svg>
-                </a>
-                <a href="#" id="zoom-out">
-                    <svg class="text-gray-400 hover:text-gray-600 focus:outline-none focus:text-gray-600 cursor-pointer"
-                         xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none"
-                         stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-                        <circle cx="11" cy="11" r="8"></circle>
-                        <line x1="21" y1="21" x2="16.65" y2="16.65"></line>
-                        <line x1="8" y1="11" x2="14" y2="11"></line>
-                    </svg>
-                </a>
-            </div>
-            <div x-data="{ open: false }" @keydown.escape="open = false" @click.away="open = false"
-                 class="relative inline-block text-left">
-                <div>
-                    <button @click="open = !open"
-                            class="flex items-center text-gray-400 hover:text-gray-600 focus:outline-none focus:text-gray-600">
-                        <svg class="h-5 w-5" fill="currentColor" viewBox="0 0 20 20">
-                            <path
-                                d="M10 6a2 2 0 110-4 2 2 0 010 4zM10 12a2 2 0 110-4 2 2 0 010 4zM10 18a2 2 0 110-4 2 2 0 010 4z"/>
-                        </svg>
-                    </button>
-                </div>
-                <div x-show="open" x-transition:enter="transition ease-out duration-100"
-                     x-transition:enter-start="transform opacity-0 scale-95"
-                     x-transition:enter-end="transform opacity-100 scale-100"
-                     x-transition:leave="transition ease-in duration-75"
-                     x-transition:leave-start="transform opacity-100 scale-100"
-                     x-transition:leave-end="transform opacity-0 scale-95"
-                     class="origin-top-right absolute right-0 mt-2 w-56 rounded-md shadow-lg">
-                    <div class="rounded-md bg-white shadow-xs">
-                        <div class="py-1">
-                            <a target="_blank" href="?mode=fullscreen"
-                               class="block px-4 py-2 text-sm leading-5 text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900">{{ ctrans('texts.open_in_new_tab') }}</a>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </section>
-    </div>
-
-    <iframe src="{{ $invoice->pdf_file_path(null, 'url', true) }}" class="h-screen w-full border-0 hidden lg:block mt-4"></iframe>
-
-    <div class="flex justify-center">
-        <canvas id="pdf-placeholder" class="shadow rounded-lg bg-white lg:hidden mt-4 p-4"></canvas>
-    </div>
-
+    @include('portal.ninja2020.components.pdf-viewer', ['entity' => $invoice])
     @include('portal.ninja2020.invoices.includes.terms', ['entities' => [$invoice], 'entity_type' => ctrans('texts.invoice')])
     @include('portal.ninja2020.invoices.includes.signature')
 @endsection
 
 @section('footer')
-    <script src="{{ asset('js/clients/shared/pdf.js') }}"></script>
     <script src="{{ asset('js/clients/invoices/payment.js') }}"></script>
 @endsection
diff --git a/resources/views/portal/ninja2020/quotes/show.blade.php b/resources/views/portal/ninja2020/quotes/show.blade.php
index 46ddef487cad..da929a86561c 100644
--- a/resources/views/portal/ninja2020/quotes/show.blade.php
+++ b/resources/views/portal/ninja2020/quotes/show.blade.php
@@ -28,69 +28,11 @@
     @endif
 
     @include('portal.ninja2020.components.entity-documents', ['entity' => $quote])
-
-    <div class="flex items-center justify-between mt-4">
-        <section class="flex items-center">
-            <div class="items-center" style="display: none" id="pagination-button-container">
-                <button class="input-label focus:outline-none hover:text-blue-600 transition ease-in-out duration-300"
-                        id="previous-page-button" title="Previous page">
-                    <svg class="w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7"/>
-                    </svg>
-                </button>
-                <button class="input-label focus:outline-none hover:text-blue-600 transition ease-in-out duration-300"
-                        id="next-page-button" title="Next page">
-                    <svg class="w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7"/>
-                    </svg>
-                </button>
-            </div>
-            <span class="text-sm text-gray-700 ml-2 lg:hidden">{{ ctrans('texts.page') }}:
-                <span id="current-page-container"></span>
-                <span>{{ strtolower(ctrans('texts.of')) }}</span>
-                <span id="total-page-container"></span>
-            </span>
-        </section>
-        <section class="flex items-center space-x-1">
-            <div class="flex items-center mr-4 space-x-1 lg:hidden">
-                <span class="text-gray-600 mr-2" id="zoom-level">100%</span>
-                <a href="#" id="zoom-in">
-                    <svg class="text-gray-400 hover:text-gray-600 focus:outline-none focus:text-gray-600 cursor-pointer" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="8"></circle><line x1="21" y1="21" x2="16.65" y2="16.65"></line><line x1="11" y1="8" x2="11" y2="14"></line><line x1="8" y1="11" x2="14" y2="11"></line></svg>
-                </a>
-                <a href="#" id="zoom-out">
-                    <svg class="text-gray-400 hover:text-gray-600 focus:outline-none focus:text-gray-600 cursor-pointer" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="11" cy="11" r="8"></circle><line x1="21" y1="21" x2="16.65" y2="16.65"></line><line x1="8" y1="11" x2="14" y2="11"></line></svg>
-                </a>
-            </div>
-            <div x-data="{ open: false }" @keydown.escape="open = false" @click.away="open = false" class="relative inline-block text-left">
-                <div>
-                    <button @click="open = !open" class="flex items-center text-gray-400 hover:text-gray-600 focus:outline-none focus:text-gray-600">
-                        <svg class="h-5 w-5" fill="currentColor" viewBox="0 0 20 20">
-                            <path d="M10 6a2 2 0 110-4 2 2 0 010 4zM10 12a2 2 0 110-4 2 2 0 010 4zM10 18a2 2 0 110-4 2 2 0 010 4z" />
-                        </svg>
-                    </button>
-                </div>
-                <div x-show="open" x-transition:enter="transition ease-out duration-100" x-transition:enter-start="transform opacity-0 scale-95" x-transition:enter-end="transform opacity-100 scale-100" x-transition:leave="transition ease-in duration-75" x-transition:leave-start="transform opacity-100 scale-100" x-transition:leave-end="transform opacity-0 scale-95" class="origin-top-right absolute right-0 mt-2 w-56 rounded-md shadow-lg">
-                    <div class="rounded-md bg-white shadow-xs">
-                        <div class="py-1">
-                            <a target="_blank" href="?mode=fullscreen" class="block px-4 py-2 text-sm leading-5 text-gray-700 hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900">{{ ctrans('texts.open_in_new_tab') }}</a>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </section>
-    </div>
-
-    <div class="flex justify-center">
-        <canvas id="pdf-placeholder" class="shadow rounded-lg bg-white lg:hidden mt-4 p-4"></canvas>
-    </div>
-
-    <iframe src="{{ $quote->pdf_file_path(null, 'url',true) }}" class="h-screen w-full border-0 hidden lg:block mt-4"></iframe>
-
+    @include('portal.ninja2020.components.pdf-viewer', ['entity' => $quote])
     @include('portal.ninja2020.invoices.includes.terms', ['entities' => [$quote], 'entity_type' => ctrans('texts.quote')])
     @include('portal.ninja2020.invoices.includes.signature')
 @endsection
 
 @section('footer')
     <script src="{{ asset('js/clients/quotes/approve.js') }}"></script>
-    <script src="{{ asset('js/clients/shared/pdf.js') }}"></script>
 @endsection