diff options
Diffstat (limited to 'src/containers/auth')
-rw-r--r-- | src/containers/auth/AuthLayoutContainer.js | 10 | ||||
-rw-r--r-- | src/containers/auth/ChangeServerScreen.js | 4 | ||||
-rw-r--r-- | src/containers/auth/ImportScreen.js | 6 | ||||
-rw-r--r-- | src/containers/auth/LockedScreen.js | 6 | ||||
-rw-r--r-- | src/containers/auth/LoginScreen.js | 4 | ||||
-rw-r--r-- | src/containers/auth/PasswordScreen.js | 4 | ||||
-rw-r--r-- | src/containers/auth/PricingScreen.js | 6 | ||||
-rw-r--r-- | src/containers/auth/SetupAssistantScreen.js | 14 | ||||
-rw-r--r-- | src/containers/auth/SignupScreen.js | 4 |
9 files changed, 25 insertions, 33 deletions
diff --git a/src/containers/auth/AuthLayoutContainer.js b/src/containers/auth/AuthLayoutContainer.js index 883a6ea60..f99a8a73f 100644 --- a/src/containers/auth/AuthLayoutContainer.js +++ b/src/containers/auth/AuthLayoutContainer.js | |||
@@ -7,9 +7,12 @@ import AuthLayout from '../../components/auth/AuthLayout'; | |||
7 | import AppStore from '../../stores/AppStore'; | 7 | import AppStore from '../../stores/AppStore'; |
8 | import UserStore from '../../stores/UserStore'; | 8 | import UserStore from '../../stores/UserStore'; |
9 | import GlobalErrorStore from '../../stores/GlobalErrorStore'; | 9 | import GlobalErrorStore from '../../stores/GlobalErrorStore'; |
10 | import UIStore from '../../stores/UIStore'; | ||
11 | import SettingsStore from '../../stores/SettingsStore'; | ||
10 | import AppLoader from '../../components/ui/AppLoader'; | 12 | import AppLoader from '../../components/ui/AppLoader'; |
11 | 13 | ||
12 | import { oneOrManyChildElements } from '../../prop-types'; | 14 | import { oneOrManyChildElements } from '../../prop-types'; |
15 | import FeaturesStore from '../../stores/FeaturesStore'; | ||
13 | 16 | ||
14 | export default @inject('stores', 'actions') @observer class AuthLayoutContainer extends Component { | 17 | export default @inject('stores', 'actions') @observer class AuthLayoutContainer extends Component { |
15 | static propTypes = { | 18 | static propTypes = { |
@@ -71,12 +74,13 @@ export default @inject('stores', 'actions') @observer class AuthLayoutContainer | |||
71 | AuthLayoutContainer.wrappedComponent.propTypes = { | 74 | AuthLayoutContainer.wrappedComponent.propTypes = { |
72 | stores: PropTypes.shape({ | 75 | stores: PropTypes.shape({ |
73 | app: PropTypes.instanceOf(AppStore).isRequired, | 76 | app: PropTypes.instanceOf(AppStore).isRequired, |
77 | features: PropTypes.instanceOf(FeaturesStore).isRequired, | ||
74 | globalError: PropTypes.instanceOf(GlobalErrorStore).isRequired, | 78 | globalError: PropTypes.instanceOf(GlobalErrorStore).isRequired, |
75 | user: PropTypes.instanceOf(UserStore).isRequired, | 79 | user: PropTypes.instanceOf(UserStore).isRequired, |
80 | ui: PropTypes.instanceOf(UIStore).isRequired, | ||
76 | }).isRequired, | 81 | }).isRequired, |
77 | actions: PropTypes.shape({ | 82 | actions: PropTypes.shape({ |
78 | app: PropTypes.shape({ | 83 | app: PropTypes.instanceOf(AppStore).isRequired, |
79 | healthCheck: PropTypes.func.isRequired, | 84 | settings: PropTypes.instanceOf(SettingsStore).isRequired, |
80 | }).isRequired, | ||
81 | }).isRequired, | 85 | }).isRequired, |
82 | }; | 86 | }; |
diff --git a/src/containers/auth/ChangeServerScreen.js b/src/containers/auth/ChangeServerScreen.js index 5c58087a3..28ecc0198 100644 --- a/src/containers/auth/ChangeServerScreen.js +++ b/src/containers/auth/ChangeServerScreen.js | |||
@@ -39,9 +39,7 @@ export default @inject('stores', 'actions') @observer class ChangeServerScreen e | |||
39 | 39 | ||
40 | ChangeServerScreen.wrappedComponent.propTypes = { | 40 | ChangeServerScreen.wrappedComponent.propTypes = { |
41 | actions: PropTypes.shape({ | 41 | actions: PropTypes.shape({ |
42 | settings: PropTypes.shape({ | 42 | settings: PropTypes.instanceOf(SettingsStore).isRequired, |
43 | update: PropTypes.func.isRequired, | ||
44 | }).isRequired, | ||
45 | }).isRequired, | 43 | }).isRequired, |
46 | stores: PropTypes.shape({ | 44 | stores: PropTypes.shape({ |
47 | settings: PropTypes.instanceOf(SettingsStore).isRequired, | 45 | settings: PropTypes.instanceOf(SettingsStore).isRequired, |
diff --git a/src/containers/auth/ImportScreen.js b/src/containers/auth/ImportScreen.js index 4a93891d6..9143ef616 100644 --- a/src/containers/auth/ImportScreen.js +++ b/src/containers/auth/ImportScreen.js | |||
@@ -1,6 +1,7 @@ | |||
1 | import React, { Component } from 'react'; | 1 | import React, { Component } from 'react'; |
2 | import PropTypes from 'prop-types'; | 2 | import PropTypes from 'prop-types'; |
3 | import { inject, observer } from 'mobx-react'; | 3 | import { inject, observer } from 'mobx-react'; |
4 | import { RouterStore } from 'mobx-react-router'; | ||
4 | import Import from '../../components/auth/Import'; | 5 | import Import from '../../components/auth/Import'; |
5 | import UserStore from '../../stores/UserStore'; | 6 | import UserStore from '../../stores/UserStore'; |
6 | 7 | ||
@@ -25,11 +26,10 @@ export default @inject('stores', 'actions') @observer class ImportScreen extends | |||
25 | 26 | ||
26 | ImportScreen.wrappedComponent.propTypes = { | 27 | ImportScreen.wrappedComponent.propTypes = { |
27 | actions: PropTypes.shape({ | 28 | actions: PropTypes.shape({ |
28 | user: PropTypes.shape({ | 29 | user: PropTypes.instanceOf(UserStore).isRequired, |
29 | importLegacyServices: PropTypes.func.isRequired, | ||
30 | }).isRequired, | ||
31 | }).isRequired, | 30 | }).isRequired, |
32 | stores: PropTypes.shape({ | 31 | stores: PropTypes.shape({ |
33 | user: PropTypes.instanceOf(UserStore).isRequired, | 32 | user: PropTypes.instanceOf(UserStore).isRequired, |
33 | router: PropTypes.instanceOf(RouterStore).isRequired, | ||
34 | }).isRequired, | 34 | }).isRequired, |
35 | }; | 35 | }; |
diff --git a/src/containers/auth/LockedScreen.js b/src/containers/auth/LockedScreen.js index a04107072..4e97c6573 100644 --- a/src/containers/auth/LockedScreen.js +++ b/src/containers/auth/LockedScreen.js | |||
@@ -5,6 +5,7 @@ import Locked from '../../components/auth/Locked'; | |||
5 | import SettingsStore from '../../stores/SettingsStore'; | 5 | import SettingsStore from '../../stores/SettingsStore'; |
6 | 6 | ||
7 | import { hash } from '../../helpers/password-helpers'; | 7 | import { hash } from '../../helpers/password-helpers'; |
8 | import UserStore from '../../stores/UserStore'; | ||
8 | 9 | ||
9 | export default @inject('stores', 'actions') @observer class LockedScreen extends Component { | 10 | export default @inject('stores', 'actions') @observer class LockedScreen extends Component { |
10 | state = { | 11 | state = { |
@@ -75,11 +76,10 @@ export default @inject('stores', 'actions') @observer class LockedScreen extends | |||
75 | 76 | ||
76 | LockedScreen.wrappedComponent.propTypes = { | 77 | LockedScreen.wrappedComponent.propTypes = { |
77 | actions: PropTypes.shape({ | 78 | actions: PropTypes.shape({ |
78 | settings: PropTypes.shape({ | 79 | settings: PropTypes.instanceOf(SettingsStore).isRequired, |
79 | update: PropTypes.func.isRequired, | ||
80 | }).isRequired, | ||
81 | }).isRequired, | 80 | }).isRequired, |
82 | stores: PropTypes.shape({ | 81 | stores: PropTypes.shape({ |
83 | settings: PropTypes.instanceOf(SettingsStore).isRequired, | 82 | settings: PropTypes.instanceOf(SettingsStore).isRequired, |
83 | user: PropTypes.instanceOf(UserStore).isRequired, | ||
84 | }).isRequired, | 84 | }).isRequired, |
85 | }; | 85 | }; |
diff --git a/src/containers/auth/LoginScreen.js b/src/containers/auth/LoginScreen.js index d17820ad6..e636f99e0 100644 --- a/src/containers/auth/LoginScreen.js +++ b/src/containers/auth/LoginScreen.js | |||
@@ -30,9 +30,7 @@ export default @inject('stores', 'actions') @observer class LoginScreen extends | |||
30 | 30 | ||
31 | LoginScreen.wrappedComponent.propTypes = { | 31 | LoginScreen.wrappedComponent.propTypes = { |
32 | actions: PropTypes.shape({ | 32 | actions: PropTypes.shape({ |
33 | user: PropTypes.shape({ | 33 | user: PropTypes.instanceOf(UserStore).isRequired, |
34 | login: PropTypes.func.isRequired, | ||
35 | }).isRequired, | ||
36 | }).isRequired, | 34 | }).isRequired, |
37 | stores: PropTypes.shape({ | 35 | stores: PropTypes.shape({ |
38 | user: PropTypes.instanceOf(UserStore).isRequired, | 36 | user: PropTypes.instanceOf(UserStore).isRequired, |
diff --git a/src/containers/auth/PasswordScreen.js b/src/containers/auth/PasswordScreen.js index 5b238860e..9c6732f1a 100644 --- a/src/containers/auth/PasswordScreen.js +++ b/src/containers/auth/PasswordScreen.js | |||
@@ -22,9 +22,7 @@ export default @inject('stores', 'actions') @observer class PasswordScreen exten | |||
22 | 22 | ||
23 | PasswordScreen.wrappedComponent.propTypes = { | 23 | PasswordScreen.wrappedComponent.propTypes = { |
24 | actions: PropTypes.shape({ | 24 | actions: PropTypes.shape({ |
25 | user: PropTypes.shape({ | 25 | user: PropTypes.instanceOf(UserStore).isRequired, |
26 | retrievePassword: PropTypes.func.isRequired, | ||
27 | }).isRequired, | ||
28 | }).isRequired, | 26 | }).isRequired, |
29 | stores: PropTypes.shape({ | 27 | stores: PropTypes.shape({ |
30 | user: PropTypes.instanceOf(UserStore).isRequired, | 28 | user: PropTypes.instanceOf(UserStore).isRequired, |
diff --git a/src/containers/auth/PricingScreen.js b/src/containers/auth/PricingScreen.js index 21c859c12..97bf1f6be 100644 --- a/src/containers/auth/PricingScreen.js +++ b/src/containers/auth/PricingScreen.js | |||
@@ -7,6 +7,7 @@ import Pricing from '../../components/auth/Pricing'; | |||
7 | import UserStore from '../../stores/UserStore'; | 7 | import UserStore from '../../stores/UserStore'; |
8 | 8 | ||
9 | import { globalError as globalErrorPropType } from '../../prop-types'; | 9 | import { globalError as globalErrorPropType } from '../../prop-types'; |
10 | import FeaturesStore from '../../stores/FeaturesStore'; | ||
10 | 11 | ||
11 | export default @inject('stores', 'actions') @observer class PricingScreen extends Component { | 12 | export default @inject('stores', 'actions') @observer class PricingScreen extends Component { |
12 | static propTypes = { | 13 | static propTypes = { |
@@ -72,12 +73,11 @@ export default @inject('stores', 'actions') @observer class PricingScreen extend | |||
72 | 73 | ||
73 | PricingScreen.wrappedComponent.propTypes = { | 74 | PricingScreen.wrappedComponent.propTypes = { |
74 | actions: PropTypes.shape({ | 75 | actions: PropTypes.shape({ |
75 | user: PropTypes.shape({ | 76 | user: PropTypes.instanceOf(UserStore).isRequired, |
76 | activateTrial: PropTypes.func.isRequired, | ||
77 | }).isRequired, | ||
78 | }).isRequired, | 77 | }).isRequired, |
79 | stores: PropTypes.shape({ | 78 | stores: PropTypes.shape({ |
80 | user: PropTypes.instanceOf(UserStore).isRequired, | 79 | user: PropTypes.instanceOf(UserStore).isRequired, |
81 | router: PropTypes.instanceOf(RouterStore).isRequired, | 80 | router: PropTypes.instanceOf(RouterStore).isRequired, |
81 | features: PropTypes.instanceOf(FeaturesStore).isRequired, | ||
82 | }).isRequired, | 82 | }).isRequired, |
83 | }; | 83 | }; |
diff --git a/src/containers/auth/SetupAssistantScreen.js b/src/containers/auth/SetupAssistantScreen.js index 1c4fa6c22..2a8f2c010 100644 --- a/src/containers/auth/SetupAssistantScreen.js +++ b/src/containers/auth/SetupAssistantScreen.js | |||
@@ -3,6 +3,7 @@ import React, { Component } from 'react'; | |||
3 | import PropTypes from 'prop-types'; | 3 | import PropTypes from 'prop-types'; |
4 | import { inject, observer } from 'mobx-react'; | 4 | import { inject, observer } from 'mobx-react'; |
5 | 5 | ||
6 | import { RouterStore } from 'mobx-react-router'; | ||
6 | import { DEFAULT_TODO_RECIPE_ID, DEFAULT_TODO_SERVICE_NAME } from '../../config'; | 7 | import { DEFAULT_TODO_RECIPE_ID, DEFAULT_TODO_SERVICE_NAME } from '../../config'; |
7 | import { sleep } from '../../helpers/async-helpers'; | 8 | import { sleep } from '../../helpers/async-helpers'; |
8 | import SetupAssistant from '../../components/auth/SetupAssistant'; | 9 | import SetupAssistant from '../../components/auth/SetupAssistant'; |
@@ -116,18 +117,13 @@ export default @inject('stores', 'actions') @observer class SetupAssistantScreen | |||
116 | SetupAssistantScreen.wrappedComponent.propTypes = { | 117 | SetupAssistantScreen.wrappedComponent.propTypes = { |
117 | stores: PropTypes.shape({ | 118 | stores: PropTypes.shape({ |
118 | services: PropTypes.instanceOf(ServicesStore), | 119 | services: PropTypes.instanceOf(ServicesStore), |
120 | router: PropTypes.instanceOf(RouterStore).isRequired, | ||
119 | recipes: PropTypes.instanceOf(RecipesStore), | 121 | recipes: PropTypes.instanceOf(RecipesStore), |
120 | user: PropTypes.instanceOf(UserStore), | 122 | user: PropTypes.instanceOf(UserStore), |
121 | }).isRequired, | 123 | }).isRequired, |
122 | actions: PropTypes.shape({ | 124 | actions: PropTypes.shape({ |
123 | user: PropTypes.shape({ | 125 | user: PropTypes.instanceOf(UserStore).isRequired, |
124 | invite: PropTypes.func.isRequired, | 126 | service: PropTypes.instanceOf(ServicesStore).isRequired, |
125 | }).isRequired, | 127 | recipe: PropTypes.instanceOf(RecipesStore).isRequired, |
126 | service: PropTypes.shape({ | ||
127 | createService: PropTypes.func.isRequired, | ||
128 | }).isRequired, | ||
129 | recipe: PropTypes.shape({ | ||
130 | install: PropTypes.func.isRequired, | ||
131 | }).isRequired, | ||
132 | }).isRequired, | 128 | }).isRequired, |
133 | }; | 129 | }; |
diff --git a/src/containers/auth/SignupScreen.js b/src/containers/auth/SignupScreen.js index 803fe1cd9..42ee09f33 100644 --- a/src/containers/auth/SignupScreen.js +++ b/src/containers/auth/SignupScreen.js | |||
@@ -45,9 +45,7 @@ export default @inject('stores', 'actions') @observer class SignupScreen extends | |||
45 | 45 | ||
46 | SignupScreen.wrappedComponent.propTypes = { | 46 | SignupScreen.wrappedComponent.propTypes = { |
47 | actions: PropTypes.shape({ | 47 | actions: PropTypes.shape({ |
48 | user: PropTypes.shape({ | 48 | user: PropTypes.instanceOf(UserStore).isRequired, |
49 | signup: PropTypes.func.isRequired, | ||
50 | }).isRequired, | ||
51 | }).isRequired, | 49 | }).isRequired, |
52 | stores: PropTypes.shape({ | 50 | stores: PropTypes.shape({ |
53 | user: PropTypes.instanceOf(UserStore).isRequired, | 51 | user: PropTypes.instanceOf(UserStore).isRequired, |