From 8a37e418958fe17da42827234829370af551c6d4 Mon Sep 17 00:00:00 2001 From: oskosk Date: Mon, 14 Dec 2015 10:01:09 -0300 Subject: [PATCH 1/2] Rename email-signup-form step to user The User step will be called UserSignupComponent in signup/config/step-components.js --- client/signup/config/step-components.js | 8 ++++---- client/signup/steps/{email-signup-form => user}/index.jsx | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) rename client/signup/steps/{email-signup-form => user}/index.jsx (99%) diff --git a/client/signup/config/step-components.js b/client/signup/config/step-components.js index 63e7ff0a44299..7ad010c2542ff 100644 --- a/client/signup/config/step-components.js +++ b/client/signup/config/step-components.js @@ -1,7 +1,7 @@ /** * Internal dependencies */ -var EmailSignupComponent = require( 'signup/steps/email-signup-form' ), +var UserSignupComponent = require( 'signup/steps/user' ), SiteCreationComponent = require( 'signup/steps/site-creation' ), ThemeSelectionComponent = require( 'signup/steps/theme-selection' ), PlansStepComponent = require( 'signup/steps/plans' ), @@ -15,14 +15,14 @@ module.exports = { themes: ThemeSelectionComponent, 'theme-headstart': ThemeSelectionComponent, site: SiteCreationComponent, - user: EmailSignupComponent, + user: UserSignupComponent, test: config( 'env' ) === 'development' ? require( 'signup/steps/test-step' ) : undefined, plans: PlansStepComponent, domains: DomainsStepComponent, survey: SurveyStepComponent, - 'survey-user': EmailSignupComponent, + 'survey-user': UserSignupComponent, 'domains-with-theme': DomainsStepComponent, 'theme-dss': DSSStepComponent, 'design-type': DesignTypeComponent, - 'jetpack-user': EmailSignupComponent + 'jetpack-user': UserSignupComponent }; diff --git a/client/signup/steps/email-signup-form/index.jsx b/client/signup/steps/user/index.jsx similarity index 99% rename from client/signup/steps/email-signup-form/index.jsx rename to client/signup/steps/user/index.jsx index 9741f18236200..ef1d41da7bfd8 100644 --- a/client/signup/steps/email-signup-form/index.jsx +++ b/client/signup/steps/user/index.jsx @@ -16,7 +16,7 @@ import { getABTestVariation } from 'lib/abtest'; export default React.createClass( { - displayName: 'EmailSignupForm', + displayName: 'User', componentWillReceiveProps( nextProps ) { if ( nextProps.step && 'invalid' === nextProps.step.status ) { From f9289f15112006a1f395e12e85370de4e9422654 Mon Sep 17 00:00:00 2001 From: oskosk Date: Mon, 14 Dec 2015 10:57:19 -0300 Subject: [PATCH 2/2] Rename site-creation step to site --- assets/stylesheets/_components.scss | 2 +- client/signup/config/step-components.js | 4 ++-- client/signup/steps/{site-creation => site}/index.jsx | 6 +++--- client/signup/steps/{site-creation => site}/style.scss | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) rename client/signup/steps/{site-creation => site}/index.jsx (97%) rename client/signup/steps/{site-creation => site}/style.scss (58%) diff --git a/assets/stylesheets/_components.scss b/assets/stylesheets/_components.scss index 0b1ee39d0a90b..b6b3062fc826a 100644 --- a/assets/stylesheets/_components.scss +++ b/assets/stylesheets/_components.scss @@ -306,7 +306,7 @@ @import 'signup/steps/survey/style'; @import 'signup/steps/design-type/style'; @import 'signup/steps/plans/style'; -@import 'signup/steps/site-creation/style'; +@import 'signup/steps/site/style'; @import 'signup/validation-fieldset/style'; @import 'vip/vip-logs/style'; @import 'signup/steps/dss/style'; diff --git a/client/signup/config/step-components.js b/client/signup/config/step-components.js index 7ad010c2542ff..4eb5ea4ebdd94 100644 --- a/client/signup/config/step-components.js +++ b/client/signup/config/step-components.js @@ -2,7 +2,7 @@ * Internal dependencies */ var UserSignupComponent = require( 'signup/steps/user' ), - SiteCreationComponent = require( 'signup/steps/site-creation' ), + SiteComponent = require( 'signup/steps/site' ), ThemeSelectionComponent = require( 'signup/steps/theme-selection' ), PlansStepComponent = require( 'signup/steps/plans' ), DomainsStepComponent = require( 'signup/steps/domains' ), @@ -14,7 +14,7 @@ var UserSignupComponent = require( 'signup/steps/user' ), module.exports = { themes: ThemeSelectionComponent, 'theme-headstart': ThemeSelectionComponent, - site: SiteCreationComponent, + site: SiteComponent, user: UserSignupComponent, test: config( 'env' ) === 'development' ? require( 'signup/steps/test-step' ) : undefined, plans: PlansStepComponent, diff --git a/client/signup/steps/site-creation/index.jsx b/client/signup/steps/site/index.jsx similarity index 97% rename from client/signup/steps/site-creation/index.jsx rename to client/signup/steps/site/index.jsx index 780c68031d068..19119abd6afa8 100644 --- a/client/signup/steps/site-creation/index.jsx +++ b/client/signup/steps/site/index.jsx @@ -34,7 +34,7 @@ var siteUrlsSearched = [], timesValidationFailed = 0; module.exports = React.createClass( { - displayName: 'SiteCreation', + displayName: 'Site', getInitialState: function() { return { @@ -235,7 +235,7 @@ module.exports = React.createClass( { - .wordpress.com + .wordpress.com ; }, diff --git a/client/signup/steps/site-creation/style.scss b/client/signup/steps/site/style.scss similarity index 58% rename from client/signup/steps/site-creation/style.scss rename to client/signup/steps/site/style.scss index 68a5e7c8a5c0d..12ec0320412dd 100644 --- a/client/signup/steps/site-creation/style.scss +++ b/client/signup/steps/site/style.scss @@ -1,8 +1,8 @@ -.site-creation__site-url.form-text-input { +.site-signup-step__site-url.form-text-input { padding-right: 122px; } -.site-creation__wordpress-domain-suffix { +.site-signup-step__wordpress-domain-suffix { color: $gray; line-height: 40px; margin-left: -122px;