Import changes from develop

app/admin/Editor/Editor.php → app/Editor/Editor.php

@@ -11,7 +11,7 @@
  * @link      https://taproot-theme.com
  */
 
-namespace Taproot\Admin\Editor;
+namespace Taproot\Editor;
 
 use Hybrid\Contracts\Bootable;
 use Rootstrap\Styles\Styles;

app/Providers/AdminProvider.php → app/Providers/EditorProvider.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Admin service provider.
+ * Editor service provider.
  *
  * Service providers are essentially the bootstrapping code for your theme.
  * They allow you to add bindings to the container on registration
@@ -17,17 +17,16 @@
 namespace Taproot\Providers;
 
 use Hybrid\Tools\ServiceProvider;
-use Taproot\Admin\Editor\Editor;
+use Taproot\Editor\Editor;
 
 
 /**
- * Admin service provider class.
+ * Editor service provider class.
  *
  * @since  1.0.0
  * @access public
  */
-class AdminProvider extends ServiceProvider {
-
+class EditorProvider extends ServiceProvider {
 
 	/**
 	 * Register classes and bind to the container
@@ -39,7 +38,6 @@ class AdminProvider extends ServiceProvider {
 	public function register() {
 
 		$this->app->singleton( Editor::class );
-
 	}
 
 	/**
@@ -53,6 +51,5 @@ public function boot() {
 
 		// Boot the Editor class
         $this->app->resolve( Editor::class )->boot();
-
-	}
+    }
 }

app/Template/Template.php

@@ -115,7 +115,7 @@ public function path() {
      * @return void
      */
     public function register( $templates ) {
-        $templates->add('templates/page-builder.php', ['label' => __('Page Builder', 'taproot')]);
+        $templates->add('templates/builder.php', ['label' => __('Page Builder', 'taproot')]);
         $templates->add('templates/blank.php', ['label' => __('Blank Template', 'taproot')]);
         $templates->add('templates/blocks.php', ['label' => __('Block Editor Template', 'taproot')]);
     }

app/bootstrap-app.php

@@ -34,7 +34,7 @@
 
 $taproot->provider( \Taproot\Providers\AppProvider::class );
 $taproot->provider( \Taproot\Providers\RootstrapProvider::class );
-$taproot->provider( \Taproot\Providers\AdminProvider::class );
+$taproot->provider( \Taproot\Providers\EditorProvider::class );
 $taproot->provider( \Taproot\Providers\CustomizeProvider::class );
 $taproot->provider( \Taproot\Providers\TemplateProvider::class );
 

changelog.md

@@ -1,5 +1,11 @@
 # Change Log
 
+= 1.4.2 =
+* 10/23/19
+* Fix - Namespacing issue
+* Fix - Custom template name collision
+* Fix - Post meta template error
+
 = 1.4.1 =
 * 10/19/19
 * Fix - Javascript errors in customizer in WP 5.3

mix-manifest.json

@@ -1,16 +1,16 @@
 {
     "/dist/js/app.js": "/dist/js/app.js?id=ffdad5cc180bc057c6e0",
-    "/dist/css/screen.css": "/dist/css/screen.css?id=4b8603730bedd1f1bda6",
-    "/dist/css/editor.css": "/dist/css/editor.css?id=243a1da93a323a6311c5",
+    "/dist/css/screen.css": "/dist/css/screen.css?id=c3376b523837137d2187",
+    "/dist/css/editor.css": "/dist/css/editor.css?id=9ef7cfd0f6ec9f378318",
     "/dist/css/customize-controls.css": "/dist/css/customize-controls.css?id=5ae8a7ff21e1103df669",
-    "/dist/js/app.js.map": "/dist/js/app.js.map?id=a2e93c728f7280b8f9f2",
-    "/dist/css/screen.css.map": "/dist/css/screen.css.map?id=a9f8575bf55733a22e21",
-    "/dist/css/editor.css.map": "/dist/css/editor.css.map?id=e7eeacab6780227a5605",
-    "/dist/css/customize-controls.css.map": "/dist/css/customize-controls.css.map?id=12285aaf9fb63f8181c5",
+    "/dist/js/app.js.map": "/dist/js/app.js.map?id=b175560b67e1179afc1a",
+    "/dist/css/screen.css.map": "/dist/css/screen.css.map?id=46c01bd90ccd3f2adf45",
+    "/dist/css/editor.css.map": "/dist/css/editor.css.map?id=ead21ac1b3f883ca5801",
+    "/dist/css/customize-controls.css.map": "/dist/css/customize-controls.css.map?id=f9021e64b4c4abc75ae4",
     "/dist/js/customize-controls.js": "/dist/js/customize-controls.js?id=ca9d69746344466d7966",
-    "/dist/js/customize-controls.js.map": "/dist/js/customize-controls.js.map?id=d6331c71acddf9b3b3d6",
+    "/dist/js/customize-controls.js.map": "/dist/js/customize-controls.js.map?id=0cadd43af5538c6995b6",
     "/dist/js/customize-preview.js": "/dist/js/customize-preview.js?id=6789d67c883f52b5c3b3",
-    "/dist/js/customize-preview.js.map": "/dist/js/customize-preview.js.map?id=5164eccd1a37d1411f2f",
-    "/dist/js/editor.js": "/dist/js/editor.js?id=230e980708b71a115491",
-    "/dist/js/editor.js.map": "/dist/js/editor.js.map?id=393a5e53ee03548de25e"
+    "/dist/js/customize-preview.js.map": "/dist/js/customize-preview.js.map?id=ee5e74521731e8b2454d",
+    "/dist/js/editor.js": "/dist/js/editor.js?id=71043939d8a47bec92f9",
+    "/dist/js/editor.js.map": "/dist/js/editor.js.map?id=4ecb01516594a32a668e"
 }

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "taproot",
-	"version": "1.4.1",
+	"version": "1.4.2",
 	"description": "Taproot is a multipurpose theme built on Hybrid Core and the Mythic started theme",
 	"author": "Sky Shabatura",
 	"license": "GPL-2.0+",

readme.md

@@ -3,7 +3,7 @@ Contributors: skyshab
 Tags: custom-background, custom-header, custom-colors, custom-menu, featured-images, one-column, two-column, theme-options, block-editor-styles, threaded-comments, translation-ready
 Requires at least: 5.0
 Tested up to: 5.3
-Stable tag: 1.4.1
+Stable tag: 1.4.2
 
 A lightweight yet powerful all-purpose theme.
 

readme.txt

@@ -3,7 +3,7 @@ Contributors: skyshab
 Tags: custom-background, custom-header, custom-colors, custom-menu, featured-images, one-column, two-column, theme-options, block-editor-styles, threaded-comments, translation-ready
 Requires at least: 5.0
 Tested up to: 5.3
-Stable tag: 1.4.1
+Stable tag: 1.4.2
 
 A lightweight yet powerful all-purpose theme.
 

style.css

@@ -2,7 +2,7 @@
  * Theme Name:   Taproot
  * Theme URI:    https://taproot-theme.com
  * Description:  Taproot is a modern, full featured multipurpose theme for WordPress. Features include a variety of Customizer settings, hooks and filters for developers, and full support for the Gutenberg block editor.
- * Version:      1.4.1
+ * Version:      1.4.2
  * Author:       Sky Shabatura
  * Author URI:   https://sky.camp
  * Tags:         custom-background, custom-header, custom-colors, custom-menu, featured-images, theme-options, threaded-comments, translation-ready

views/partials/post-meta.php

@@ -56,24 +56,24 @@
 
 // Display Taxonomies
 if( !empty( $data['taxonomies'] ) ) {
-    foreach( $data['taxonomies'] as $taxonomy ) {
-        if( taxonomy_exists($taxonomy) ) {
+    foreach( $data['taxonomies'] as $tax ) {
+        if( taxonomy_exists($tax) ) {
 
             if( $data['icons'] ) {
-                $tax_label = ( is_taxonomy_hierarchical( $taxonomy ) ) ?
+                $tax_label = ( is_taxonomy_hierarchical( $tax ) ) ?
                     icon( 'categories', ['icon' => 'list-ul'] ) :
                     icon( 'tags', ['icon' => 'tags'] );
             }
             else {
-                $tax_labels = get_taxonomy_labels( get_taxonomy( $taxonomy ) );
-                $tax_label = sprintf('<span class="taproot-meta__item__label">%s:</span>', esc_html__($tax_labels->name, 'taproot') );
+                $tax_labels = get_taxonomy_labels( get_taxonomy( $tax ) );
+                $tax_label = sprintf('<span class="taproot-meta__item__label">%s:</span>', esc_html($tax_labels->name) );
             }
 
             display_terms([
-                'taxonomy' => $taxonomy,
-                'before' => sprintf( '<span class=" taproot-meta__item taproot-meta__item--%s">%s', $taxonomy, $tax_label ),
+                'taxonomy' => $tax,
+                'before' => sprintf( '<span class=" taproot-meta__item taproot-meta__item--%s">%s', $tax, $tax_label ),
                 'after' => '</span>',
-                'class' => sprintf( 'taproot-meta__terms taproot-meta__terms--%s', $taxonomy)
+                'class' => sprintf( 'taproot-meta__terms taproot-meta__terms--%s', $tax)
             ]);
         }
     }