diff --git a/includes/Data/Brands.php b/includes/Data/Brands.php
index 58506d68c..4e8620fd6 100644
--- a/includes/Data/Brands.php
+++ b/includes/Data/Brands.php
@@ -29,6 +29,7 @@ public static function get_brands() {
'accountUrl' => 'https://my.bluehost.com',
'domainsUrl' => 'https://my.bluehost.com/hosting/app?lil=1#/domains',
'emailUrl' => 'https://my.bluehost.com/hosting/app?lil=1#/email-office',
+ 'pluginDashboardPage' => \admin_url( 'admin.php?page=bluehost' ),
'phoneNumbers' => array(
'sales' => '844-303-1730',
'support' => '888-401-4678',
@@ -66,6 +67,9 @@ public static function get_brands() {
'utm_medium' => 'brand-plugin',
),
),
+ 'config' => array(
+ 'net_new_signup_date_threshold' => '2022-08-18T15:30:00.000Z',
+ ),
),
'bluehost-india' => array(
'brand' => 'bluehost-india',
@@ -82,6 +86,7 @@ public static function get_brands() {
'accountUrl' => 'https://my.bluehost.in',
'domainsUrl' => 'https://my.bluehost.in/hosting/app?lil=1#/domains',
'emailUrl' => 'https://my.bluehost.in/hosting/app?lil=1#/email-office',
+ 'pluginDashboardPage' => \admin_url( 'admin.php?page=bluehost' ),
'phoneNumbers' => array(
'support' => '1800-419-4426',
),
@@ -115,6 +120,9 @@ public static function get_brands() {
'utm_medium' => 'brand-plugin',
),
),
+ 'config' => array(
+ 'net_new_signup_date_threshold' => '2022-08-18T15:30:00.000Z',
+ ),
),
'webcom' => array(
'brand' => 'webcom',
@@ -166,7 +174,87 @@ public static function get_brands() {
'utm_medium' => '',
),
),
+ 'config' => array(
+ 'net_new_signup_date_threshold' => '2022-08-18T15:30:00.000Z',
+ ),
+ ),
+ 'crazy-domains' => array(
+ 'brand' => 'crazy-domains',
+ 'name' => 'Crazy Domains',
+ 'url' => 'https://www.crazydomains.com',
+ 'knowledgeBaseUrl' => 'https://www.crazydomains.com/learn/online-academy/',
+ 'helpUrl' => 'https://www.crazydomains.com/help',
+ 'blogUrl' => 'https://www.crazydomains.com/learn/',
+ 'facebookUrl' => 'https://www.facebook.com/crazydomains/',
+ 'twitterName' => '@crazydomains',
+ 'twitterUrl' => 'https://twitter.com/crazydomains',
+ 'youtubeUrl' => 'https://www.youtube.com/user/CrazyDomains',
+ 'linkedinUrl' => '',
+ 'accountUrl' => 'https://www.crazydomains.com/my-account/home/',
+ 'domainsUrl' => '',
+ 'emailUrl' => 'https://www.crazydomains.com/contact/',
+ 'pluginDashboardPage' => \admin_url( 'admin.php?page=crazy-domains' ),
+ 'phoneNumbers' => array(
+ 'support' => '2135592459',
+ ),
+ 'hireExpertsInfo' => array(
+ 'defaultLink' => 'https://www.crazydomains.com/help/',
+ 'fragment' => '',
+ 'queryParameters' => array(
+ 'utm_source' => 'wp-onboarding',
+ 'utm_medium' => 'brand-plugin',
+ 'utm_campaign' => 'wp-setup',
+ ),
+ ),
+ 'expertsInfo' => array(
+ 'defaultLink' => 'https://www.crazydomains.com/help/',
+ 'queryParams' => array(
+ 'utm_source' => 'wp-onboarding',
+ 'utm_medium' => 'brand-plugin',
+ ),
+ ),
+ 'fullServiceCreativeTeamInfo' => array(
+ 'defaultLink' => 'https://www.crazydomains.com/help/',
+ 'fragment' => '',
+ 'queryParams' => array(
+ 'utm_source' => 'wp-onboarding',
+ 'utm_medium' => 'brand-plugin',
+ ),
+ ),
+ 'techSupportInfo' => array(
+ 'defaultLink' => 'https://www.crazydomains.com/contact/',
+ 'queryParams' => array(
+ 'utm_source' => 'wp-onboarding',
+ 'utm_medium' => 'brand-plugin',
+ ),
+ ),
+ 'config' => array(
+ 'net_new_signup_date_threshold' => '2022-08-18T15:30:00.000Z',
+ 'views' => array(
+ 'sidebar' => array(
+ 'illustration' => array(
+ 'shown' => false,
+ ),
+ ),
+ ),
+ ),
),
);
}
+
+ /**
+ * Sets the hosting brand for which Onboarding is active.
+ *
+ * @param array $container The brand plugin container.
+ * @return void
+ */
+ public static function set_current_brand( $container ) {
+ if ( ! defined( 'NFD_ONBOARDING_PLUGIN_BRAND' ) ) {
+ $brand = $container->plugin()->brand;
+ if ( empty( $brand ) ) {
+ $brand = 'newfold';
+ }
+ define( 'NFD_ONBOARDING_PLUGIN_BRAND', sanitize_title_with_dashes( str_replace( '_', '-', $brand ) ) );
+ }
+ }
}
diff --git a/includes/Data/Data.php b/includes/Data/Data.php
index 8a29b2143..ea316b139 100644
--- a/includes/Data/Data.php
+++ b/includes/Data/Data.php
@@ -31,22 +31,14 @@ public static function runtime() {
/**
* Establish brand to apply to Onboarding experience.
*
- * [TODO]: Pull brand from container.
- *
* @return array
*/
public static function current_brand() {
-
- $brand = \get_option( Options::get_option_name( 'brand', false ), 'newfold' );
- // This case arises when the option mm_brand exists but has an empty string as it's value.
- if ( empty( $brand ) ) {
- $brand = 'newfold';
- }
- $brand = \apply_filters( 'nfd_module_onboarding_brand', sanitize_title_with_dashes( str_replace( '_', '-', $brand ) ) );
-
$brands = Brands::get_brands();
- return array_key_exists( $brand, $brands ) ? $brands[ $brand ] : array( 'brand' => $brand );
+ return array_key_exists( NFD_ONBOARDING_PLUGIN_BRAND, $brands ) ?
+ $brands[ NFD_ONBOARDING_PLUGIN_BRAND ] :
+ array( 'brand' => NFD_ONBOARDING_PLUGIN_BRAND );
}
@@ -60,11 +52,11 @@ public static function current_plan() {
$current_flow = Flows::get_flow_from_customer_data( $customer_data );
if ( false !== $current_flow ) {
- return array(
- 'flow' => $current_flow,
- 'subtype' => $customer_data['plan_subtype'],
- 'type' => $customer_data['plan_type'],
- );
+ return array(
+ 'flow' => $current_flow,
+ 'subtype' => $customer_data['plan_subtype'],
+ 'type' => $customer_data['plan_type'],
+ );
}
$current_flow = Flows::get_flow_from_params();
@@ -128,9 +120,9 @@ public static function current_flow() {
*/
public static function customer_data() {
if ( class_exists( 'NewfoldLabs\WP\Module\CustomerBluehost\CustomerBluehost' ) ) {
- return CustomerBluehost::collect();
+ return CustomerBluehost::collect();
}
- return array();
+ return array();
}
-} // END \NewfoldLabs\WP\Module\Onboarding\Data()
+}
diff --git a/includes/Data/Plugins.php b/includes/Data/Plugins.php
index 546653bc1..3b759f5b7 100644
--- a/includes/Data/Plugins.php
+++ b/includes/Data/Plugins.php
@@ -284,6 +284,20 @@ final class Plugins {
),
'wc_priority' => array(),
),
+ 'crazy-domains' => array(
+ 'wc_priority' => array(
+ array(
+ 'slug' => 'nfd_slug_yith_shippo_shippings_for_woocommerce',
+ 'activate' => true,
+ 'priority' => 259,
+ ),
+ array(
+ 'slug' => 'nfd_slug_yith_paypal_payments_for_woocommerce',
+ 'activate' => true,
+ 'priority' => 258,
+ ),
+ ),
+ ),
),
);
diff --git a/includes/ModuleController.php b/includes/ModuleController.php
index 49b93584c..5ec609efd 100644
--- a/includes/ModuleController.php
+++ b/includes/ModuleController.php
@@ -3,10 +3,12 @@
use NewfoldLabs\WP\Module\Onboarding\Data\Data;
use NewfoldLabs\WP\Module\Onboarding\Data\Flows;
-
+use NewfoldLabs\WP\Module\Onboarding\Data\Options;
+use NewfoldLabs\WP\Module\Onboarding\Data\Brands;
use NewfoldLabs\WP\ModuleLoader\ModuleRegistry;
use function NewfoldLabs\WP\ModuleLoader\activate;
use function NewfoldLabs\WP\ModuleLoader\deactivate;
+use function NewfoldLabs\WP\ModuleLoader\container;
/**
@@ -18,24 +20,23 @@ class ModuleController {
* Initialize the Module Controller functionality.
*/
public static function init() {
- // Check the conditions after the step_theme loads as only after that the moudle had been registered prior
- add_action( 'after_setup_theme', array( __CLASS__, 'module_switcher' ), 10, 0 );
+ // Enable/Disable the module after_setup_theme.
+ \add_action( 'after_setup_theme', array( __CLASS__, 'module_switcher' ), 10, 0 );
}
/**
- * Check if the user is a valid Ecommerce and subsequently enable/disable modules
+ * Enable/Disable Onboarding based on certain checks.
*/
public static function module_switcher() {
- $module_name = 'onboarding';
- $customer_data = Data::customer_data();
+ $module_name = 'onboarding';
- // Sample data for Testing
- // $customer_data['plan_subtype'] = 'wc_standard';
- // $customer_data['signup_date'] = '2022-08-18T15:30:00.000Z';
+ // Set brand context for the module.
+ Brands::set_current_brand( container() );
+ $customer_data = Data::customer_data();
// Check if he is a Non-Ecom Cust and Disable Redirect and Module
- if ( ! self::is_ecom_customer( $customer_data ) ) {
+ if ( ! self::is_new_commerce_signup( $customer_data ) ) {
// Check if the Module Does Exist
if ( ModuleRegistry::get( $module_name ) ) {
@@ -59,43 +60,79 @@ public static function module_switcher() {
}
/**
- * Get the current customer data using the Bluehost customer data module.
+ * Get signup date of the install.
*
- * @param array $customer_data The customer data to be parsed.
- * @return boolean
+ * @param array $customer_data The customer data to be checked for signup date.
+ * @return string|boolean
*/
- public static function is_ecom_customer( $customer_data ) {
+ public static function get_signup_date( $customer_data ) {
+ // Get the signup_date from customer data.
+ if ( isset( $customer_data['signup_date'] ) ) {
+ return gmdate( 'Y-m-d H:i:s', strtotime( $customer_data['signup_date'] ) );
+ }
+
+ // Get the signup_date from the container's install_date.
+ if ( ! empty( container()->plugin()->install_date ) ) {
+ return gmdate( 'Y-m-d H:i:s', container()->plugin()->install_date );
+ }
+
+ // Get the signup_date from the mm_install_date option.
+ $install_date = \get_option( Options::get_option_name( 'install_date', false ), false );
+ if ( false !== $install_date ) {
+ return gmdate( 'Y-m-d H:i:s', strtotime( $install_date ) );
+ }
+ return false;
+ }
+
+ /**
+ * Determine if the install is a new commerce signup
+ *
+ * @param array $customer_data The site's customer data.
+ * @return boolean
+ */
+ public static function is_new_commerce_signup( $customer_data ) {
+ // Determine if the flow=ecommerce param is set.
if ( isset( $_GET['flow'] ) && 'ecommerce' === \sanitize_text_field( $_GET['flow'] ) ) {
return true;
}
- // August 18
- $new_cust_date = gmdate( 'Y-m-d H:i:s', strtotime( '2022-08-18T15:30:00.000Z' ) );
-
- if ( isset( $customer_data['signup_date'] ) ) {
+ // Determine if the install is on a commerce plan (or) has Woocommerce active (commerce priority).
+ $is_commerce = false;
+ if ( isset( $customer_data['plan_subtype'] ) ) {
+ $is_commerce = Flows::is_ecommerce_plan( $customer_data['plan_subtype'] );
+ }
+ if ( ! $is_commerce ) {
+ $is_commerce = Flows::is_commerce_priority();
+ }
+ if ( ! $is_commerce ) {
+ return false;
+ }
- // Convert the Customer Signup Date to a Php known format
- $cust_signup_date = gmdate( 'Y-m-d H:i:s', strtotime( $customer_data['signup_date'] ) );
+ /*
+ Get the net new signup date threshold from the brand configuration.
+ As a safety measure, return false if a threshold is not set for a particular brand.
+ */
+ $current_brand = Data::current_brand();
+ if ( ! isset( $current_brand['config']['net_new_signup_date_threshold'] ) ) {
+ return false;
+ }
+ $net_new_signup_date_threshold = gmdate( 'Y-m-d H:i:s', strtotime( $current_brand['config']['net_new_signup_date_threshold'] ) );
- // Check if the Customer is a new Customer
- $is_new_cust = $cust_signup_date >= $new_cust_date;
+ // Get the actual signup date of the install.
+ $signup_date = self::get_signup_date( $customer_data );
- // Check if the Customer has an Ecom Plan
- $has_ecom_plan = false;
- if ( isset( $customer_data['plan_subtype'] ) ) {
- $has_ecom_plan = Flows::is_ecommerce_plan( $customer_data['plan_subtype'] );
- }
- if ( ! $has_ecom_plan ) {
- $has_ecom_plan = Flows::is_commerce_priority();
- }
+ // As a safety measure, return false if a signup date cannot be determined.
+ if ( false === $signup_date ) {
+ return false;
+ }
- if ( $has_ecom_plan && $is_new_cust ) {
- return true;
- }
+ // Determine whether the commerce install is a net new signup.
+ $is_net_new_signup = $signup_date >= $net_new_signup_date_threshold;
+ if ( ! $is_net_new_signup ) {
+ return false;
}
- // If the Customer is not a Ecommerce Customer or is an Old Customer
- return false;
+ return true;
}
}
diff --git a/src/OnboardingSPA/static/images/bluesky.png b/src/Brands/bluehost/bluesky.png
similarity index 100%
rename from src/OnboardingSPA/static/images/bluesky.png
rename to src/Brands/bluehost/bluesky.png
diff --git a/src/OnboardingSPA/static/icons/learn-more-basic-info.svg b/src/Brands/bluehost/learn-more-basic-info.svg
similarity index 100%
rename from src/OnboardingSPA/static/icons/learn-more-basic-info.svg
rename to src/Brands/bluehost/learn-more-basic-info.svg
diff --git a/src/OnboardingSPA/static/icons/learn-more-design-colors.svg b/src/Brands/bluehost/learn-more-design-colors.svg
similarity index 100%
rename from src/OnboardingSPA/static/icons/learn-more-design-colors.svg
rename to src/Brands/bluehost/learn-more-design-colors.svg
diff --git a/src/OnboardingSPA/static/icons/learn-more-design-header-menu.svg b/src/Brands/bluehost/learn-more-design-header-menu.svg
similarity index 100%
rename from src/OnboardingSPA/static/icons/learn-more-design-header-menu.svg
rename to src/Brands/bluehost/learn-more-design-header-menu.svg
diff --git a/src/OnboardingSPA/static/icons/learn-more-design-homepage.svg b/src/Brands/bluehost/learn-more-design-homepage.svg
similarity index 100%
rename from src/OnboardingSPA/static/icons/learn-more-design-homepage.svg
rename to src/Brands/bluehost/learn-more-design-homepage.svg
diff --git a/src/OnboardingSPA/static/icons/learn-more-design-theme-styles.svg b/src/Brands/bluehost/learn-more-design-theme-styles.svg
similarity index 100%
rename from src/OnboardingSPA/static/icons/learn-more-design-theme-styles.svg
rename to src/Brands/bluehost/learn-more-design-theme-styles.svg
diff --git a/src/OnboardingSPA/static/icons/learn-more-design-typography.svg b/src/Brands/bluehost/learn-more-design-typography.svg
similarity index 100%
rename from src/OnboardingSPA/static/icons/learn-more-design-typography.svg
rename to src/Brands/bluehost/learn-more-design-typography.svg
diff --git a/src/OnboardingSPA/static/icons/learn-more-ecommerce-address.svg b/src/Brands/bluehost/learn-more-ecommerce-address.svg
similarity index 100%
rename from src/OnboardingSPA/static/icons/learn-more-ecommerce-address.svg
rename to src/Brands/bluehost/learn-more-ecommerce-address.svg
diff --git a/src/OnboardingSPA/static/icons/learn-more-ecommerce-products.svg b/src/Brands/bluehost/learn-more-ecommerce-products.svg
similarity index 100%
rename from src/OnboardingSPA/static/icons/learn-more-ecommerce-products.svg
rename to src/Brands/bluehost/learn-more-ecommerce-products.svg
diff --git a/src/OnboardingSPA/static/icons/learn-more-ecommerce-tax-info.svg b/src/Brands/bluehost/learn-more-ecommerce-tax-info.svg
similarity index 100%
rename from src/OnboardingSPA/static/icons/learn-more-ecommerce-tax-info.svg
rename to src/Brands/bluehost/learn-more-ecommerce-tax-info.svg
diff --git a/src/OnboardingSPA/static/icons/learn-more-get-started-site-type.svg b/src/Brands/bluehost/learn-more-get-started-site-type.svg
similarity index 100%
rename from src/OnboardingSPA/static/icons/learn-more-get-started-site-type.svg
rename to src/Brands/bluehost/learn-more-get-started-site-type.svg
diff --git a/src/OnboardingSPA/static/icons/learn-more-get-started-welcome.svg b/src/Brands/bluehost/learn-more-get-started-welcome.svg
similarity index 100%
rename from src/OnboardingSPA/static/icons/learn-more-get-started-welcome.svg
rename to src/Brands/bluehost/learn-more-get-started-welcome.svg
diff --git a/src/OnboardingSPA/static/icons/learn-more-get-started-wp-experience.svg b/src/Brands/bluehost/learn-more-get-started-wp-experience.svg
similarity index 100%
rename from src/OnboardingSPA/static/icons/learn-more-get-started-wp-experience.svg
rename to src/Brands/bluehost/learn-more-get-started-wp-experience.svg
diff --git a/src/OnboardingSPA/static/icons/learn-more-pages.svg b/src/Brands/bluehost/learn-more-pages.svg
similarity index 100%
rename from src/OnboardingSPA/static/icons/learn-more-pages.svg
rename to src/Brands/bluehost/learn-more-pages.svg
diff --git a/src/OnboardingSPA/static/icons/learn-more-site-features.svg b/src/Brands/bluehost/learn-more-site-features.svg
similarity index 100%
rename from src/OnboardingSPA/static/icons/learn-more-site-features.svg
rename to src/Brands/bluehost/learn-more-site-features.svg
diff --git a/src/OnboardingSPA/static/icons/learn-more-what-next.svg b/src/Brands/bluehost/learn-more-what-next.svg
similarity index 100%
rename from src/OnboardingSPA/static/icons/learn-more-what-next.svg
rename to src/Brands/bluehost/learn-more-what-next.svg
diff --git a/src/OnboardingSPA/static/images/wp-admin.png b/src/Brands/bluehost/wp-admin.png
similarity index 100%
rename from src/OnboardingSPA/static/images/wp-admin.png
rename to src/Brands/bluehost/wp-admin.png
diff --git a/src/Brands/crazy-domains/full-service.png b/src/Brands/crazy-domains/full-service.png
new file mode 100644
index 000000000..76a53dd82
Binary files /dev/null and b/src/Brands/crazy-domains/full-service.png differ
diff --git a/src/Brands/crazy-domains/icon-empty.svg b/src/Brands/crazy-domains/icon-empty.svg
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/Brands/crazy-domains/icon.svg b/src/Brands/crazy-domains/icon.svg
new file mode 100644
index 000000000..b39ce0458
--- /dev/null
+++ b/src/Brands/crazy-domains/icon.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/Brands/crazy-domains/logo.svg b/src/Brands/crazy-domains/logo.svg
new file mode 100644
index 000000000..4f4a5cdcc
--- /dev/null
+++ b/src/Brands/crazy-domains/logo.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/Brands/crazy-domains/step-error-logo.svg b/src/Brands/crazy-domains/step-error-logo.svg
new file mode 100644
index 000000000..f554b5ba5
--- /dev/null
+++ b/src/Brands/crazy-domains/step-error-logo.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/Brands/crazy-domains/step-loader-logo.svg b/src/Brands/crazy-domains/step-loader-logo.svg
new file mode 100644
index 000000000..0c5ca0e5e
--- /dev/null
+++ b/src/Brands/crazy-domains/step-loader-logo.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/Brands/crazy-domains/wp-admin.png b/src/Brands/crazy-domains/wp-admin.png
new file mode 100644
index 000000000..591a570f9
Binary files /dev/null and b/src/Brands/crazy-domains/wp-admin.png differ
diff --git a/src/OnboardingSPA/components/Button/NavCardButton/index.js b/src/OnboardingSPA/components/Button/NavCardButton/index.js
index 3872897af..b99d4c537 100644
--- a/src/OnboardingSPA/components/Button/NavCardButton/index.js
+++ b/src/OnboardingSPA/components/Button/NavCardButton/index.js
@@ -4,7 +4,7 @@ import { store as nfdOnboardingStore } from '../../../store';
import Button from '../../Button';
import { setFlow } from '../../../utils/api/flow';
-import { wpAdminPage, bluehostDashboardPage } from '../../../../constants';
+import { wpAdminPage, pluginDashboardPage } from '../../../../constants';
/**
* Navigation Button Component on Card
@@ -37,7 +37,7 @@ const NavCardButton = ( { text, disabled } ) => {
//Redirect to Admin Page for normal customers
// and Bluehost Dashboard for ecommerce customers
const exitLink = exitToWordpressForEcommerce()
- ? bluehostDashboardPage
+ ? pluginDashboardPage
: wpAdminPage;
window.location.replace( exitLink );
}
diff --git a/src/OnboardingSPA/components/CheckboxTemplate/CheckboxItem/index.js b/src/OnboardingSPA/components/CheckboxTemplate/CheckboxItem/index.js
index b2c91c1b1..1b905e405 100644
--- a/src/OnboardingSPA/components/CheckboxTemplate/CheckboxItem/index.js
+++ b/src/OnboardingSPA/components/CheckboxTemplate/CheckboxItem/index.js
@@ -23,6 +23,7 @@ const CheckboxItem = ( {
desc,
subtitle,
callback,
+ tabIndex = 0,
isSelectedDefault,
className = 'checkbox-item',
} ) => {
@@ -91,17 +92,19 @@ const CheckboxItem = ( {
diff --git a/src/OnboardingSPA/components/CheckboxTemplate/CheckboxItem/stylesheet.scss b/src/OnboardingSPA/components/CheckboxTemplate/CheckboxItem/stylesheet.scss
index 5a607410f..fa438ee21 100644
--- a/src/OnboardingSPA/components/CheckboxTemplate/CheckboxItem/stylesheet.scss
+++ b/src/OnboardingSPA/components/CheckboxTemplate/CheckboxItem/stylesheet.scss
@@ -7,6 +7,11 @@ $main-border-main: var(--nfd-onboarding-primary-alt);
$box-shadow: var(--nfd-onboarding-light-gray-highlighted);
.checkbox-item {
+
+ .highlighted {
+ fill: var(--wp-admin-theme-color-darker-10);
+ }
+
margin: 12px;
padding: 16px;
margin-top: 16px;
@@ -80,7 +85,12 @@ $box-shadow: var(--nfd-onboarding-light-gray-highlighted);
}
&-help {
- cursor: pointer;
+ fill: #666;
+
+ &:hover {
+ cursor: pointer;
+ fill: var(--wp-admin-theme-color-darker-10);
+ }
}
}
@@ -121,6 +131,6 @@ $box-shadow: var(--nfd-onboarding-light-gray-highlighted);
border-left: 1px solid rgba($main-color, 0.1);
border-right: 1px solid rgba($main-color, 0.1);
border-bottom: 1px solid rgba($main-color, 0.1);
- box-shadow: 0 11px 8px -3px rgba($main-color, 0.2);
+ box-shadow: 0 11px 8px -3px rgba($main-color, 0.37);
}
}
diff --git a/src/OnboardingSPA/components/ExitToWordPress/index.js b/src/OnboardingSPA/components/ExitToWordPress/index.js
index a68bae7b6..26525314e 100644
--- a/src/OnboardingSPA/components/ExitToWordPress/index.js
+++ b/src/OnboardingSPA/components/ExitToWordPress/index.js
@@ -9,7 +9,7 @@ import classNames from 'classnames';
import { setFlow } from '../../utils/api/flow';
import { store as nfdOnboardingStore } from '../../store';
import { getSettings, setSettings } from '../../utils/api/settings';
-import { wpAdminPage, bluehostDashboardPage } from '../../../constants';
+import { wpAdminPage, pluginDashboardPage } from '../../../constants';
/**
* Self-contained button and confirmation modal for exiting Onboarding page.
@@ -94,7 +94,7 @@ const ExitToWordPress = ( {
//Redirect to Admin Page for normal customers
// and Bluehost Dashboard for ecommerce customers
const exitLink = exitToWordpressForEcommerce()
- ? bluehostDashboardPage
+ ? pluginDashboardPage
: wpAdminPage;
window.location.replace( exitLink );
}
diff --git a/src/OnboardingSPA/components/Header/step-navigation.js b/src/OnboardingSPA/components/Header/step-navigation.js
index 6ac1fc434..dc71ec939 100644
--- a/src/OnboardingSPA/components/Header/step-navigation.js
+++ b/src/OnboardingSPA/components/Header/step-navigation.js
@@ -6,13 +6,14 @@ import { Icon, chevronLeft, chevronRight } from '@wordpress/icons';
import { __ } from '@wordpress/i18n';
import { setFlow } from '../../utils/api/flow';
import { store as nfdOnboardingStore } from '../../store';
-import { wpAdminPage, bluehostDashboardPage } from '../../../constants';
+import { wpAdminPage, pluginDashboardPage } from '../../../constants';
/**
* Back step Navigation button.
*
* @param {*} param0
- * @return
+ *
+ * @return {WPComponent} Back Component
*/
const Back = ( { path } ) => {
const navigate = useNavigate();
@@ -34,7 +35,8 @@ const Back = ( { path } ) => {
* Next step naigation button
*
* @param {*} param0
- * @return
+ *
+ * @return {WPComponent} Next Component
*/
const Next = ( { path } ) => {
/* [TODO]: some sense of isStepComplete to enable/disable */
@@ -61,7 +63,7 @@ async function saveDataAndExit( currentData ) {
//Redirect to Admin Page for normal customers
// and Bluehost Dashboard for ecommerce customers
const exitLink = exitToWordpressForEcommerce()
- ? bluehostDashboardPage
+ ? pluginDashboardPage
: wpAdminPage;
window.location.replace( exitLink );
}
@@ -69,14 +71,13 @@ async function saveDataAndExit( currentData ) {
/**
* Finish step navigation button.
*
- * @param root0
- * @param root0.currentData
- * @param root0.saveDataAndExit
- * @return
+ * @param {*} param0
+ *
+ * @return {WPComponent} Finish Component
*/
-const Finish = ( { currentData, saveDataAndExit } ) => (
+const Finish = ( { currentData, saveDataAndExitFunc } ) => (