Merge pull request #461 from art-institute-of-chicago/feature/digital…

…-publication-listing Add digital publication listing page [PUB-205]
art-institute-of-chicago · Jul 15, 2024 · 43bf44b · 43bf44b
2 parents 90d6b5d + bb65a10
commit 43bf44b
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 6 deletions.
diff --git a/app/Http/Controllers/DigitalPublicationsController.php b/app/Http/Controllers/DigitalPublicationsController.php
@@ -37,6 +37,16 @@ public function index(Request $request)
     }
 
     public function show($id)
+    {
+        return $this->showDetail($id);
+    }
+
+    public function showListing($id)
+    {
+        return $this->showDetail($id, true);
+    }
+
+    private function showDetail($id, $showAll = false)
     {
         $item = $this->repository->published()->find((int) $id);
 
@@ -48,7 +58,7 @@ public function show($id)
             abort(404);
         }
 
-        $canonicalPath = $item->present()->getCanonicalUrl();
+        $canonicalPath = $item->present()->getCanonicalUrl() . ($showAll ? '/content' : '');
 
         if ($canonicalRedirect = $this->getCanonicalRedirect($canonicalPath)) {
             return $canonicalRedirect;
@@ -69,6 +79,7 @@ public function show($id)
             'unstickyHeader' => true,
             'canonicalUrl' => $canonicalPath,
             'welcomeNote' => $this->repository->getWelcomeNote($item),
+            'showAll' => $showAll,
         ]);
     }
 

diff --git a/app/Presenters/Admin/DigitalPublicationArticlePresenter.php b/app/Presenters/Admin/DigitalPublicationArticlePresenter.php
@@ -2,6 +2,7 @@
 
 namespace App\Presenters\Admin;
 
+use Illuminate\Support\Str;
 use App\Presenters\BasePresenter;
 
 class DigitalPublicationArticlePresenter extends BasePresenter
@@ -37,6 +38,25 @@ public function getArticleUrl($digitalPublication, $article = null)
         ]);
     }
 
+    public function getBrowseMoreLink($showAll = false)
+    {
+        if ($this->entity->children->count() > 0  && !$showAll) {
+            return [
+                [
+                    'label' => 'Browse all ' . $this->entity->children->count() . ' ' . $this->entity->title,
+                    'href' => route(
+                        'collection.publications.digital-publications.showListing',
+                        [
+                            'id' => $this->entity->digitalPublication->id,
+                            'slug' => $this->entity->digitalPublication->getSlug()
+                        ]
+                    ) . '#' . Str::kebab($this->entity->title)
+                ]
+            ];
+        }
+        return '';
+    }
+
     public function references()
     {
         if (empty($this->entity->references)) {

diff --git a/frontend/scss/pages/_p-issue-show.scss b/frontend/scss/pages/_p-issue-show.scss
@@ -1,7 +1,8 @@
 // This file contains styles for both journal issues and magazine issues
 .p-magazineissue-show,
 .p-magazineissue-latest,
-.p-digitalpublications-show {
+.p-digitalpublications-show,
+.p-digitalpublications-showlisting {
   @extend %sticky-sidebar;
 
   .o-article__body {
@@ -62,7 +63,8 @@
   }
 }
 
-.p-digitalpublications-show {
+.p-digitalpublications-show,
+.p-digitalpublications-showlisting {
   .o-article__body {
     margin-top: 40px;
   }

diff --git a/resources/views/components/organisms/_o-table-of-contents.blade.php b/resources/views/components/organisms/_o-table-of-contents.blade.php
@@ -2,7 +2,7 @@
     @foreach ($items as $item)
         @if (count($item->children) > 0)
             <h3>
-                <button id="{{ StringHelpers::getUtf8Slug($item->title) }}" class="o-accordion__trigger {{ $titleFont ?? 'f-list-3' }}" tabindex="0"{!! (isset($item->gtmAttributes)) ? ' '.$item->gtmAttributes.'' : '' !!} aria-expanded="{{ (isset($item->active) and $item->active) ? 'true' : 'false' }}">
+                <button id="toc-{{ StringHelpers::getUtf8Slug($item->title) }}" class="o-accordion__trigger {{ $titleFont ?? 'f-list-3' }}" tabindex="0"{!! (isset($item->gtmAttributes)) ? ' '.$item->gtmAttributes.'' : '' !!} aria-expanded="{{ (isset($item->active) and $item->active) ? 'true' : 'false' }}">
                     {!! $item->title !!}
                     <span class="o-accordion__trigger-icon">
                         <svg class="icon--plus"><use xlink:href="#icon--plus" /></svg>

diff --git a/resources/views/site/digitalPublicationDetail.blade.php b/resources/views/site/digitalPublicationDetail.blade.php
@@ -45,17 +45,18 @@
             @component('components.molecules._m-title-bar', [
                 'variation' => 'm-title-bar--compact m-title-bar--light',
             ])
+                @slot('links', $topLevelArticle->present()->getBrowseMoreLink($showAll))
                 {!! $topLevelArticle->title !!}
             @endcomponent
 
             @component('components.organisms._o-grid-listing')
-                @slot('variation', 'o-grid-listing--single-row o-grid-listing--scroll@xsmall o-grid-listing--scroll@small o-grid-listing--scroll@medium o-grid-listing--gridlines-cols')
+                @slot('variation', 'o-grid-listing--gridlines-cols o-grid-listing--gridlines-rows')
                 @slot('cols_medium','3')
                 @slot('cols_large','4')
                 @slot('cols_xlarge','4')
 
                 @foreach ($topLevelArticle->children as $article)
-                    @if ($loop->iteration <= 3)
+                    @if ($loop->iteration <= 3 || $showAll == true)
                         @component('components.molecules._m-listing----article')
                             @slot('imgVariation','')
                             @slot('item', $article)

diff --git a/routes/web.php b/routes/web.php
@@ -83,6 +83,7 @@
 // Collection Publications Digital Publications
 Route::get('/digital-publications', [DigitalPublicationsController::class, 'index'])->name('collection.publications.digital-publications');
 Route::get('/digital-publications/{id}/{slug?}', [DigitalPublicationsController::class, 'show'])->name('collection.publications.digital-publications.show');
+Route::get('/digital-publications/{id}/{slug?}/content', [DigitalPublicationsController::class, 'showListing'])->name('collection.publications.digital-publications.showListing');
 Route::get('/digital-publications/{pubId}/{pubSlug}/{id}/{slug?}', [DigitalPublicationArticleController::class, 'show'])->name('collection.publications.digital-publications-articles.show');
 
 // Collection Research