From 1cc9c70e4774f4da8b1ad927d6cb7f74c0ce730a Mon Sep 17 00:00:00 2001 From: Bennett Date: Wed, 25 Mar 2020 10:30:08 +0100 Subject: Improve user onboarding (#493) Until now, new users have started on the Ferdi dashboard and not on the Welcome screen like Franz does it. This change was made, as users needed to be ablet to change their server before logging in. This commit will change this onboarding process to bring users to the welcome screen on first login and it adds a new "Change Server" screen during authentication that allows the user to change the server without going to the full settings screen. This way, the onboarding experience for new users is a lot easier to go though while also improving the experience for experienced users who want to change their server as they only get the option they are looking for and not the whole settings list. --- recipes | 2 +- src/app.js | 2 + src/components/auth/ChangeServer.js | 80 ++++++++++++++++++++++ src/components/auth/Login.js | 4 +- src/components/auth/Signup.js | 7 +- src/components/auth/Welcome.js | 4 +- src/containers/auth/ChangeServerScreen.js | 50 ++++++++++++++ src/containers/auth/LoginScreen.js | 1 + src/containers/auth/SignupScreen.js | 1 + src/containers/auth/WelcomeScreen.js | 1 + src/i18n/locales/defaultMessages.json | 44 ++++++++++++ src/i18n/locales/en-US.json | 3 + .../messages/src/components/auth/ChangeServer.json | 41 +++++++++++ src/internal-server | 2 +- src/stores/UserStore.js | 8 ++- 15 files changed, 243 insertions(+), 7 deletions(-) create mode 100644 src/components/auth/ChangeServer.js create mode 100644 src/containers/auth/ChangeServerScreen.js create mode 100644 src/i18n/messages/src/components/auth/ChangeServer.json diff --git a/recipes b/recipes index fc3e248af..4bd9247f4 160000 --- a/recipes +++ b/recipes @@ -1 +1 @@ -Subproject commit fc3e248afa57b0cd13f96b54a7546ad09ceeef98 +Subproject commit 4bd9247f4b3efc92808552a851be10ad6546cc94 diff --git a/src/app.js b/src/app.js index d8fa37014..0e24420c3 100644 --- a/src/app.js +++ b/src/app.js @@ -35,6 +35,7 @@ import WelcomeScreen from './containers/auth/WelcomeScreen'; import LoginScreen from './containers/auth/LoginScreen'; import LockedScreen from './containers/auth/LockedScreen'; import PasswordScreen from './containers/auth/PasswordScreen'; +import ChangeServerScreen from './containers/auth/ChangeServerScreen'; import SignupScreen from './containers/auth/SignupScreen'; import ImportScreen from './containers/auth/ImportScreen'; import PricingScreen from './containers/auth/PricingScreen'; @@ -97,6 +98,7 @@ window.addEventListener('load', () => { + diff --git a/src/components/auth/ChangeServer.js b/src/components/auth/ChangeServer.js new file mode 100644 index 000000000..433334b6c --- /dev/null +++ b/src/components/auth/ChangeServer.js @@ -0,0 +1,80 @@ +import React, { Component } from 'react'; +import PropTypes from 'prop-types'; +import { observer } from 'mobx-react'; +import { defineMessages, intlShape } from 'react-intl'; + +import Form from '../../lib/Form'; +import Input from '../ui/Input'; +import Button from '../ui/Button'; + +const messages = defineMessages({ + headline: { + id: 'changeserver.headline', + defaultMessage: '!!!Change server', + }, + label: { + id: 'changeserver.label', + defaultMessage: '!!!Server', + }, + submit: { + id: 'changeserver.submit', + defaultMessage: '!!!Submit', + }, +}); + +export default @observer class ChangeServer extends Component { + static propTypes = { + onSubmit: PropTypes.func.isRequired, + server: PropTypes.string.isRequired, + }; + + static contextTypes = { + intl: intlShape, + }; + + form = new Form({ + fields: { + server: { + label: this.context.intl.formatMessage(messages.label), + value: '', + }, + }, + }, this.context.intl); + + componentDidMount() { + this.form.$('server').value = this.props.server; + } + + submit(e) { + e.preventDefault(); + this.form.submit({ + onSuccess: (form) => { + this.props.onSubmit(form.values()); + }, + onError: () => { }, + }); + } + + render() { + const { form } = this; + const { intl } = this.context; + + return ( +
+
this.submit(e)}> +

{intl.formatMessage(messages.headline)}

