diff options
author | vantezzen <properly@protonmail.com> | 2019-09-07 16:12:13 +0200 |
---|---|---|
committer | vantezzen <properly@protonmail.com> | 2019-09-07 16:12:13 +0200 |
commit | 44a7cfc62d1a1352a9825d172428b12dca44cab0 (patch) | |
tree | 15cc743be3347390aa223abfeec3cc2054a23882 /src/features | |
parent | Bump version number (diff) | |
download | ferdium-app-44a7cfc62d1a1352a9825d172428b12dca44cab0.tar.gz ferdium-app-44a7cfc62d1a1352a9825d172428b12dca44cab0.tar.zst ferdium-app-44a7cfc62d1a1352a9825d172428b12dca44cab0.zip |
Remove service limit and enable workspaces
Diffstat (limited to 'src/features')
-rw-r--r-- | src/features/serviceLimit/store.js | 7 | ||||
-rw-r--r-- | src/features/workspaces/store.js | 17 |
2 files changed, 13 insertions, 11 deletions
diff --git a/src/features/serviceLimit/store.js b/src/features/serviceLimit/store.js index 9836c5f51..9c4b5ef1a 100644 --- a/src/features/serviceLimit/store.js +++ b/src/features/serviceLimit/store.js | |||
@@ -12,7 +12,7 @@ export class ServiceLimitStore extends FeatureStore { | |||
12 | this.stores = stores; | 12 | this.stores = stores; |
13 | this.actions = actions; | 13 | this.actions = actions; |
14 | 14 | ||
15 | this.isServiceLimitEnabled = true; | 15 | this.isServiceLimitEnabled = false; |
16 | } | 16 | } |
17 | 17 | ||
18 | stop() { | 18 | stop() { |
@@ -22,9 +22,10 @@ export class ServiceLimitStore extends FeatureStore { | |||
22 | } | 22 | } |
23 | 23 | ||
24 | @computed get userHasReachedServiceLimit() { | 24 | @computed get userHasReachedServiceLimit() { |
25 | if (!this.isServiceLimitEnabled) return false; | 25 | return false; |
26 | // if (!this.isServiceLimitEnabled) return false; | ||
26 | 27 | ||
27 | return this.serviceLimit !== 0 && this.serviceCount >= this.serviceLimit; | 28 | // return this.serviceLimit !== 0 && this.serviceCount >= this.serviceLimit; |
28 | } | 29 | } |
29 | 30 | ||
30 | @computed get serviceLimit() { | 31 | @computed get serviceLimit() { |
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js index 4a1f80b4e..bdec530ec 100644 --- a/src/features/workspaces/store.js +++ b/src/features/workspaces/store.js | |||
@@ -20,13 +20,13 @@ import { createActionBindings } from '../utils/ActionBinding'; | |||
20 | const debug = require('debug')('Franz:feature:workspaces:store'); | 20 | const debug = require('debug')('Franz:feature:workspaces:store'); |
21 | 21 | ||
22 | export default class WorkspacesStore extends FeatureStore { | 22 | export default class WorkspacesStore extends FeatureStore { |
23 | @observable isFeatureEnabled = false; | 23 | @observable isFeatureEnabled = true; |
24 | 24 | ||
25 | @observable isFeatureActive = false; | 25 | @observable isFeatureActive = false; |
26 | 26 | ||
27 | @observable isPremiumFeature = true; | 27 | @observable isPremiumFeature = false; |
28 | 28 | ||
29 | @observable isPremiumUpgradeRequired = true; | 29 | @observable isPremiumUpgradeRequired = false; |
30 | 30 | ||
31 | @observable activeWorkspace = null; | 31 | @observable activeWorkspace = null; |
32 | 32 | ||
@@ -54,7 +54,8 @@ export default class WorkspacesStore extends FeatureStore { | |||
54 | } | 54 | } |
55 | 55 | ||
56 | @computed get isUserAllowedToUseFeature() { | 56 | @computed get isUserAllowedToUseFeature() { |
57 | return !this.isPremiumUpgradeRequired; | 57 | return true; |
58 | // return !this.isPremiumUpgradeRequired; | ||
58 | } | 59 | } |
59 | 60 | ||
60 | @computed get isAnyWorkspaceActive() { | 61 | @computed get isAnyWorkspaceActive() { |
@@ -253,10 +254,10 @@ export default class WorkspacesStore extends FeatureStore { | |||
253 | }; | 254 | }; |
254 | 255 | ||
255 | _setIsPremiumFeatureReaction = () => { | 256 | _setIsPremiumFeatureReaction = () => { |
256 | const { features } = this.stores; | 257 | // const { features } = this.stores; |
257 | const { isWorkspaceIncludedInCurrentPlan } = features.features; | 258 | // const { isWorkspaceIncludedInCurrentPlan } = features.features; |
258 | this.isPremiumFeature = !isWorkspaceIncludedInCurrentPlan; | 259 | // this.isPremiumFeature = !isWorkspaceIncludedInCurrentPlan; |
259 | this.isPremiumUpgradeRequired = !isWorkspaceIncludedInCurrentPlan; | 260 | // this.isPremiumUpgradeRequired = !isWorkspaceIncludedInCurrentPlan; |
260 | }; | 261 | }; |
261 | 262 | ||
262 | _setWorkspaceBeingEditedReaction = () => { | 263 | _setWorkspaceBeingEditedReaction = () => { |