diff options
author | Markus Hatvan <markus_hatvan@aon.at> | 2021-12-04 10:51:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-04 10:51:16 +0100 |
commit | 11c992b04f3cad6badf0ae86da65f490e31dd359 (patch) | |
tree | 749e63f6ba3e9bea48c186b5d8502d328edfd276 /src/containers/auth | |
parent | 5.6.4-nightly.24 [skip ci] (diff) | |
download | ferdium-app-11c992b04f3cad6badf0ae86da65f490e31dd359.tar.gz ferdium-app-11c992b04f3cad6badf0ae86da65f490e31dd359.tar.zst ferdium-app-11c992b04f3cad6badf0ae86da65f490e31dd359.zip |
chore: upgrade react-jss to latest (#2302)
Diffstat (limited to 'src/containers/auth')
-rw-r--r-- | src/containers/auth/AuthLayoutContainer.js | 6 | ||||
-rw-r--r-- | src/containers/auth/ChangeServerScreen.js | 6 | ||||
-rw-r--r-- | src/containers/auth/ImportScreen.js | 6 | ||||
-rw-r--r-- | src/containers/auth/InviteScreen.js | 6 | ||||
-rw-r--r-- | src/containers/auth/LockedScreen.js | 6 | ||||
-rw-r--r-- | src/containers/auth/LoginScreen.js | 6 | ||||
-rw-r--r-- | src/containers/auth/PasswordScreen.js | 6 | ||||
-rw-r--r-- | src/containers/auth/SetupAssistantScreen.js | 6 | ||||
-rw-r--r-- | src/containers/auth/SignupScreen.js | 6 | ||||
-rw-r--r-- | src/containers/auth/WelcomeScreen.js | 6 |
10 files changed, 20 insertions, 40 deletions
diff --git a/src/containers/auth/AuthLayoutContainer.js b/src/containers/auth/AuthLayoutContainer.js index aa36e3969..e6d6dcf8a 100644 --- a/src/containers/auth/AuthLayoutContainer.js +++ b/src/containers/auth/AuthLayoutContainer.js | |||
@@ -14,8 +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 | @inject('stores', 'actions') | ||
18 | @observer | ||
19 | class AuthLayoutContainer extends Component { | 17 | class AuthLayoutContainer extends Component { |
20 | static propTypes = { | 18 | static propTypes = { |
21 | children: oneOrManyChildElements.isRequired, | 19 | children: oneOrManyChildElements.isRequired, |
@@ -71,7 +69,7 @@ class AuthLayoutContainer extends Component { | |||
71 | } | 69 | } |
72 | } | 70 | } |
73 | 71 | ||
74 | AuthLayoutContainer.wrappedComponent.propTypes = { | 72 | AuthLayoutContainer.propTypes = { |
75 | stores: PropTypes.shape({ | 73 | stores: PropTypes.shape({ |
76 | app: PropTypes.instanceOf(AppStore).isRequired, | 74 | app: PropTypes.instanceOf(AppStore).isRequired, |
77 | features: PropTypes.instanceOf(FeaturesStore).isRequired, | 75 | features: PropTypes.instanceOf(FeaturesStore).isRequired, |
@@ -85,4 +83,4 @@ AuthLayoutContainer.wrappedComponent.propTypes = { | |||
85 | }).isRequired, | 83 | }).isRequired, |
86 | }; | 84 | }; |
87 | 85 | ||
88 | export default AuthLayoutContainer; | 86 | export default inject('stores', 'actions')(observer(AuthLayoutContainer)); |
diff --git a/src/containers/auth/ChangeServerScreen.js b/src/containers/auth/ChangeServerScreen.js index dcc913c39..60bfde088 100644 --- a/src/containers/auth/ChangeServerScreen.js +++ b/src/containers/auth/ChangeServerScreen.js | |||
@@ -5,8 +5,6 @@ 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 | @inject('stores', 'actions') | ||
9 | @observer | ||
10 | class ChangeServerScreen extends Component { | 8 | class ChangeServerScreen extends Component { |
11 | constructor(props) { | 9 | constructor(props) { |
12 | super(props); | 10 | super(props); |
@@ -34,7 +32,7 @@ class ChangeServerScreen extends Component { | |||
34 | } | 32 | } |
35 | } | 33 | } |
36 | 34 | ||
37 | ChangeServerScreen.wrappedComponent.propTypes = { | 35 | ChangeServerScreen.propTypes = { |
38 | actions: PropTypes.shape({ | 36 | actions: PropTypes.shape({ |
39 | settings: PropTypes.instanceOf(SettingsStore).isRequired, | 37 | settings: PropTypes.instanceOf(SettingsStore).isRequired, |
40 | }).isRequired, | 38 | }).isRequired, |
@@ -44,4 +42,4 @@ ChangeServerScreen.wrappedComponent.propTypes = { | |||
44 | }).isRequired, | 42 | }).isRequired, |
45 | }; | 43 | }; |
46 | 44 | ||
47 | export default ChangeServerScreen; | 45 | export default inject('stores', 'actions')(observer(ChangeServerScreen)); |
diff --git a/src/containers/auth/ImportScreen.js b/src/containers/auth/ImportScreen.js index 46e2d41f0..c01c3d355 100644 --- a/src/containers/auth/ImportScreen.js +++ b/src/containers/auth/ImportScreen.js | |||
@@ -5,8 +5,6 @@ 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 | @inject('stores', 'actions') | ||
9 | @observer | ||
10 | class ImportScreen extends Component { | 8 | class ImportScreen extends Component { |
11 | render() { | 9 | render() { |
12 | const { actions, stores } = this.props; | 10 | const { actions, stores } = this.props; |
@@ -26,7 +24,7 @@ class ImportScreen extends Component { | |||
26 | } | 24 | } |
27 | } | 25 | } |
28 | 26 | ||
29 | ImportScreen.wrappedComponent.propTypes = { | 27 | ImportScreen.propTypes = { |
30 | actions: PropTypes.shape({ | 28 | actions: PropTypes.shape({ |
31 | user: PropTypes.instanceOf(UserStore).isRequired, | 29 | user: PropTypes.instanceOf(UserStore).isRequired, |
32 | }).isRequired, | 30 | }).isRequired, |
@@ -36,4 +34,4 @@ ImportScreen.wrappedComponent.propTypes = { | |||
36 | }).isRequired, | 34 | }).isRequired, |
37 | }; | 35 | }; |
38 | 36 | ||
39 | export default ImportScreen; | 37 | export default inject('stores', 'actions')(observer(ImportScreen)); |
diff --git a/src/containers/auth/InviteScreen.js b/src/containers/auth/InviteScreen.js index e252242ae..fc66227cc 100644 --- a/src/containers/auth/InviteScreen.js +++ b/src/containers/auth/InviteScreen.js | |||
@@ -3,8 +3,6 @@ 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 | @inject('stores', 'actions') | ||
7 | @observer | ||
8 | class InviteScreen extends Component { | 6 | class InviteScreen extends Component { |
9 | render() { | 7 | render() { |
10 | const { actions } = this.props; | 8 | const { actions } = this.props; |
@@ -13,7 +11,7 @@ class InviteScreen extends Component { | |||
13 | } | 11 | } |
14 | } | 12 | } |
15 | 13 | ||
16 | InviteScreen.wrappedComponent.propTypes = { | 14 | InviteScreen.propTypes = { |
17 | actions: PropTypes.shape({ | 15 | actions: PropTypes.shape({ |
18 | user: PropTypes.shape({ | 16 | user: PropTypes.shape({ |
19 | invite: PropTypes.func.isRequired, | 17 | invite: PropTypes.func.isRequired, |
@@ -21,4 +19,4 @@ InviteScreen.wrappedComponent.propTypes = { | |||
21 | }).isRequired, | 19 | }).isRequired, |
22 | }; | 20 | }; |
23 | 21 | ||
24 | export default InviteScreen; | 22 | export default inject('stores', 'actions')(observer(InviteScreen)); |
diff --git a/src/containers/auth/LockedScreen.js b/src/containers/auth/LockedScreen.js index 945e41284..87a00800f 100644 --- a/src/containers/auth/LockedScreen.js +++ b/src/containers/auth/LockedScreen.js | |||
@@ -7,8 +7,6 @@ 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 | @inject('stores', 'actions') | ||
11 | @observer | ||
12 | class LockedScreen extends Component { | 10 | class LockedScreen extends Component { |
13 | state = { | 11 | state = { |
14 | error: false, | 12 | error: false, |
@@ -76,7 +74,7 @@ class LockedScreen extends Component { | |||
76 | } | 74 | } |
77 | } | 75 | } |
78 | 76 | ||
79 | LockedScreen.wrappedComponent.propTypes = { | 77 | LockedScreen.propTypes = { |
80 | actions: PropTypes.shape({ | 78 | actions: PropTypes.shape({ |
81 | settings: PropTypes.instanceOf(SettingsStore).isRequired, | 79 | settings: PropTypes.instanceOf(SettingsStore).isRequired, |
82 | }).isRequired, | 80 | }).isRequired, |
@@ -86,4 +84,4 @@ LockedScreen.wrappedComponent.propTypes = { | |||
86 | }).isRequired, | 84 | }).isRequired, |
87 | }; | 85 | }; |
88 | 86 | ||
89 | export default LockedScreen; | 87 | export default inject('stores', 'actions')(observer(LockedScreen)); |
diff --git a/src/containers/auth/LoginScreen.js b/src/containers/auth/LoginScreen.js index 3f8c67fa8..572a38ea1 100644 --- a/src/containers/auth/LoginScreen.js +++ b/src/containers/auth/LoginScreen.js | |||
@@ -6,8 +6,6 @@ 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 | @inject('stores', 'actions') | ||
10 | @observer | ||
11 | class LoginScreen extends Component { | 9 | class LoginScreen extends Component { |
12 | static propTypes = { | 10 | static propTypes = { |
13 | error: globalErrorPropType.isRequired, | 11 | error: globalErrorPropType.isRequired, |
@@ -32,7 +30,7 @@ class LoginScreen extends Component { | |||
32 | } | 30 | } |
33 | } | 31 | } |
34 | 32 | ||
35 | LoginScreen.wrappedComponent.propTypes = { | 33 | LoginScreen.propTypes = { |
36 | actions: PropTypes.shape({ | 34 | actions: PropTypes.shape({ |
37 | user: PropTypes.instanceOf(UserStore).isRequired, | 35 | user: PropTypes.instanceOf(UserStore).isRequired, |
38 | }).isRequired, | 36 | }).isRequired, |
@@ -41,4 +39,4 @@ LoginScreen.wrappedComponent.propTypes = { | |||
41 | }).isRequired, | 39 | }).isRequired, |
42 | }; | 40 | }; |
43 | 41 | ||
44 | export default LoginScreen; | 42 | export default inject('stores', 'actions')(observer(LoginScreen)); |
diff --git a/src/containers/auth/PasswordScreen.js b/src/containers/auth/PasswordScreen.js index 836d4cc88..4b2c1b4a2 100644 --- a/src/containers/auth/PasswordScreen.js +++ b/src/containers/auth/PasswordScreen.js | |||
@@ -4,8 +4,6 @@ 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 | @inject('stores', 'actions') | ||
8 | @observer | ||
9 | class PasswordScreen extends Component { | 7 | class PasswordScreen extends Component { |
10 | render() { | 8 | render() { |
11 | const { actions, stores } = this.props; | 9 | const { actions, stores } = this.props; |
@@ -22,7 +20,7 @@ class PasswordScreen extends Component { | |||
22 | } | 20 | } |
23 | } | 21 | } |
24 | 22 | ||
25 | PasswordScreen.wrappedComponent.propTypes = { | 23 | PasswordScreen.propTypes = { |
26 | actions: PropTypes.shape({ | 24 | actions: PropTypes.shape({ |
27 | user: PropTypes.instanceOf(UserStore).isRequired, | 25 | user: PropTypes.instanceOf(UserStore).isRequired, |
28 | }).isRequired, | 26 | }).isRequired, |
@@ -31,4 +29,4 @@ PasswordScreen.wrappedComponent.propTypes = { | |||
31 | }).isRequired, | 29 | }).isRequired, |
32 | }; | 30 | }; |
33 | 31 | ||
34 | export default PasswordScreen; | 32 | export default inject('stores', 'actions')(observer(PasswordScreen)); |
diff --git a/src/containers/auth/SetupAssistantScreen.js b/src/containers/auth/SetupAssistantScreen.js index 8cdd95a88..f6392712d 100644 --- a/src/containers/auth/SetupAssistantScreen.js +++ b/src/containers/auth/SetupAssistantScreen.js | |||
@@ -14,8 +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 | @inject('stores', 'actions') | ||
18 | @observer | ||
19 | class SetupAssistantScreen extends Component { | 17 | class SetupAssistantScreen extends Component { |
20 | constructor(props) { | 18 | constructor(props) { |
21 | super(props); | 19 | super(props); |
@@ -120,7 +118,7 @@ class SetupAssistantScreen extends Component { | |||
120 | } | 118 | } |
121 | } | 119 | } |
122 | 120 | ||
123 | SetupAssistantScreen.wrappedComponent.propTypes = { | 121 | SetupAssistantScreen.propTypes = { |
124 | stores: PropTypes.shape({ | 122 | stores: PropTypes.shape({ |
125 | services: PropTypes.instanceOf(ServicesStore), | 123 | services: PropTypes.instanceOf(ServicesStore), |
126 | router: PropTypes.instanceOf(RouterStore).isRequired, | 124 | router: PropTypes.instanceOf(RouterStore).isRequired, |
@@ -134,4 +132,4 @@ SetupAssistantScreen.wrappedComponent.propTypes = { | |||
134 | }).isRequired, | 132 | }).isRequired, |
135 | }; | 133 | }; |
136 | 134 | ||
137 | export default SetupAssistantScreen; | 135 | export default inject('stores', 'actions')(observer(SetupAssistantScreen)); |
diff --git a/src/containers/auth/SignupScreen.js b/src/containers/auth/SignupScreen.js index 3b19f3c50..1dd8d0772 100644 --- a/src/containers/auth/SignupScreen.js +++ b/src/containers/auth/SignupScreen.js | |||
@@ -8,8 +8,6 @@ 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 | @inject('stores', 'actions') | ||
12 | @observer | ||
13 | class SignupScreen extends Component { | 11 | class SignupScreen extends Component { |
14 | static propTypes = { | 12 | static propTypes = { |
15 | error: globalErrorPropType.isRequired, | 13 | error: globalErrorPropType.isRequired, |
@@ -36,7 +34,7 @@ class SignupScreen extends Component { | |||
36 | } | 34 | } |
37 | } | 35 | } |
38 | 36 | ||
39 | SignupScreen.wrappedComponent.propTypes = { | 37 | SignupScreen.propTypes = { |
40 | actions: PropTypes.shape({ | 38 | actions: PropTypes.shape({ |
41 | user: PropTypes.instanceOf(UserStore).isRequired, | 39 | user: PropTypes.instanceOf(UserStore).isRequired, |
42 | }).isRequired, | 40 | }).isRequired, |
@@ -46,4 +44,4 @@ SignupScreen.wrappedComponent.propTypes = { | |||
46 | }).isRequired, | 44 | }).isRequired, |
47 | }; | 45 | }; |
48 | 46 | ||
49 | export default SignupScreen; | 47 | export default inject('stores', 'actions')(observer(SignupScreen)); |
diff --git a/src/containers/auth/WelcomeScreen.js b/src/containers/auth/WelcomeScreen.js index 7a23d9ba9..18b6b2eda 100644 --- a/src/containers/auth/WelcomeScreen.js +++ b/src/containers/auth/WelcomeScreen.js | |||
@@ -6,8 +6,6 @@ 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 | @inject('stores', 'actions') | ||
10 | @observer | ||
11 | class LoginScreen extends Component { | 9 | class LoginScreen extends Component { |
12 | render() { | 10 | render() { |
13 | const { user, recipePreviews } = this.props.stores; | 11 | const { user, recipePreviews } = this.props.stores; |
@@ -23,11 +21,11 @@ class LoginScreen extends Component { | |||
23 | } | 21 | } |
24 | } | 22 | } |
25 | 23 | ||
26 | LoginScreen.wrappedComponent.propTypes = { | 24 | LoginScreen.propTypes = { |
27 | stores: PropTypes.shape({ | 25 | stores: PropTypes.shape({ |
28 | user: PropTypes.instanceOf(UserStore).isRequired, | 26 | user: PropTypes.instanceOf(UserStore).isRequired, |
29 | recipePreviews: PropTypes.instanceOf(RecipePreviewsStore).isRequired, | 27 | recipePreviews: PropTypes.instanceOf(RecipePreviewsStore).isRequired, |
30 | }).isRequired, | 28 | }).isRequired, |
31 | }; | 29 | }; |
32 | 30 | ||
33 | export default LoginScreen; | 31 | export default inject('stores', 'actions')(observer(LoginScreen)); |