Skip to content

Implement yoast domain addition step behind feature flag #52081

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

Merged
ddc22 merged 30 commits into from
May 10, 2021
Merged

Implement yoast domain addition step behind feature flag #52081

Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
1c2db40
Added to basket successfully
ddc22 Apr 19, 2021
b6a8f7a
Styling fixes for domains page
ddc22 Apr 20, 2021
2e2e93f
Final shopping cart designs
ddc22 Apr 21, 2021
780c59b
Add yoast plan on load
ddc22 Apr 22, 2021
a6d810b
RHide recommendation prop added
ddc22 Apr 22, 2021
a14025a
Fix max width
ddc22 Apr 22, 2021
7118ae2
Yoast feature flag cleanup
ddc22 Apr 23, 2021
5ae76c8
Complete initial mobile layout
ddc22 Apr 27, 2021
2016e99
Multiple minor fixes
ddc22 Apr 28, 2021
01d6d0d
Add translation and import fix
ddc22 Apr 28, 2021
f758fdf
Clean up css and reuse components, fix links
ddc22 Apr 29, 2021
84c064f
Show recommendation label refactor
ddc22 Apr 29, 2021
19069f0
Introduce emotion based styles
ddc22 Apr 29, 2021
065b99e
Styling fixes and css cleanup and traslation additions
ddc22 May 1, 2021
931cc96
Added rest of the text
ddc22 May 1, 2021
b2b68d8
Fix basket expanding view and other style issues
ddc22 May 2, 2021
59ffe12
Async loading domains route
ddc22 May 3, 2021
2188242
Loading indicators, add to basket on click, remove previous domain fr…
ddc22 May 3, 2021
3879ed3
Remove redundant props
ddc22 May 4, 2021
b54ca83
Simple url string
ddc22 May 4, 2021
71c3ff0
Cosmetic fixes
ddc22 May 4, 2021
f3810b6
Fixed scrollbars
ddc22 May 5, 2021
802f21d
Site preloading task complete, code redundancy fix
ddc22 May 6, 2021
fa68052
Removed cross state tree dipendency import
ddc22 May 6, 2021
3b1d448
Refactor emotion theme code, replace promise with async await, fix ro…
ddc22 May 6, 2021
44ad236
Review fixes
ddc22 May 6, 2021
b745edd
Fix type errors
ddc22 May 6, 2021
c7f5d1a
Remove unecessary url
ddc22 May 7, 2021
fe45139
Merge branch 'trunk' into add/yoast-domain-addition-step
ddc22 May 7, 2021
abcc784
Can be null
ddc22 May 10, 2021
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
Prev Previous commit
Next Next commit
Async loading domains route
  • Loading branch information
@ddc22
ddc22 committed May 6, 2021
commit 59ffe1231a52e7ab6bd4b9a21162698d0d8e5f3c
6 changes: 4 additions & 2 deletions client/my-sites/plugins/controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import PluginBrowser from './plugins-browser';
import PluginUpload from './plugin-upload';
import { getSelectedSite } from 'calypso/state/ui/selectors';
import getSelectedOrAllSitesWithPlugins from 'calypso/state/selectors/get-selected-or-all-sites-with-plugins';
import MarketplaceDomainUpsell from './marketplace/marketplace-domain-upsell';
import AsyncLoad from 'calypso/components/async-load';

/**
* Module variables
Expand Down Expand Up @@ -207,6 +207,8 @@ export function scrollTopIfNoHash( context, next ) {
}

export function renderDomainsPage( context, next ) {
context.primary = <MarketplaceDomainUpsell />;
context.primary = (
<AsyncLoad require="calypso/my-sites/plugins/marketplace/marketplace-domain-upsell" />
Copy link
Member

@tyxla tyxla May 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: have we considered the default placeholder that appears here for just a little while this is loading? We often remove it by providing placeholder={ null }

Copy link
Contributor Author

@ddc22 ddc22 May 6, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't know this, but I would opt to leave the default placeholder for now and circle back if stakeholders opt to remove it. In any case it feels better with it.

);
next();
}