Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add dynamic brand configuration to hide sidebar illustrations for crazy domains #190

Merged
merged 2 commits into from
Mar 8, 2023
Merged

Add dynamic brand configuration to hide sidebar illustrations for crazy domains #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3cc460b
hide crazy domains sidebar illustrations, add dynamic brand config to…
arunshenoy99 Mar 6, 2023
5981cf0
fix list issues
arunshenoy99 Mar 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion includes/Data/Brands.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ public static function get_brands() {
'utm_medium' => 'brand-plugin',
),
),
'config' => array(),
),
'bluehost-india' => array(
'brand' => 'bluehost-india',
Expand Down Expand Up @@ -112,6 +113,7 @@ public static function get_brands() {
'utm_medium' => 'brand-plugin',
),
),
'config' => array(),
),
'webcom' => array(
'brand' => 'webcom',
Expand Down Expand Up @@ -163,8 +165,9 @@ public static function get_brands() {
'utm_medium' => '',
),
),
'config' => array(),
),
'crazy-domains' => array(
'crazy-domains' => array(
'brand' => 'crazy-domains',
'name' => 'Crazy Domains',
'url' => 'https://www.crazydomains.com',
Expand Down Expand Up @@ -213,6 +216,15 @@ public static function get_brands() {
'utm_medium' => 'brand-plugin',
),
),
'config' => array(
'views' => array(
'sidebar' => array(
'illustration' => array(
'shown' => false,
),
),
),
),
),
);
}
Expand Down
0 ...PA/static/icons/learn-more-basic-info.svg → ...Brands/bluehost/learn-more-basic-info.svg
View file
Open in desktop
File renamed without changes
0 ...static/icons/learn-more-design-colors.svg → ...nds/bluehost/learn-more-design-colors.svg
View file
Open in desktop
File renamed without changes
0 ...c/icons/learn-more-design-header-menu.svg → ...luehost/learn-more-design-header-menu.svg
View file
Open in desktop
File renamed without changes
0 ...atic/icons/learn-more-design-homepage.svg → ...s/bluehost/learn-more-design-homepage.svg
View file
Open in desktop
File renamed without changes
0 .../icons/learn-more-design-theme-styles.svg → ...uehost/learn-more-design-theme-styles.svg
View file
Open in desktop
File renamed without changes
0 ...ic/icons/learn-more-design-typography.svg → ...bluehost/learn-more-design-typography.svg
View file
Open in desktop
File renamed without changes
0 ...ic/icons/learn-more-ecommerce-address.svg → ...bluehost/learn-more-ecommerce-address.svg
View file
Open in desktop
File renamed without changes
0 ...c/icons/learn-more-ecommerce-products.svg → ...luehost/learn-more-ecommerce-products.svg
View file
Open in desktop
File renamed without changes
0 ...c/icons/learn-more-ecommerce-tax-info.svg → ...luehost/learn-more-ecommerce-tax-info.svg
View file
Open in desktop
File renamed without changes
0 ...cons/learn-more-get-started-site-type.svg → ...host/learn-more-get-started-site-type.svg
View file
Open in desktop
File renamed without changes
0 .../icons/learn-more-get-started-welcome.svg → ...uehost/learn-more-get-started-welcome.svg
View file
Open in desktop
File renamed without changes
0 .../learn-more-get-started-wp-experience.svg → .../learn-more-get-started-wp-experience.svg
View file
Open in desktop
File renamed without changes
0 ...dingSPA/static/icons/learn-more-pages.svg → src/Brands/bluehost/learn-more-pages.svg
View file
Open in desktop
File renamed without changes
0 ...static/icons/learn-more-site-features.svg → ...nds/bluehost/learn-more-site-features.svg
View file
Open in desktop
File renamed without changes
0 ...SPA/static/icons/learn-more-what-next.svg → src/Brands/bluehost/learn-more-what-next.svg
View file
Open in desktop
File renamed without changes
8 changes: 5 additions & 3 deletions src/OnboardingSPA/components/Sidebar/components/LearnMore/IllustrationPanel/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ import { PanelBody } from '@wordpress/components';
const IllustrationPanel = ( {
cssIcon = 'nfd-onboarding-sidebar-learn-more-get-started-welcome-illustration',
baseClassName = 'nfd-onboarding-sidebar-learn-more--illustration-panel',
backgroundPosition = 'center'
backgroundPosition = 'center',
} ) => {
const iconExists = window.getComputedStyle( document.body ).getPropertyValue( `--${ cssIcon }` ) !== '';

return (
<PanelBody
iconExists && <PanelBody
className={ `${ baseClassName }__container` }
initialOpen={ true }
>
Expand All @@ -18,7 +20,7 @@ const IllustrationPanel = ( {
height: '100%',
backgroundSize: 'contain',
backgroundRepeat: 'no-repeat',
backgroundPosition: backgroundPosition,
backgroundPosition,
} }
></div>
</PanelBody>
Expand Down
26 changes: 19 additions & 7 deletions src/OnboardingSPA/components/Sidebar/components/LearnMore/Skeleton/SidebarSkeleton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
import { useSelect } from '@wordpress/data';
import { Fragment } from '@wordpress/element';

import Animate from '../../../../Animate';
import { store as nfdOnboardingStore } from '../../../../../store';

/** Skeleton Structure for the SideBar */
const SidebarSkeleton = () => {
const { brandConfig } = useSelect( ( select ) => {
return {
brandConfig: select( nfdOnboardingStore ).getNewfoldBrandConfig(),
};
} );

return (
<div className="sidebar-skeleton">
<div className="sidebar-skeleton-header">
Expand All @@ -27,13 +37,15 @@ const SidebarSkeleton = () => {
</div>
</div>
<div className="sidebar-skeleton-divider" />
<div className="sidebar-skeleton-body">
<Animate
type={ 'shine-placeholder' }
className="shimmer sidebar-skeleton-body-image"
/>
</div>
<div className="sidebar-skeleton-divider" />
{ brandConfig?.views?.sidebar?.illustration?.shown !== false && <Fragment>
<div className="sidebar-skeleton-body">
<Animate
type={ 'shine-placeholder' }
className="shimmer sidebar-skeleton-body-image"
/>
</div>
<div className="sidebar-skeleton-divider" />
</Fragment> }
<div className="sidebar-skeleton-footer">
<Animate
type={ 'shine-placeholder' }
Expand Down
8 changes: 5 additions & 3 deletions src/OnboardingSPA/pages/Steps/BasicInfo/Sidebar/LearnMore/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,12 @@ const StepIntroPanel = lazy( () =>
);

const LearnMore = () => {
const { brandName, techSupportLink, fullServiceCreativeTeamLink } = useSelect( ( select ) => {
const { brandName, techSupportLink, fullServiceCreativeTeamLink, brandConfig } = useSelect( ( select ) => {
return {
brandName: select( nfdOnboardingStore ).getNewfoldBrandName(),
techSupportLink: select( nfdOnboardingStore ).getTechSupportUrl(),
fullServiceCreativeTeamLink: select( nfdOnboardingStore ).getfullServiceCreativeTeamUrl(),
brandConfig: select( nfdOnboardingStore ).getNewfoldBrandConfig(),
};
} );

Expand All @@ -47,7 +48,8 @@ const LearnMore = () => {
subheading={ content.introduction.subheading }
icon={ content.introduction.icon }
/>
<IllustrationPanel cssIcon={ content.illustration.icon } />
{ brandConfig?.views?.sidebar?.illustration?.shown !== false &&
<IllustrationPanel cssIcon={ content.illustration.icon } /> }
<InfoPanel
headingWithDescriptions={
content.information.headingWithDescriptions
Expand All @@ -57,7 +59,7 @@ const LearnMore = () => {
<ButtonWhite
text={ content.help.fullService.text }
onClick={ () =>
( window.open( content.help.fullService.link, '_blank') )
( window.open( content.help.fullService.link, '_blank' ) )
}
/>
<SupportLink
Expand Down
7 changes: 4 additions & 3 deletions src/OnboardingSPA/pages/Steps/DesignColors/Sidebar/LearnMore/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ const StepIntroPanel = lazy( () =>
);

const LearnMore = () => {

const { techSupportLink, fullServiceCreativeTeamLink } = useSelect( ( select ) => {
const { techSupportLink, fullServiceCreativeTeamLink, brandConfig } = useSelect( ( select ) => {
return {
techSupportLink: select( nfdOnboardingStore ).getTechSupportUrl(),
fullServiceCreativeTeamLink: select( nfdOnboardingStore ).getfullServiceCreativeTeamUrl(),
brandConfig: select( nfdOnboardingStore ).getNewfoldBrandConfig(),
};
} );

Expand All @@ -47,7 +47,8 @@ const LearnMore = () => {
subheading={ content.introduction.subheading }
icon={ content.introduction.icon }
/>
<IllustrationPanel cssIcon={ content.illustration.icon } />
{ brandConfig?.views?.sidebar?.illustration?.shown !== false &&
<IllustrationPanel cssIcon={ content.illustration.icon } /> }
<InfoPanel
headingWithDescriptions={
content.information.headingWithDescriptions
Expand Down
7 changes: 4 additions & 3 deletions src/OnboardingSPA/pages/Steps/DesignHeaderMenu/Sidebar/LearnMore/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ const StepIntroPanel = lazy( () =>
);

const LearnMore = () => {

const { techSupportLink, fullServiceCreativeTeamLink } = useSelect( ( select ) => {
const { techSupportLink, fullServiceCreativeTeamLink, brandConfig } = useSelect( ( select ) => {
return {
techSupportLink: select( nfdOnboardingStore ).getTechSupportUrl(),
fullServiceCreativeTeamLink: select( nfdOnboardingStore ).getfullServiceCreativeTeamUrl(),
brandConfig: select( nfdOnboardingStore ).getNewfoldBrandConfig(),
};
} );

Expand All @@ -47,7 +47,8 @@ const LearnMore = () => {
subheading={ content.introduction.subheading }
icon={ content.introduction.icon }
/>
<IllustrationPanel cssIcon={ content.illustration.icon } />
{ brandConfig?.views?.sidebar?.illustration?.shown !== false &&
<IllustrationPanel cssIcon={ content.illustration.icon } /> }
<InfoPanel
headingWithDescriptions={
content.information.headingWithDescriptions
Expand Down
7 changes: 4 additions & 3 deletions src/OnboardingSPA/pages/Steps/DesignHomepageMenu/Sidebar/LearnMore/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ const StepIntroPanel = lazy( () =>
);

const LearnMore = () => {

const { techSupportLink, fullServiceCreativeTeamLink } = useSelect( ( select ) => {
const { techSupportLink, fullServiceCreativeTeamLink, brandConfig } = useSelect( ( select ) => {
return {
techSupportLink: select( nfdOnboardingStore ).getTechSupportUrl(),
fullServiceCreativeTeamLink: select( nfdOnboardingStore ).getfullServiceCreativeTeamUrl(),
brandConfig: select( nfdOnboardingStore ).getNewfoldBrandConfig(),
};
} );

Expand All @@ -47,7 +47,8 @@ const LearnMore = () => {
subheading={ content.introduction.subheading }
icon={ content.introduction.icon }
/>
<IllustrationPanel cssIcon={ content.illustration.icon } />
{ brandConfig?.views?.sidebar?.illustration?.shown !== false &&
<IllustrationPanel cssIcon={ content.illustration.icon } /> }
<InfoPanel
headingWithDescriptions={
content.information.headingWithDescriptions
Expand Down
6 changes: 4 additions & 2 deletions src/OnboardingSPA/pages/Steps/DesignThemeStyles/Menu/Sidebar/LearnMore/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,12 @@ const StepIntroPanel = lazy( () =>
);

const LearnMore = () => {
const { brandName, techSupportLink, fullServiceCreativeTeamLink } = useSelect( ( select ) => {
const { brandName, techSupportLink, fullServiceCreativeTeamLink, brandConfig } = useSelect( ( select ) => {
return {
brandName: select( nfdOnboardingStore ).getNewfoldBrandName(),
techSupportLink: select( nfdOnboardingStore ).getTechSupportUrl(),
fullServiceCreativeTeamLink: select( nfdOnboardingStore ).getfullServiceCreativeTeamUrl(),
brandConfig: select( nfdOnboardingStore ).getNewfoldBrandConfig(),
};
} );

Expand All @@ -51,7 +52,8 @@ const LearnMore = () => {
subheading={ content.introduction.subheading }
icon={ content.introduction.icon }
/>
<IllustrationPanel cssIcon={ content.illustration.icon } />
{ brandConfig?.views?.sidebar?.illustration?.shown !== false &&
<IllustrationPanel cssIcon={ content.illustration.icon } /> }
<InfoPanel
headingWithDescriptions={
content.information.headingWithDescriptions
Expand Down
6 changes: 4 additions & 2 deletions src/OnboardingSPA/pages/Steps/DesignThemeStyles/Preview/Sidebar/LearnMore/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,12 @@ const StepIntroPanel = lazy( () =>
);

const LearnMore = () => {
const { brandName, techSupportLink, fullServiceCreativeTeamLink } = useSelect( ( select ) => {
const { brandName, techSupportLink, fullServiceCreativeTeamLink, brandConfig } = useSelect( ( select ) => {
return {
brandName: select( nfdOnboardingStore ).getNewfoldBrandName(),
techSupportLink: select( nfdOnboardingStore ).getTechSupportUrl(),
fullServiceCreativeTeamLink: select( nfdOnboardingStore ).getfullServiceCreativeTeamUrl(),
brandConfig: select( nfdOnboardingStore ).getNewfoldBrandConfig(),
};
} );

Expand All @@ -51,7 +52,8 @@ const LearnMore = () => {
subheading={ content.introduction.subheading }
icon={ content.introduction.icon }
/>
<IllustrationPanel cssIcon={ content.illustration.icon } />
{ brandConfig?.views?.sidebar?.illustration?.shown !== false &&
<IllustrationPanel cssIcon={ content.illustration.icon } /> }
<InfoPanel
headingWithDescriptions={
content.information.headingWithDescriptions
Expand Down
6 changes: 4 additions & 2 deletions src/OnboardingSPA/pages/Steps/DesignTypography/Sidebar/LearnMore/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,11 @@ const StepIntroPanel = lazy( () =>
);

const LearnMore = () => {
const { techSupportLink, fullServiceCreativeTeamLink } = useSelect( ( select ) => {
const { techSupportLink, fullServiceCreativeTeamLink, brandConfig } = useSelect( ( select ) => {
return {
techSupportLink: select( nfdOnboardingStore ).getTechSupportUrl(),
fullServiceCreativeTeamLink: select( nfdOnboardingStore ).getfullServiceCreativeTeamUrl(),
brandConfig: select( nfdOnboardingStore ).getNewfoldBrandConfig(),
};
} );

Expand All @@ -45,7 +46,8 @@ const LearnMore = () => {
subheading={ content.introduction.subheading }
icon={ content.introduction.icon }
/>
<IllustrationPanel cssIcon={ content.illustration.icon } />
{ brandConfig?.views?.sidebar?.illustration?.shown !== false &&
<IllustrationPanel cssIcon={ content.illustration.icon } /> }
<InfoPanel
headingWithDescriptions={
content.information.headingWithDescriptions
Expand Down
8 changes: 5 additions & 3 deletions src/OnboardingSPA/pages/Steps/Ecommerce/StepAddress/Sidebar/LearnMore/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,12 @@ const StepIntroPanel = lazy( () =>
);

const LearnMore = () => {
const { brandName, techSupportLink, fullServiceCreativeTeamLink } = useSelect( ( select ) => {
const { brandName, techSupportLink, fullServiceCreativeTeamLink, brandConfig } = useSelect( ( select ) => {
return {
brandName: select( nfdOnboardingStore ).getNewfoldBrandName(),
techSupportLink: select( nfdOnboardingStore ).getTechSupportUrl(),
fullServiceCreativeTeamLink: select( nfdOnboardingStore ).getfullServiceCreativeTeamUrl(),
brandConfig: select( nfdOnboardingStore ).getNewfoldBrandConfig(),
};
} );

Expand All @@ -51,7 +52,8 @@ const LearnMore = () => {
subheading={ content.introduction.subheading }
icon={ content.introduction.icon }
/>
<IllustrationPanel cssIcon={ content.illustration.icon } />
{ brandConfig?.views?.sidebar?.illustration?.shown !== false &&
<IllustrationPanel cssIcon={ content.illustration.icon } /> }
<InfoPanel
headingWithDescriptions={
content.information.headingWithDescriptions
Expand All @@ -61,7 +63,7 @@ const LearnMore = () => {
<ButtonWhite
text={ content.help.fullService.text }
onClick={ () =>
( window.open( content.help.fullService.link, '_blank') )
( window.open( content.help.fullService.link, '_blank' ) )
}
/>
<SupportLink
Expand Down
8 changes: 5 additions & 3 deletions src/OnboardingSPA/pages/Steps/Ecommerce/StepProducts/Sidebar/LearnMore/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,12 @@ const StepIntroPanel = lazy( () =>
);

const LearnMore = () => {
const { brandName, techSupportLink, fullServiceCreativeTeamLink } = useSelect( ( select ) => {
const { brandName, techSupportLink, fullServiceCreativeTeamLink, brandConfig } = useSelect( ( select ) => {
return {
brandName: select( nfdOnboardingStore ).getNewfoldBrandName(),
techSupportLink: select( nfdOnboardingStore ).getTechSupportUrl(),
fullServiceCreativeTeamLink: select( nfdOnboardingStore ).getfullServiceCreativeTeamUrl(),
brandConfig: select( nfdOnboardingStore ).getNewfoldBrandConfig(),
};
} );

Expand All @@ -51,7 +52,8 @@ const LearnMore = () => {
subheading={ content.introduction.subheading }
icon={ content.introduction.icon }
/>
<IllustrationPanel cssIcon={ content.illustration.icon } />
{ brandConfig?.views?.sidebar?.illustration?.shown !== false &&
<IllustrationPanel cssIcon={ content.illustration.icon } /> }
<InfoPanel
headingWithDescriptions={
content.information.headingWithDescriptions
Expand All @@ -61,7 +63,7 @@ const LearnMore = () => {
<ButtonWhite
text={ content.help.fullService.text }
onClick={ () =>
( window.open( content.help.fullService.link, '_blank') )
( window.open( content.help.fullService.link, '_blank' ) )
}
/>
<SupportLink
Expand Down
6 changes: 4 additions & 2 deletions src/OnboardingSPA/pages/Steps/Ecommerce/StepTax/Sidebar/LearnMore/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const StepIntroPanel = lazy( () =>
);

const LearnMore = () => {
const { brandName, techSupportLink, fullServiceCreativeTeamLink } =
const { brandName, techSupportLink, fullServiceCreativeTeamLink, brandConfig } =
useSelect( ( select ) => {
return {
brandName: select( nfdOnboardingStore ).getNewfoldBrandName(),
Expand All @@ -44,6 +44,7 @@ const LearnMore = () => {
select(
nfdOnboardingStore
).getfullServiceCreativeTeamUrl(),
brandConfig: select( nfdOnboardingStore ).getNewfoldBrandConfig(),
};
} );

Expand All @@ -60,7 +61,8 @@ const LearnMore = () => {
subheading={ content.introduction.subheading }
icon={ content.introduction.icon }
/>
<IllustrationPanel cssIcon={ content.illustration.icon } />
{ brandConfig?.views?.sidebar?.illustration?.shown !== false &&
<IllustrationPanel cssIcon={ content.illustration.icon } /> }
<InfoPanel
headingWithDescriptions={
content.information.headingWithDescriptions
Expand Down
Loading