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/components/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/components/auth')
-rw-r--r-- | src/components/auth/AuthLayout.js | 3 | ||||
-rw-r--r-- | src/components/auth/ChangeServer.js | 3 | ||||
-rw-r--r-- | src/components/auth/Import.js | 3 | ||||
-rw-r--r-- | src/components/auth/Invite.js | 3 | ||||
-rw-r--r-- | src/components/auth/Locked.js | 3 | ||||
-rw-r--r-- | src/components/auth/Login.js | 4 | ||||
-rw-r--r-- | src/components/auth/Password.js | 3 | ||||
-rw-r--r-- | src/components/auth/SetupAssistant.js | 6 | ||||
-rw-r--r-- | src/components/auth/Signup.js | 4 | ||||
-rw-r--r-- | src/components/auth/Welcome.js | 4 |
10 files changed, 12 insertions, 24 deletions
diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js index f26282cfc..94ff5d54d 100644 --- a/src/components/auth/AuthLayout.js +++ b/src/components/auth/AuthLayout.js | |||
@@ -19,7 +19,6 @@ import AppUpdateInfoBar from '../AppUpdateInfoBar'; | |||
19 | import { GITHUB_FERDI_URL } from '../../config'; | 19 | import { GITHUB_FERDI_URL } from '../../config'; |
20 | import { Icon } from '../ui/icon'; | 20 | import { Icon } from '../ui/icon'; |
21 | 21 | ||
22 | @observer | ||
23 | class AuthLayout extends Component { | 22 | class AuthLayout extends Component { |
24 | static propTypes = { | 23 | static propTypes = { |
25 | children: oneOrManyChildElements.isRequired, | 24 | children: oneOrManyChildElements.isRequired, |
@@ -107,4 +106,4 @@ class AuthLayout extends Component { | |||
107 | } | 106 | } |
108 | } | 107 | } |
109 | 108 | ||
110 | export default injectIntl(AuthLayout); | 109 | export default injectIntl(observer(AuthLayout)); |
diff --git a/src/components/auth/ChangeServer.js b/src/components/auth/ChangeServer.js index 9aeebc5c8..c284c0d19 100644 --- a/src/components/auth/ChangeServer.js +++ b/src/components/auth/ChangeServer.js | |||
@@ -34,7 +34,6 @@ const messages = defineMessages({ | |||
34 | }, | 34 | }, |
35 | }); | 35 | }); |
36 | 36 | ||
37 | @observer | ||
38 | class ChangeServer extends Component { | 37 | class ChangeServer extends Component { |
39 | static propTypes = { | 38 | static propTypes = { |
40 | onSubmit: PropTypes.func.isRequired, | 39 | onSubmit: PropTypes.func.isRequired, |
@@ -131,4 +130,4 @@ class ChangeServer extends Component { | |||
131 | } | 130 | } |
132 | } | 131 | } |
133 | 132 | ||
134 | export default injectIntl(ChangeServer); | 133 | export default injectIntl(observer(ChangeServer)); |
diff --git a/src/components/auth/Import.js b/src/components/auth/Import.js index fe2fe9872..8f70318ed 100644 --- a/src/components/auth/Import.js +++ b/src/components/auth/Import.js | |||
@@ -28,7 +28,6 @@ const messages = defineMessages({ | |||
28 | }, | 28 | }, |
29 | }); | 29 | }); |
30 | 30 | ||
31 | @observer | ||
32 | class Import extends Component { | 31 | class Import extends Component { |
33 | static propTypes = { | 32 | static propTypes = { |
34 | services: MobxPropTypes.arrayOrObservableArray.isRequired, | 33 | services: MobxPropTypes.arrayOrObservableArray.isRequired, |
@@ -166,4 +165,4 @@ class Import extends Component { | |||
166 | } | 165 | } |
167 | } | 166 | } |
168 | 167 | ||
169 | export default injectIntl(Import); | 168 | export default injectIntl(observer(Import)); |
diff --git a/src/components/auth/Invite.js b/src/components/auth/Invite.js index dd71c2450..a23af7c6b 100644 --- a/src/components/auth/Invite.js +++ b/src/components/auth/Invite.js | |||
@@ -43,7 +43,6 @@ const messages = defineMessages({ | |||
43 | }, | 43 | }, |
44 | }); | 44 | }); |
45 | 45 | ||
46 | @observer | ||
47 | class Invite extends Component { | 46 | class Invite extends Component { |
48 | static propTypes = { | 47 | static propTypes = { |
49 | onSubmit: PropTypes.func.isRequired, | 48 | onSubmit: PropTypes.func.isRequired, |
@@ -198,4 +197,4 @@ class Invite extends Component { | |||
198 | } | 197 | } |
199 | } | 198 | } |
200 | 199 | ||
201 | export default injectIntl(Invite); | 200 | export default injectIntl(observer(Invite)); |
diff --git a/src/components/auth/Locked.js b/src/components/auth/Locked.js index 5b36b9fc2..2ed429199 100644 --- a/src/components/auth/Locked.js +++ b/src/components/auth/Locked.js | |||
@@ -48,7 +48,6 @@ const messages = defineMessages({ | |||
48 | }, | 48 | }, |
49 | }); | 49 | }); |
50 | 50 | ||
51 | @observer | ||
52 | class Locked extends Component { | 51 | class Locked extends Component { |
53 | static propTypes = { | 52 | static propTypes = { |
54 | onSubmit: PropTypes.func.isRequired, | 53 | onSubmit: PropTypes.func.isRequired, |
@@ -149,4 +148,4 @@ class Locked extends Component { | |||
149 | } | 148 | } |
150 | } | 149 | } |
151 | 150 | ||
152 | export default injectIntl(Locked); | 151 | export default injectIntl(observer(Locked)); |
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js index 0c327d67e..c1602a047 100644 --- a/src/components/auth/Login.js +++ b/src/components/auth/Login.js | |||
@@ -71,8 +71,6 @@ const messages = defineMessages({ | |||
71 | }, | 71 | }, |
72 | }); | 72 | }); |
73 | 73 | ||
74 | @inject('actions') | ||
75 | @observer | ||
76 | class Login extends Component { | 74 | class Login extends Component { |
77 | static propTypes = { | 75 | static propTypes = { |
78 | onSubmit: PropTypes.func.isRequired, | 76 | onSubmit: PropTypes.func.isRequired, |
@@ -215,4 +213,4 @@ class Login extends Component { | |||
215 | } | 213 | } |
216 | } | 214 | } |
217 | 215 | ||
218 | export default injectIntl(Login); | 216 | export default injectIntl(inject('actions')(observer(Login))); |
diff --git a/src/components/auth/Password.js b/src/components/auth/Password.js index d5bc7fa80..b4d51f43d 100644 --- a/src/components/auth/Password.js +++ b/src/components/auth/Password.js | |||
@@ -38,7 +38,6 @@ const messages = defineMessages({ | |||
38 | }, | 38 | }, |
39 | }); | 39 | }); |
40 | 40 | ||
41 | @observer | ||
42 | class Password extends Component { | 41 | class Password extends Component { |
43 | static propTypes = { | 42 | static propTypes = { |
44 | onSubmit: PropTypes.func.isRequired, | 43 | onSubmit: PropTypes.func.isRequired, |
@@ -119,4 +118,4 @@ class Password extends Component { | |||
119 | } | 118 | } |
120 | } | 119 | } |
121 | 120 | ||
122 | export default injectIntl(Password); | 121 | export default injectIntl(observer(Password)); |
diff --git a/src/components/auth/SetupAssistant.js b/src/components/auth/SetupAssistant.js index 47fe88f43..a24f4e4d5 100644 --- a/src/components/auth/SetupAssistant.js +++ b/src/components/auth/SetupAssistant.js | |||
@@ -131,8 +131,6 @@ const styles = theme => ({ | |||
131 | }, | 131 | }, |
132 | }); | 132 | }); |
133 | 133 | ||
134 | @injectSheet(styles) | ||
135 | @observer | ||
136 | class SetupAssistant extends Component { | 134 | class SetupAssistant extends Component { |
137 | static propTypes = { | 135 | static propTypes = { |
138 | classes: PropTypes.object.isRequired, | 136 | classes: PropTypes.object.isRequired, |
@@ -327,4 +325,6 @@ class SetupAssistant extends Component { | |||
327 | } | 325 | } |
328 | } | 326 | } |
329 | 327 | ||
330 | export default injectIntl(SetupAssistant); | 328 | export default injectIntl( |
329 | injectSheet(styles, { injectTheme: true })(observer(SetupAssistant)), | ||
330 | ); | ||
diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js index 00625a3ac..ac86dcdc3 100644 --- a/src/components/auth/Signup.js +++ b/src/components/auth/Signup.js | |||
@@ -75,8 +75,6 @@ const messages = defineMessages({ | |||
75 | }, | 75 | }, |
76 | }); | 76 | }); |
77 | 77 | ||
78 | @inject('actions') | ||
79 | @observer | ||
80 | class Signup extends Component { | 78 | class Signup extends Component { |
81 | static propTypes = { | 79 | static propTypes = { |
82 | onSubmit: PropTypes.func.isRequired, | 80 | onSubmit: PropTypes.func.isRequired, |
@@ -217,4 +215,4 @@ class Signup extends Component { | |||
217 | } | 215 | } |
218 | } | 216 | } |
219 | 217 | ||
220 | export default injectIntl(Signup); | 218 | export default injectIntl(inject('actions')(observer(Signup))); |
diff --git a/src/components/auth/Welcome.js b/src/components/auth/Welcome.js index 809ec67a7..794c78987 100644 --- a/src/components/auth/Welcome.js +++ b/src/components/auth/Welcome.js | |||
@@ -22,8 +22,6 @@ const messages = defineMessages({ | |||
22 | }, | 22 | }, |
23 | }); | 23 | }); |
24 | 24 | ||
25 | @inject('actions') | ||
26 | @observer | ||
27 | class Login extends Component { | 25 | class Login extends Component { |
28 | static propTypes = { | 26 | static propTypes = { |
29 | loginRoute: PropTypes.string.isRequired, | 27 | loginRoute: PropTypes.string.isRequired, |
@@ -93,4 +91,4 @@ class Login extends Component { | |||
93 | } | 91 | } |
94 | } | 92 | } |
95 | 93 | ||
96 | export default injectIntl(Login); | 94 | export default injectIntl(inject('actions')(observer(Login))); |