Layout: Replace `LayoutLoggedOut` and `LayoutLoggedOutOAuth` with `Layout` #2964

drewblaisdell · 2016-02-01T22:05:16Z

Fixes #2960. The layout changes based on the current section and presence of a user prop.

LayoutLoggedOutDesign hasn't been removed yet because it is also rendered on the server and has dependencies (like abtest) that assume a browser environment. I started working on this, but updating Layout to run on the server is a rather large task, and will be handled separately - I'll open an issue for this once this is merged.

Testing
There are no visual changes. We need to assert that the layout doesn't break when the user is logged out, logged in, using the desktop app, and on /design.

Logged out

Visit /start while logged out, and assert that the page isn't broken.
Go through the signup flow an ensure the email verification notice shows.

Logged in

Visit any page while logged in, and assert that the page isn't broken.

Using the desktop app

Check out this branch inside the calypso/ directory in the desktop app (cd calypso && git checkout update/one-layout).
make run from wp-desktop/ and assert that the login page isn't broken.
Log in and assert that the Reader (or any other page, once logged in) isn't broken.

/design

Visit /design while logged out and assert that the page isn't broken.
Code review
Product review

drewblaisdell · 2016-02-02T21:16:11Z

client/auth/style.scss

-		}
+.is-section-login {
+	background: $blue-wordpress;
+	height: 100%;


This block obviates most of these styles. They should be removed once this is merged.

This block obviates most of these styles. They should be removed once this is merged.

I created an issue for that here: https://github.com/Automattic/wp-desktop/issues/67

scruffian · 2016-02-03T16:10:19Z

client/layout/index.jsx

@@ -81,7 +82,23 @@ Layout = React.createClass( {
 		return sortBy( this.props.sites.get(), property( 'ID' ) ).pop();
 	},

-	renderMasterbar() {
+	renderEmailVerificationNotice: function() {


This doesn't seem to be called anywhere anymore.

I added it in eb1059e22ce0c16682238e8ea22ab282541297fc

scruffian · 2016-02-03T16:33:13Z

Code looks good. @drewblaisdell I added a couple of tiny commits.

stephanethomas · 2016-02-04T09:43:19Z

client/layout/index.jsx

+				<Welcome isVisible={ showWelcome } closeAction={ this.closeWelcome } additionalClassName="NuxWelcome">
+					<WelcomeMessage welcomeSite={ newestSite } />
+				</Welcome>
+				<TranslatorInvitation isVisible={ showInvitation } />


showInvitation is undefined.

Fixed. Thanks for catching that, @stephanethomas.

scruffian · 2016-02-05T14:55:29Z

Tested again on desktop, logged in and logged out. LGTM.

Layout: Replace `LayoutLoggedOut` and `LayoutLoggedOutOAuth` with `Layout`

scruffian · 2016-02-05T16:18:54Z

LayoutLoggedOutDesign hasn't been removed yet because it is also rendered on the server and has dependencies (like abtest) that assume a browser environment. I started working on this, but updating Layout to run on the server is a rather large task, and will be handled separately - I'll open an issue for this once this is merged.

I did this in #3112.

drewblaisdell added Framework [Status] In Progress [Type] Task labels Feb 1, 2016

drewblaisdell self-assigned this Feb 1, 2016

drewblaisdell force-pushed the update/one-layout branch 2 times, most recently from 9b8cb63 to d60439b Compare February 2, 2016 20:45

drewblaisdell changed the title ~~Layout: Render Layout on all routes~~ Layout: Replace LayoutLoggedOut and LayoutLoggedOutOAuth with Layout Feb 2, 2016

drewblaisdell force-pushed the update/one-layout branch from d60439b to 7eb3646 Compare February 2, 2016 21:12

drewblaisdell reviewed Feb 2, 2016
View reviewed changes

drewblaisdell force-pushed the update/one-layout branch from 7eb3646 to ab288b7 Compare February 2, 2016 21:18

drewblaisdell added [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. and removed [Status] In Progress labels Feb 2, 2016

scruffian reviewed Feb 3, 2016
View reviewed changes

drewblaisdell force-pushed the update/one-layout branch from eb1059e to 713ea77 Compare February 3, 2016 16:35

stephanethomas reviewed Feb 4, 2016
View reviewed changes

stephanethomas added [Status] Needs Author Reply and removed [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. labels Feb 4, 2016

drewblaisdell force-pushed the update/one-layout branch from c27183d to 28ca330 Compare February 4, 2016 14:58

drewblaisdell added [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. and removed [Status] Needs Author Reply labels Feb 4, 2016

drewblaisdell force-pushed the update/one-layout branch from 28ca330 to 30d2be3 Compare February 4, 2016 15:10

scruffian force-pushed the update/one-layout branch from 30d2be3 to 363579a Compare February 5, 2016 12:48

scruffian added [Status] Ready to Merge and removed [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. labels Feb 5, 2016

drewblaisdell and others added 3 commits February 5, 2016 15:56

Layout: Render Layout on all routes except /design

dba56ca

Layout: Fix layout on /login

5bc2f56

Framework: Update this comment so it is more accurate

0993a24

scruffian force-pushed the update/one-layout branch from 363579a to 0993a24 Compare February 5, 2016 15:56

scruffian added a commit that referenced this pull request Feb 5, 2016

Merge pull request #2964 from Automattic/update/one-layout

4e716a5

Layout: Replace `LayoutLoggedOut` and `LayoutLoggedOutOAuth` with `Layout`

scruffian merged commit 4e716a5 into master Feb 5, 2016

scruffian deleted the update/one-layout branch February 5, 2016 16:15

scruffian removed the [Status] Ready to Merge label Feb 5, 2016

scruffian mentioned this pull request Feb 5, 2016

Framework: Layout for /design #3112

Closed

This was referenced Feb 9, 2016

Notices: Connect layout/logged-out to Redux notices #3083

Closed

Themes: Merge layout/logged-out-design back into layout/logged-out #3082

Closed

drewblaisdell mentioned this pull request Feb 10, 2016

Remove unused CSS Automattic/wp-desktop#79

Merged

fabianapsimoes mentioned this pull request May 20, 2016

Signup: Desktop: Show signup in desktop when logged out #2813

Closed

sirreal mentioned this pull request Apr 6, 2018

Notices: Add to logged out layout #23951

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Layout: Replace `LayoutLoggedOut` and `LayoutLoggedOutOAuth` with `Layout` #2964

Layout: Replace `LayoutLoggedOut` and `LayoutLoggedOutOAuth` with `Layout` #2964

drewblaisdell commented Feb 1, 2016

drewblaisdell Feb 2, 2016

scruffian Feb 5, 2016

scruffian Feb 3, 2016

scruffian Feb 3, 2016

scruffian commented Feb 3, 2016

stephanethomas Feb 4, 2016

drewblaisdell Feb 4, 2016

scruffian commented Feb 5, 2016

scruffian commented Feb 5, 2016

Layout: Replace LayoutLoggedOut and LayoutLoggedOutOAuth with Layout #2964

Layout: Replace LayoutLoggedOut and LayoutLoggedOutOAuth with Layout #2964

Conversation

drewblaisdell commented Feb 1, 2016

drewblaisdell Feb 2, 2016

Choose a reason for hiding this comment

scruffian Feb 5, 2016

Choose a reason for hiding this comment

scruffian Feb 3, 2016

Choose a reason for hiding this comment

scruffian Feb 3, 2016

Choose a reason for hiding this comment

scruffian commented Feb 3, 2016

stephanethomas Feb 4, 2016

Choose a reason for hiding this comment

drewblaisdell Feb 4, 2016

Choose a reason for hiding this comment

scruffian commented Feb 5, 2016

scruffian commented Feb 5, 2016

Layout: Replace `LayoutLoggedOut` and `LayoutLoggedOutOAuth` with `Layout` #2964

Layout: Replace `LayoutLoggedOut` and `LayoutLoggedOutOAuth` with `Layout` #2964