Merge branch 'develop'

art-institute-of-chicago · May 26, 2020 · 006b1d2 · 006b1d2
2 parents 383376a + cd3ef94
commit 006b1d2
Show file tree

Hide file tree

Showing 149 changed files with 3,154 additions and 950 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-6.12
+6.13
diff --git a/app/Console/Commands/GeneratePdfs.php b/app/Console/Commands/GeneratePdfs.php
@@ -55,7 +55,7 @@ public function handle()
 
         if (config('app.debug')) {
             $prince->setVerbose(true);
-            $prince->setLog('/Users/ntrive/tmp/prince.log');
+            $prince->setLog(storage_path('logs/prince-' .date('Y-m-d') .'.log'));
         }
 
         set_time_limit(0);

diff --git a/app/Helpers/DatesHelpers.php b/app/Helpers/DatesHelpers.php
@@ -27,10 +27,10 @@ function printYear($date)
         return null;
     }
     if ($date < 0) {
-        return abs($date) ." BC";
+        return abs($date) ." BCE";
     }
     if ($date <= 1000) {
-        return $date ." AD";
+        return $date ." CE";
     }
     if ($date == Carbon::now()->year) {
         return "Present";
@@ -63,9 +63,9 @@ function convertArtworkDates($date)
     $formatdate = "";
 
     if($date < 0) {
-        $formatdate = abs($date) . " BC";
+        $formatdate = abs($date) . " BCE";
     } else if($date < 1000) {
-        $formatdate = $date . " AD";
+        $formatdate = $date . " CE";
     } else {
         $formatdate = $date;
     }

diff --git a/app/Helpers/UrlHelpers.php b/app/Helpers/UrlHelpers.php
@@ -1,6 +1,7 @@
 <?php
 
 use Illuminate\Support\Facades\Request;
+use Illuminate\Support\Facades\Route;
 
 if (!function_exists('currentUrlWithQuery')) {
     function currentUrlWithQuery($options = [])
@@ -30,3 +31,12 @@ function secureRoute($routeName)
         return $route;
     }
 }
+
+// derived from moduleRoute
+if (!function_exists('moduleRouteExists')) {
+    function moduleRouteExists($moduleName, $prefix, $action)
+    {
+        $routeName = 'admin.' . ($prefix ? $prefix . '.' : '') . camel_case($moduleName) . '.' . $action;
+        return Route::has($routeName);
+    }
+}
diff --git a/app/Http/Controllers/API/CookieController.php b/app/Http/Controllers/API/CookieController.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Controllers\API;
+
+use Illuminate\Http\Request;
+
+use Illuminate\Routing\Controller as BaseController;
+use Illuminate\Support\Facades\Cookie;
+
+class CookieController extends BaseController
+{
+    public function notification($minutes = 1440)
+    {
+        return response()
+            ->json(['has_seen_notification' => 'true'])
+            ->cookie('has_seen_notification', 'true', $minutes);
+    }
+}
diff --git a/app/Http/Controllers/Admin/BaseApiController.php b/app/Http/Controllers/Admin/BaseApiController.php
@@ -65,7 +65,17 @@ protected function getRepository()
     protected function getBrowserTableData($items)
     {
         // Ensure data is an array and not an object to avoid json_encode wrong conversion
-        return array_values(parent::getBrowserTableData($items));
+        $results = array_values(parent::getBrowserTableData($items));
+
+        // WEB-1187: Fix the edit link
+        $results = array_map(function($result) {
+            if (moduleRouteExists($this->moduleName, $this->routePrefix, 'augment')) {
+                $result['edit'] = moduleRoute($this->moduleName, $this->routePrefix, 'augment', $result['id']);
+            }
+            return $result;
+        }, $results);
+
+        return $results;
     }
 
     protected function getApiRepository()

diff --git a/app/Http/Controllers/Admin/CollectionFeatureController.php b/app/Http/Controllers/Admin/CollectionFeatureController.php
diff --git a/...nteractiveFeatureExperienceController.php → ...ontrollers/Admin/ExperienceController.php b/...nteractiveFeatureExperienceController.php → ...ontrollers/Admin/ExperienceController.php
@@ -4,20 +4,20 @@
 
 use A17\Twill\Http\Controllers\Admin\ModuleController;
 use App\Models\Experience;
+use App\Models\InteractiveFeature;
 use App\Models\Article;
 use App\Repositories\InteractiveFeatureRepository;
 use App\Repositories\ExperienceRepository;
 
