From 1a6e4289b6d591f0dc16c3a5d4af337af2fd2f0d Mon Sep 17 00:00:00 2001
From: Daniel Pett <dejp3@cam.ac.uk>
Date: Tue, 24 May 2022 00:23:55 +0100
Subject: [PATCH] Add pannellum to package.json Fix image height/width

---
 .gitignore                                            |  1 +
 package-lock.json                                     | 11 +++++++++++
 package.json                                          |  3 +++
 resources/views/components/image-card.blade.php       |  4 ++--
 .../views/includes/css/photosphere-css.blade.php      |  2 +-
 .../views/includes/scripts/photosphere-js.blade.php   |  2 +-
 resources/views/layouts/highlights.blade.php          |  3 ---
 resources/views/layouts/layout.blade.php              |  3 ---
 8 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 88430165..88bbc909 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ public/uv.css
 public/uv.html
 public/images/svg/
 cookieconsent.*
+pannellum.*
diff --git a/package-lock.json b/package-lock.json
index 4a586782..0cf0b45d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,6 +12,7 @@
                 "clean-css": "^5.3.0",
                 "leaflet-iiif": "^3.0.0",
                 "minimist": ">=1.2.6",
+                "pannellum": "^2.5.6",
                 "popper.js": "^1.16.1",
                 "super-tiny-icons": "^0.4.0",
                 "universalviewer": "^4.0.0-pre.107",
@@ -7895,6 +7896,11 @@
             "version": "1.0.11",
             "license": "(MIT AND Zlib)"
         },
+        "node_modules/pannellum": {
+            "version": "2.5.6",
+            "resolved": "https://registry.npmjs.org/pannellum/-/pannellum-2.5.6.tgz",
+            "integrity": "sha512-R4kSPpj36wQPlyIi9ZftxPfVYF11DEbNBATUEI+pkMGZDFYBV5Jxi6tYFVDdmxA2xaTeKZQHMIuIIj7njVSTQQ=="
+        },
         "node_modules/parallel-transform": {
             "version": "1.2.0",
             "license": "MIT",
@@ -17413,6 +17419,11 @@
         "pako": {
             "version": "1.0.11"
         },
+        "pannellum": {
+            "version": "2.5.6",
+            "resolved": "https://registry.npmjs.org/pannellum/-/pannellum-2.5.6.tgz",
+            "integrity": "sha512-R4kSPpj36wQPlyIi9ZftxPfVYF11DEbNBATUEI+pkMGZDFYBV5Jxi6tYFVDdmxA2xaTeKZQHMIuIIj7njVSTQQ=="
+        },
         "parallel-transform": {
             "version": "1.2.0",
             "peer": true,
diff --git a/package.json b/package.json
index 5f2e0cf7..cf7df43c 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,8 @@
         "copy-icons": "cp -R node_modules/super-tiny-icons/images/svg/ ./public/images/svg/",
         "copy-cookie-css": "cp -R node_modules/vanilla-cookieconsent/dist/*.css ./resources/css/",
         "copy-cookie-js": "cp -R node_modules/vanilla-cookieconsent/dist/*.js ./resources/js/",
+        "copy-pannellum-css": "cp -R node_modules/pannellum/build/*.css ./public/css/",
+        "copy-pannellum-js": "cp -R node_modules/pannellum/build/*.js ./public/js/",
         "postinstall": "npm run copy"
     },
     "devDependencies": {
@@ -47,6 +49,7 @@
         "clean-css": "^5.3.0",
         "leaflet-iiif": "^3.0.0",
         "minimist": ">=1.2.6",
+        "pannellum": "^2.5.6",
         "popper.js": "^1.16.1",
         "super-tiny-icons": "^0.4.0",
         "universalviewer": "^4.0.0-pre.107",
diff --git a/resources/views/components/image-card.blade.php b/resources/views/components/image-card.blade.php
index 40121daa..96ef4ac1 100644
--- a/resources/views/components/image-card.blade.php
+++ b/resources/views/components/image-card.blade.php
@@ -5,8 +5,8 @@
                 <img class="card-img-top"
                      src="{{ $image['data']['thumbnails'][13]['url']}}"
                      alt="{{ $altTag }}"
-                     width="{{ $image['data']['thumbnails'][13]['width'] }}"
-                     height="{{ $image['data']['thumbnails'][13]['height'] }}"
+                     width="100%"
+                     height="100%"
                      loading="lazy"
                 />
             </a>
diff --git a/resources/views/includes/css/photosphere-css.blade.php b/resources/views/includes/css/photosphere-css.blade.php
index 2b1960dc..6259253c 100644
--- a/resources/views/includes/css/photosphere-css.blade.php
+++ b/resources/views/includes/css/photosphere-css.blade.php
@@ -1 +1 @@
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/pannellum@2.5.6/build/pannellum.css"/>
+<link rel="stylesheet" href="{{ asset("/css/pannellum.css")}}"/>
diff --git a/resources/views/includes/scripts/photosphere-js.blade.php b/resources/views/includes/scripts/photosphere-js.blade.php
index bcf1515d..e7bc4ede 100644
--- a/resources/views/includes/scripts/photosphere-js.blade.php
+++ b/resources/views/includes/scripts/photosphere-js.blade.php
@@ -1,4 +1,4 @@
-<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/pannellum@2.5.6/build/pannellum.js"></script>
+<script type="text/javascript" src="{{ asset('js/pannellum.js') }}"></script>
 <script>
     pannellum.viewer('panorama', {
         "type": "equirectangular",
diff --git a/resources/views/layouts/highlights.blade.php b/resources/views/layouts/highlights.blade.php
index 00b27ab6..bc9071d0 100644
--- a/resources/views/layouts/highlights.blade.php
+++ b/resources/views/layouts/highlights.blade.php
@@ -113,8 +113,5 @@
     @include('includes.scripts.timeline-js')
 @endif
 
-@hasSection('datepicker')
-    @yield('datepicker')
-@endif
 </body>
 </html>
diff --git a/resources/views/layouts/layout.blade.php b/resources/views/layouts/layout.blade.php
index dd0176c5..9be051ca 100644
--- a/resources/views/layouts/layout.blade.php
+++ b/resources/views/layouts/layout.blade.php
@@ -152,8 +152,5 @@
             @include('includes.scripts.timeline-js')
         @endif
 
-        @hasSection('datepicker')
-            @yield('datepicker')
-        @endif
     </body>
 </html>