Update to 1.1.0

Author: elzadj

core/admin/admin.scss

@@ -215,10 +215,11 @@ body.toplevel_page_maxi-blocks-dashboard {
 						transition: 0.3s;
 					}
 					.sign-up_button-wrap {
-						display: flex;
-						align-items: center;
-						column-gap: 10px;
-						margin-top: 24px;
+						// display: flex;
+						// align-items: center;
+						// column-gap: 10px;
+						// margin-top: 24px;
+						margin-top: 40px;
 					}
 					.maxi-dashboard_main-content_accordion {
 						max-width: 642px;
@@ -519,6 +520,10 @@ body.toplevel_page_maxi-blocks-dashboard {
 			}
 		}
 	}
+
+	.maxi-dashboard-how-to-image {
+		max-width: 700px;
+	}
 }
 
 @media only screen and (max-width: 1390px) {

core/admin/class-maxi-dashboard.php

@@ -838,9 +838,13 @@ public function maxi_blocks_pro()
             // $content .= '<p>'.__('I want to join', self::$maxi_text_domain).'</p>';
             $content .= '<div class="sign-up_button-wrap">';
             $content .= '<a href="https://maxiblocks.com/go/pricing" target="_blank" class="sign-up_button">'.__('Sign up', self::$maxi_text_domain).'</a>';
-            $content .= '<p>'.__('Already have an account? ', self::$maxi_text_domain);
-            $content .= '<a href="https://maxiblocks.com/go/user-login" target="_blank">'.__('Sign in', self::$maxi_text_domain).'</a>';
+            $content .= '<br/><br/><br/><p>'.__('Already have an account? ', self::$maxi_text_domain);
             $content .= '</p>';
+            $content .= '<p>Sign in from the template library like this.</p>';
+            $content .= '<p>Step 1. Launch template library from the page edit screen.</p>';
+            $content .= '<img class="maxi-dashboard-how-to-image" src="'.esc_url(MAXI_PLUGIN_URL_PATH).'img/how-to-log-in-1.png"/>';
+            $content .= '<p>Step 2. Add email and sign in.</p>';
+            $content .= '<img class="maxi-dashboard-how-to-image" src="'.esc_url(MAXI_PLUGIN_URL_PATH).'img/how-to-log-in-2.png"/>';
             $content .= '</div>';
             $content .= '<ul class="not_loggedin-bottom-menu">';
             $content .= '<li><a href="https://maxiblocks.com/go/help-desk" target="_blank">'.__('help desk', self::$maxi_text_domain).'</a></li>';

core/class-maxi-api.php

@@ -243,6 +243,13 @@ public function mb_register_routes()
                 'permission_callback' => function () {
                     return current_user_can('edit_posts');
                 },
+                'args' => [
+                    'data' => [
+                        'validate_callback' => function ($param) {
+                            return is_string($param);
+                        },
+                    ],
+                ],
             ]);
         }
 
@@ -767,13 +774,17 @@ public function get_maxi_blocks_pro_status()
 
         public function set_maxi_blocks_pro_status($data)
         {
-            $dataString = json_encode($data);
+            $dataString = $data['data'];
+            $dataType = gettype($dataString);
+            if(get_option('maxi_pro')) {
+                $oldData = json_decode(get_option('maxi_pro'));
+
+            }
 
             if($dataString) {
                 update_option('maxi_pro', $dataString);
                 return $dataString;
             }
-
             return false;
         }
     }

core/class-maxi-style-cards.php

@@ -1,6 +1,6 @@
 <?php
 require_once MAXI_PLUGIN_DIR_PATH . 'core/utils/get-last-breakpoint-attribute.php';
-include MAXI_PLUGIN_DIR_PATH . 'core/defaults/sc_defaults.php';
+require_once MAXI_PLUGIN_DIR_PATH . 'core/defaults/sc_defaults.php';
 
 
 class MaxiBlocks_StyleCards
@@ -47,6 +47,11 @@ public function enqueue_styles()
 
         $styles = $this->get_style_card_styles();
 
