Move Jetpack connection to first step

Automattic · Sep 4, 2017 · 86c59e8 · 86c59e8
1 parent faffb02
commit 86c59e8
Show file tree

Hide file tree

Showing 5 changed files with 948 additions and 2,037 deletions.
diff --git a/client/components/steps/jetpack-jumpstart.jsx b/client/components/steps/jetpack-jumpstart.jsx
@@ -42,13 +42,9 @@ var JetpackJumpstart = React.createClass({
 
 	handleJetpackConnect: function( event ) {
 		event.preventDefault();
-		const path = JPS.bloginfo.type === 'business' ?
-			Paths.BUSINESS_ADDRESS_SLUG :
-			Paths.REVIEW_STEP_SLUG;
-
 		this.setState( { jetpackConnecting: true } );
 		SiteActions
-			.configureJetpack( path )
+			.configureJetpack( Paths.SITE_TITLE_STEP_SLUG )
 			.always(function() {
 				this.setState( { jetpackConnecting: false } );
 			}.bind( this ) );
@@ -62,10 +58,7 @@ var JetpackJumpstart = React.createClass({
 
 	handleSkip: function() {
 		SetupProgressActions.skipStep();
-		if ( JPS.bloginfo.type !== 'business' ) {
-			return SetupProgressActions.setCurrentStep( Paths.REVIEW_STEP_SLUG );
-		}
-		return SetupProgressActions.setCurrentStep( Paths.BUSINESS_ADDRESS_SLUG );
+		return SetupProgressActions.setCurrentStep( Paths.SITE_TITLE_STEP_SLUG );
 	},
 
 	render: function() {

diff --git a/client/welcome-panel.jsx b/client/welcome-panel.jsx
@@ -19,6 +19,12 @@ module.exports = function() {
 			// 	completed: true,
 			// 	static: true
 			// },
+			{
+				name: 'Enable Jetpack',
+				slug: Paths.JETPACK_MODULES_STEP_SLUG,
+				neverSkip: true, // don't skip this even if it's been completed
+				welcomeView: require('./components/steps/jetpack-jumpstart'),
+			},
 			{
 				name: 'Site title',
 				slug: Paths.SITE_TITLE_STEP_SLUG,
@@ -39,12 +45,6 @@ module.exports = function() {
 				slug: Paths.CONTACT_PAGE_STEP_SLUG,
 				welcomeView: require('./components/steps/contact')
 			},
-			{
-				name: 'Enable Jetpack',
-				slug: Paths.JETPACK_MODULES_STEP_SLUG,
-				neverSkip: true, // don't skip this even if it's been completed
-				welcomeView: require('./components/steps/jetpack-jumpstart'),
-			},
 			{
 				name: 'Business Address',
 				slug: Paths.BUSINESS_ADDRESS_SLUG,

diff --git a/dist/ie-shims.js b/dist/ie-shims.js
@@ -1,6 +1,6 @@
 webpackJsonp([1],{
 
-/***/ 115:
+/***/ 107:
 /***/ (function(module, exports, __webpack_require__) {
 
 var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
@@ -574,7 +574,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
 
 /***/ }),
 
-/***/ 116:
+/***/ 108:
 /***/ (function(module, exports, __webpack_require__) {
 
 var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
@@ -2650,15 +2650,15 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
 
 /***/ }),
 
-/***/ 153:
+/***/ 123:
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-__webpack_require__(116);
-__webpack_require__(115);
+__webpack_require__(108);
+__webpack_require__(107);
 
 /***/ })
 
-},[153]);
+},[123]);