Merge branch 'release/1.2.0'

CHANGES.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.2.0 (6/20/23)
+* Changed: Rename to Mai Theme Pro plugin.
+* Changed: Update the updater.
+* Added: Add Block Types to Mai Post Grid patterns.
+
 ## 1.1.0 (8/10/22)
 * Added: Block patterns are now included inside the plugin. Easily insert them directly into your posts/pages.
 

README.md

@@ -1,2 +1,2 @@
-# Mai Design Pack
+# Mai Theme Pro
 Unlimited access to all Mai Plugins, Mai Patterns, and more. Requires Mai Theme v2.

composer.json

@@ -1,5 +1,5 @@
 {
     "require": {
-        "yahnis-elsts/plugin-update-checker": "^4.5"
+        "yahnis-elsts/plugin-update-checker": "^5"
     }
 }

mai-design-pack.php

@@ -1,10 +1,10 @@
 <?php
 
 /**
- * Plugin Name:     Mai Design Pack
- * Plugin URI:      https://bizbudding.com/mai-design-pack/
+ * Plugin Name:     Mai Theme Pro Plugin (formerly Mai Design Pack)
+ * Plugin URI:      https://bizbudding.com/mai-theme-pro/
  * Description:     Unlimited access to all Mai Plugins, and more. Requires Mai Theme v2.
- * Version:         1.1.0
+ * Version:         1.2.0
  *
  * Author:          BizBudding
  * Author URI:      https://bizbudding.com
@@ -13,6 +13,9 @@
 // Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) exit;
 
+// Must be at the top of the file.
+use YahnisElsts\PluginUpdateChecker\v5\PucFactory;
+
 /**
  * Main Mai_Design_Pack Class.
  *
@@ -88,7 +91,7 @@ public function __wakeup() {
 	private function setup_constants() {
 		// Plugin version.
 		if ( ! defined( 'MAI_DESIGN_PACK_VERSION' ) ) {
-			define( 'MAI_DESIGN_PACK_VERSION', '1.1.0' );
+			define( 'MAI_DESIGN_PACK_VERSION', '1.2.0' );
 		}
 
 		// Plugin Folder Path.
@@ -140,7 +143,7 @@ private function includes() {
 	public function hooks() {
 		$plugins_link_hook = 'plugin_action_links_mai-design-pack/mai-design-pack.php';
 		add_filter( $plugins_link_hook, [ $this, 'plugins_link' ], 10, 4 );
-		add_action( 'plugins_loaded',   [ $this, 'updater' ] );
+		add_action( 'plugins_loaded',   [ $this, 'updater' ], 12 );
 		add_action( 'init',             [ $this, 'register_block_pattern_categories' ], 4 );
 		add_action( 'init',             [ $this, 'unregister_block_pattern_categories' ] );
 		add_action( 'init',             [ $this, 'register_block_patterns' ], 4 );
@@ -178,18 +181,12 @@ function plugins_link( $actions, $plugin_file, $plugin_data, $context ) {
 	 * @return void
 	 */
 	public function updater() {
-		// Bail if current user cannot manage plugins.
-		if ( ! current_user_can( 'install_plugins' ) ) {
-			return;
-		}
-
 		// Bail if plugin updater is not loaded.
-		if ( ! class_exists( 'Puc_v4_Factory' ) ) {
+		if ( ! class_exists( 'YahnisElsts\PluginUpdateChecker\v5\PucFactory' ) ) {
 			return;
 		}
 
-		// Setup the updater.
-		$updater = Puc_v4_Factory::buildUpdateChecker( 'https://github.com/maithemewp/mai-design-pack/', __FILE__, 'mai-design-pack' );
+		PucFactory::buildUpdateChecker( 'https://github.com/maithemewp/mai-design-pack/', __FILE__, 'mai-design-pack' );
 
 		// Maybe set github api token.
 		if ( defined( 'MAI_GITHUB_API_TOKEN' ) ) {
@@ -294,15 +291,17 @@ function register_block_patterns() {
 						'description' => __( 'Description', 'mai-engine' ),
 						'categories'  => __( 'Categories', 'mai-engine' ),
 						'keywords'    => __( 'Keywords', 'mai-engine' ),
+						'block_types' => __( 'Block Types', 'mai-engine' ),
 					]
 				);
 
 				ob_start();
 				include $file;
-				$content    = ob_get_clean();
-				$title      = function_exists( 'mai_convert_case' ) ? mai_convert_case( $base, 'title' ) : $base;
-				$categories = array_map( 'trim', explode( ',', $data['categories'] ) );
-				$keywords   = array_map( 'trim', explode( ',', $data['keywords'] ) );
+				$content     = ob_get_clean();
+				$title       = function_exists( 'mai_convert_case' ) ? mai_convert_case( $base, 'title' ) : $base;
+				$categories  = array_map( 'trim', explode( ',', $data['categories'] ) );
+				$keywords    = array_map( 'trim', explode( ',', $data['keywords'] ) );
+				$block_types = array_map( 'trim', explode( ',', $data['block_types'] ) );
 
 				// Adds `mai_` prefix.
 				foreach ( $categories as $index => $category ) {
@@ -326,6 +325,7 @@ function register_block_patterns() {
 						'content'     => trim( $content ),
 						'categories'  => $categories,
 						'keywords'    => $keywords,
+						'blockTypes'  => $block_types,
 					]
 				);
 			}

patterns/posts/posts-1.php

@@ -3,6 +3,7 @@
  * Description: Posts grid with image, title, excerpt, and read more link.
  * Categories: posts
  * Keywords: post, grid
+ * Block Types: acf/mai-post-grid
  */
 ?>
 <!-- wp:acf/mai-post-grid {"name":"acf/mai-post-grid","data":{"mai_post_grid_clone":{"mai_grid_block_show":["image","title","excerpt","more_link"],"mai_grid_block_title_size":"lg","mai_grid_block_image_orientation":"landscape","mai_grid_block_image_position":"full","mai_grid_block_content_limit":"180","mai_grid_block_more_link_text":"","mai_grid_block_align_text":"start","mai_grid_block_boxed":"1","mai_grid_block_border_radius":"","mai_grid_block_columns":"3","mai_grid_block_columns_responsive":"0","mai_grid_block_align_columns":"start","mai_grid_block_align_columns_vertical":"","mai_grid_block_column_gap":"lg","mai_grid_block_row_gap":"lg","mai_grid_block_margin_top":"","mai_grid_block_margin_bottom":"","mai_grid_block_remove_spacing":"0","mai_grid_block_post_type":["post"],"mai_grid_block_query_by":"","mai_grid_block_posts_per_page":"6","mai_grid_block_posts_offset":"0","mai_grid_block_posts_date_after":"","mai_grid_block_posts_date_before":"","mai_grid_block_posts_orderby":"date","mai_grid_block_posts_order":"DESC","mai_grid_block_post_not_in":"","mai_grid_block_posts_exclude":"","mai_grid_block_disable_entry_link":"0"}},"mode":"preview"} /-->

patterns/posts/posts-2.php

@@ -3,6 +3,7 @@
  * Description: Posts grid with background image and title
  * Categories: posts
  * Keywords: post, grid
+ * Block Types: acf/mai-post-grid
  */
 ?>
 <!-- wp:acf/mai-post-grid {"name":"acf/mai-post-grid","data":{"mai_post_grid_clone":{"mai_grid_block_show":["image","title"],"mai_grid_block_title_size":"md","mai_grid_block_image_orientation":"landscape","mai_grid_block_image_position":"background","mai_grid_block_align_text":"center","mai_grid_block_align_text_vertical":"bottom","mai_grid_block_border_radius":"","mai_grid_block_columns":"3","mai_grid_block_columns_responsive":"0","mai_grid_block_align_columns":"center","mai_grid_block_align_columns_vertical":"bottom","mai_grid_block_column_gap":"lg","mai_grid_block_row_gap":"lg","mai_grid_block_margin_top":"","mai_grid_block_margin_bottom":"","mai_grid_block_remove_spacing":"0","mai_grid_block_post_type":["post"],"mai_grid_block_query_by":"","mai_grid_block_posts_per_page":"6","mai_grid_block_posts_offset":"0","mai_grid_block_posts_date_after":"","mai_grid_block_posts_date_before":"","mai_grid_block_posts_orderby":"date","mai_grid_block_posts_order":"DESC","mai_grid_block_post_not_in":"","mai_grid_block_posts_exclude":"","mai_grid_block_disable_entry_link":"0"}},"mode":"preview"} /-->

patterns/posts/posts-3.php

@@ -3,6 +3,7 @@
  * Description: Sidebar posts list
  * Categories: posts
  * Keywords: post, grid
+ * Block Types: acf/mai-post-grid
  */
 ?>
 <!-- wp:acf/mai-post-grid {"name":"acf/mai-post-grid","data":{"show":["image","title"],"_show":"mai_grid_block_show","title_size":"sm","_title_size":"mai_grid_block_title_size","image_orientation":"custom","_image_orientation":"mai_grid_block_image_orientation","image_size":"tiny","_image_size":"mai_grid_block_image_size","image_position":"left-middle","_image_position":"mai_grid_block_image_position","image_alternate":"0","_image_alternate":"mai_grid_block_image_alternate","align_text":"start","_align_text":"mai_grid_block_align_text","align_text_vertical":"middle","_align_text_vertical":"mai_grid_block_align_text_vertical","image_stack":"0","_image_stack":"mai_grid_block_image_stack","boxed":"0","_boxed":"mai_grid_block_boxed","columns":"1","_columns":"mai_grid_block_columns","columns_responsive":"0","_columns_responsive":"mai_grid_block_columns_responsive","column_gap":"md","_column_gap":"mai_grid_block_column_gap","row_gap":"lg","_row_gap":"mai_grid_block_row_gap","margin_top":"","_margin_top":"mai_grid_block_margin_top","margin_bottom":"","_margin_bottom":"mai_grid_block_margin_bottom","post_type":["post"],"_post_type":"mai_grid_block_post_type","query_by":"","_query_by":"mai_grid_block_query_by","posts_per_page":"5","_posts_per_page":"mai_grid_block_posts_per_page","offset":"0","_offset":"mai_grid_block_posts_offset","date_after":"","_date_after":"mai_grid_block_posts_date_after","date_before":"","_date_before":"mai_grid_block_posts_date_before","orderby":"date","_orderby":"mai_grid_block_posts_orderby","order":"DESC","_order":"mai_grid_block_posts_order","post__not_in":"","_post__not_in":"mai_grid_block_post_not_in","excludes":"","_excludes":"mai_grid_block_posts_exclude","disable_entry_link":"0","_disable_entry_link":"mai_grid_block_disable_entry_link","post_grid_clone":"","_post_grid_clone":"mai_post_grid_clone"},"mode":"preview"} /-->

patterns/posts/posts-4.php

@@ -3,6 +3,7 @@
  * Description: Minimal posts grid
  * Categories: posts
  * Keywords: post, grid
+ * Block Types: acf/mai-post-grid
  */
 ?>
 <!-- wp:acf/mai-post-grid {"name":"acf/mai-post-grid","data":{"mai_post_grid_clone":{"mai_grid_block_show":["image","title"],"mai_grid_block_title_size":"sm","mai_grid_block_image_orientation":"custom","mai_grid_block_image_size":"tiny","mai_grid_block_image_position":"left-full","mai_grid_block_image_alternate":"0","mai_grid_block_align_text":"start","mai_grid_block_align_text_vertical":"middle","mai_grid_block_image_stack":"0","mai_grid_block_boxed":"1","mai_grid_block_border_radius":"","mai_grid_block_columns":"2","mai_grid_block_columns_responsive":"0","mai_grid_block_align_columns":"start","mai_grid_block_align_columns_vertical":"","mai_grid_block_column_gap":"lg","mai_grid_block_row_gap":"lg","mai_grid_block_margin_top":"","mai_grid_block_margin_bottom":"","mai_grid_block_post_type":["post"],"mai_grid_block_query_by":"","mai_grid_block_posts_per_page":"6","mai_grid_block_posts_offset":"0","mai_grid_block_posts_date_after":"","mai_grid_block_posts_date_before":"","mai_grid_block_posts_orderby":"date","mai_grid_block_posts_order":"DESC","mai_grid_block_post_not_in":"","mai_grid_block_posts_exclude":"","mai_grid_block_disable_entry_link":"0"}},"mode":"preview"} /-->

patterns/posts/posts-5.php

@@ -3,6 +3,7 @@
  * Description: Simple posts grid
  * Categories: posts
  * Keywords: post, grid
+ * Block Types: acf/mai-post-grid
  */
 ?>
 <!-- wp:acf/mai-post-grid {"name":"acf/mai-post-grid","data":{"mai_post_grid_clone":{"mai_grid_block_show":["image","title"],"mai_grid_block_title_size":"md","mai_grid_block_image_orientation":"landscape","mai_grid_block_image_position":"full","mai_grid_block_align_text":"center","mai_grid_block_boxed":"0","mai_grid_block_columns":"3","mai_grid_block_columns_responsive":"0","mai_grid_block_align_columns":"start","mai_grid_block_align_columns_vertical":"","mai_grid_block_column_gap":"xl","mai_grid_block_row_gap":"xl","mai_grid_block_margin_top":"","mai_grid_block_margin_bottom":"","mai_grid_block_post_type":["post"],"mai_grid_block_query_by":"","mai_grid_block_posts_per_page":"6","mai_grid_block_posts_offset":"0","mai_grid_block_posts_date_after":"","mai_grid_block_posts_date_before":"","mai_grid_block_posts_orderby":"date","mai_grid_block_posts_order":"DESC","mai_grid_block_post_not_in":"","mai_grid_block_posts_exclude":"","mai_grid_block_disable_entry_link":"0"}},"mode":"preview"} /-->

vendor/autoload.php

@@ -3,8 +3,21 @@
 // autoload.php @generated by Composer
 
 if (PHP_VERSION_ID < 50600) {
-    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
-    exit(1);
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, $err);
+        } elseif (!headers_sent()) {
+            echo $err;
+        }
+    }
+    trigger_error(
+        $err,
+        E_USER_ERROR
+    );
 }
 
 require_once __DIR__ . '/composer/autoload_real.php';