+ + +
+ ); + } +} diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js index e25121de0..f33d134c8 100644 --- a/src/components/auth/Login.js +++ b/src/components/auth/Login.js @@ -78,6 +78,7 @@ export default @inject('actions') @observer class Login extends Component { isServerLogout: PropTypes.bool.isRequired, signupRoute: PropTypes.string.isRequired, passwordRoute: PropTypes.string.isRequired, + changeServerRoute: PropTypes.string.isRequired, error: globalErrorPropType.isRequired, actions: PropTypes.object.isRequired, }; @@ -127,6 +128,7 @@ export default @inject('actions') @observer class Login extends Component { isServerLogout, signupRoute, passwordRoute, + changeServerRoute, error, } = this.props; @@ -194,7 +196,7 @@ export default @inject('actions') @observer class Login extends Component { )}
- {intl.formatMessage(messages.changeServer)} + {intl.formatMessage(messages.changeServer)} {intl.formatMessage(messages.serverless)} {intl.formatMessage(messages.signupLink)} {intl.formatMessage(messages.passwordLink)} diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js index a166155a7..6a7db5cde 100644 --- a/src/components/auth/Signup.js +++ b/src/components/auth/Signup.js @@ -79,6 +79,7 @@ export default @inject('actions') @observer class Signup extends Component { onSubmit: PropTypes.func.isRequired, isSubmitting: PropTypes.bool.isRequired, loginRoute: PropTypes.string.isRequired, + changeServerRoute: PropTypes.string.isRequired, error: globalErrorPropType.isRequired, actions: PropTypes.object.isRequired, }; @@ -130,7 +131,9 @@ export default @inject('actions') @observer class Signup extends Component { render() { const { form } = this; const { intl } = this.context; - const { isSubmitting, loginRoute, error } = this.props; + const { + isSubmitting, loginRoute, error, changeServerRoute, + } = this.props; const termsBase = window.ferdi.stores.settings.all.app.server !== 'https://api.franzinfra.com' ? window.ferdi.stores.settings.all.app.server : 'https://meetfranz.com'; @@ -198,7 +201,7 @@ export default @inject('actions') @observer class Signup extends Component {

- {intl.formatMessage(messages.changeServer)} + {intl.formatMessage(messages.changeServer)} {intl.formatMessage(messages.serverless)} {intl.formatMessage(messages.loginLink)}
diff --git a/src/components/auth/Welcome.js b/src/components/auth/Welcome.js index 1453c1d7c..6e742e0c1 100644 --- a/src/components/auth/Welcome.js +++ b/src/components/auth/Welcome.js @@ -26,6 +26,7 @@ export default @inject('actions') @observer class Login extends Component { static propTypes = { loginRoute: PropTypes.string.isRequired, signupRoute: PropTypes.string.isRequired, + changeServerRoute: PropTypes.string.isRequired, recipes: MobxPropTypes.arrayOrObservableArray.isRequired, actions: PropTypes.object.isRequired, }; @@ -43,6 +44,7 @@ export default @inject('actions') @observer class Login extends Component { const { loginRoute, signupRoute, + changeServerRoute, recipes, } = this.props; @@ -71,7 +73,7 @@ export default @inject('actions') @observer class Login extends Component {
- + + ); + } +} + +ChangeServerScreen.wrappedComponent.propTypes = { + actions: PropTypes.shape({ + settings: PropTypes.shape({ + update: PropTypes.func.isRequired, + }).isRequired, + }).isRequired, + stores: PropTypes.shape({ + settings: PropTypes.instanceOf(SettingsStore).isRequired, + router: PropTypes.instanceOf(RouterStore).isRequired, + }).isRequired, +}; diff --git a/src/containers/auth/LoginScreen.js b/src/containers/auth/LoginScreen.js index e5ee10785..d17820ad6 100644 --- a/src/containers/auth/LoginScreen.js +++ b/src/containers/auth/LoginScreen.js @@ -21,6 +21,7 @@ export default @inject('stores', 'actions') @observer class LoginScreen extends isServerLogout={stores.user.logoutReason === stores.user.logoutReasonTypes.SERVER} signupRoute={stores.user.signupRoute} passwordRoute={stores.user.passwordRoute} + changeServerRoute={stores.user.changeServerRoute} error={error} /> ); diff --git a/src/containers/auth/SignupScreen.js b/src/containers/auth/SignupScreen.js index f93498be2..803fe1cd9 100644 --- a/src/containers/auth/SignupScreen.js +++ b/src/containers/auth/SignupScreen.js @@ -36,6 +36,7 @@ export default @inject('stores', 'actions') @observer class SignupScreen extends onSubmit={values => this.onSignup(values)} isSubmitting={stores.user.signupRequest.isExecuting} loginRoute={stores.user.loginRoute} + changeServerRoute={stores.user.changeServerRoute} error={error} /> ); diff --git a/src/containers/auth/WelcomeScreen.js b/src/containers/auth/WelcomeScreen.js index 75182345a..6f2d0eee6 100644 --- a/src/containers/auth/WelcomeScreen.js +++ b/src/containers/auth/WelcomeScreen.js @@ -14,6 +14,7 @@ export default @inject('stores', 'actions') @observer class LoginScreen extends ); diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index be0cd008b..f825d773b 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json @@ -43,6 +43,50 @@ ], "path": "src/components/AppUpdateInfoBar.json" }, + { + "descriptors": [ + { + "defaultMessage": "!!!Change server", + "end": { + "column": 3, + "line": 14 + }, + "file": "src/components/auth/ChangeServer.js", + "id": "changeserver.headline", + "start": { + "column": 12, + "line": 11 + } + }, + { + "defaultMessage": "!!!Server", + "end": { + "column": 3, + "line": 18 + }, + "file": "src/components/auth/ChangeServer.js", + "id": "changeserver.label", + "start": { + "column": 9, + "line": 15 + } + }, + { + "defaultMessage": "!!!Submit", + "end": { + "column": 3, + "line": 22 + }, + "file": "src/components/auth/ChangeServer.js", + "id": "changeserver.submit", + "start": { + "column": 10, + "line": 19 + } + } + ], + "path": "src/components/auth/ChangeServer.json" + }, { "descriptors": [ { diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 4c14c8f90..d9613dc43 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -1,6 +1,9 @@ { "app.errorHandler.action": "Reload", "app.errorHandler.headline": "Something went wrong", + "changeserver.headline": "Change server", + "changeserver.label": "Server", + "changeserver.submit": "Submit", "feature.announcements.changelog.headline": "Changes in Ferdi {version}", "feature.debugger.title": "Publish debugging information", "feature.delayApp.headline": "Please purchase a Ferdi Supporter License to skip waiting", diff --git a/src/i18n/messages/src/components/auth/ChangeServer.json b/src/i18n/messages/src/components/auth/ChangeServer.json new file mode 100644 index 000000000..3a122d50c --- /dev/null +++ b/src/i18n/messages/src/components/auth/ChangeServer.json @@ -0,0 +1,41 @@ +[ + { + "id": "changeserver.headline", + "defaultMessage": "!!!Change server", + "file": "src/components/auth/ChangeServer.js", + "start": { + "line": 11, + "column": 12 + }, + "end": { + "line": 14, + "column": 3 + } + }, + { + "id": "changeserver.label", + "defaultMessage": "!!!Server", + "file": "src/components/auth/ChangeServer.js", + "start": { + "line": 15, + "column": 9 + }, + "end": { + "line": 18, + "column": 3 + } + }, + { + "id": "changeserver.submit", + "defaultMessage": "!!!Submit", + "file": "src/components/auth/ChangeServer.js", + "start": { + "line": 19, + "column": 10 + }, + "end": { + "line": 22, + "column": 3 + } + } +] \ No newline at end of file diff --git a/src/internal-server b/src/internal-server index 3ad266e13..38fc9925d 160000 --- a/src/internal-server +++ b/src/internal-server @@ -1 +1 @@ -Subproject commit 3ad266e1371075612ce866332472595bfd89a5d6 +Subproject commit 38fc9925d88971cee26cc08343da2f0e153c053a diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js index ec0b0cf8d..3a53d150d 100644 --- a/src/stores/UserStore.js +++ b/src/stores/UserStore.js @@ -34,6 +34,8 @@ export default class UserStore extends Store { PASSWORD_ROUTE = `${this.BASE_ROUTE}/password`; + CHANGE_SERVER_ROUTE = `${this.BASE_ROUTE}/server`; + @observable loginRequest = new Request(this.api.user, 'login'); @observable signupRequest = new Request(this.api.user, 'signup'); @@ -97,7 +99,7 @@ export default class UserStore extends Store { // Reactions this.registerReactions([ - // this._requireAuthenticatedUser, + this._requireAuthenticatedUser, this._getUserData.bind(this), this._resetTrialActivationState.bind(this), ]); @@ -137,6 +139,10 @@ export default class UserStore extends Store { return this.PASSWORD_ROUTE; } + get changeServerRoute() { + return this.CHANGE_SERVER_ROUTE; + } + // Data @computed get isLoggedIn() { return Boolean(localStorage.getItem('authToken')); -- cgit v1.2.3-70-g09d2