Merge pull request #406

Replace breadcrumbs
FitzwilliamMuseum · May 25, 2022 · 9618a52 · 9618a52
2 parents a156abf + cdd6af5
commit 9618a52
Show file tree

Hide file tree

Showing 12 changed files with 788 additions and 90 deletions.
diff --git a/composer.json b/composer.json
@@ -29,6 +29,7 @@
         "atymic/twitter": "^3.1",
         "codeat3/blade-fluentui-system-icons": "^1.24",
         "conedevelopment/blade-filters": "^1.0",
+        "diglactic/laravel-breadcrumbs": "^7.2",
         "elasticsearch/elasticsearch": "^7.17.0",
         "fitzwilliammuseum/instagram-php-scraper": "master",
         "fitzwilliammuseum/maps": "master",

diff --git a/composer.lock b/composer.lock
diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,5 +1,5 @@
 {
     "/js/app.js": "/js/app.js?id=1072f3bf5674b0bbd5892213a7f75ff1",
-    "/css/app.css": "/css/app.css?id=c3fa58bc0f7de5324b34ae95fb25d5fe",
+    "/css/app.css": "/css/app.css?id=bf846dd8edf2f05e55bd3e13cc3a439d",
     "/css/fitzwilliam.css": "/css/fitzwilliam.css?id=77a35cfaed6c45d6581e734762fb43ad"
 }
diff --git a/resources/css/site.css b/resources/css/site.css
@@ -1087,3 +1087,6 @@ a.text-center.btn.btn-outline-light.btn__book {
 .eden {
     filter: invert(1) sepia(1) saturate(5) hue-rotate(175deg);
 }
+.card-img-top {
+    height: 100% !important;
+}
diff --git a/resources/sass/_variables.scss b/resources/sass/_variables.scss
@@ -21,3 +21,5 @@ $yellow: #ffed4a;
 $green: #38c172;
 $teal: #4dc0b5;
 $cyan: #6cb2eb;
+
+$breadcrumb-divider: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8'%3E%3Cpath d='M2.5 0L1 1.5 3.5 4 1 6.5 2.5 8l4-4-4-4z' fill='currentColor'/%3E%3C/svg%3E");
diff --git a/resources/views/components/viewpoint.blade.php b/resources/views/components/viewpoint.blade.php
@@ -3,12 +3,15 @@
 <div>
     @foreach($viewpoint['associated_artworks'] as $image)
         <figure class="figure">
-            <img class="figure-img img-fluid  my-2" src="{{$image['ttn_labels_id']['image']['data']['url']}}"
+            <img class="figure-img img-fluid  my-2"
+                 src="{{$image['ttn_labels_id']['image']['data']['url']}}"
                  alt="{{ $image['ttn_labels_id']['alt_text'] }}"
                  width="{{ $image['ttn_labels_id']['image']['width'] }}"
                  height="{{ $image['ttn_labels_id']['image']['height'] }}"
                  loading="lazy"/>
-            <figcaption class="figure-caption text-info">{{$image['ttn_labels_id']['image']['title']}}</figcaption>
+            <figcaption class="figure-caption text-info">
+                {{$image['ttn_labels_id']['image']['title']}}
+            </figcaption>
         </figure>
     @endforeach
 </div>
@@ -25,7 +28,8 @@
             {{$person['associated_people_id']['display_name']}}@isset($person['associated_people_id']['associated_role']), {{$person['associated_people_id']['associated_role']}}
             @endisset
             @if(!empty($person['associated_people_id']['associated_institution']))
-                <br/>{{$person['associated_people_id']['associated_institution'][0]['partner_organisations_id']['partner_full_name']}}
+                <br/>
+                {{$person['associated_people_id']['associated_institution'][0]['partner_organisations_id']['partner_full_name']}}
             @endisset
             <br/>
         @endforeach

diff --git a/resources/views/includes/structure/breadcrumb.blade.php b/resources/views/includes/structure/breadcrumb.blade.php
@@ -1,24 +1,3 @@
-<!-- Breadcrumb done by @sina-rzp -->
-
-<nav aria-label="breadcrumb">
-    <ol class="breadcrumb p-3">
-        <li class="breadcrumb-item active" aria-current="page"><a href="{{ route('home') }}">Home</a></li>
-        @php
-            $bread = URL::to('/');
-            $link = Request::path();
-            $subs = explode("/", $link)
-        @endphp
-        @if (Request::path() != '/')
-            @for($i = 0; $i < count($subs); $i++)
-                @php
-                    $bread = $bread."/".$subs[$i];
-                    $title = urldecode($subs[$i]);
-                    $title = str_replace("-", " ", $title);
-                    $title = ucwords($title)
-                @endphp
-                <li class="breadcrumb-item active" aria-current="page"><a
-                        href="{{ $bread }}">{{ $title }}</a></li>
-            @endfor
-        @endif
-    </ol>
-</nav>
+<div class="col-md-12 shadow-sm p-3 mx-auto">
+    {{ Breadcrumbs::render() }}
+</div>
diff --git a/resources/views/layouts/layout.blade.php b/resources/views/layouts/layout.blade.php
@@ -40,12 +40,11 @@
             @include('includes.css.photosphere-css')
         @endif
 
-        <div class="container-fluid  mt-3 mb-3 p-3">
+        <div class="container-fluid mt-3 mb-3 p-3">
             <div class="container">
                 @include('includes.structure.breadcrumb')
                 @yield('press-contact')
                 @yield('content')
-
                 @yield('adlib')
                 @yield('timeline')
             </div>