diff options
Diffstat (limited to 'src/components/settings')
12 files changed, 28 insertions, 37 deletions
diff --git a/src/components/settings/SettingsLayout.js b/src/components/settings/SettingsLayout.js index e9119a944..de13e95ab 100644 --- a/src/components/settings/SettingsLayout.js +++ b/src/components/settings/SettingsLayout.js | |||
@@ -16,7 +16,6 @@ const messages = defineMessages({ | |||
16 | }, | 16 | }, |
17 | }); | 17 | }); |
18 | 18 | ||
19 | @observer | ||
20 | class SettingsLayout extends Component { | 19 | class SettingsLayout extends Component { |
21 | static propTypes = { | 20 | static propTypes = { |
22 | navigation: PropTypes.element.isRequired, | 21 | navigation: PropTypes.element.isRequired, |
@@ -78,4 +77,4 @@ class SettingsLayout extends Component { | |||
78 | } | 77 | } |
79 | } | 78 | } |
80 | 79 | ||
81 | export default injectIntl(SettingsLayout); | 80 | export default injectIntl(observer(SettingsLayout)); |
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js index 6c489e64b..d0c56af05 100644 --- a/src/components/settings/account/AccountDashboard.js +++ b/src/components/settings/account/AccountDashboard.js | |||
@@ -64,7 +64,6 @@ const messages = defineMessages({ | |||
64 | }, | 64 | }, |
65 | }); | 65 | }); |
66 | 66 | ||
67 | @observer | ||
68 | class AccountDashboard extends Component { | 67 | class AccountDashboard extends Component { |
69 | static propTypes = { | 68 | static propTypes = { |
70 | user: MobxPropTypes.observableObject.isRequired, | 69 | user: MobxPropTypes.observableObject.isRequired, |
@@ -229,4 +228,4 @@ class AccountDashboard extends Component { | |||
229 | } | 228 | } |
230 | } | 229 | } |
231 | 230 | ||
232 | export default injectIntl(AccountDashboard); | 231 | export default injectIntl(observer(AccountDashboard)); |
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js index dbb1365b0..2fdb6e574 100644 --- a/src/components/settings/navigation/SettingsNavigation.js +++ b/src/components/settings/navigation/SettingsNavigation.js | |||
@@ -42,8 +42,6 @@ const messages = defineMessages({ | |||
42 | }, | 42 | }, |
43 | }); | 43 | }); |
44 | 44 | ||
45 | @inject('stores', 'actions') | ||
46 | @observer | ||
47 | class SettingsNavigation extends Component { | 45 | class SettingsNavigation extends Component { |
48 | static propTypes = { | 46 | static propTypes = { |
49 | stores: PropTypes.shape({ | 47 | stores: PropTypes.shape({ |
@@ -175,4 +173,4 @@ class SettingsNavigation extends Component { | |||
175 | } | 173 | } |
176 | } | 174 | } |
177 | 175 | ||
178 | export default injectIntl(SettingsNavigation); | 176 | export default injectIntl(inject('stores', 'actions')(observer(SettingsNavigation))); |
diff --git a/src/components/settings/recipes/RecipeItem.js b/src/components/settings/recipes/RecipeItem.js index 1e910e6dc..df5b42222 100644 --- a/src/components/settings/recipes/RecipeItem.js +++ b/src/components/settings/recipes/RecipeItem.js | |||
@@ -4,7 +4,6 @@ import { observer } from 'mobx-react'; | |||
4 | 4 | ||
5 | import RecipePreviewModel from '../../../models/RecipePreview'; | 5 | import RecipePreviewModel from '../../../models/RecipePreview'; |
6 | 6 | ||
7 | @observer | ||
8 | class RecipeItem extends Component { | 7 | class RecipeItem extends Component { |
9 | static propTypes = { | 8 | static propTypes = { |
10 | recipe: PropTypes.instanceOf(RecipePreviewModel).isRequired, | 9 | recipe: PropTypes.instanceOf(RecipePreviewModel).isRequired, |
@@ -31,4 +30,4 @@ class RecipeItem extends Component { | |||
31 | } | 30 | } |
32 | } | 31 | } |
33 | 32 | ||
34 | export default RecipeItem; | 33 | export default observer(RecipeItem); |
diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js index 7ec285431..d9f53d74e 100644 --- a/src/components/settings/recipes/RecipesDashboard.js +++ b/src/components/settings/recipes/RecipesDashboard.js | |||
@@ -105,8 +105,6 @@ const styles = { | |||
105 | }, | 105 | }, |
106 | }; | 106 | }; |
107 | 107 | ||
108 | @injectSheet(styles) | ||
109 | @observer | ||
110 | class RecipesDashboard extends Component { | 108 | class RecipesDashboard extends Component { |
111 | static propTypes = { | 109 | static propTypes = { |
112 | recipes: MobxPropTypes.arrayOrObservableArray.isRequired, | 110 | recipes: MobxPropTypes.arrayOrObservableArray.isRequired, |
@@ -247,16 +245,18 @@ class RecipesDashboard extends Component { | |||
247 | {intl.formatMessage(messages.nothingFound)} | 245 | {intl.formatMessage(messages.nothingFound)} |
248 | </p> | 246 | </p> |
249 | 247 | ||
250 | <RecipeItem | 248 | {customWebsiteRecipe && customWebsiteRecipe.id && ( |
251 | key={customWebsiteRecipe.id} | 249 | <RecipeItem |
252 | recipe={customWebsiteRecipe} | 250 | key={customWebsiteRecipe.id} |
253 | onClick={() => | 251 | recipe={customWebsiteRecipe} |
254 | isLoggedIn && | 252 | onClick={() => |
255 | showAddServiceInterface({ | 253 | isLoggedIn && |
256 | recipeId: customWebsiteRecipe.id, | 254 | showAddServiceInterface({ |
257 | }) | 255 | recipeId: customWebsiteRecipe.id, |
258 | } | 256 | }) |
259 | /> | 257 | } |
258 | /> | ||
259 | )} | ||
260 | </div> | 260 | </div> |
261 | )} | 261 | )} |
262 | {communityRecipes.map(recipe => ( | 262 | {communityRecipes.map(recipe => ( |
@@ -295,4 +295,6 @@ class RecipesDashboard extends Component { | |||
295 | } | 295 | } |
296 | } | 296 | } |
297 | 297 | ||
298 | export default injectIntl(RecipesDashboard); | 298 | export default injectIntl( |
299 | injectSheet(styles, { injectTheme: true })(observer(RecipesDashboard)), | ||
300 | ); | ||
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index 6b4cc721d..f0e791b87 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js | |||
@@ -134,7 +134,6 @@ const messages = defineMessages({ | |||
134 | }, | 134 | }, |
135 | }); | 135 | }); |
136 | 136 | ||
137 | @observer | ||
138 | class EditServiceForm extends Component { | 137 | class EditServiceForm extends Component { |
139 | static propTypes = { | 138 | static propTypes = { |
140 | recipe: PropTypes.instanceOf(Recipe).isRequired, | 139 | recipe: PropTypes.instanceOf(Recipe).isRequired, |
@@ -500,4 +499,4 @@ class EditServiceForm extends Component { | |||
500 | } | 499 | } |
501 | } | 500 | } |
502 | 501 | ||
503 | export default injectIntl(EditServiceForm); | 502 | export default injectIntl(observer(EditServiceForm)); |
diff --git a/src/components/settings/services/ServiceError.js b/src/components/settings/services/ServiceError.js index 6dd53a102..bcbbca3de 100644 --- a/src/components/settings/services/ServiceError.js +++ b/src/components/settings/services/ServiceError.js | |||
@@ -25,7 +25,6 @@ const messages = defineMessages({ | |||
25 | }, | 25 | }, |
26 | }); | 26 | }); |
27 | 27 | ||
28 | @observer | ||
29 | class ServiceError extends Component { | 28 | class ServiceError extends Component { |
30 | render() { | 29 | render() { |
31 | const { intl } = this.props; | 30 | const { intl } = this.props; |
@@ -60,4 +59,4 @@ class ServiceError extends Component { | |||
60 | } | 59 | } |
61 | } | 60 | } |
62 | 61 | ||
63 | export default injectIntl(ServiceError); | 62 | export default injectIntl(observer(ServiceError)); |
diff --git a/src/components/settings/services/ServiceItem.js b/src/components/settings/services/ServiceItem.js index d83e5fd56..23250ad09 100644 --- a/src/components/settings/services/ServiceItem.js +++ b/src/components/settings/services/ServiceItem.js | |||
@@ -24,7 +24,6 @@ const messages = defineMessages({ | |||
24 | }, | 24 | }, |
25 | }); | 25 | }); |
26 | 26 | ||
27 | @observer | ||
28 | class ServiceItem extends Component { | 27 | class ServiceItem extends Component { |
29 | static propTypes = { | 28 | static propTypes = { |
30 | service: PropTypes.instanceOf(ServiceModel).isRequired, | 29 | service: PropTypes.instanceOf(ServiceModel).isRequired, |
@@ -91,4 +90,4 @@ class ServiceItem extends Component { | |||
91 | } | 90 | } |
92 | } | 91 | } |
93 | 92 | ||
94 | export default injectIntl(ServiceItem); | 93 | export default injectIntl(observer(ServiceItem)); |
diff --git a/src/components/settings/services/ServicesDashboard.js b/src/components/settings/services/ServicesDashboard.js index aae6eb855..81c5faa70 100644 --- a/src/components/settings/services/ServicesDashboard.js +++ b/src/components/settings/services/ServicesDashboard.js | |||
@@ -51,7 +51,6 @@ const messages = defineMessages({ | |||
51 | }, | 51 | }, |
52 | }); | 52 | }); |
53 | 53 | ||
54 | @observer | ||
55 | class ServicesDashboard extends Component { | 54 | class ServicesDashboard extends Component { |
56 | static propTypes = { | 55 | static propTypes = { |
57 | services: MobxPropTypes.arrayOrObservableArray.isRequired, | 56 | services: MobxPropTypes.arrayOrObservableArray.isRequired, |
@@ -188,4 +187,4 @@ class ServicesDashboard extends Component { | |||
188 | } | 187 | } |
189 | } | 188 | } |
190 | 189 | ||
191 | export default injectIntl(ServicesDashboard); | 190 | export default injectIntl(observer(ServicesDashboard)); |
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 9f51b54d5..d9df9c41c 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -188,7 +188,6 @@ const messages = defineMessages({ | |||
188 | 188 | ||
189 | const Hr = () => <hr style={{ marginBottom: 20 }} />; | 189 | const Hr = () => <hr style={{ marginBottom: 20 }} />; |
190 | 190 | ||
191 | @observer | ||
192 | class EditSettingsForm extends Component { | 191 | class EditSettingsForm extends Component { |
193 | static propTypes = { | 192 | static propTypes = { |
194 | checkForUpdates: PropTypes.func.isRequired, | 193 | checkForUpdates: PropTypes.func.isRequired, |
@@ -847,4 +846,4 @@ class EditSettingsForm extends Component { | |||
847 | } | 846 | } |
848 | } | 847 | } |
849 | 848 | ||
850 | export default injectIntl(EditSettingsForm); | 849 | export default injectIntl(observer(EditSettingsForm)); |
diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js index 38d124266..802284051 100644 --- a/src/components/settings/team/TeamDashboard.js +++ b/src/components/settings/team/TeamDashboard.js | |||
@@ -90,8 +90,6 @@ const styles = { | |||
90 | }, | 90 | }, |
91 | }; | 91 | }; |
92 | 92 | ||
93 | @injectSheet(styles) | ||
94 | @observer | ||
95 | class TeamDashboard extends Component { | 93 | class TeamDashboard extends Component { |
96 | static propTypes = { | 94 | static propTypes = { |
97 | isLoading: PropTypes.bool.isRequired, | 95 | isLoading: PropTypes.bool.isRequired, |
@@ -197,4 +195,6 @@ class TeamDashboard extends Component { | |||
197 | } | 195 | } |
198 | } | 196 | } |
199 | 197 | ||
200 | export default injectIntl(TeamDashboard); | 198 | export default injectIntl( |
199 | injectSheet(styles, { injectTheme: true })(observer(TeamDashboard)), | ||
200 | ); | ||
diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js index 1b8a4f25a..95498d9bb 100644 --- a/src/components/settings/user/EditUserForm.js +++ b/src/components/settings/user/EditUserForm.js | |||
@@ -37,7 +37,6 @@ const messages = defineMessages({ | |||
37 | }, | 37 | }, |
38 | }); | 38 | }); |
39 | 39 | ||
40 | @observer | ||
41 | class EditUserForm extends Component { | 40 | class EditUserForm extends Component { |
42 | static propTypes = { | 41 | static propTypes = { |
43 | status: MobxPropTypes.observableArray.isRequired, | 42 | status: MobxPropTypes.observableArray.isRequired, |
@@ -128,4 +127,4 @@ class EditUserForm extends Component { | |||
128 | } | 127 | } |
129 | } | 128 | } |
130 | 129 | ||
131 | export default injectIntl(EditUserForm); | 130 | export default injectIntl(observer(EditUserForm)); |