diff options
Diffstat (limited to 'src/containers/auth')
-rw-r--r-- | src/containers/auth/AuthLayoutContainer.js | 3 | ||||
-rw-r--r-- | src/containers/auth/ChangeServerScreen.js | 11 | ||||
-rw-r--r-- | src/containers/auth/ImportScreen.js | 4 | ||||
-rw-r--r-- | src/containers/auth/InviteScreen.js | 13 | ||||
-rw-r--r-- | src/containers/auth/LockedScreen.js | 6 | ||||
-rw-r--r-- | src/containers/auth/LoginScreen.js | 8 | ||||
-rw-r--r-- | src/containers/auth/PasswordScreen.js | 4 | ||||
-rw-r--r-- | src/containers/auth/SetupAssistantScreen.js | 3 | ||||
-rw-r--r-- | src/containers/auth/SignupScreen.js | 8 | ||||
-rw-r--r-- | src/containers/auth/WelcomeScreen.js | 6 |
10 files changed, 41 insertions, 25 deletions
diff --git a/src/containers/auth/AuthLayoutContainer.js b/src/containers/auth/AuthLayoutContainer.js index a0d50ab54..7673ab9c7 100644 --- a/src/containers/auth/AuthLayoutContainer.js +++ b/src/containers/auth/AuthLayoutContainer.js | |||
@@ -14,7 +14,6 @@ import AppLoader from '../../components/ui/AppLoader'; | |||
14 | import { oneOrManyChildElements } from '../../prop-types'; | 14 | import { oneOrManyChildElements } from '../../prop-types'; |
15 | import FeaturesStore from '../../stores/FeaturesStore'; | 15 | import FeaturesStore from '../../stores/FeaturesStore'; |
16 | 16 | ||
17 | export default | ||
18 | @inject('stores', 'actions') | 17 | @inject('stores', 'actions') |
19 | @observer | 18 | @observer |
20 | class AuthLayoutContainer extends Component { | 19 | class AuthLayoutContainer extends Component { |
@@ -85,3 +84,5 @@ AuthLayoutContainer.wrappedComponent.propTypes = { | |||
85 | settings: PropTypes.instanceOf(SettingsStore).isRequired, | 84 | settings: PropTypes.instanceOf(SettingsStore).isRequired, |
86 | }).isRequired, | 85 | }).isRequired, |
87 | }; | 86 | }; |
87 | |||
88 | export default AuthLayoutContainer; | ||
diff --git a/src/containers/auth/ChangeServerScreen.js b/src/containers/auth/ChangeServerScreen.js index 28ecc0198..94fc98b61 100644 --- a/src/containers/auth/ChangeServerScreen.js +++ b/src/containers/auth/ChangeServerScreen.js | |||
@@ -5,7 +5,9 @@ import { RouterStore } from 'mobx-react-router'; | |||
5 | import ChangeServer from '../../components/auth/ChangeServer'; | 5 | import ChangeServer from '../../components/auth/ChangeServer'; |
6 | import SettingsStore from '../../stores/SettingsStore'; | 6 | import SettingsStore from '../../stores/SettingsStore'; |
7 | 7 | ||
8 | export default @inject('stores', 'actions') @observer class ChangeServerScreen extends Component { | 8 | @inject('stores', 'actions') |
9 | @observer | ||
10 | class ChangeServerScreen extends Component { | ||
9 | constructor(props) { | 11 | constructor(props) { |
10 | super(props); | 12 | super(props); |
11 | 13 | ||
@@ -28,12 +30,7 @@ export default @inject('stores', 'actions') @observer class ChangeServerScreen e | |||
28 | const { stores } = this.props; | 30 | const { stores } = this.props; |
29 | const { server } = stores.settings.all.app; | 31 | const { server } = stores.settings.all.app; |
30 | 32 | ||
31 | return ( | 33 | return <ChangeServer onSubmit={this.onSubmit} server={server} />; |
32 | <ChangeServer | ||
33 | onSubmit={this.onSubmit} | ||
34 | server={server} | ||
35 | /> | ||
36 | ); | ||
37 | } | 34 | } |
38 | } | 35 | } |
39 | 36 | ||
diff --git a/src/containers/auth/ImportScreen.js b/src/containers/auth/ImportScreen.js index 9143ef616..ff2854f6e 100644 --- a/src/containers/auth/ImportScreen.js +++ b/src/containers/auth/ImportScreen.js | |||
@@ -5,7 +5,9 @@ import { RouterStore } from 'mobx-react-router'; | |||
5 | import Import from '../../components/auth/Import'; | 5 | import Import from '../../components/auth/Import'; |
6 | import UserStore from '../../stores/UserStore'; | 6 | import UserStore from '../../stores/UserStore'; |
7 | 7 | ||
8 | export default @inject('stores', 'actions') @observer class ImportScreen extends Component { | 8 | @inject('stores', 'actions') |
9 | @observer | ||
10 | class ImportScreen extends Component { | ||
9 | render() { | 11 | render() { |
10 | const { actions, stores } = this.props; | 12 | const { actions, stores } = this.props; |
11 | 13 | ||
diff --git a/src/containers/auth/InviteScreen.js b/src/containers/auth/InviteScreen.js index 66afaf7e1..d9d52a57c 100644 --- a/src/containers/auth/InviteScreen.js +++ b/src/containers/auth/InviteScreen.js | |||
@@ -3,16 +3,13 @@ import PropTypes from 'prop-types'; | |||
3 | import { inject, observer } from 'mobx-react'; | 3 | import { inject, observer } from 'mobx-react'; |
4 | import Invite from '../../components/auth/Invite'; | 4 | import Invite from '../../components/auth/Invite'; |
5 | 5 | ||
6 | export default @inject('stores', 'actions') @observer class InviteScreen extends Component { | 6 | @inject('stores', 'actions') |
7 | @observer | ||
8 | class InviteScreen extends Component { | ||
7 | render() { | 9 | render() { |
8 | const { actions } = this.props; | 10 | const { actions } = this.props; |
9 | 11 | ||
10 | return ( | 12 | return <Invite onSubmit={actions.user.invite} embed={false} />; |
11 | <Invite | ||
12 | onSubmit={actions.user.invite} | ||
13 | embed={false} | ||
14 | /> | ||
15 | ); | ||
16 | } | 13 | } |
17 | } | 14 | } |
18 | 15 | ||
@@ -23,3 +20,5 @@ InviteScreen.wrappedComponent.propTypes = { | |||
23 | }).isRequired, | 20 | }).isRequired, |
24 | }).isRequired, | 21 | }).isRequired, |
25 | }; | 22 | }; |
23 | |||
24 | export default InviteScreen; | ||
diff --git a/src/containers/auth/LockedScreen.js b/src/containers/auth/LockedScreen.js index 4e97c6573..87205c4b9 100644 --- a/src/containers/auth/LockedScreen.js +++ b/src/containers/auth/LockedScreen.js | |||
@@ -7,10 +7,12 @@ import SettingsStore from '../../stores/SettingsStore'; | |||
7 | import { hash } from '../../helpers/password-helpers'; | 7 | import { hash } from '../../helpers/password-helpers'; |
8 | import UserStore from '../../stores/UserStore'; | 8 | import UserStore from '../../stores/UserStore'; |
9 | 9 | ||
10 | export default @inject('stores', 'actions') @observer class LockedScreen extends Component { | 10 | @inject('stores', 'actions') |
11 | @observer | ||
12 | class LockedScreen extends Component { | ||
11 | state = { | 13 | state = { |
12 | error: false, | 14 | error: false, |
13 | } | 15 | }; |
14 | 16 | ||
15 | constructor(props) { | 17 | constructor(props) { |
16 | super(props); | 18 | super(props); |
diff --git a/src/containers/auth/LoginScreen.js b/src/containers/auth/LoginScreen.js index e636f99e0..d24eb1d22 100644 --- a/src/containers/auth/LoginScreen.js +++ b/src/containers/auth/LoginScreen.js | |||
@@ -6,7 +6,9 @@ import UserStore from '../../stores/UserStore'; | |||
6 | 6 | ||
7 | import { globalError as globalErrorPropType } from '../../prop-types'; | 7 | import { globalError as globalErrorPropType } from '../../prop-types'; |
8 | 8 | ||
9 | export default @inject('stores', 'actions') @observer class LoginScreen extends Component { | 9 | @inject('stores', 'actions') |
10 | @observer | ||
11 | class LoginScreen extends Component { | ||
10 | static propTypes = { | 12 | static propTypes = { |
11 | error: globalErrorPropType.isRequired, | 13 | error: globalErrorPropType.isRequired, |
12 | }; | 14 | }; |
@@ -18,7 +20,9 @@ export default @inject('stores', 'actions') @observer class LoginScreen extends | |||
18 | onSubmit={actions.user.login} | 20 | onSubmit={actions.user.login} |
19 | isSubmitting={stores.user.loginRequest.isExecuting} | 21 | isSubmitting={stores.user.loginRequest.isExecuting} |
20 | isTokenExpired={stores.user.isTokenExpired} | 22 | isTokenExpired={stores.user.isTokenExpired} |
21 | isServerLogout={stores.user.logoutReason === stores.user.logoutReasonTypes.SERVER} | 23 | isServerLogout={ |
24 | stores.user.logoutReason === stores.user.logoutReasonTypes.SERVER | ||
25 | } | ||
22 | signupRoute={stores.user.signupRoute} | 26 | signupRoute={stores.user.signupRoute} |
23 | passwordRoute={stores.user.passwordRoute} | 27 | passwordRoute={stores.user.passwordRoute} |
24 | changeServerRoute={stores.user.changeServerRoute} | 28 | changeServerRoute={stores.user.changeServerRoute} |
diff --git a/src/containers/auth/PasswordScreen.js b/src/containers/auth/PasswordScreen.js index 9c6732f1a..47f6dfd01 100644 --- a/src/containers/auth/PasswordScreen.js +++ b/src/containers/auth/PasswordScreen.js | |||
@@ -4,7 +4,9 @@ import { inject, observer } from 'mobx-react'; | |||
4 | import Password from '../../components/auth/Password'; | 4 | import Password from '../../components/auth/Password'; |
5 | import UserStore from '../../stores/UserStore'; | 5 | import UserStore from '../../stores/UserStore'; |
6 | 6 | ||
7 | export default @inject('stores', 'actions') @observer class PasswordScreen extends Component { | 7 | @inject('stores', 'actions') |
8 | @observer | ||
9 | class PasswordScreen extends Component { | ||
8 | render() { | 10 | render() { |
9 | const { actions, stores } = this.props; | 11 | const { actions, stores } = this.props; |
10 | 12 | ||
diff --git a/src/containers/auth/SetupAssistantScreen.js b/src/containers/auth/SetupAssistantScreen.js index d7036969a..efda2e9d2 100644 --- a/src/containers/auth/SetupAssistantScreen.js +++ b/src/containers/auth/SetupAssistantScreen.js | |||
@@ -14,7 +14,6 @@ import ServicesStore from '../../stores/ServicesStore'; | |||
14 | import RecipesStore from '../../stores/RecipesStore'; | 14 | import RecipesStore from '../../stores/RecipesStore'; |
15 | import UserStore from '../../stores/UserStore'; | 15 | import UserStore from '../../stores/UserStore'; |
16 | 16 | ||
17 | export default | ||
18 | @inject('stores', 'actions') | 17 | @inject('stores', 'actions') |
19 | @observer | 18 | @observer |
20 | class SetupAssistantScreen extends Component { | 19 | class SetupAssistantScreen extends Component { |
@@ -134,3 +133,5 @@ SetupAssistantScreen.wrappedComponent.propTypes = { | |||
134 | recipe: PropTypes.instanceOf(RecipesStore).isRequired, | 133 | recipe: PropTypes.instanceOf(RecipesStore).isRequired, |
135 | }).isRequired, | 134 | }).isRequired, |
136 | }; | 135 | }; |
136 | |||
137 | export default SetupAssistantScreen; | ||
diff --git a/src/containers/auth/SignupScreen.js b/src/containers/auth/SignupScreen.js index 38c5dfb43..b20a7fd62 100644 --- a/src/containers/auth/SignupScreen.js +++ b/src/containers/auth/SignupScreen.js | |||
@@ -8,7 +8,9 @@ import FeaturesStore from '../../stores/FeaturesStore'; | |||
8 | 8 | ||
9 | import { globalError as globalErrorPropType } from '../../prop-types'; | 9 | import { globalError as globalErrorPropType } from '../../prop-types'; |
10 | 10 | ||
11 | export default @inject('stores', 'actions') @observer class SignupScreen extends Component { | 11 | @inject('stores', 'actions') |
12 | @observer | ||
13 | class SignupScreen extends Component { | ||
12 | static propTypes = { | 14 | static propTypes = { |
13 | error: globalErrorPropType.isRequired, | 15 | error: globalErrorPropType.isRequired, |
14 | }; | 16 | }; |
@@ -24,7 +26,7 @@ export default @inject('stores', 'actions') @observer class SignupScreen extends | |||
24 | 26 | ||
25 | return ( | 27 | return ( |
26 | <Signup | 28 | <Signup |
27 | onSubmit={(values) => this.onSignup(values)} | 29 | onSubmit={values => this.onSignup(values)} |
28 | isSubmitting={stores.user.signupRequest.isExecuting} | 30 | isSubmitting={stores.user.signupRequest.isExecuting} |
29 | loginRoute={stores.user.loginRoute} | 31 | loginRoute={stores.user.loginRoute} |
30 | changeServerRoute={stores.user.changeServerRoute} | 32 | changeServerRoute={stores.user.changeServerRoute} |
@@ -43,3 +45,5 @@ SignupScreen.wrappedComponent.propTypes = { | |||
43 | features: PropTypes.instanceOf(FeaturesStore).isRequired, | 45 | features: PropTypes.instanceOf(FeaturesStore).isRequired, |
44 | }).isRequired, | 46 | }).isRequired, |
45 | }; | 47 | }; |
48 | |||
49 | export default SignupScreen; | ||
diff --git a/src/containers/auth/WelcomeScreen.js b/src/containers/auth/WelcomeScreen.js index bfcc880d0..d169e5f0f 100644 --- a/src/containers/auth/WelcomeScreen.js +++ b/src/containers/auth/WelcomeScreen.js | |||
@@ -6,7 +6,9 @@ import Welcome from '../../components/auth/Welcome'; | |||
6 | import UserStore from '../../stores/UserStore'; | 6 | import UserStore from '../../stores/UserStore'; |
7 | import RecipePreviewsStore from '../../stores/RecipePreviewsStore'; | 7 | import RecipePreviewsStore from '../../stores/RecipePreviewsStore'; |
8 | 8 | ||
9 | export default @inject('stores', 'actions') @observer class LoginScreen extends Component { | 9 | @inject('stores', 'actions') |
10 | @observer | ||
11 | class LoginScreen extends Component { | ||
10 | render() { | 12 | render() { |
11 | const { user, recipePreviews } = this.props.stores; | 13 | const { user, recipePreviews } = this.props.stores; |
12 | 14 | ||
@@ -27,3 +29,5 @@ LoginScreen.wrappedComponent.propTypes = { | |||
27 | recipePreviews: PropTypes.instanceOf(RecipePreviewsStore).isRequired, | 29 | recipePreviews: PropTypes.instanceOf(RecipePreviewsStore).isRequired, |
28 | }).isRequired, | 30 | }).isRequired, |
29 | }; | 31 | }; |
32 | |||
33 | export default LoginScreen; | ||