Delete non existent step 7 instalation (#862)
* Delete non existent step 7 instalation * Add INSTALLATION_COMPLETED_TITLE i18n and delete INSTALLATION_COMPLETED.
This commit is contained in:
parent
f72f2ac074
commit
1c5d156723
|
@ -61,7 +61,7 @@ import InstallStep3Database from 'app/install/install-step-3-database';
|
||||||
import InstallStep4UserSystem from 'app/install/install-step-4-user-system';
|
import InstallStep4UserSystem from 'app/install/install-step-4-user-system';
|
||||||
import InstallStep5Settings from 'app/install/install-step-5-settings';
|
import InstallStep5Settings from 'app/install/install-step-5-settings';
|
||||||
import InstallStep6Admin from 'app/install/install-step-6-admin';
|
import InstallStep6Admin from 'app/install/install-step-6-admin';
|
||||||
import InstallStep7Completed from 'app/install/install-step-7-completed';
|
import InstallCompleted from 'app/install/install-completed';
|
||||||
|
|
||||||
export default (
|
export default (
|
||||||
<Router history={history}>
|
<Router history={history}>
|
||||||
|
@ -98,7 +98,7 @@ export default (
|
||||||
<Route path="step-4" component={InstallStep4UserSystem} />
|
<Route path="step-4" component={InstallStep4UserSystem} />
|
||||||
<Route path="step-5" component={InstallStep5Settings} />
|
<Route path="step-5" component={InstallStep5Settings} />
|
||||||
<Route path="step-6" component={InstallStep6Admin} />
|
<Route path="step-6" component={InstallStep6Admin} />
|
||||||
<Route path="step-7" component={InstallStep7Completed} />
|
<Route path="completed" component={InstallCompleted} />
|
||||||
</Route>
|
</Route>
|
||||||
<Route path="admin">
|
<Route path="admin">
|
||||||
<IndexRoute component={AdminLoginPage} />
|
<IndexRoute component={AdminLoginPage} />
|
||||||
|
|
|
@ -4,10 +4,9 @@ import store from 'app/store';
|
||||||
import ConfigActions from 'actions/config-actions';
|
import ConfigActions from 'actions/config-actions';
|
||||||
import i18n from 'lib-app/i18n';
|
import i18n from 'lib-app/i18n';
|
||||||
|
|
||||||
import Header from 'core-components/header';
|
|
||||||
import Message from 'core-components/message';
|
import Message from 'core-components/message';
|
||||||
|
|
||||||
class InstallStep7Completed extends React.Component {
|
class InstallCompleted extends React.Component {
|
||||||
|
|
||||||
componentDidMount() {
|
componentDidMount() {
|
||||||
store.dispatch(ConfigActions.init());
|
store.dispatch(ConfigActions.init());
|
||||||
|
@ -19,9 +18,8 @@ class InstallStep7Completed extends React.Component {
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<div className="install-step-7">
|
<div className="install-completed">
|
||||||
<Header title={i18n('STEP_TITLE', {title: i18n('COMPLETED'), current: 7, total: 7})} description={i18n('STEP_7_DESCRIPTION')}/>
|
<Message title={i18n('INSTALLATION_COMPLETED_TITLE')} type="success">
|
||||||
<Message title={i18n('INSTALLATION_COMPLETED')} type="success">
|
|
||||||
{i18n('INSTALLATION_COMPLETED_DESCRIPTION')}
|
{i18n('INSTALLATION_COMPLETED_DESCRIPTION')}
|
||||||
</Message>
|
</Message>
|
||||||
</div>
|
</div>
|
||||||
|
@ -29,4 +27,4 @@ class InstallStep7Completed extends React.Component {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default InstallStep7Completed;
|
export default InstallCompleted;
|
|
@ -14,7 +14,7 @@ class InstallStep1Language extends React.Component {
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<div className="install-step-1">
|
<div className="install-step-1">
|
||||||
<Header title={i18n('STEP_TITLE', {title: i18n('SELECT_LANGUAGE'), current: 1, total: 7})} description={i18n('STEP_1_DESCRIPTION')}/>
|
<Header title={i18n('STEP_TITLE', {title: i18n('SELECT_LANGUAGE'), current: 1, total: 6})} description={i18n('STEP_1_DESCRIPTION')} />
|
||||||
<LanguageSelector {...this.getLanguageSelectorProps()} />
|
<LanguageSelector {...this.getLanguageSelectorProps()} />
|
||||||
<div className="install-step-1__button">
|
<div className="install-step-1__button">
|
||||||
<Button size="medium" type="secondary" onClick={() => history.push('/install/step-2')}>
|
<Button size="medium" type="secondary" onClick={() => history.push('/install/step-2')}>
|
||||||
|
|
|
@ -30,7 +30,7 @@ class InstallStep2Requirements extends React.Component {
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<div className="install-step-2">
|
<div className="install-step-2">
|
||||||
<Header title={i18n('STEP_TITLE', {title: i18n('SERVER_REQUIREMENTS'), current: 2, total: 7})} description={i18n('STEP_2_DESCRIPTION')}/>
|
<Header title={i18n('STEP_TITLE', {title: i18n('SERVER_REQUIREMENTS'), current: 2, total: 6})} description={i18n('STEP_2_DESCRIPTION')} />
|
||||||
<div className="install-step-2__refresh">
|
<div className="install-step-2__refresh">
|
||||||
<Button className="install-step-2__refresh-button" type="secondary" size="medium" onClick={this.retrieveRequirements.bind(this)}>
|
<Button className="install-step-2__refresh-button" type="secondary" size="medium" onClick={this.retrieveRequirements.bind(this)}>
|
||||||
<Icon className="install-step-2__refresh-icon" name="refresh" /> {i18n('REFRESH')}
|
<Icon className="install-step-2__refresh-icon" name="refresh" /> {i18n('REFRESH')}
|
||||||
|
|
|
@ -24,7 +24,7 @@ class InstallStep3Database extends React.Component {
|
||||||
const { loading } = this.state;
|
const { loading } = this.state;
|
||||||
return (
|
return (
|
||||||
<div className="install-step-3">
|
<div className="install-step-3">
|
||||||
<Header title={i18n('STEP_TITLE', {title: i18n('DATABASE_CONFIGURATION'), current: 3, total: 7})} description={i18n('STEP_3_DESCRIPTION')}/>
|
<Header title={i18n('STEP_TITLE', {title: i18n('DATABASE_CONFIGURATION'), current: 3, total: 6})} description={i18n('STEP_3_DESCRIPTION')} />
|
||||||
{this.renderMessage()}
|
{this.renderMessage()}
|
||||||
<Form loading={loading} onSubmit={this.onSubmit.bind(this)}>
|
<Form loading={loading} onSubmit={this.onSubmit.bind(this)}>
|
||||||
<FormField name="dbHost" label={i18n('DATABASE_HOST')} fieldProps={{size: 'large'}} required/>
|
<FormField name="dbHost" label={i18n('DATABASE_HOST')} fieldProps={{size: 'large'}} required/>
|
||||||
|
|
|
@ -24,7 +24,7 @@ class InstallStep4UserSystem extends React.Component {
|
||||||
const { form } = this.state
|
const { form } = this.state
|
||||||
return (
|
return (
|
||||||
<div className="install-step-4">
|
<div className="install-step-4">
|
||||||
<Header title={i18n('STEP_TITLE', {title: i18n('USER_SYSTEM'), current: 4, total: 7})} description={i18n('STEP_4_DESCRIPTION')}/>
|
<Header title={i18n('STEP_TITLE', {title: i18n('USER_SYSTEM'), current: 4, total: 6})} description={i18n('STEP_4_DESCRIPTION')} />
|
||||||
<Form onSubmit={this.onSubmit.bind(this)} values={form} onChange={this.onChange.bind(this)}>
|
<Form onSubmit={this.onSubmit.bind(this)} values={form} onChange={this.onChange.bind(this)}>
|
||||||
<div className="install-step-4__container">
|
<div className="install-step-4__container">
|
||||||
<FormField
|
<FormField
|
||||||
|
|
|
@ -31,7 +31,7 @@ class InstallStep5Settings extends React.Component {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="install-step-5">
|
<div className="install-step-5">
|
||||||
<Header title={i18n('STEP_TITLE', {title: i18n('SETTINGS'), current: 5, total: 7})} description={i18n('STEP_5_DESCRIPTION')}/>
|
<Header title={i18n('STEP_TITLE', {title: i18n('SETTINGS'), current: 5, total: 6})} description={i18n('STEP_5_DESCRIPTION')} />
|
||||||
{this.renderMessage()}
|
{this.renderMessage()}
|
||||||
<Form loading={loading} onSubmit={this.onSubmit.bind(this)} value={form} onChange={(form) => this.setState({form})}>
|
<Form loading={loading} onSubmit={this.onSubmit.bind(this)} value={form} onChange={(form) => this.setState({form})}>
|
||||||
<FormField name="title" label={i18n('TITLE')} fieldProps={{size: 'large'}} required/>
|
<FormField name="title" label={i18n('TITLE')} fieldProps={{size: 'large'}} required/>
|
||||||
|
|
|
@ -21,7 +21,7 @@ class InstallStep6Admin extends React.Component {
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<div className="install-step-6">
|
<div className="install-step-6">
|
||||||
<Header title={i18n('STEP_TITLE', {title: i18n('ADMIN_SETUP'), current: 6, total: 7})} description={i18n('STEP_6_DESCRIPTION')}/>
|
<Header title={i18n('STEP_TITLE', {title: i18n('ADMIN_SETUP'), current: 6, total: 6})} description={i18n('STEP_6_DESCRIPTION')} />
|
||||||
{this.renderMessage()}
|
{this.renderMessage()}
|
||||||
<Form onSubmit={this.onSubmit.bind(this)}>
|
<Form onSubmit={this.onSubmit.bind(this)}>
|
||||||
<FormField name="name" validation="NAME" label={i18n('ADMIN_NAME')} fieldProps={{size: 'large'}} required/>
|
<FormField name="name" validation="NAME" label={i18n('ADMIN_NAME')} fieldProps={{size: 'large'}} required/>
|
||||||
|
@ -57,7 +57,7 @@ class InstallStep6Admin extends React.Component {
|
||||||
path: '/system/init-admin',
|
path: '/system/init-admin',
|
||||||
data: form
|
data: form
|
||||||
})
|
})
|
||||||
.then(() => history.push('/install/step-7'))
|
.then(() => history.push('/install/completed'))
|
||||||
.catch(({message}) => this.setState({
|
.catch(({message}) => this.setState({
|
||||||
loading: false,
|
loading: false,
|
||||||
error: true,
|
error: true,
|
||||||
|
|
|
@ -285,7 +285,7 @@ export default {
|
||||||
'ADMIN_EMAIL': 'Admin account email',
|
'ADMIN_EMAIL': 'Admin account email',
|
||||||
'ADMIN_PASSWORD': 'Admin account password',
|
'ADMIN_PASSWORD': 'Admin account password',
|
||||||
'ADMIN_PASSWORD_DESCRIPTION': 'Please remember this password. It is needed for accessing the admin panel. You can change it later.',
|
'ADMIN_PASSWORD_DESCRIPTION': 'Please remember this password. It is needed for accessing the admin panel. You can change it later.',
|
||||||
'INSTALLATION_COMPLETED': 'Installation completed.',
|
'INSTALLATION_COMPLETED_TITLE': 'Installation completed',
|
||||||
'INSTALLATION_COMPLETED_DESCRIPTION': 'The installation of OpenSupports is completed. Redirecting to admin panel...',
|
'INSTALLATION_COMPLETED_DESCRIPTION': 'The installation of OpenSupports is completed. Redirecting to admin panel...',
|
||||||
|
|
||||||
'STEP_TITLE': 'Step {current} of {total} - {title}',
|
'STEP_TITLE': 'Step {current} of {total} - {title}',
|
||||||
|
@ -295,7 +295,6 @@ export default {
|
||||||
'STEP_4_DESCRIPTION': 'Please select your user system preferences.',
|
'STEP_4_DESCRIPTION': 'Please select your user system preferences.',
|
||||||
'STEP_5_DESCRIPTION': 'Please fill your general system preferences.',
|
'STEP_5_DESCRIPTION': 'Please fill your general system preferences.',
|
||||||
'STEP_6_DESCRIPTION': 'Please configure the administrator account.',
|
'STEP_6_DESCRIPTION': 'Please configure the administrator account.',
|
||||||
'STEP_7_DESCRIPTION': 'Installation is completed.',
|
|
||||||
|
|
||||||
//VIEW DESCRIPTIONS
|
//VIEW DESCRIPTIONS
|
||||||
'CREATE_TICKET_DESCRIPTION': 'This is a form for creating tickets. Fill the form and send us your issues/doubts/suggestions. Our support system will answer it as soon as possible.',
|
'CREATE_TICKET_DESCRIPTION': 'This is a form for creating tickets. Fill the form and send us your issues/doubts/suggestions. Our support system will answer it as soon as possible.',
|
||||||
|
|
Loading…
Reference in New Issue