+        // MVP: ensure no margin-bottom for button
+        if (str_contains($styles, 'margin-bottom: var(--maxi-light-button-margin-bottom-general);')) {
+            $styles = str_replace('margin-bottom: var(--maxi-light-button-margin-bottom-general);', '', $styles);
+        }
+
         // SC styles
         if ($styles) {
             wp_register_style('maxi-blocks-sc-styles', false);
@@ -78,7 +83,7 @@ public function get_style_card_variables()
         $style_card = $this->get_style_card_object_from_db();
 
         if (!$style_card) {
-            if($GLOBALS['default_sc_variables_string']) {
+            if(isset($GLOBALS['default_sc_variables_string'])) {
                 return $GLOBALS['default_sc_variables_string'];
             }
 
@@ -103,7 +108,7 @@ public function get_style_card_variables()
         }
 
         if (!$style || empty($style) || $style === ':root{--maxi-active-sc-color:0,0,0;}') { // ':root{--maxi-active-sc-color:0,0,0;}' is the default value
-            if($GLOBALS['default_sc_variables_string']) {
+            if(isset($GLOBALS['default_sc_variables_string'])) {
                 return $GLOBALS['default_sc_variables_string'];
             }
 
@@ -118,7 +123,7 @@ public function get_style_card_styles()
         $style_card = $this->get_style_card_object_from_db();
 
         if (!$style_card) {
-            if($GLOBALS['default_sc_styles_string']) {
+            if(isset($GLOBALS['default_sc_styles_string'])) {
                 return $GLOBALS['default_sc_styles_string'];
             }
 
@@ -137,7 +142,7 @@ public function get_style_card_styles()
             !array_key_exists('_maxi_blocks_style_card_styles', $style_card) &&
             !array_key_exists('_maxi_blocks_style_card_styles_preview', $style_card)
         ) {
-            if($GLOBALS['default_sc_styles_string']) {
+            if(isset($GLOBALS['default_sc_styles_string'])) {
                 return $GLOBALS['default_sc_styles_string'];
             }
 
@@ -157,7 +162,7 @@ public function get_style_card_styles()
         }
 
         if (!$sc_variables || empty($sc_variables)) {
-            if($GLOBALS['default_sc_styles_string']) {
+            if(isset($GLOBALS['default_sc_styles_string'])) {
                 return $GLOBALS['default_sc_styles_string'];
             }
 
@@ -239,7 +244,7 @@ public static function get_maxi_blocks_style_card_fonts($block_style, $text_leve
          * Button case has an exception for font-family. If it's empty, it will use the
          * font-family of the paragraph text level.
          */
-        if ($text_level === 'button' && empty($font)) {
+        if ($text_level === 'button' && (empty($font) || empty(str_replace('"', '', $font)) || str_contains($font, 'undefined'))) {
             $font = $style_card_values->p['font-family-general'];
         }
 

core/class-maxi-styles.php

@@ -128,6 +128,13 @@ public function enqueue_styles()
         }
     }
 
+    public function get_template_name()
+    {
+        $template_name = wp_get_theme()->stylesheet ?? get_template();
+
+        return $template_name;
+    }
+
     public function get_template_parts($content)
     {
         if ($content && array_key_exists('template_parts', $content)) {
@@ -142,7 +149,7 @@ public function get_template_parts($content)
          * so it doesn't have template parts. In this case, we need to get default
          * template parts (header and footer).
          */
-        $theme_name = get_template();
+        $theme_name = $this->get_template_name();
         return [
             $theme_name . '//header',
             $theme_name . '//footer',
@@ -172,7 +179,7 @@ public function apply_content($name, $content, $id)
             if ($fonts) {
                 $this->enqueue_fonts($fonts, $name);
             }
-        } elseif (get_template() === 'maxi-theme' && $is_template_part) {
+        } elseif ($this->get_template_name() === 'maxi-theme' && $is_template_part) {
             do_action('maxi_enqueue_template_styles', $name, $id, $is_template);
         }
 
@@ -204,7 +211,7 @@ public function get_id($is_template = false)
         }
 
         $template_slug = get_page_template_slug();
-        $template_id = get_template() . '//';
+        $template_id = $this->get_template_name() . '//';
 
         if ($template_slug != '' && $template_slug !== false) {
             $template_id .= $template_slug;
@@ -724,10 +731,10 @@ public function set_home_to_front_page($post_id, $post, $update)
         global $wpdb;
 
         if (class_exists('MaxiBlocks_API')) {
-            $home_id =  get_template() . '//' . 'home';
+            $home_id =  $this->get_template_name() . '//' . 'home';
             $home_content = $this->get_content(true, $home_id);
 
-            $front_page_id = get_template() . '//' . 'front-page';
+            $front_page_id = $this->get_template_name() . '//' . 'front-page';
 
             $api = new MaxiBlocks_API();