fix: deprecated municipio function images gone

helsingborg-stad · Apr 5, 2024 · 2f0a5f1 · 2f0a5f1
1 parent 7a086bf
commit 2f0a5f1
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 11 deletions.
diff --git a/source/php/Controller/Challenge.php b/source/php/Controller/Challenge.php
@@ -5,6 +5,7 @@
 use ProjectManagerIntegration\Helper\Municipio;
 use ProjectManagerIntegration\Helper\WP;
 use ProjectManagerIntegration\UI\RelatedPosts;
+use ProjectManagerIntegration\UI\FeaturedImage;
 
 class Challenge
 {
@@ -45,7 +46,7 @@ public function singleViewController($data)
     {
         $data['challenge'] = [
             'hero' => [
-                'image' => municipio_get_thumbnail_source(null, array(1440, 416)),
+                'image' => FeaturedImage::getFeaturedImage(),
                 'meta' => get_post_type_object(get_post_type())->labels->singular_name,
                 'title' => get_the_title(),
             ],

diff --git a/source/php/Controller/Platform.php b/source/php/Controller/Platform.php
@@ -4,6 +4,7 @@
 
 use ProjectManagerIntegration\Helper\WP;
 use ProjectManagerIntegration\UI\RelatedPosts;
+use ProjectManagerIntegration\UI\FeaturedImage;
 
 class Platform
 {
@@ -19,10 +20,10 @@ public function singleViewController($data)
         if (!is_singular('platform')) {
             return $data;
         }
-
+        
         $data['platform'] = [
             'hero' => [
-                'image' => municipio_get_thumbnail_source(null, array(1440,416)),
+                'image' => FeaturedImage::getFeaturedImage(),
                 'meta' => get_post_type_object(get_post_type())->labels->singular_name,
                 'title' => get_the_title(),
             ],

diff --git a/source/php/Controller/Project.php b/source/php/Controller/Project.php
@@ -7,6 +7,7 @@
 use ProjectManagerIntegration\UI\ProjectStatus;
 use ProjectManagerIntegration\UI\RelatedPosts;
 use ProjectManagerIntegration\UI\Gallery;
+use ProjectManagerIntegration\UI\FeaturedImage;
 
 class Project
 {
@@ -21,8 +22,6 @@ public function __construct()
 
     public function singleViewController($data)
     {
-        $fields = get_fields();
-
         $data['project'] = array_merge(
             WP::getPostMeta(),
             [
@@ -47,6 +46,7 @@ public function singleViewController($data)
                     'updated'   => __('Last updated', PROJECTMANAGERINTEGRATION_TEXTDOMAIN),
                 ],
                  'archive' => get_post_type_archive_link(get_post_type()),
+                 'image' => FeaturedImage::getFeaturedImage(),
 
             ]
         );
@@ -59,7 +59,7 @@ public function singleViewController($data)
     public function mapProjectPostData(object $post): object
     {
         $post->project = (object) [
-            'statusBar'     => ProjectStatus::create($post->id),
+            // 'statusBar'     => ProjectStatus::create($post->id),
             'category'      => WP::getPostTermsJoined(['challenge_category'], $post->id) ?? '',
             'taxonomies'    => WP::getPostTermsJoined(['project_sector', 'project_technology'], $post->id)
         ];
@@ -77,7 +77,7 @@ protected static function createProjectCardPosts(array $posts): array
             ];
 
             if (!$post->thumbnail) {
-                $post->thumbnail = municipio_get_thumbnail_source($post->id, "sm", '12:16');
+                $post->thumbnail = FeaturedImage::getFeaturedImage($post->id);
             }
 
             if (!$post->permalink) {

diff --git a/source/php/Shortcodes/PostTypeLink/PostTypeLink.php b/source/php/Shortcodes/PostTypeLink/PostTypeLink.php
@@ -3,6 +3,7 @@
 namespace ProjectManagerIntegration\Shortcodes\PostTypeLink;
 
 use ProjectManagerIntegration\Helper\Blade;
+use ProjectManagerIntegration\UI\FeaturedImage;
 
 class PostTypeLink
 {
@@ -25,12 +26,14 @@ public function shortcodeController($atts)
         $post = get_post($atts['id']);
 
         if ($post) {
+            $image = FeaturedImage::getFeaturedImage($post->ID, [75, 56]);
+
             $atts = shortcode_atts(array(
                 'id' => 0,
                 'title' => $post->post_title,
                 'meta' => get_post_type_object($post->post_type)->labels->singular_name,
                 'url' => get_permalink($post->ID),
-                'imageUrl' => municipio_get_thumbnail_source($post->ID, array(75, 56), '3:2'),
+                'imageUrl' => !empty($image['src']) ? $image['src'] : false,
                 'buttonText' => __('Open', PROJECTMANAGERINTEGRATION_TEXTDOMAIN),
                 'blank' => 0
             ), $atts);

diff --git a/source/php/UI/FeaturedImage.php b/source/php/UI/FeaturedImage.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace ProjectManagerIntegration\UI;
+
+class FeaturedImage
+{
+    public static function getFeaturedImage(?int $id = null, array $size = [854, 480])
+    {
+        $id = $id ?? get_queried_object_id();
+        if (!empty($id) && class_exists('Municipio\Helper\Image')) {
+            $image = \Municipio\Helper\Image::getImageAttachmentData(get_post_thumbnail_id($id), $size);
+
+            return $image;
+        } 
+
+        return false;
+    }
+}
diff --git a/views/partials/challenge/hero.blade.php b/views/partials/challenge/hero.blade.php
@@ -1,5 +1,5 @@
 @hero([
-    'image' => $challenge['hero']['image'],
+    'image' => !empty($challenge['hero']['image']['src']) ? $challenge['hero']['image']['src'] : null,
     'title' => $challenge['hero']['title'],
     'meta' => $challenge['hero']['meta']
 ])

diff --git a/views/partials/platform/hero.blade.php b/views/partials/platform/hero.blade.php
@@ -1,5 +1,5 @@
 @hero([
-    'image' => $platform['hero']['image'],
+    'image' => !empty($platform['hero']['image']['src']) ? $platform['hero']['image']['src'] : null,
     'title' => $platform['hero']['title'],
     'meta' => $platform['hero']['meta'],
 ])

diff --git a/views/partials/project/hero.blade.php b/views/partials/project/hero.blade.php
@@ -1,5 +1,5 @@
 @hero([
-    'image' => municipio_get_thumbnail_source($post->id, [456, 342], '4:3'),
+    'image' => !empty($project['image']['src']) ? $project['image']['src'] : null,
     'heroView' => 'twoColumn',
     'background' => '#f7f7f7',
     'textColor' => 'black'