@@ -196,7 +188,7 @@ const MiniPreview = ( {
{ titlePreview }
- { urlPreview }
+ { wpSiteUrl }
-
- { questionnaire }
-
-
- { forkOptions.map( ( tab, idx ) => {
- if (
- tab.flow === SITEGEN_FLOW &&
- ! validateFlow( brandConfig, tab.flow )
- ) {
- // Do not show the Sitegen AI option if not enabled for the customer
- return false;
- }
- return (
-
{
+
+
+ { questionnaire }
+
+
+ { options.map( ( tab, idx ) => {
+ if (
+ tab.flow === SITEGEN_FLOW &&
+ ! validateFlow( brandConfig, tab.flow )
+ ) {
+ // Do not show the Sitegen AI option if not enabled for the customer
+ return false;
+ }
+ return (
+
{
+ selectFlow( tab.flow );
+ } }
+ onKeyDown={ () => {
+ {
selectFlow( tab.flow );
- } }
- onKeyDown={ () => {
- {
- selectFlow( tab.flow );
- }
- } }
- data-flow={ tab.flow }
- >
- { tab.flow === SITEGEN_FLOW &&
- showAIRecommendedBadge && (
-
- { content.badge }
-
- ) }
-
- { tab.span && (
-
- { tab.span }
-
- ) }
- { tab.title }
-
-
- { tab.subtitle }
-
-
- );
- } ) }
-
+ }
+ } }
+ data-flow={ tab.flow }
+ >
+
+ { tab.span && (
+
+ { tab.span }
+
+ ) }
+ { tab.title }
+
+
+ { tab.subtitle }
+
+
+ );
+ } ) }
- )
+
);
};
diff --git a/src/OnboardingSPA/components/StartOptions/stylesheet.scss b/src/OnboardingSPA/components/StartOptions/stylesheet.scss
index 021bde287..b57c58d58 100644
--- a/src/OnboardingSPA/components/StartOptions/stylesheet.scss
+++ b/src/OnboardingSPA/components/StartOptions/stylesheet.scss
@@ -23,7 +23,6 @@
&__options {
flex: 1;
- position: relative;
min-width: 310px;
height: 130px;
border: 1px solid #9ca2a7;
@@ -59,16 +58,6 @@
padding-top: 3px;
padding-bottom: 2px;
}
-
- &--badge {
- top: -12px;
- font-size: 16px;
- padding: 8px 12px;
- border-radius: 4px;
- position: absolute;
- background: linear-gradient(0deg, #f36, #f36);
-
- }
}
&__options:hover {
diff --git a/src/OnboardingSPA/steps/TheFork/contents.js b/src/OnboardingSPA/steps/TheFork/contents.js
index 38f301ca6..bd3228135 100644
--- a/src/OnboardingSPA/steps/TheFork/contents.js
+++ b/src/OnboardingSPA/steps/TheFork/contents.js
@@ -10,21 +10,21 @@ const getContents = () => {
),
options: [
{
- title: __( 'Guided Configuration', 'wp-module-onboarding' ),
+ title: __( ' Website Creator', 'wp-module-onboarding' ),
subtitle: __(
- 'Robust configuration guide to help you build your site',
+ 'Unique AI generated content & design curated for you.',
'wp-module-onboarding'
),
- flow: 'sitebuild',
+ span: __( 'AI', 'wp-module-onboarding' ),
+ flow: 'sitegen',
},
{
- title: __( ' Website Creator', 'wp-module-onboarding' ),
+ title: __( 'Guided Configuration', 'wp-module-onboarding' ),
subtitle: __(
- 'Unique AI generated content & design curated for you.',
+ 'Robust configuration guide to help you build your site',
'wp-module-onboarding'
),
- span: __( 'AI', 'wp-module-onboarding' ),
- flow: 'sitegen',
+ flow: 'sitebuild',
},
{
title: __( 'Hire a Pro', 'wp-module-onboarding' ),
diff --git a/src/OnboardingSPA/steps/TheFork/index.js b/src/OnboardingSPA/steps/TheFork/index.js
index 2133c0ed0..71698c9e7 100644
--- a/src/OnboardingSPA/steps/TheFork/index.js
+++ b/src/OnboardingSPA/steps/TheFork/index.js
@@ -1,10 +1,9 @@
// WordPress
-import { useEffect, useState } from '@wordpress/element';
+import { useEffect } from '@wordpress/element';
import { useSelect, useDispatch } from '@wordpress/data';
// Classes and functions
import getContents from './contents';
-import { setFlow } from '../../utils/api/flow';
// Components
import StartOptions from '../../components/StartOptions';
@@ -22,20 +21,13 @@ import {
sendOnboardingEvent,
trackOnboardingEvent,
} from '../../utils/analytics/hiive';
-import {
- ACTION_SITEGEN_FORK_AI_EXPERIMENT,
- ACTION_SITEGEN_FORK_OPTION_SELECTED,
- CATEGORY_EXPERIMENT,
-} from '../../utils/analytics/hiive/constants';
+import { ACTION_SITEGEN_FORK_OPTION_SELECTED } from '../../utils/analytics/hiive/constants';
import { store as nfdOnboardingStore } from '../../store';
import { DEFAULT_FLOW } from '../../data/flows/constants';
const TheFork = () => {
- const [ experimentVersion, setExperimentVersion ] = useState();
- const { currentData, migrationUrl } = useSelect( ( select ) => {
+ const { migrationUrl } = useSelect( ( select ) => {
return {
- currentData:
- select( nfdOnboardingStore ).getCurrentOnboardingData(),
migrationUrl: select( nfdOnboardingStore ).getMigrationUrl(),
};
} );
@@ -48,7 +40,6 @@ const TheFork = () => {
setIsHeaderNavigationEnabled,
setFooterActiveView,
setHideFooterNav,
- setCurrentOnboardingData,
} = useDispatch( nfdOnboardingStore );
useEffect( () => {
@@ -59,48 +50,8 @@ const TheFork = () => {
setHeaderActiveView( HEADER_SITEGEN );
setDrawerActiveView( false );
setFooterActiveView( FOOTER_SITEGEN );
- handleExperimentVersion();
} );
- const handleExperimentVersion = async () => {
- let theForkExperimentVersion = 0;
- if ( currentData.sitegen.theForkExperimentVersion !== 0 ) {
- // Use an existing experiment version if it exists
- setExperimentVersion(
- currentData.sitegen.theForkExperimentVersion
- );
- theForkExperimentVersion =
- currentData.sitegen.theForkExperimentVersion;
- } else {
- // Generate a random experiment version from 1 to 4
- theForkExperimentVersion = Math.floor( Math.random() * 5 );
- setExperimentVersion( theForkExperimentVersion );
-
- // Sync that to the store and DB for same version on refresh
- currentData.sitegen.theForkExperimentVersion =
- theForkExperimentVersion;
- setCurrentOnboardingData( currentData );
- await setFlow( currentData );
- const experimentVersionNames = {
- 1: 'control',
- 2: 'position',
- 3: 'badge',
- 4: 'position_badge',
- };
-
- // Send an event for the experiment version shown to the user.
- sendOnboardingEvent(
- new OnboardingEvent(
- ACTION_SITEGEN_FORK_AI_EXPERIMENT,
- experimentVersionNames[ theForkExperimentVersion ],
- null,
- null,
- CATEGORY_EXPERIMENT
- )
- );
- }
- };
-
const oldFlow = window.nfdOnboarding?.oldFlow
? window.nfdOnboarding.oldFlow
: DEFAULT_FLOW;
@@ -126,7 +77,6 @@ const TheFork = () => {
subtitle={ content.subheading }
/>
{
@@ -27,19 +24,6 @@ if ( runtimeDataExists ) {
},
} );
- HiiveAnalytics.initialize( {
- namespace: CATEGORY_EXPERIMENT,
- urls: {
- single: onboardingRestURL( 'events' ),
- batch: onboardingRestURL( 'events/batch' ),
- },
- settings: {
- debounce: {
- time: 3000,
- },
- },
- } );
-
initializeNFDOnboarding(
NFD_ONBOARDING_ELEMENT_ID,
window.nfdOnboarding