Merge pull request #161 from alleyinteractive/feature/LEDE-2677/block…

…-organization LEDE-2677 Organize Newsletter Builder Blocks
alleyinteractive · Jun 27, 2024 · 1e41c24 · 1e41c24
2 parents 916d98b + 7fd1e0d
commit 1e41c24
Show file tree

Hide file tree

Showing 19 changed files with 60 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Contributors: alleyinteractive
 
 Tags: alleyinteractive, wp-newsletter-builder
 
-Stable tag: 0.3.32
+Stable tag: 0.3.33
 
 Requires at least: 6.2
 

diff --git a/block-filters/latest-posts/index.tsx b/block-filters/latest-posts/index.tsx
@@ -25,6 +25,7 @@ function modifyLatestPostsSupports(settings, name) {
           default: 20,
         },
       }),
+      category: 'wp-newsletter-builder-newsletter',
       supports: Object.assign(settings.supports, {
         align: [],
         anchor: false,

diff --git a/blocks/email-settings/block.json b/blocks/email-settings/block.json
@@ -4,7 +4,7 @@
 	"name": "wp-newsletter-builder/email-settings",
 	"version": "0.1.0",
 	"title": "Email Settings",
-	"category": "design",
+	"category": "wp-newsletter-builder-newsletter",
 	"icon": "email",
 	"description": "Block to set the email subject, preview text, and list.",
 	"textdomain": "wp-newsletter-builder",
@@ -13,5 +13,8 @@
 	"style": [
 		"file:style-index.css"
 	],
+	"supports": {
+		"inserter": false
+	},
 	"render": "file:render.php"
 }
diff --git a/blocks/footer/block.json b/blocks/footer/block.json
@@ -4,7 +4,7 @@
 	"name": "wp-newsletter-builder/footer",
 	"version": "0.1.0",
 	"title": "Newsletter Footer",
-	"category": "design",
+	"category": "wp-newsletter-builder-newsletter",
 	"icon": "align-wide",
 	"description": "Outputs the company logo, social links, address, and footer links.",
 	"textdomain": "wp-newsletter-builder",

diff --git a/blocks/header/block.json b/blocks/header/block.json
@@ -4,7 +4,7 @@
 	"name": "wp-newsletter-builder/header",
 	"version": "0.1.0",
 	"title": "Newsletter Header",
-	"category": "design",
+	"category": "wp-newsletter-builder-newsletter",
 	"icon": "format-image",
 	"description": "Displays the header image for a newsletter",
 	"textdomain": "wp-newsletter-builder",

diff --git a/blocks/post-byline/block.json b/blocks/post-byline/block.json
@@ -12,6 +12,9 @@
 	"style": [
 		"file:style-index.css"
 	],
+	"supports": {
+		"inserter": false
+	},
 	"render": "file:render.php",
 	"attributes": {
 		"overrideByline": {

diff --git a/blocks/post-content/block.json b/blocks/post-content/block.json
@@ -12,6 +12,9 @@
 	"style": [
 		"file:style-index.css"
 	],
+	"supports": {
+		"inserter": false
+	},
 	"render": "file:render.php",
 	"attributes": {
 		"overrideContent": {

diff --git a/blocks/post-excerpt/block.json b/blocks/post-excerpt/block.json
@@ -13,6 +13,9 @@
 	"style": [
 		"file:style-index.css"
 	],
+	"supports": {
+		"inserter": false
+	},
 	"render": "file:render.php",
 	"attributes": {
 		"overrideExcerpt": {

diff --git a/blocks/post-featured-image/block.json b/blocks/post-featured-image/block.json
@@ -12,6 +12,9 @@
 	"style": [
 		"file:style-index.css"
 	],
+	"supports": {
+		"inserter": false
+	},
 	"render": "file:render.php",
 	"attributes": {
 		"overrideImage": {

diff --git a/blocks/post-item/block.json b/blocks/post-item/block.json
@@ -13,5 +13,8 @@
 	"style": [
 		"file:style-index.css"
 	],
+	"supports": {
+		"inserter": false
+	},
 	"render": "file:render.php"
 }
diff --git a/blocks/post-read-more/block.json b/blocks/post-read-more/block.json
@@ -12,6 +12,9 @@
 	"style": [
 		"file:style-index.css"
 	],
+	"supports": {
+		"inserter": false
+	},
 	"render": "file:render.php",
 	"attributes": {
 		"readMoreText": {

diff --git a/blocks/post-title/block.json b/blocks/post-title/block.json
@@ -12,6 +12,9 @@
 	"style": [
 		"file:style-index.css"
 	],
+	"supports": {
+		"inserter": false
+	},
 	"render": "file:render.php",
 	"attributes": {
 		"overrideTitle": {

diff --git a/blocks/post/block.json b/blocks/post/block.json
@@ -4,7 +4,7 @@
   "name": "wp-newsletter-builder/post",
   "version": "0.1.0",
   "title": "Newsletter Single Post",
-  "category": "design",
+  "category": "wp-newsletter-builder-newsletter",
   "icon": "admin-post",
   "description": "Displays a post",
   "textdomain": "wp-newsletter-builder",

diff --git a/blocks/section/block.json b/blocks/section/block.json
@@ -13,6 +13,9 @@
 	"style": [
 		"file:style-index.css"
 	],
+	"supports": {
+		"inserter": false
+	},
 	"render": "file:render.php",
 	"attributes": {
 		"showNumbers": {

diff --git a/blocks/signup-form-list/block.json b/blocks/signup-form-list/block.json
@@ -9,6 +9,9 @@
 	"description": "Child block of Newsletter Signup Form to show a single list",
 	"textdomain": "wp-newsletter-builder",
 	"editorScript": "file:index.ts",
+	"supports": {
+		"inserter": false
+	},
 	"render": "file:render.php",
 	"attributes": {
 		"logo": {

diff --git a/blocks/signup-form/block.json b/blocks/signup-form/block.json
@@ -13,6 +13,9 @@
 	"style": [
 		"file:style-index.css"
 	],
+	"supports": {
+		"inserter": false
+	},
 	"render": "file:render.php",
 	"viewScript": [
 		"file:view.ts"

diff --git a/blocks/two-up-post/block.json b/blocks/two-up-post/block.json
@@ -4,7 +4,7 @@
 	"name": "wp-newsletter-builder/two-up-post",
 	"version": "0.1.0",
 	"title": "Two Up Newsletter Post",
-	"category": "design",
+	"category": "wp-newsletter-builder-newsletter",
 	"icon": "editor-table",
 	"description": "Displays two posts, side by side",
 	"textdomain": "wp-newsletter-builder",

diff --git a/plugin.php b/plugin.php
@@ -3,7 +3,7 @@
  * Plugin Name: Newsletter Builder
  * Plugin URI: https://github.com/alleyinteractive/wp-newsletter-builder
  * Description: Interface to manage email newsletters
- * Version: 0.3.32
+ * Version: 0.3.33
  * Author: Alley Interactive
  * Author URI: https://github.com/alleyinteractive/wp-newsletter-builder
  * Requires at least: 6.2

diff --git a/src/class-wp-newsletter-builder.php b/src/class-wp-newsletter-builder.php
@@ -26,6 +26,7 @@ public function __construct() {
 		add_filter( 'wp_newsletter_builder_html_url', [ $this, 'modify_html_url' ] );
 		add_filter( 'pre_get_posts', [ $this, 'modify_query' ] );
 		add_action( 'init', [ $this, 'check_for_fieldmanager' ] );
+		add_filter( 'block_categories_all', [ $this, 'add_newsletter_block_category' ], 10, 2 );
 	}
 
 	/**
@@ -337,4 +338,22 @@ public function check_for_fieldmanager(): void {
 			add_action( 'admin_notices', [ $this, 'fieldmanager_not_found_error' ] );
 		}
 	}
+
+	/**
+	 * Adds a new Newsletter block category.
+	 *
+	 * @param array $categories Array of categories for block types.
+	 * 
+	 * @return array
+	 */
+	public function add_newsletter_block_category( $categories ): array {
+
+		$categories[] = [
+			'slug'  => 'wp-newsletter-builder-newsletter',
+			'title' => 'Newsletter',
+			'icon'  => 'email-alt',
+		];
+
+		return $categories;
+	}
 }