-class InteractiveFeatureExperienceController extends ModuleController
+class ExperienceController extends ModuleController
 {
-    protected $moduleName = 'interactiveFeatures.experiences';
+    protected $moduleName = 'experiences';
     protected $modelName = 'Experience';
     protected $previewView = 'site.experienceDetail';
 
-    protected function getParentModuleForeignKey()
-    {
-        return 'interactive_feature_id';
-    }
+    protected $indexOptions = [
+        'reorder' => true,
+    ];
 
     protected $indexColumns = [
         'image' => [
@@ -27,63 +27,26 @@ protected function getParentModuleForeignKey()
                 'crop' => 'default',
             ],
         ],
+        'isWebPublished' => [
+            'title' => 'Is web published?',
+            'field' => 'isWebPublished',
+            'present' => true,
+        ],
         'title' => [
             'title' => 'Title',
             'field' => 'title',
-            'sort' => true,
+        ],
+        'interactiveFeatureTitle' => [ // relation column
+            'title' => 'Grouping',
+            'relationship' => 'interactiveFeature',
+            'field' => 'title'
         ],
         'experiences' => [
             'title' => 'Slides',
             'nested' => 'slides',
         ],
     ];
 
-    protected function indexData($request)
-    {
-        $interactiveFeature = app(InteractiveFeatureRepository::class)->getById(request('interactiveFeature'));
-        return [
-            'breadcrumb' => [
-                [
-                    'label' => 'Groupings',
-                    'url' => moduleRoute('interactiveFeatures', 'collection', 'index'),
-                ],
-                [
-                    'label' => $interactiveFeature->title,
-                    'url' => moduleRoute('interactiveFeatures', 'collection', 'edit', $interactiveFeature->id),
-                ],
-                [
-                    'label' => 'Experiences',
-                ],
-
-            ],
-        ];
-    }
-
-    protected function formData($request)
-    {
-        $experience = app(ExperienceRepository::class)->getById(request('experience'));
-        return [
-            'breadcrumb' => [
-                [
-                    'label' => 'Groupings',
-                    'url' => moduleRoute('interactiveFeatures', 'collection', 'index'),
-                ],
-                [
-                    'label' => $experience->interactiveFeature->title,
-                    'url' => moduleRoute('interactiveFeatures', 'collection', 'edit', $experience->interactiveFeature->id),
-                ],
-                [
-                    'label' => 'Experiences',
-                    'url' => moduleRoute('interactiveFeatures.experiences', 'collection', 'index', $request->route('interactiveFeature')),
-                ],
-                [
-                    'label' => $experience->title,
-                ],
-
-            ],
-        ];
-    }
-
     // Intend to override the lines:
     // thumbnail
     // $value .= moduleRoute("experiences.slides", $this->routePrefix, 'index', [$item->id]);
@@ -176,6 +139,14 @@ protected function previewData($item)
         ];
     }
 
