| @@ -26,9 +26,13 @@ | ||
| 26 | 26 | public function __construct() |
| 27 | 27 | { |
| 28 | 28 | add_action('init', array($this, 'blockspare_blocks_block_assets' )); |
| 29 | 29 | add_action('enqueue_block_editor_assets', array($this,'blockspare_create_block')); |
| 30 | - add_action('wp_enqueue_scripts', array($this,'blockspare_load_scripts')); | |
| 30 | + if (version_compare(get_bloginfo('version') , '5.8', '<')) { | |
| 31 | + add_action('wp_enqueue_scripts', array($this,'blockspare_load_scripts')); | |
| 32 | + }else{ | |
| 33 | + add_action('enqueue_block_assets', array($this,'blockspare_load_scripts')); | |
| 34 | + } | |
| 31 | 35 | add_action('plugins_loaded', array($this,'blockspare_blocks_loader')); |
| 32 | 36 | add_action( 'rest_api_init', array($this,'blockspare_blocks_register_api_endpoints' )); |
| 33 | 37 | |
| 34 | 38 | |
| @@ -56,10 +60,28 @@ | ||
| 56 | 60 | include(BLOCKSPARE_PLUGIN_DIR . '/admin/notice-upgrade.php'); |
| 57 | 61 | } |
| 58 | 62 | |
| 59 | 63 | function blockspare_load_scripts(){ |
| 60 | - if(has_blocks()){ | |
| 64 | + | |
| 65 | + wp_register_style( | |
| 66 | + 'fontawesome', | |
| 67 | + plugins_url('assets/fontawesome/css/all.css', dirname(__FILE__)), | |
| 68 | + array() | |
| 61 | 69 | |
| 70 | + ); | |
| 71 | + // Load the compiled styles. | |
| 72 | + wp_enqueue_style( | |
| 73 | + 'blockspare-frontend-block-style-css', | |
| 74 | + plugins_url('dist/style-blocks.css', dirname(__FILE__)), | |
| 75 | + array() | |
| 76 | + ); | |
| 77 | + | |
| 78 | + wp_register_style('slick', BLOCKSPARE_PLUGIN_URL . 'assets/slick/css/slick.css', array(), '', 'all'); | |
| 79 | + if (is_admin()){ | |
| 80 | + wp_enqueue_style('slick'); | |
| 81 | + } | |
| 82 | + //if(has_blocks()){ | |
| 83 | + | |
| 62 | 84 | wp_enqueue_style('fontawesome'); |
| 63 | 85 | $min = (SCRIPT_DEBUG == true) ? '' : '.min'; |
| 64 | 86 | wp_register_script('slick', BLOCKSPARE_PLUGIN_URL . 'assets/slick/js/slick.js', array('jquery'), '', true); |
| 65 | 87 | if(has_block('blockspare/blockspare-carousel' )|| has_block('blockspare/blockspare-slider' ) || has_block('blockspare/latest-posts-block-carousel-grid') || has_block('blockspare/blockspare-posts-block-slider')){ |
| @@ -83,9 +105,9 @@ | ||
| 83 | 105 | wp_localize_script('blockspare-pagination-js', 'blocsparePagination',array( |
| 84 | 106 | 'ajaxurl' => admin_url( 'admin-ajax.php' ), |
| 85 | 107 | 'nonce'=>wp_create_nonce('blockspare-load-more-nonce') |
| 86 | 108 | )); |
| 87 | - } | |
| 109 | + //} | |
| 88 | 110 | |
| 89 | 111 | |
| 90 | 112 | } |
| 91 | 113 | |
| @@ -125,14 +147,17 @@ | ||
| 125 | 147 | 'blockspare-block-edit-style', |
| 126 | 148 | BLOCKSPARE_PLUGIN_URL . 'dist/blocks.css', |
| 127 | 149 | array('wp-edit-blocks') |
| 128 | 150 | ); |
| 151 | + wp_enqueue_script('blockspare-design-btn', BLOCKSPARE_PLUGIN_URL.'dist/block_design_btn.js',array( 'blockspare-blocks-block-js'), $script_info['version'], true); | |
| 152 | + wp_enqueue_script('blockspare-design', BLOCKSPARE_PLUGIN_URL.'dist/block_design.js',array( 'blockspare-blocks-block-js'), $script_info['version'], true); | |
| 153 | + wp_enqueue_style('blockspare-design', BLOCKSPARE_PLUGIN_URL.'dist/block_design.css',array( 'blockspare-block-edit-style')); | |
| 129 | 154 | endif; |
| 130 | 155 | |
| 131 | 156 | |
| 132 | 157 | $blockspare_priview_img_url = BLOCKSPARE_PLUGIN_URL . 'assets/blockspare-placeholder-img.jpg'; |
| 133 | 158 | $blockspare_food_img_url = BLOCKSPARE_PLUGIN_URL . 'assets/blockspare-placeholder-img-square.jpg'; |
| 134 | - | |
| 159 | + $blockspare_dashboard_logo = BLOCKSPARE_PLUGIN_URL . 'assets/images/blockspare-logo.png'; | |
| 135 | 160 | $taxonomies = get_categories(); |
| 136 | 161 | $txnm = array(); |
| 137 | 162 | |
| 138 | 163 | foreach( $taxonomies as $type ) { |
| @@ -151,9 +176,12 @@ | ||
| 151 | 176 | array( |
| 152 | 177 | 'srcUrl' => untrailingslashit(plugins_url('/', BLOCKSPARE_BASE_DIR . '/dist/')), |
| 153 | 178 | 'rest_url' => esc_url(rest_url()), |
| 154 | 179 | 'img' => $blockspare_priview_img_url, |
| 180 | + 'homeUrl'=>home_url(), | |
| 181 | + 'blogUrl'=>get_site_url(), | |
| 155 | 182 | 'menu_img_url' => $blockspare_food_img_url, |
| 183 | + 'logo'=>$blockspare_dashboard_logo, | |
| 156 | 184 | 'postTypes' => $this->aft_get_post_types(), |
| 157 | 185 | 'taxonomies' => $this->aft_get_taxonomies(), |
| 158 | 186 | 'postQueryEndpoint'=>'aft/v1/post-query', |
| 159 | 187 | 'config' => '', |
| @@ -219,8 +247,9 @@ | ||
| 219 | 247 | |
| 220 | 248 | function blockspare_blocks_loader(){ |
| 221 | 249 | |
| 222 | 250 | if ( PHP_VERSION_ID >= 50600 ) { |
| 251 | + require_once BLOCKSPARE_PLUGIN_DIR .'inc/layout/class-image-importer.php'; | |
| 223 | 252 | require_once BLOCKSPARE_PLUGIN_DIR . 'inc/layout/functions.php'; |
| 224 | 253 | require_once BLOCKSPARE_PLUGIN_DIR . 'inc/layout/registry.php'; |
| 225 | 254 | require_once BLOCKSPARE_PLUGIN_DIR . 'inc/layout/components.php'; |
| 226 | 255 | |
| @@ -242,8 +271,9 @@ | ||
| 242 | 271 | include(BLOCKSPARE_PLUGIN_DIR . '/inc/latest-post-block/posts-grid/index.php'); |
| 243 | 272 | include(BLOCKSPARE_PLUGIN_DIR . '/inc/latest-post-block/posts-list/index.php'); |
| 244 | 273 | |
| 245 | 274 | include(BLOCKSPARE_PLUGIN_DIR . '/inc/latest-post-block/posts-express-grid/index.php'); |
| 275 | + include(BLOCKSPARE_PLUGIN_DIR . '/inc/latest-post-block/posts-express-grid/post-content.php'); | |
| 246 | 276 | |
| 247 | 277 | |
| 248 | 278 | include(BLOCKSPARE_PLUGIN_DIR . '/inc/latest-post-block/posts-carousel-grid/index.php'); |
| 249 | 279 | include(BLOCKSPARE_PLUGIN_DIR . '/inc/latest-post-block/posts-slider/index.php'); |
| @@ -249,8 +279,9 @@ | ||
| 249 | 279 | include(BLOCKSPARE_PLUGIN_DIR . '/inc/latest-post-block/posts-slider/index.php'); |
| 250 | 280 | |
| 251 | 281 | include(BLOCKSPARE_PLUGIN_DIR . '/inc/post-banner/banner-1/index.php'); |
| 252 | 282 | include(BLOCKSPARE_PLUGIN_DIR . '/inc/post-banner/banner-2/index.php'); |
| 283 | + include(BLOCKSPARE_PLUGIN_DIR . '/inc/post-banner/banner-9/index.php'); | |
| 253 | 284 | include(BLOCKSPARE_PLUGIN_DIR . 'inc/block-posts-config/ajax-pagination.php'); |
| 254 | 285 | include(BLOCKSPARE_PLUGIN_DIR . 'inc/block-posts-config/class-post-rest-api.php'); |
| 255 | 286 | include(BLOCKSPARE_PLUGIN_DIR . 'inc/block-posts-config/class-multiauthor-backend.php'); |
| 256 | 287 | include(BLOCKSPARE_PLUGIN_DIR . 'inc/block-posts-config/class-multiauthor-frontend.php'); |