Merge pull request #471 from newfold-labs/fixes-some-minor-issues-in-…

…sitegen

More Minor Changes

src/OnboardingSPA/steps/SiteGen/Building/index.js

@@ -15,11 +15,13 @@ const SiteGenBuilding = () => {
 		setSidebarActiveView,
 		setHeaderActiveView,
 		setDrawerActiveView,
+		setIsHeaderNavigationEnabled,
 	} = useDispatch( nfdOnboardingStore );
 
 	useEffect( () => {
 		setIsHeaderEnabled( true );
 		setSidebarActiveView( false );
+		setIsHeaderNavigationEnabled( false );
 		setHeaderActiveView( HEADER_SITEGEN );
 		setDrawerActiveView( false );
 	} );

src/OnboardingSPA/steps/SiteGen/Editor/index.js

@@ -22,6 +22,7 @@ const StepSiteGenEditor = () => {
 		setDrawerActiveView,
 		setHideFooterNav,
 		setCurrentOnboardingData,
+		setIsHeaderNavigationEnabled,
 	} = useDispatch( nfdOnboardingStore );
 
 	const { currentData } = useSelect( ( select ) => {
@@ -48,6 +49,7 @@ const StepSiteGenEditor = () => {
 		setIsHeaderEnabled( true );
 		setHeaderActiveView( HEADER_SITEGEN );
 		setDrawerActiveView( false );
+		setIsHeaderNavigationEnabled( false );
 		const activeHomepage = currentData.sitegen.homepages.active;
 		setHomepage( activeHomepage );
 		const globalStylesResponse = await getGlobalStyles();

src/OnboardingSPA/steps/SiteGen/Experience/index.js

@@ -28,12 +28,14 @@ const SiteGenExperience = () => {
 		setDrawerActiveView,
 		setHideFooterNav,
 		setCurrentOnboardingData,
+		setIsHeaderNavigationEnabled,
 	} = useDispatch( nfdOnboardingStore );
 
 	useEffect( () => {
 		setHideFooterNav( true );
 		setIsHeaderEnabled( true );
 		setSidebarActiveView( false );
+		setIsHeaderNavigationEnabled( false );
 		setHeaderActiveView( HEADER_SITEGEN );
 		setDrawerActiveView( false );
 

src/OnboardingSPA/steps/SiteGen/Preview/index.js

@@ -34,6 +34,7 @@ const SiteGenPreview = () => {
 		updateInitialize,
 		setHideFooterNav,
 		updateSiteGenErrorStatus,
+		setIsHeaderNavigationEnabled,
 	} = useDispatch( nfdOnboardingStore );
 
 	const { currentData, nextStep, siteGenErrorStatus } = useSelect(
@@ -55,6 +56,7 @@ const SiteGenPreview = () => {
 		setHeaderActiveView( HEADER_SITEGEN );
 		setDrawerActiveView( false );
 		updateInitialize( true );
+		setIsHeaderNavigationEnabled( false );
 	}, [ currentData ] );
 
 	useEffect( () => {

src/OnboardingSPA/steps/SiteGen/SiteDetails/index.js

@@ -32,13 +32,15 @@ const SiteGenSiteDetails = () => {
 		setDrawerActiveView,
 		setHideFooterNav,
 		setCurrentOnboardingData,
+		setIsHeaderNavigationEnabled,
 	} = useDispatch( nfdOnboardingStore );
 
 	useEffect( () => {
 		setHideFooterNav( false );
 		setIsHeaderEnabled( true );
 		setSidebarActiveView( false );
 		setHeaderActiveView( HEADER_SITEGEN );
+		setIsHeaderNavigationEnabled( true );
 		setDrawerActiveView( false );
 		if ( currentData.sitegen.siteDetails?.prompt !== '' ) {
 			setIsValidInput( true );

src/OnboardingSPA/steps/SiteGen/SiteDetails/stylesheet.scss

@@ -1,17 +1,20 @@
 .nfd-sg-site-details {
 
-	margin-top: 20%;
 	width: 40vw;
 	height: 100vh;
+	display: flex;
+	align-items: center;
+	flex-direction: column;
+	justify-content: center;
 
 
 	@media (max-width: #{ ($break-large) }) {
 		width: 80vw;
 	}
 
 	@media (max-width: #{ ($break-small) }) {
-		margin: 10px;
 		height: 100vh;
+		margin-top: 30%;
 		margin-bottom: 150px;
 	}
 

src/OnboardingSPA/steps/SiteGen/SiteLogo/index.js

@@ -38,6 +38,7 @@ const SiteGenSiteLogo = () => {
 		setDrawerActiveView,
 		setHideFooterNav,
 		setCurrentOnboardingData,
+		setIsHeaderNavigationEnabled,
 	} = useDispatch( nfdOnboardingStore );
 
 	const resetSiteLogo = () => {
@@ -57,6 +58,7 @@ const SiteGenSiteLogo = () => {
 		setHideFooterNav( false );
 		setIsHeaderEnabled( true );
 		setSidebarActiveView( false );
+		setIsHeaderNavigationEnabled( true );
 		setHeaderActiveView( HEADER_SITEGEN );
 		setDrawerActiveView( false );
 		if ( currentData.data.siteLogo?.id !== 0 ) {

src/OnboardingSPA/steps/SiteGen/SocialMedia/index.js

@@ -26,13 +26,15 @@ const SiteGenSiteSocialMedia = () => {
 		setDrawerActiveView,
 		setIsFooterNavAllowed,
 		updateSiteGenErrorStatus,
+		setIsHeaderNavigationEnabled,
 	} = useDispatch( nfdOnboardingStore );
 
 	useEffect( () => {
 		setIsHeaderEnabled( true );
 		setSidebarActiveView( false );
 		setHeaderActiveView( HEADER_SITEGEN );
 		setDrawerActiveView( false );
+		setIsHeaderNavigationEnabled( true );
 	} );
 
 	const { nextStep } = useSelect( ( select ) => {

src/OnboardingSPA/steps/SiteGen/Welcome/contents.js

@@ -4,7 +4,7 @@ const getContents = () => {
 	return {
 		heading: __( 'Website Creator for WordPress', 'wp-module-onboarding' ),
 		subHeading: __(
-			'Tell our AI engine what kind of site you want to make and let it handle the content and design for you',
+			'Tell our AI engine what kind of site you want to make and let it handle the content and design for you.',
 			'wp-module-onboarding'
 		),
 		buttonText: __( 'Get Started', 'wp-module-onboarding' ),

src/OnboardingSPA/steps/TheFork/contents.js

@@ -10,17 +10,17 @@ const getContents = () => {
 		),
 		options: [
 			{
-				title: __( 'Build it myself', 'wp-module-onboarding' ),
+				title: __( 'Guided Configuration', 'wp-module-onboarding' ),
 				subtitle: __(
-					"We'll stay out of your way.",
+					'A few questions & settings to get you a jumpstart.',
 					'wp-module-onboarding'
 				),
 				flow: 'sitebuild',
 			},
 			{
 				title: __( ' Website Creator', 'wp-module-onboarding' ),
 				subtitle: __(
-					'Custom AI generated content & design.',
+					'Unique AI generated content & design curated for you.',
 					'wp-module-onboarding'
 				),
 				span: __( 'AI', 'wp-module-onboarding' ),
@@ -35,7 +35,6 @@ const getContents = () => {
 				flow: 'hirepro',
 			},
 		],
-
 		importtext: __(
 			'Already have a WordPress site you want to import?',
 			'wp-module-onboarding'
@@ -44,6 +43,10 @@ const getContents = () => {
 			'https://my.bluehost.com/cgi/services/migration',
 			'wp-module-onboarding'
 		),
+		exitToWordPress: __(
+			'I’m following a tutorial',
+			'wp-module-onboarding'
+		),
 	};
 };
 

src/OnboardingSPA/steps/TheFork/index.js

@@ -4,7 +4,11 @@ import { useEffect } from '@wordpress/element';
 import { useSelect, useDispatch } from '@wordpress/data';
 
 import { store as nfdOnboardingStore } from '../../store';
-import { FOOTER_SITEGEN, HEADER_SITEGEN } from '../../../constants';
+import {
+	FOOTER_SITEGEN,
+	HEADER_SITEGEN,
+	pluginDashboardPage,
+} from '../../../constants';
 
 import { DEFAULT_FLOW } from '../../data/flows/constants';
 import HeadingWithSubHeading from '../../components/HeadingWithSubHeading/SiteGen/index';
@@ -69,6 +73,12 @@ const TheFork = () => {
 				>
 					{ content.importtext }
 				</a>
+				<a
+					className="nfd-onboarding-step--site-gen__fork__exit"
+					href={ pluginDashboardPage }
+				>
+					{ content.exitToWordPress }
+				</a>
 			</CommonLayout>
 		</SitegenAiStateHandler>
 	);

src/OnboardingSPA/steps/TheFork/stylesheet.scss

@@ -45,12 +45,20 @@
 			}
 
 			&__importsite {
-				color: var(--nfd-onboarding-primary);
+				font-size: 18px;
 				font-weight: 510;
+				line-height: 20px;
 				text-align: center;
-				font-size: 18px;
+				margin: 25px !important;
+				color: var(--nfd-onboarding-primary);
+			}
+
+			&__exit {
+				cursor: pointer;
+				font-weight: 510;
 				line-height: 20px;
-				margin: 35px !important;
+				text-align: center;
+				color: var(--nfd-onboarding-primary);
 			}
 		}
 	}