From 2c46b69c25bd09eb30c632777baf17fcdbe8f4a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ja=CC=81n=20Mikla=CC=81s=CC=8C?= <neosinner@gmail.com>
Date: Tue, 9 Apr 2019 13:09:46 +0200
Subject: [PATCH] Move stepped progress bar above content

[MAILPOET-1927]
---
 assets/js/src/welcome_wizard/header.jsx       | 22 -------------------
 .../src/welcome_wizard/steps_controller.jsx   | 17 ++++++++------
 2 files changed, 10 insertions(+), 29 deletions(-)
 delete mode 100644 assets/js/src/welcome_wizard/header.jsx

diff --git a/assets/js/src/welcome_wizard/header.jsx b/assets/js/src/welcome_wizard/header.jsx
deleted file mode 100644
index c7ad389d93..0000000000
--- a/assets/js/src/welcome_wizard/header.jsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import SteppedProgressBar from '../common/stepped_progess_bar.jsx';
-
-const WelcomeWizardHeader = props => (
-  <div className="mailpoet_welcome_wizard_header">
-    <img src={props.logo_src} width="200" height="87" alt="MailPoet logo" />
-    {
-      props.current_step <= props.steps_count
-        ? (<SteppedProgressBar steps_count={props.steps_count} step={props.current_step} />)
-        : null
-    }
-  </div>
-);
-
-WelcomeWizardHeader.propTypes = {
-  current_step: PropTypes.number.isRequired,
-  steps_count: PropTypes.number.isRequired,
-  logo_src: PropTypes.string.isRequired,
-};
-
-export default WelcomeWizardHeader;
diff --git a/assets/js/src/welcome_wizard/steps_controller.jsx b/assets/js/src/welcome_wizard/steps_controller.jsx
index 82412bab19..1527c3ea38 100644
--- a/assets/js/src/welcome_wizard/steps_controller.jsx
+++ b/assets/js/src/welcome_wizard/steps_controller.jsx
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import React, { useState, useEffect } from 'react';
 import MailPoet from 'mailpoet';
-import WelcomeWizardHeader from './header.jsx';
+import SteppedProgressBar from '../common/stepped_progess_bar.jsx';
 import WelcomeWizardSenderStep from './steps/sender_step.jsx';
 import WelcomeWizardMigratedUserStep from './steps/migrated_user_step.jsx';
 import WelcomeWizardEmailCourseStep from './steps/email_course_step.jsx';
@@ -77,17 +77,20 @@ const WelcomeWizardStepsController = (props) => {
 
   return (
     <div className="mailpoet_welcome_wizard_steps">
-      <WelcomeWizardHeader
-        current_step={step}
-        steps_count={stepsCount}
-        logo_src={window.mailpoet_logo_url}
-      />
+      <div className="mailpoet_welcome_wizard_header">
+        <img src={window.mailpoet_logo_url} width="200" height="87" alt="MailPoet logo" />
+      </div>
       <div className="mailpoet_welcome_wizard_flex">
-
         <div className="mailpoet_welcome_wizard_illustration">
           <img src={window['step_' + step + '_illustration_url']} alt="" />
         </div>
         <div className="mailpoet_welcome_wizard_step">
+          { step <= stepsCount
+            ? (
+              <SteppedProgressBar steps_count={stepsCount} step={step} />
+            ) : null
+          }
+
           { step === 1 && shouldSetSender
             ? (
               <WelcomeWizardSenderStep