+    protected function formData($request)
+    {
+        return [
+            'groupingsList' => InteractiveFeature::all()->pluck('title', 'id')
+        ];
+    }
+
+
     protected function getBrowserTableData($items)
     {
         $withImage = $this->moduleHas('medias');

diff --git a/app/Http/Controllers/Admin/ExperienceSlideController.php b/app/Http/Controllers/Admin/ExperienceSlideController.php
@@ -26,24 +26,15 @@ protected function getParentModuleForeignKey()
     protected function indexData($request)
     {
         $experience = app(ExperienceRepository::class)->getById(request('experience'));
-        $interactiveFeature = $experience->interactiveFeature;
         return [
             'breadcrumb' => [
-                [
-                    'label' => 'Groupings',
-                    'url' => moduleRoute('interactiveFeatures', 'collection', 'index'),
-                ],
-                [
-                    'label' => $interactiveFeature->title,
-                    'url' => moduleRoute('interactiveFeatures', 'collection', 'edit', $interactiveFeature->id),
-                ],
                 [
                     'label' => 'Experiences',
-                    'url' => moduleRoute('interactiveFeatures.experiences', 'collection', 'index', $experience->interactiveFeature->id),
+                    'url' => moduleRoute('experiences', 'collection', 'index'),
                 ],
                 [
                     'label' => $experience->title,
-                    'url' => moduleRoute('interactiveFeatures.experiences', 'collection', 'edit', [$interactiveFeature->id, $experience->id]),
+                    'url' => moduleRoute('experiences', 'collection', 'edit', [$experience->id]),
                 ],
                 [
                     'label' => 'Slides',
@@ -56,7 +47,6 @@ protected function indexData($request)
     protected function formData($request)
     {
         $experience = app(ExperienceRepository::class)->getById(request('experience'));
-        $interactiveFeature = $experience->interactiveFeature;
         $slide = app(SlideRepository::class)->getById(request('slide'));
         $slides = $this->repository->get([], ['experience_id' => $experience->id], ['position' => 'asc']);
         $currentSlideIndex = $slides->search($slide);
@@ -71,21 +61,13 @@ protected function formData($request)
                 ];
             }),
             'breadcrumb' => [
-                [
-                    'label' => 'Groupings',
-                    'url' => moduleRoute('interactiveFeatures', 'collection', 'index'),
-                ],
-                [
-                    'label' => $interactiveFeature->title,
-                    'url' => moduleRoute('interactiveFeatures', 'collection', 'edit', $interactiveFeature->id),
-                ],
                 [
                     'label' => 'Experiences',
-                    'url' => moduleRoute('interactiveFeatures.experiences', 'collection', 'index', $experience->interactiveFeature->id),
+                    'url' => moduleRoute('experiences', 'collection', 'index'),
                 ],
                 [
                     'label' => $experience->title,
-                    'url' => moduleRoute('interactiveFeatures.experiences', 'collection', 'edit', [$interactiveFeature->id, $experience->id]),
+                    'url' => moduleRoute('experiences', 'collection', 'edit', [$experience->id]),
                 ],
                 [
                     'label' => 'Slides',

diff --git a/app/Http/Controllers/Admin/HomeArtistController.php b/app/Http/Controllers/Admin/HomeArtistController.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use A17\Twill\Http\Controllers\Admin\ModuleController;
+
+class HomeArtistController extends ModuleController
+{
+    protected $moduleName = 'homeArtists';
+}
diff --git a/app/Http/Controllers/Admin/InteractiveFeatureController.php b/app/Http/Controllers/Admin/InteractiveFeatureController.php
@@ -21,10 +21,6 @@ class InteractiveFeatureController extends ModuleController
             'field' => 'updatedDate',
             'present' => true,
         ],
-        'experiences' => [
-            'title' => 'Experiences',
-            'nested' => 'experiences',
-        ]
     ];
 
     protected $formWith = ['revisions'];

diff --git a/app/Http/Controllers/Admin/PageController.php b/app/Http/Controllers/Admin/PageController.php
@@ -30,10 +30,15 @@ public function home(PageRepository $pages)
         Session::put("pages_back_link", route('admin.homepage.landing'));
 
         $additionalFieldsets = [
-            ['fieldset' => 'exhibitions-and-events', 'label' => 'Exhibitions and Event'],
-            ['fieldset' => 'membership', 'label' => 'Membership Module'],
+            ['fieldset' => 'plan-your-visit', 'label' => 'Plan Your Visit'],
+            ['fieldset' => 'video-carousel', 'label' => 'Video Carousel'],
+            ['fieldset' => 'call-to-action', 'label' => 'Call to Action'],
+            ['fieldset' => 'highlights', 'label' => 'Highlights'],
+            ['fieldset' => 'artists', 'label' => 'Artists'],
             ['fieldset' => 'from-the-collection', 'label' => 'From the Collection'],
             ['fieldset' => 'from-the-shop', 'label' => 'From the Shop'],
+            ['fieldset' => 'exhibitions-and-events', 'label' => 'Exhibitions and Events'],
+            // ['fieldset' => 'interactive-features', 'label' => 'Interactive Features'],
         ];
         $fields = $this->form($page->id);
         $fields['additionalFieldsets'] = $additionalFieldsets;

diff --git a/app/Http/Controllers/Admin/SelectionController.php b/app/Http/Controllers/Admin/SelectionController.php
@@ -13,6 +13,7 @@ class SelectionController extends ModuleController
 
     protected $indexOptions = [
         'permalink' => true,
+        'reorder' => true,
     ];
 
     protected $indexColumns = [
@@ -66,6 +67,7 @@ protected function formData($request)
         return [
             'baseUrl' => $baseUrl,
             'siteTagsList' => app(SiteTagRepository::class)->listAll('name'),
+            'highlightTypeList' => $this->repository->getHighlightTypeList(),
         ];
     }
 

diff --git a/app/Http/Controllers/ArticleController.php b/app/Http/Controllers/ArticleController.php
@@ -27,7 +27,7 @@ public function index()
 
         $featuredItems = $page->getRelatedWithApiModels("featured_items", [], [
             'articles' => false,
-            'interactiveFeatures.experiences' => false
+            'experiences' => false
         ]);
 
         $heroArticle = $featuredItems->first();

diff --git a/app/Http/Controllers/ArticlesPublicationsController.php b/app/Http/Controllers/ArticlesPublicationsController.php
@@ -15,7 +15,7 @@ public function index()
 
         $articles = $page->getRelatedWithApiModels("featured_items", [], [
             'articles' => false,
-            'interactiveFeatures.experiences' => false
+            'experiences' => false
         ]) ?? null;
 
         $featureHero = $articles->shift();

diff --git a/app/Http/Controllers/CollectionController.php b/app/Http/Controllers/CollectionController.php
@@ -105,7 +105,7 @@ public function index()
         $featuredItems = $page->getRelatedWithApiModels(
             'featured_items', [], [
                 'articles' => false,
-                'interactiveFeatures.experiences' => false
+                'experiences' => false
         ]);
 
         $page = Page::forType('Art and Ideas')->with('apiElements')->first();