diff options
author | Stefan Malzner <stefan@adlk.io> | 2019-09-03 16:33:16 +0200 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2019-09-03 16:33:16 +0200 |
commit | a22f18094a64ff9359923c4a91ffbf81769d35f3 (patch) | |
tree | 6294b7332fbc29623d13532d48dd52fdd59de677 /src/stores | |
parent | Add CTA for pro upgrade (diff) | |
parent | Merge branch 'feature/todos' into develop (diff) | |
download | ferdium-app-a22f18094a64ff9359923c4a91ffbf81769d35f3.tar.gz ferdium-app-a22f18094a64ff9359923c4a91ffbf81769d35f3.tar.zst ferdium-app-a22f18094a64ff9359923c4a91ffbf81769d35f3.zip |
Merge branch 'develop' into feature/new-pricing
Diffstat (limited to 'src/stores')
-rw-r--r-- | src/stores/FeaturesStore.js | 2 | ||||
-rw-r--r-- | src/stores/ServicesStore.js | 3 | ||||
-rw-r--r-- | src/stores/index.js | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js index 27334c9a2..cf28b6bec 100644 --- a/src/stores/FeaturesStore.js +++ b/src/stores/FeaturesStore.js | |||
@@ -18,6 +18,7 @@ import announcements from '../features/announcements'; | |||
18 | import settingsWS from '../features/settingsWS'; | 18 | import settingsWS from '../features/settingsWS'; |
19 | import serviceLimit from '../features/serviceLimit'; | 19 | import serviceLimit from '../features/serviceLimit'; |
20 | import communityRecipes from '../features/communityRecipes'; | 20 | import communityRecipes from '../features/communityRecipes'; |
21 | import todos from '../features/todos'; | ||
21 | 22 | ||
22 | import { DEFAULT_FEATURES_CONFIG } from '../config'; | 23 | import { DEFAULT_FEATURES_CONFIG } from '../config'; |
23 | 24 | ||
@@ -79,5 +80,6 @@ export default class FeaturesStore extends Store { | |||
79 | settingsWS(this.stores, this.actions); | 80 | settingsWS(this.stores, this.actions); |
80 | serviceLimit(this.stores, this.actions); | 81 | serviceLimit(this.stores, this.actions); |
81 | communityRecipes(this.stores, this.actions); | 82 | communityRecipes(this.stores, this.actions); |
83 | todos(this.stores, this.actions); | ||
82 | } | 84 | } |
83 | } | 85 | } |
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js index e3b3fcf21..2fc543192 100644 --- a/src/stores/ServicesStore.js +++ b/src/stores/ServicesStore.js | |||
@@ -448,6 +448,9 @@ export default class ServicesStore extends Store { | |||
448 | redirect: false, | 448 | redirect: false, |
449 | }); | 449 | }); |
450 | } | 450 | } |
451 | } else if (channel === 'feature:todos') { | ||
452 | Object.assign(args[0].data, { serviceId }); | ||
453 | this.actions.todos.handleHostMessage(args[0]); | ||
451 | } | 454 | } |
452 | } | 455 | } |
453 | 456 | ||
diff --git a/src/stores/index.js b/src/stores/index.js index c9ec77612..10dd56665 100644 --- a/src/stores/index.js +++ b/src/stores/index.js | |||
@@ -14,6 +14,7 @@ import { workspaceStore } from '../features/workspaces'; | |||
14 | import { announcementsStore } from '../features/announcements'; | 14 | import { announcementsStore } from '../features/announcements'; |
15 | import { serviceLimitStore } from '../features/serviceLimit'; | 15 | import { serviceLimitStore } from '../features/serviceLimit'; |
16 | import { communityRecipesStore } from '../features/communityRecipes'; | 16 | import { communityRecipesStore } from '../features/communityRecipes'; |
17 | import { todosStore } from '../features/todos'; | ||
17 | 18 | ||
18 | export default (api, actions, router) => { | 19 | export default (api, actions, router) => { |
19 | const stores = {}; | 20 | const stores = {}; |
@@ -35,6 +36,7 @@ export default (api, actions, router) => { | |||
35 | announcements: announcementsStore, | 36 | announcements: announcementsStore, |
36 | serviceLimit: serviceLimitStore, | 37 | serviceLimit: serviceLimitStore, |
37 | communityRecipes: communityRecipesStore, | 38 | communityRecipes: communityRecipesStore, |
39 | todos: todosStore, | ||
38 | }); | 40 | }); |
39 | // Initialize all stores | 41 | // Initialize all stores |
40 | Object.keys(stores).forEach((name) => { | 42 | Object.keys(stores).forEach((name) => { |