Merge branch 'release/6.19'

art-institute-of-chicago · Aug 13, 2020 · 6b840a0 · 6b840a0
2 parents 29ddca6 + 6382c21
commit 6b840a0
Show file tree

Hide file tree

Showing 41 changed files with 428 additions and 176 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-6.18
+6.19
diff --git a/app/Http/Controllers/Admin/ExperienceController.php b/app/Http/Controllers/Admin/ExperienceController.php
@@ -127,6 +127,7 @@ protected function previewData($item)
     {
         $articles = Article::published()
         ->orderBy('date', 'desc')
+        ->listed()
         ->paginate(4);
 
         return [

diff --git a/app/Http/Controllers/DigitalPublicationsController.php b/app/Http/Controllers/DigitalPublicationsController.php
@@ -41,7 +41,7 @@ public function index(Request $request)
 
     public function show($id)
     {
-        $page = $this->repository->forSlug($id);
+        $page = $this->repository->safeForSlug($id);
         if (!$page) {
             $page = $this->repository->find((Integer) $id) ?? abort(404);
         }

diff --git a/app/Http/Controllers/EducatorResourcesController.php b/app/Http/Controllers/EducatorResourcesController.php
@@ -73,7 +73,7 @@ public function show($id)
     {
         $page = $this->repository->find((Integer) $id);
         if (!$page) {
-            $page = $this->repository->forSlug($id);
+            $page = $this->repository->safeForSlug($id);
 
             if (!$page) {
                 abort(404);

diff --git a/app/Http/Controllers/GenericPagesController.php b/app/Http/Controllers/GenericPagesController.php
@@ -51,7 +51,7 @@ public function show($slug)
     protected function getPage($slug)
     {
         $idSlug = collect(explode("/", $slug))->last();
-        $page = $this->genericPageRepository->forSlug($idSlug);
+        $page = $this->genericPageRepository->safeForSlug($idSlug);
         if (empty($page)) {
             $page = $this->genericPageRepository->getById((integer) $idSlug);
             if (!$page) {

diff --git a/app/Http/Controllers/InteractiveFeatureExperiencesController.php b/app/Http/Controllers/InteractiveFeatureExperiencesController.php
@@ -91,7 +91,7 @@ protected function show($slug)
             );
         }
 
-        $experience = $this->repository->forSlug($slug);
+        $experience = $this->repository->safeForSlug($slug);
 
         if (!$experience || $experience->kiosk_only === true) {
             abort(404);
@@ -116,6 +116,7 @@ protected function show($slug)
         else {
             $articles = Article::published()
                 ->orderBy('date', 'desc')
+                ->listed()
                 ->paginate(4);
         }
 
@@ -134,7 +135,7 @@ protected function show($slug)
 
     protected function showKiosk($slug)
     {
-        $experience = $this->repository->forSlug($slug);
+        $experience = $this->repository->safeForSlug($slug);
         if (!$experience) {
             abort(404);
         }

diff --git a/app/Http/Controllers/PrintedPublicationsController.php b/app/Http/Controllers/PrintedPublicationsController.php
@@ -56,7 +56,7 @@ public function index(Request $request)
 
     public function show($id)
     {
-        $page = $this->repository->forSlug($id);
+        $page = $this->repository->safeForSlug($id);
         if (!$page) {
             $page = $this->repository->find((Integer) $id) ?? abort(404);
         }

diff --git a/app/Http/Controllers/ResearchGuidesController.php b/app/Http/Controllers/ResearchGuidesController.php
@@ -57,7 +57,7 @@ public function show($id)
     {
         $page = $this->repository->find((Integer) $id);
         if (!$page) {
-            $page = $this->repository->forSlug($id);
+            $page = $this->repository->safeForSlug($id);
 
             if (!$page) {
                 abort(404);

diff --git a/app/Http/Controllers/VideoController.php b/app/Http/Controllers/VideoController.php
@@ -23,7 +23,7 @@ public function show($id, $slug = null)
 
         // Temporary. Remove after redirects are in place!
         if (empty($item)) {
-            $item = $this->repository->forSlug($id);
+            $item = $this->repository->safeForSlug($id);
         }
 
         if (!$item) {

diff --git a/app/Http/Resources/Slide.php b/app/Http/Resources/Slide.php
@@ -212,7 +212,8 @@ protected function get3DTourAttributes()
                 'model_id' => $model3d->model_id,
                 'camera_position' => $model3d->camera_position,
                 'camera_target' => $model3d->camera_target,
-                'annotation_list' => json_decode($model3d->annotation_list)
+                'annotation_list' => json_decode($model3d->annotation_list),
+                'hide_annotation_title' => $model3d->hide_annotation_title
             ];
         } else {
             return [

diff --git a/app/Models/Model3d.php b/app/Models/Model3d.php
@@ -17,7 +17,8 @@ class Model3d extends Model
         'model_caption_title',
         'model_caption',
         'guided_tour',
-        'hide_annotation'
+        'hide_annotation',
+        'hide_annotation_title'
     ];
     protected $casts = [
         'camera_position' => 'array',

diff --git a/app/Repositories/AuthorRepository.php b/app/Repositories/AuthorRepository.php
@@ -5,7 +5,6 @@
 use A17\Twill\Repositories\Behaviors\HandleSlugs;
 use A17\Twill\Repositories\Behaviors\HandleMedias;
 use A17\Twill\Repositories\Behaviors\HandleRevisions;
-use A17\Twill\Repositories\ModuleRepository;
 use App\Models\Author;
 
 class AuthorRepository extends ModuleRepository

diff --git a/app/Repositories/Behaviors/Handle3DModel.php b/app/Repositories/Behaviors/Handle3DModel.php
@@ -30,6 +30,7 @@ private function handle3DModel($object, $fields, $fieldName = 'aic_3d_model')
                     'annotation_list' => $fields["{$fieldName}[annotation_list]"],
                     'guided_tour' => $fields["{$fieldName}[guided_tour]"] ?? false,
                     'hide_annotation' => empty($fields["{$fieldName}[hide_annotation]"]) ? false : $fields["{$fieldName}[hide_annotation]"],
+                    'hide_annotation_title' => empty($fields["{$fieldName}[hide_annotation_title]"]) ? false : $fields["{$fieldName}[hide_annotation_title]"],
                 ]
             );
             $object->model3d()->associate($model);
@@ -45,7 +46,7 @@ private function getFormFieldsFor3DModel($object, $fields, $fieldName = 'aic_3d_
         $model3d = $object->secondaryExperienceModal->first()->model3d)
         {
             $secondaryExperienceModal = $object->secondaryExperienceModal->first();
-            $aic3dFields = ['model_url', 'model_id', 'model_caption_title', 'model_caption', 'camera_position', 'guided_tour', 'camera_target', 'annotation_list', 'hide_annotation'];
+            $aic3dFields = ['model_url', 'model_id', 'model_caption_title', 'model_caption', 'camera_position', 'guided_tour', 'camera_target', 'annotation_list', 'hide_annotation', 'hide_annotation_title'];
             foreach ($aic3dFields as $aic3dField) {
                 array_push($fields['repeaterFields']['secondary_experience_modal'], [
                     'name' => "blocks[secondaryExperienceModal-{$secondaryExperienceModal->id}][aic_split_3d_model][{$aic3dField}]",
@@ -64,6 +65,7 @@ private function getFormFieldsFor3DModel($object, $fields, $fieldName = 'aic_3d_
             $fields["{$fieldName}[camera_target]"] = $model3d->getOriginal('camera_target');
             $fields["{$fieldName}[annotation_list]"] = $model3d->getOriginal('annotation_list');
             $fields["{$fieldName}[hide_annotation]"] = $model3d->getOriginal('hide_annotation');
+            $fields["{$fieldName}[hide_annotation_title]"] = $model3d->getOriginal('hide_annotation_title');
         };
 
         return $fields;

diff --git a/app/Repositories/EmailSeriesRepository.php b/app/Repositories/EmailSeriesRepository.php
@@ -2,14 +2,10 @@
 
 namespace App\Repositories;
 
-
-use A17\Twill\Repositories\ModuleRepository;
 use App\Models\EmailSeries;
 
 class EmailSeriesRepository extends ModuleRepository
 {
-
-
     public function __construct(EmailSeries $model)
     {
         $this->model = $model;

diff --git a/app/Repositories/ExperienceImageRepository.php b/app/Repositories/ExperienceImageRepository.php
@@ -7,7 +7,6 @@
 use A17\Twill\Repositories\Behaviors\HandleMedias;
 use A17\Twill\Repositories\Behaviors\HandleRevisions;
 use A17\Twill\Repositories\Behaviors\HandleSlugs;
-use A17\Twill\Repositories\ModuleRepository;
 use App\Models\Api\Artwork;
 use App\Models\ExperienceImage;
 

diff --git a/app/Repositories/ExperienceModalRepository.php b/app/Repositories/ExperienceModalRepository.php
@@ -6,7 +6,6 @@
 use A17\Twill\Repositories\Behaviors\HandleFiles;
 use A17\Twill\Repositories\Behaviors\HandleMedias;
 use A17\Twill\Repositories\Behaviors\HandleRevisions;
-use A17\Twill\Repositories\ModuleRepository;
 use App\Models\ExperienceModal;
 use App\Repositories\Behaviors\HandleExperienceModule;
 use App\Repositories\Behaviors\Handle3DModel;
@@ -42,7 +41,7 @@ public function prepareFieldsBeforeSave($object, $fields)
             $fields['repeaters'] = $fields['blocks'];
             unset($fields['blocks']);
         };
-        
+
         return parent::prepareFieldsBeforeCreate($fields);
     }
 }
diff --git a/app/Repositories/ExperienceRepository.php b/app/Repositories/ExperienceRepository.php
@@ -9,7 +9,6 @@
 use A17\Twill\Repositories\Behaviors\HandleRevisions;
 use A17\Twill\Repositories\Behaviors\HandleSlugs;
 use A17\Twill\Repositories\Behaviors\HandleTranslations;
-use A17\Twill\Repositories\ModuleRepository;
 use App\Models\Experience;
 use App\Repositories\Behaviors\HandleExperienceModule;
 use App\Repositories\Behaviors\HandleMagazine;

diff --git a/app/Repositories/HomeArtistRepository.php b/app/Repositories/HomeArtistRepository.php
@@ -3,7 +3,6 @@
 namespace App\Repositories;
 
 use A17\Twill\Repositories\Behaviors\HandleMedias;
-use A17\Twill\Repositories\ModuleRepository;
 
 use App\Models\HomeArtist;
 use App\Repositories\Behaviors\HandleApiRelations;

diff --git a/app/Repositories/InteractiveFeatureRepository.php b/app/Repositories/InteractiveFeatureRepository.php
@@ -7,7 +7,6 @@
 use A17\Twill\Repositories\Behaviors\HandleRepeaters;
 use A17\Twill\Repositories\Behaviors\HandleRevisions;
 use A17\Twill\Repositories\Behaviors\HandleSlugs;
-use A17\Twill\Repositories\ModuleRepository;
 use App\Models\InteractiveFeature;
 use App\Models\Experience;
 use Artisan;
@@ -36,5 +35,5 @@ public function search($search)
     {
         return Experience::where('title', 'ILIKE', "%{$search}%")->published();
     }
-    
+
 }
diff --git a/app/Repositories/IssueArticleRepository.php b/app/Repositories/IssueArticleRepository.php
@@ -6,7 +6,6 @@
 use A17\Twill\Repositories\Behaviors\HandleMedias;
 use A17\Twill\Repositories\Behaviors\HandleRevisions;
 use A17\Twill\Repositories\Behaviors\HandleBlocks;
-use A17\Twill\Repositories\ModuleRepository;
 use App\Models\IssueArticle;
 use App\Models\Api\Search;
 

diff --git a/app/Repositories/IssueRepository.php b/app/Repositories/IssueRepository.php
@@ -5,7 +5,6 @@
 use A17\Twill\Repositories\Behaviors\HandleSlugs;
 use A17\Twill\Repositories\Behaviors\HandleMedias;
 use A17\Twill\Repositories\Behaviors\HandleRevisions;
-use A17\Twill\Repositories\ModuleRepository;
 use App\Models\Issue;
 use App\Models\Api\Search;
 

diff --git a/app/Repositories/MagazineIssueRepository.php b/app/Repositories/MagazineIssueRepository.php
@@ -8,7 +8,6 @@
 use A17\Twill\Repositories\Behaviors\HandleBlocks;
 use A17\Twill\Repositories\Behaviors\HandleMedias;
 use A17\Twill\Repositories\Behaviors\HandleRevisions;
-use A17\Twill\Repositories\ModuleRepository;
 use App\Repositories\Behaviors\HandleApiBlocks;
 
 class MagazineIssueRepository extends ModuleRepository

diff --git a/app/Repositories/ModuleRepository.php b/app/Repositories/ModuleRepository.php
@@ -2,6 +2,7 @@
 
 namespace App\Repositories;
 
+use BadMethodCallException;
 use A17\Twill\Repositories\ModuleRepository as BaseModuleRepository;
 
 class ModuleRepository extends BaseModuleRepository
@@ -29,4 +30,16 @@ public function prepareFieldsBeforeSave($object, $fields)
         return parent::prepareFieldsBeforeSave($object, $fields);
     }
 
+    /**
+     * Temporary work-around for https://github.com/area17/twill/issues/723
+     */
+    public function safeForSlug($slug, $with = [], $withCount = [], $scopes = [])
+    {
+        try {
+            return $this->forSlug(...func_get_args());
+        } catch (BadMethodCallException $e) {
+            abort(404);
+        }
+    }
+
 }
diff --git a/app/Repositories/SlideRepository.php b/app/Repositories/SlideRepository.php
@@ -7,7 +7,6 @@
 use A17\Twill\Repositories\Behaviors\HandleMedias;
 use A17\Twill\Repositories\Behaviors\HandleRevisions;
 use A17\Twill\Repositories\Behaviors\HandleSlugs;
-use A17\Twill\Repositories\ModuleRepository;
 use App\Models\Slide;
 use App\Repositories\Behaviors\HandleExperienceModule;
 use App\Repositories\Behaviors\Handle3DModel;

diff --git a/app/Repositories/VanityRedirectRepository.php b/app/Repositories/VanityRedirectRepository.php
@@ -3,7 +3,6 @@
 namespace App\Repositories;
 
 use A17\Twill\Repositories\Behaviors\HandleRevisions;
-use A17\Twill\Repositories\ModuleRepository;
 use App\Models\VanityRedirect;
 
 class VanityRedirectRepository extends ModuleRepository

diff --git a/app/Repositories/WhatToExpectRepository.php b/app/Repositories/WhatToExpectRepository.php
@@ -4,7 +4,6 @@
 
 use A17\Twill\Repositories\Behaviors\HandleTranslations;
 use A17\Twill\Repositories\Behaviors\HandleRevisions;
-use A17\Twill\Repositories\ModuleRepository;
 use App\Models\WhatToExpect;
 
 class WhatToExpectRepository extends ModuleRepository

diff --git a/database/migrations/2020_08_12_163624_add_hide_annotation_title_to_3d_models.php b/database/migrations/2020_08_12_163624_add_hide_annotation_title_to_3d_models.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddHideAnnotationTitleTo3dModels extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('3d_models', function (Blueprint $table) {
+            $table->boolean('hide_annotation_title')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('3d_models', function (Blueprint $table) {
+            $table->dropColumn('hide_annotation_title');
+        });
+    }
+}
diff --git a/frontend/js/behaviors/viewer3D.js b/frontend/js/behaviors/viewer3D.js
@@ -16,6 +16,7 @@ const viewer3D = function(container) {
   let btnExplore = wrapper.querySelector('.m-viewer-3d__overlay');
   let btnCloseAnnotation = descriptionBlock.querySelector('.m-viewer-3d__annotation__close');
   let hideAnnots = JSON.parse(wrapper.dataset.hideannot);
+  let hideAnnotTitles = JSON.parse(wrapper.dataset.hideannottitle);
   let cc0 = JSON.parse(wrapper.dataset.cc);
   let isGuided = JSON.parse(wrapper.dataset.guided);
   let uid = wrapper.dataset.uid;
@@ -256,10 +257,13 @@ const viewer3D = function(container) {
         var blockWindow = document.createElement("div");
         blockWindow.classList.add('m-media--3d-tour__sep');
         blockWindow.setAttribute('data-hotspot', i);
-        blockText.innerHTML = '<p class="m-media--3d-tour__p"><strong>' + annot.name + '</strong>' + annot.content.raw + '</p>';
+        if(hideAnnotTitles) {
+          blockText.innerHTML = '<p class="m-media--3d-tour__p">' + annot.content.raw + '</p>';
+        } else {
+          blockText.innerHTML = '<p class="m-media--3d-tour__p"><strong>' + annot.name + '</strong>' + annot.content.raw + '</p>';
+        }
         containerText.appendChild(blockWindow);
         containerText.appendChild(blockText);
-        containerText.classList.remove('is-not-loaded');
       }
 
       if(i == 0) {

diff --git a/frontend/scss/molecules/_m-listing.scss b/frontend/scss/molecules/_m-listing.scss
@@ -1417,7 +1417,7 @@ $f-audio-subtitle: generate-font-obj(
 
 // Quick aside for artwork detail's sound variant
 .m-listing--inline.m-listing--sound {
-  .m-listing__meta {
+  .m-listing__meta--sound {
     @include font-styles($f-module-title-1);
   }