generator-chisel 2.0.0 → 2.1.1

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 <!-- INSERT-NEW-ENTRIES-HERE -->
 
+## <small>2.1.1 (2025-05-26)</small>
+
+- add woo hooks, get_blocks fixes, js slider adjustments ([8c02af7](https://github.com/xfiveco/generator-chisel/commit/8c02af7))
+
+## 2.1.0 (2025-05-16)
+
+- acf sync module as a plugin, add x5 plugins to installation script ([93b4f8a](https://github.com/xfiveco/generator-chisel/commit/93b4f8a))
+- improve woocommerce support, small refactor ([1968fbc](https://github.com/xfiveco/generator-chisel/commit/1968fbc))
+
 ## 2.0.0 (2025-04-07)
 
 - Update chisel version and readme ([0aca167](https://github.com/xfiveco/generator-chisel/commit/0aca167))

package/lib/commands/create/creators/app/chisel-starter-theme/functions.php

@@ -26,7 +26,7 @@ spl_autoload_register(
 
 Timber\Timber::init();
 
-\Chisel\Module\Ajax::get_instance();
+\Chisel\Controllers\AjaxController::get_instance();
 \Chisel\WP\Blocks::get_instance();
 \Chisel\WP\Acf::get_instance();
 \Chisel\WP\AcfBlocks::get_instance();

package/lib/commands/create/creators/app/chisel-starter-theme/inc/{Module/Ajax.php → Controllers/AjaxController.php}

@@ -1,6 +1,6 @@
 <?php
 
-namespace Chisel\Module;
+namespace Chisel\Controllers;
 
 use Chisel\WP\AjaxEnpoints;
 use Chisel\Interfaces\InstanceInterface;
@@ -12,7 +12,7 @@ use Chisel\Traits\Singleton;
  *
  * @package Chisel
  */
-class Ajax extends \WP_REST_Controller implements InstanceInterface, HooksInterface {
+class AjaxController extends \WP_REST_Controller implements InstanceInterface, HooksInterface {
 
 	use Singleton;
 

package/lib/commands/create/creators/app/chisel-starter-theme/inc/Factory/RegisterAcfOptionsPage.php

@@ -37,7 +37,7 @@ class RegisterAcfOptionsPage {
 	/**
 	 * Register ACF options page.
 	 */
-	private function register_options_page() {
+	public function register() {
 		$options_page_args = array(
 			'page_title'      => $this->args['page_title'],
 			'menu_title'      => isset( $this->args['menu_title'] ) ? $this->args['menu_title'] : $this->args['page_title'],

package/lib/commands/create/creators/app/chisel-starter-theme/inc/Factory/RegisterBlocks.php

@@ -54,20 +54,6 @@ class RegisterBlocks {
 	 */
 	private $blocks = array();
 
-	/**
-	 * Blocks option name.
-	 *
-	 * @var string
-	 */
-	private $blocks_option_name;
-
-	/**
-	 * Blocks version option name.
-	 *
-	 * @var string
-	 */
-	private $blocks_version_option_name;
-
 	/**
 	 * Theme.
 	 *
@@ -102,15 +88,13 @@ class RegisterBlocks {
 	 * @param string $blocks_type The blocks type : acf or wp.
 	 */
 	public function __construct( $blocks_type ) {
-		$this->blocks_type                = $blocks_type;
-		$this->theme                      = wp_get_theme();
-		$this->blocks_folder              = $this->blocks_type === 'acf' ? 'blocks-acf' : 'blocks';
-		$this->blocks_path                = get_template_directory() . '/' . $this->build_folder . '/' . $this->blocks_folder;
-		$this->blocks_path_src            = get_template_directory() . '/' . $this->src_folder . '/' . $this->blocks_folder;
-		$this->blocks_url                 = get_template_directory_uri() . '/' . $this->build_folder . '/' . $this->blocks_folder;
-		$this->blocks                     = $this->get_blocks();
-		$this->blocks_option_name         = 'chisel_' . $this->blocks_type;
-		$this->blocks_version_option_name = 'chisel_' . $this->blocks_type . '_version';
+		$this->blocks_type     = $blocks_type;
+		$this->theme           = wp_get_theme();
+		$this->blocks_folder   = $this->blocks_type === 'acf' ? 'blocks-acf' : 'blocks';
+		$this->blocks_path     = get_template_directory() . '/' . $this->build_folder . '/' . $this->blocks_folder;
+		$this->blocks_path_src = get_template_directory() . '/' . $this->src_folder . '/' . $this->blocks_folder;
+		$this->blocks_url      = get_template_directory_uri() . '/' . $this->build_folder . '/' . $this->blocks_folder;
+		$this->blocks          = $this->get_blocks();
 
 		$this->register_scripts = apply_filters( 'chisel_blocks_register_scripts', true, $this->blocks_type );
 	}
@@ -228,29 +212,27 @@ class RegisterBlocks {
 	 * @return array
 	 */
 	public function get_blocks() {
-		$blocks         = get_option( $this->blocks_option_name, array() ) ?: array();
-		$blocks_version = get_option( $this->blocks_version_option_name, 0 );
-
-		if ( ! $blocks || version_compare( $this->theme->get( 'Version' ), $blocks_version ) ) {
-			$blocks_list = is_dir( $this->blocks_path ) ? new \DirectoryIterator( $this->blocks_path ) : array();
+		if ( $this->blocks ) {
+			return $this->blocks;
+		}
 
-			if ( $blocks_list ) {
-				foreach ( $blocks_list as $item ) {
-					if ( $item->isDot() || ! $item->isDir() ) {
-						continue;
-					}
+		$blocks_list = is_dir( $this->blocks_path ) ? new \DirectoryIterator( $this->blocks_path ) : array();
 
-					$blocks[] = $item->getFilename();
+		if ( $blocks_list ) {
+			foreach ( $blocks_list as $item ) {
+				if ( $item->isDot() || ! $item->isDir() ) {
+					continue;
 				}
-			}
 
-			if ( ! ThemeHelpers::is_fast_refresh() ) {
-				update_option( $this->blocks_option_name, $blocks );
-				update_option( $this->blocks_version_option_name, $this->theme->get( 'Version' ) );
+				$block_name = $item->getFilename();
+
+				if ( ! in_array( $block_name, $this->blocks, true ) ) {
+					$this->blocks[] = $item->getFilename();
+				}
 			}
 		}
 
-		return $blocks;
+		return $this->blocks;
 	}
 
 	/**

package/lib/commands/create/creators/app/chisel-starter-theme/inc/Helper/AjaxHelpers.php

@@ -2,7 +2,7 @@
 
 namespace Chisel\Helper;
 
-use Chisel\Module\Ajax;
+use Chisel\Controllers\AjaxController;
 
 /**
  * Helper functions.
@@ -17,7 +17,7 @@ class AjaxHelpers {
 	 * @return string
 	 */
 	public static function get_ajax_endpoint_url() {
-		return sprintf( '%s/wp-json/%s/%s', esc_url( get_bloginfo( 'url' ) ), Ajax::ROUTE_NAMESPACE, Ajax::ROUTE_BASE );
+		return sprintf( '%s/wp-json/%s/%s', esc_url( get_bloginfo( 'url' ) ), AjaxController::ROUTE_NAMESPACE, AjaxController::ROUTE_BASE );
 	}
 
 	/**

package/lib/commands/create/creators/app/chisel-starter-theme/inc/Helper/YoastHelpers.php

@@ -10,7 +10,7 @@ namespace Chisel\Helper;
 class YoastHelpers {
 
 	/**
-	 * Check if Gravity Forms plugin is active.
+	 * Check if Yoast plugin is active.
 	 *
 	 * @return bool
 	 */

package/lib/commands/create/creators/app/chisel-starter-theme/inc/Plugin/Woocommerce.php

@@ -59,6 +59,8 @@ class Woocommerce implements InstanceInterface, HooksInterface {
 
 		add_action( 'woocommerce_before_shop_loop', array( $this, 'before_shop_loop_div_open' ), 19 );
 		add_action( 'woocommerce_before_shop_loop', array( $this, 'before_shop_loop_div_close' ), 31 );
+
+		add_action( 'customize_register', array( $this, 'modify_customizer' ), 20 );
 	}
 
 	/**
@@ -78,6 +80,12 @@ class Woocommerce implements InstanceInterface, HooksInterface {
 		remove_action( 'woocommerce_before_shop_loop_item', 'woocommerce_template_loop_product_link_open', 10 );
 		remove_action( 'woocommerce_after_shop_loop_item', 'woocommerce_template_loop_product_link_close', 5 );
 
+		// Remove loop category link open and close, so we can use our own.
+		remove_action( 'woocommerce_before_subcategory', 'woocommerce_template_loop_category_link_open', 10 );
+		remove_action( 'woocommerce_after_subcategory', 'woocommerce_template_loop_category_link_close', 10 );
+		// Remove category default thumbnail.
+		remove_action( 'woocommerce_before_subcategory_title', 'woocommerce_subcategory_thumbnail', 10 );
+
 		remove_action( 'woocommerce_before_main_content', 'woocommerce_output_content_wrapper', 10 );
 		remove_action( 'woocommerce_after_main_content', 'woocommerce_output_content_wrapper_end', 10 );
 		remove_action( 'woocommerce_before_main_content', 'woocommerce_breadcrumb', 20 );
@@ -115,6 +123,26 @@ class Woocommerce implements InstanceInterface, HooksInterface {
 		echo ' </div> ';
 	}
 
+	/**
+	 * Modify woocommerce customizer settings.
+	 *
+	 * @param WP_Customize_Manager $wp_customize
+	 *
+	 * @return void
+	 */
+	public function modify_customizer( $wp_customize ) {
+		$shop_page_display_control     = $wp_customize->get_control( 'woocommerce_shop_page_display' );
+		$category_page_display_control = $wp_customize->get_control( 'woocommerce_category_archive_display' );
+
+		if ( $shop_page_display_control && isset( $shop_page_display_control->choices ) ) {
+				unset( $shop_page_display_control->choices['both'] );
+		}
+
+		if ( $category_page_display_control && isset( $category_page_display_control->choices ) ) {
+				unset( $category_page_display_control->choices['both'] );
+		}
+	}
+
 	/**
 	 * Register woocommerce sidebars.
 	 *

package/lib/commands/create/creators/app/chisel-starter-theme/inc/WP/Acf.php

@@ -5,7 +5,6 @@ namespace Chisel\WP;
 use Chisel\Interfaces\InstanceInterface;
 use Chisel\Interfaces\HooksInterface;
 use Chisel\Traits\Singleton;
-use Chisel\Module\AcfSync;
 use Chisel\Factory\RegisterAcfOptionsPage;
 
 /**
@@ -39,10 +38,6 @@ class Acf implements InstanceInterface, HooksInterface {
 
 		$this->action_hooks();
 		$this->filter_hooks();
-
-		if ( class_exists( '\ACF_Admin_Internal_Post_Type_List' ) ) {
-			AcfSync::get_instance();
-		}
 	}
 
 	/**
@@ -115,4 +110,16 @@ class Acf implements InstanceInterface, HooksInterface {
 			}
 		}
 	}
+
+	/**
+	 * Register ACF options pages.
+	 *
+	 * @param array  $data
+	 * @param string $type
+	 *
+	 * @return void
+	 */
+	private function register_options_page( $data, $type = 'page' ) {
+		( new RegisterAcfOptionsPage( $data, $type ) )->register();
+	}
 }

package/lib/commands/create/creators/app/chisel-starter-theme/inc/WP/ChiselProduct.php

@@ -18,7 +18,14 @@ class ChiselProduct extends TimberPost {
 	 *
 	 * @var html
 	 */
-	public $thumbnail_html;
+	public $thumbnail_html = null;
+
+	/**
+	 * Category thumbnail id.
+	 *
+	 * @var int
+	 */
+	public $thumbnail_id = null;
 
 	/**
 	 * Get the product thumbnail. Returns the thumbnail responsive image html.
@@ -27,16 +34,33 @@ class ChiselProduct extends TimberPost {
 	 * @return html
 	 */
 	public function get_thumbnail( $size = 'woocommerce_thumbnail' ) {
-		if ( ! $this->thumbnail_html ) {
-			$thumbnail_html = has_post_thumbnail( $this->ID ) ? ImageHelpers::get_responsive_image( get_post_thumbnail_id( $this->ID ), $size ) : '';
+		$size = apply_filters( 'single_product_archive_thumbnail_size', $size );
 
-			if ( ! $thumbnail_html ) {
-				$thumbnail_html = wc_placeholder_img( $size );
-			}
+		if ( $this->thumbnail_html === null ) {
+			$thumbnail_id = $this->get_thumbnail_id( $size );
 
-			$this->thumbnail_html = $thumbnail_html;
+			$this->thumbnail_html = $thumbnail_id ? ImageHelpers::get_responsive_image( $thumbnail_id, $size ) : '';
 		}
 
 		return $this->thumbnail_html;
 	}
+
+	/**
+	 * Get the product thumbnail id
+	 *
+	 * @return int
+	 */
+	public function get_thumbnail_id() {
+		if ( $this->thumbnail_id === null ) {
+			$thumbnail_id = get_post_thumbnail_id( $this->ID );
+
+			if ( ! $thumbnail_id ) {
+				$thumbnail_id = get_option( 'woocommerce_placeholder_image', 0 );
+			}
+
+			$this->thumbnail_id = $thumbnail_id;
+		}
+
+		return $this->thumbnail_id;
+	}
 }

package/lib/commands/create/creators/app/chisel-starter-theme/inc/WP/ChiselProductCategory.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace Chisel\WP;
+
+use Timber\Term as TimberTerm;
+use Chisel\Helper\ImageHelpers;
+
+/**
+ * Extend Timber Term class with custom functionality.
+ *
+ * @package Chisel
+ */
+class ChiselProductCategory extends TimberTerm {
+
+	/**
+	 * Category thumbnail.
+	 *
+	 * @var html
+	 */
+	public $thumbnail_html = null;
+
+	/**
+	 * Category thumbnail id.
+	 *
+	 * @var int
+	 */
+	public $thumbnail_id = null;
+
+	/**
+	 * Get the product thumbnail. Returns the thumbnail responsive image html.
+	 *
+	 * @param string $size Thumbnail size.
+	 *
+	 * @return html
+	 */
+	public function get_thumbnail( $size = 'woocommerce_thumbnail' ) {
+		$size = apply_filters( 'subcategory_archive_thumbnail_size', $size );
+
+		if ( $this->thumbnail_html === null ) {
+			$thumbnail_id = $this->get_thumbnail_id( $size );
+
+			$this->thumbnail_html = $thumbnail_id ? ImageHelpers::get_responsive_image( $thumbnail_id, $size ) : '';
+		}
+
+		return $this->thumbnail_html;
+	}
+
+	/**
+	 * Get the product thumbnail id.
+	 *
+	 * @return int
+	 */
+	public function get_thumbnail_id() {
+		if ( $this->thumbnail_id === null ) {
+			$thumbnail_id = $this->meta( 'thumbnail_id' );
+
+			if ( ! $thumbnail_id ) {
+				$thumbnail_id = get_option( 'woocommerce_placeholder_image', 0 );
+			}
+
+			$this->thumbnail_id = $thumbnail_id;
+		}
+
+		return $this->thumbnail_id;
+	}
+}

package/lib/commands/create/creators/app/chisel-starter-theme/inc/WP/Site.php

@@ -92,7 +92,8 @@ class Site extends TimberSite implements InstanceInterface, HooksInterface {
 	 */
 	public function term_classmap( $classmap ) {
 		$custom_classmap = array(
-			'category' => ChiselTerm::class,
+			'category'    => ChiselTerm::class,
+			'product_cat' => ChiselProductCategory::class,
 		);
 
 		return array_merge( $classmap, $custom_classmap );

package/lib/commands/create/creators/app/chisel-starter-theme/src/scripts/modules/slider.js

@@ -312,6 +312,12 @@ class Slider {
         slideImg.removeAttribute(attr);
       });
 
+      if (!thumbnailUrl) {
+        throw new Error(
+          'data-thumbnail-url attribute must be present on each swiper-slide element.',
+        );
+      }
+
       const imageSize = thumbnailUrl.match(/(\d+)x(\d+)\./i);
 
       if (imageSize?.[2]) {

package/lib/commands/create/creators/app/chisel-starter-theme/twig_cs.php

@@ -4,8 +4,8 @@ declare(strict_types=1);
 use FriendsOfTwig\Twigcs;
 
 $finder_1 = Twigcs\Finder\TemplateFinder::create()->in( __DIR__ . '/views' );
-$finder_2 = Twigcs\Finder\TemplateFinder::create()->in( __DIR__ . '/build/blocks' );
-$finder_3 = Twigcs\Finder\TemplateFinder::create()->in( __DIR__ . '/build/blocks-acf' );
+$finder_2 = Twigcs\Finder\TemplateFinder::create()->in( __DIR__ . '/src/blocks' );
+$finder_3 = Twigcs\Finder\TemplateFinder::create()->in( __DIR__ . '/src/blocks-acf' );
 
 return Twigcs\Config\Config::create()
 	->addFinder( $finder_1 )

package/lib/commands/create/creators/app/chisel-starter-theme/views/woocommerce/archive-product.twig

@@ -34,15 +34,19 @@
   <div class="o-layout">
     <div class="{{ bem('o-layout__item', (sidebar ? '8' : '12') ~ '-large') }}">
       <div class="c-posts-items c-shop-items {{ loop_columns_class }} js-load-more-container">
-      {% if products is not empty %}
-        {% for post in products %}
+      {% if items is not empty %}
+        {% for item in items %}
 
           {#
           * Hook: woocommerce_shop_loop.
           #}
           {% do action('woocommerce_shop_loop') %}
 
-          {% include "woocommerce/content-product.twig" with {post: post} %}
+          {% if show_products %}
+            {% include "woocommerce/content-product.twig" with {post: item} %}
+          {% else %}
+            {% include "woocommerce/content-product-cat.twig" with {term: item} %}
+          {% endif %}
         {% endfor %}
 
         {#
@@ -61,7 +65,7 @@
       {% endif %}
       </div>
 
-      {% if products is not empty %}
+      {% if items is not empty and show_products %}
         {% include 'components/pagination.twig' with {type: 'load-more'} %}
       {% endif %}
     </div>

package/lib/commands/create/creators/app/chisel-starter-theme/views/woocommerce/content-product-cat.twig

@@ -0,0 +1,42 @@
+<article class="c-product-item c-product-item--category c-post-card">
+  <div class="c-product-item__inner">
+
+    {#
+     * Hook: woocommerce_before_subcategory.
+    *
+    * @hooked woocommerce_template_loop_category_link_open - 10 (Removed by the theme)
+    #}
+    {% do action('woocommerce_before_subcategory', term) %}
+
+    <a class="c-product-item__content" href="{{ term.link }}">
+      {#
+      * Hook: woocommerce_before_subcategory_title.
+      *
+      * hooked woocommerce_subcategory_thumbnail - 10 (Removed by the theme)
+      #}
+      {% do action('woocommerce_before_subcategory_title', term) %}
+
+      <h2 class="c-product-item__title">{{ term.title }}</h2>
+
+      {#
+      * Hook: woocommerce_after_subcategory_title.
+      #}
+      {% do action('woocommerce_after_subcategory_title') %}
+
+      {% if term.get_thumbnail() %}
+        <div class="c-product-item__image">
+          {{ term.get_thumbnail() }}
+        </div>
+      {% endif %}
+
+    </a>
+
+    {#
+    * Hook: woocommerce_after_subcategory.
+    *
+    * @hooked woocommerce_template_loop_category_link_close - 10 (Removed by the theme)
+    #}
+    {% do action('woocommerce_after_subcategory', term) %}
+
+  </div>
+</article>

package/lib/commands/create/creators/app/chisel-starter-theme/woocommerce.php

@@ -16,11 +16,11 @@ if ( is_singular( 'product' ) ) {
 	$context['product'] = wc_get_product( $context['post']->ID );
 
 	// Get upsells ids.
-	$upsells_ids = $context['product']->get_upsell_ids();
+	$upsells_ids = apply_filters( 'chisel_woocommerce_upsell_display', true ) ? $context['product']->get_upsell_ids() : array();
 
 	// Get related / crossells products ids.
 	$related_limit = wc_get_loop_prop( 'columns' );
-	$related_ids   = wc_get_related_products( $context['post']->id, $related_limit, $upsells_ids );
+	$related_ids   = apply_filters( 'chisel_woocommerce_output_related_products', true ) ? wc_get_related_products( $context['post']->id, $related_limit, $upsells_ids ) : array();
 
 	$context['upsells_products'] = $upsells_ids ? Timber::get_posts( $upsells_ids ) : array();
 	$context['related_products'] = $related_ids ? Timber::get_posts( $related_ids ) : array();
@@ -32,26 +32,36 @@ if ( is_singular( 'product' ) ) {
 
 	Timber::render( 'woocommerce/single-product.twig', $context, CacheHelpers::expiry() );
 } else {
-	$products     = Timber::get_posts();
+	$display_type  = woocommerce_get_loop_display_mode();
+	$show_products = true;
+	$categories    = array();
+
+	if ( $display_type === 'subcategories' ) {
+		$categories = woocommerce_get_product_subcategories( is_product_category() ? get_queried_object_id() : 0 );
+
+		$show_products = empty( $categories );
+	}
+
+	if ( $show_products ) {
+		$items = Timber::get_posts();
+	} else {
+		$items = array_map( 'Timber::get_term', $categories );
+	}
+
 	$has_sidebar  = ! empty( $context['sidebar'] );
 	$loop_columns = wc_get_loop_prop( 'columns' );
 	$loop_rows    = wc_get_default_product_rows_per_page();
 
 	$grid_classnames = WoocommerceHelpers::get_products_grid_classnames( $products, $has_sidebar );
 
-	$context['products']           = $products;
+	$context['show_products']      = $show_products;
+	$context['items']              = $items;
+	$context['categories']         = $categories;
 	$context['loop_columns_class'] = $grid_classnames;
 	$context['load_more']          = array(
 		'per_page'  => absint( $loop_columns * $loop_rows ),
 		'post_type' => 'product',
 	);
 
-	if ( is_product_category() ) {
-		$queried_object      = get_queried_object();
-		$term_id             = $queried_object->term_id;
-		$context['category'] = get_term( $term_id, 'product_cat' );
-		$context['title']    = single_term_title( '', false );
-	}
-
 	Timber::render( 'woocommerce/archive-product.twig', $context, CacheHelpers::expiry() );
 }

package/lib/commands/create/creators/wp/index.js

@@ -165,6 +165,7 @@ module.exports = (api) => {
       'install',
       'disable-emojis',
       'https://github.com/wp-premium/advanced-custom-fields-pro/archive/master.zip',
+      'xfive-sync-watcher-for-acf',
       { activate: true },
     ]);
   });

package/lib/commands/create/creators/wp-plugins/index.js

@@ -6,6 +6,7 @@ module.exports = (api) => {
 
   api.schedule(api.PRIORITIES.PROMPT, async () => {
     console.log('Advanced Custom Fields Pro is installed by default.');
+    console.log('X5 Plato - Reliable Sync Watcher for ACF is installed by default.');
 
     await api.prompt([
       {

package/lib/commands/create/creators/wp-plugins/plugins.json

@@ -3,6 +3,7 @@
     "WP Premium: Gravity Forms": "https://github.com/pronamic/gravityforms/archive/master.zip",
     "SVG Support": "svg-support",
     "Yoast SEO": "wordpress-seo",
-    "Yoast SEO ACF": "acf-content-analysis-for-yoast-seo"
+    "Yoast SEO ACF": "acf-content-analysis-for-yoast-seo",
+    "X5 Aristotle - Monitor Site Errors with Sentry": "xfive-sentry-integration"
   }
 }

package/lib/commands/create/packages-versions.js

@@ -1,5 +1,5 @@
 module.exports = {
   'chisel-scripts': '2.0.0-2.0.0-alpha.8.1',
   'chisel-shared-utils': '2.0.0-alpha.1',
-  'generator-chisel': '2.0.0',
+  'generator-chisel': '2.1.1',
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-chisel",
-  "version": "2.0.0",
+  "version": "2.1.1",
   "description": "A generator for scaffolding front-end and WordPress projects",
   "bin": {
     "chisel": "bin/chisel.js"
@@ -37,5 +37,5 @@
     "tinyqueue": "^2.0.3",
     "update-notifier": "^4.1.0"
   },
-  "gitHead": "1c7715ab7398126f66ff0155133481a9cb863b83"
+  "gitHead": "5ce0d679d897e7cc1ed936bddf6d50aa9cab3ea1"
 }

package/lib/commands/create/creators/app/chisel-starter-theme/inc/Module/AcfSync.php

@@ -1,223 +0,0 @@
-<?php
-
-namespace Chisel\Module;
-
-use Chisel\Interfaces\InstanceInterface;
-use Chisel\Interfaces\HooksInterface;
-use Chisel\Traits\Singleton;
-
-/**
- * ACF related functionalities.
- *
- * @package Chisel
- */
-class AcfSync extends \ACF_Admin_Internal_Post_Type_List implements InstanceInterface, HooksInterface {
-
-	use Singleton;
-
-	/**
-	 * The acf groups post type.
-	 *
-	 * @var string
-	 */
-	public $post_type = 'acf-field-group';
-
-	/**
-	 * The acf groups sync data.
-	 *
-	 * @var array
-	 */
-	public $sync = array();
-
-	/**
-	 * The acf group single post id.
-	 *
-	 * @var null|int
-	 */
-	private $post_id = null;
-
-	/**
-	 * The key of acf field group to sync.
-	 *
-	 * @var null|string
-	 */
-	private $single_post_key = null;
-
-	/**
-	 * The acf groups sync page url.
-	 *
-	 * @var string
-	 */
-	private $sync_page_url = '';
-
-	/**
-	 * ACF section current page
-	 *
-	 * @var string
-	 */
-	public $view = '';
-
-
-	/**
-	 * Class constructor.
-	 */
-	private function __construct() {
-		$this->action_hooks();
-		$this->filter_hooks();
-	}
-
-	/**
-	 * Register action hooks.
-	 */
-	public function action_hooks() {
-		add_action( 'admin_notices', array( $this, 'acf_sync_notice' ) );
-		add_action( 'init', array( $this, 'set_properties' ) );
-
-		add_filter( 'chisel_admin_styles', array( $this, 'load_plugin_scripts' ) );
-		add_filter( 'chisel_admin_scripts', array( $this, 'load_plugin_scripts' ) );
-	}
-
-	/**
-	 * Register filter hooks.
-	 */
-	public function filter_hooks() {
-	}
-
-	/**
-	 * Set properties.
-	 */
-	public function set_properties() {
-		if ( wp_doing_ajax() || wp_doing_cron() ) {
-			return;
-		}
-
-		// Stop if parent method doesn't exist.
-		if ( ! method_exists( $this, 'setup_sync' ) ) {
-			return;
-		}
-
-		global $pagenow;
-		$this->view = acf_request_arg( 'post_status', '' );
-
-		if ( $pagenow === 'edit.php' && isset( $_GET['post_type'] ) && sanitize_text_field( wp_unslash( $_GET['post_type'] ) ) === $this->post_type ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			$this->view = 'all';
-		}
-
-		if ( $pagenow === 'post.php' && isset( $_GET['post'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			$post_id   = absint( $_GET['post'] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			$post_type = get_post_type( $post_id );
-
-			if ( $post_type === $this->post_type ) {
-				$this->post_id = $post_id;
-				$this->view    = 'single';
-			}
-		}
-
-		if ( ! $this->view ) {
-			return;
-		}
-
-		// Check for unsynced fields groups. Call a parent method.
-		$this->setup_sync();
-
-		if ( $this->view === 'single' && $this->sync ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			foreach ( $this->sync as $key => $field_group ) {
-				if ( $field_group['ID'] === $this->post_id ) {
-					$this->single_post_key = $key;
-
-					break;
-				}
-			}
-		}
-
-		$this->sync_page_url = add_query_arg(
-			array(
-				'post_type'   => $this->post_type,
-				'post_status' => 'sync',
-			),
-			admin_url( 'edit.php' )
-		);
-	}
-
-	/**
-	 * Enqueue plugin scripts
-	 *
-	 * @param array $scripts
-	 *
-	 * @return array
-	 */
-	public function load_plugin_scripts( $scripts ) {
-		$scripts['acf-sync'] = array();
-
-		return $scripts;
-	}
-
-	/**
-	 * Check if sync notice needs to be displayed.
-	 *
-	 * @return void
-	 */
-	public function acf_sync_notice() {
-		if ( $this->post_id && $this->single_post_key ) { // We're on a single page.
-			$this->display_modal_notice();
-		} elseif ( $this->sync ) {
-			$this->display_admin_notice();
-		}
-	}
-
-	/**
-	 * Display ACF sync admin notice.
-	 *
-	 * @return void
-	 */
-	private function display_admin_notice() {
-		?>
-		<div class="error">
-			<p><?php esc_html_e( 'You have unsynced ACF fields.', 'chisel' ); ?> <a href="<?php echo esc_url( $this->sync_page_url ); ?>"><?php esc_html_e( ' View fields available for sync', 'chisel' ); ?></a></p>
-		</div>
-		<?php
-	}
-
-	/**
-	 * Display ACF sync modal notice.
-	 *
-	 * @return void
-	 */
-	private function display_modal_notice() {
-		$url = $this->get_admin_url( '&acfsync=' . $this->single_post_key . '&_wpnonce=' . wp_create_nonce( 'bulk-posts' ) );
-		?>
-		<div class="xfive-acf-sync-modal js-xfive-acf-sync-modal is-open" role="dialog">
-			<div class="xfive-acf-sync-modal__box">
-				<div class="xfive-acf-sync-modal__content">
-					<div class="xfive-acf-sync-modal__icon">
-						<svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20">
-							<path stroke="#d63638" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 11V6m0 8h.01M19 10a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z"></path>
-						</svg>
-					</div>
-
-					<h3>
-						<?php esc_html_e( 'The field group you are editing has not been synced with your local acf json file.', 'chisel' ); ?>
-						<?php esc_html_e( 'Making any changes will overwrite the local json file and result in losing data.', 'chisel' ); ?>
-						<?php esc_html_e( 'This is irreversible.', 'chisel' ); ?>
-					</h3>
-
-					<div class="xfive-acf-sync-modal__actions">
-						<a href="<?php echo esc_url( $this->sync_page_url ); ?>" class="acf-btn"><?php esc_html_e( 'View changes', 'chisel' ); ?></a>
-						<a href="<?php echo esc_url( $url ); ?>" class="acf-btn"><?php esc_html_e( 'Sync data', 'chisel' ); ?></a>
-						<button type="button" class="acf-btn acf-btn-secondary js-xfive-acf-sync-modal-close"><?php esc_html_e( 'Ignore', 'chisel' ); ?></button>
-					</div>
-				</div>
-			</div>
-		</div>
-		<?php
-	}
-
-	/**
-	 *  Check if the sync notice scripts should be loaded.
-	 *
-	 * @return bool
-	 */
-	public static function load_scripts() {
-		return self::get_instance()->post_id && self::get_instance()->single_post_key;
-	}
-}

package/lib/commands/create/creators/app/chisel-starter-theme/src/scripts/acf-sync.js

@@ -1,26 +0,0 @@
-class XfiveACFSync {
-  constructor() {
-    this.modal = document.querySelector('.js-xfive-acf-sync-modal');
-
-    if (!this.modal) {
-      return;
-    }
-
-    this.classnames = {
-      open: 'is-open',
-    };
-
-    this.modalCloseButton = document.querySelector('.js-xfive-acf-sync-modal-close');
-
-    this.modalCloseHandler();
-  }
-
-  modalCloseHandler() {
-    this.modalCloseButton.addEventListener('click', () => {
-      this.modal.classList.remove(this.classnames.open);
-    });
-  }
-}
-
-// eslint-disable-next-line no-new
-new XfiveACFSync();

package/lib/commands/create/creators/app/chisel-starter-theme/src/styles/acf-sync.scss

@@ -1,64 +0,0 @@
-/* ACF Sync module styles */
-
-.xfive-acf-sync-modal {
-  position: fixed;
-  inset: 0;
-  z-index: 99999;
-  display: none;
-  align-items: center;
-  justify-content: center;
-  overflow: auto;
-  background-color: rgba(0, 0, 0, 50%);
-
-  &.is-open {
-    display: flex;
-  }
-}
-
-.xfive-acf-sync-modal__box {
-  width: 100%;
-  max-width: 500px;
-  padding: 16px;
-  margin-top: auto;
-  margin-bottom: auto;
-}
-
-.xfive-acf-sync-modal__content {
-  padding: 24px;
-  font-size: 20px;
-  line-height: 1.5;
-  text-align: center;
-  background-color: #fff;
-  border-radius: 8px;
-  box-shadow:
-    rgba(0, 0, 0, 0%) 0 0 0 0,
-    rgba(0, 0, 0, 0%) 0 0 0 0,
-    rgba(0, 0, 0, 10%) 0 1px 3px 0,
-    rgba(0, 0, 0, 10%) 0 1px 2px -1px;
-
-  h3 {
-    margin-bottom: 30px;
-    font-size: 18px !important;
-  }
-}
-
-.xfive-acf-sync-modal__actions {
-  display: grid;
-  grid-template-columns: repeat(3, 1fr);
-  gap: 16px;
-
-  a,
-  button {
-    justify-content: center;
-    font-size: 15px;
-  }
-}
-
-.xfive-acf-sync-modal__icon {
-  text-align: center;
-
-  svg {
-    width: 50px;
-    height: 50px;
-  }
-}