Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Move stepped progress bar above content

Browse Source 
[MAILPOET-1927]
This commit is contained in:
Ján Mikláš
2019-04-09 13:09:46 +02:00
committed by Ján Mikláš
parent 00950b1ec5
commit 2c46b69c25
2 changed files with 10 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
assets/js/src/welcome_wizard/header.jsx
View File

@ -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;

17
assets/js/src/welcome_wizard/steps_controller.jsx
View File

@ -1,7 +1,7 @@
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import MailPoet from 'mailpoet'; 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 WelcomeWizardSenderStep from './steps/sender_step.jsx';
import WelcomeWizardMigratedUserStep from './steps/migrated_user_step.jsx'; import WelcomeWizardMigratedUserStep from './steps/migrated_user_step.jsx';
import WelcomeWizardEmailCourseStep from './steps/email_course_step.jsx'; import WelcomeWizardEmailCourseStep from './steps/email_course_step.jsx';
@ -77,17 +77,20 @@ const WelcomeWizardStepsController = (props) => {
return ( return (
<div className="mailpoet_welcome_wizard_steps"> <div className="mailpoet_welcome_wizard_steps">
<WelcomeWizardHeader <div className="mailpoet_welcome_wizard_header">
current_step={step} <img src={window.mailpoet_logo_url} width="200" height="87" alt="MailPoet logo" />
steps_count={stepsCount} </div>
logo_src={window.mailpoet_logo_url}
/>
<div className="mailpoet_welcome_wizard_flex"> <div className="mailpoet_welcome_wizard_flex">
<div className="mailpoet_welcome_wizard_illustration"> <div className="mailpoet_welcome_wizard_illustration">
<img src={window['step_' + step + '_illustration_url']} alt="" /> <img src={window['step_' + step + '_illustration_url']} alt="" />
</div> </div>
<div className="mailpoet_welcome_wizard_step"> <div className="mailpoet_welcome_wizard_step">
{ step <= stepsCount
? (
<SteppedProgressBar steps_count={stepsCount} step={step} />
) : null
}
{ step === 1 && shouldSetSender { step === 1 && shouldSetSender
? ( ? (
<WelcomeWizardSenderStep <WelcomeWizardSenderStep