12 files changed, 259 insertions, 23 deletions

diff --git a/src/features/basicAuth/Component.js b/src/features/basicAuth/Component.js
index a8252acb7..ba9ae2273 100644
--- a/src/features/basicAuth/Component.js
+++ b/src/features/basicAuth/Component.js
@@ -27,7 +27,6 @@ export default @injectSheet(styles) @observer class BasicAuthModal extends Compo
     e.preventDefault();
 
     const values = Form.values();
-    console.log('form submit', values);
 
     sendCredentials(values.user, values.password);
     resetState();
diff --git a/src/features/communityRecipes/index.js b/src/features/communityRecipes/index.js
new file mode 100644
index 000000000..4d050f90e
--- /dev/null
+++ b/src/features/communityRecipes/index.js
@@ -0,0 +1,28 @@
+import { reaction } from 'mobx';
+import { CommunityRecipesStore } from './store';
+
+const debug = require('debug')('Franz:feature:communityRecipes');
+
+export const DEFAULT_SERVICE_LIMIT = 3;
+
+export const communityRecipesStore = new CommunityRecipesStore();
+
+export default function initCommunityRecipes(stores, actions) {
+  const { features } = stores;
+
+  communityRecipesStore.start(stores, actions);
+
+  // Toggle communityRecipe premium status
+  reaction(
+    () => (
+      features.features.isCommunityRecipesIncludedInCurrentPlan
+    ),
+    (isPremiumFeature) => {
+      debug('Community recipes is premium feature: ', isPremiumFeature);
+      communityRecipesStore.isCommunityRecipesIncludedInCurrentPlan = isPremiumFeature;
+    },
+    {
+      fireImmediately: true,
+    },
+  );
+}
diff --git a/src/features/communityRecipes/store.js b/src/features/communityRecipes/store.js
new file mode 100644
index 000000000..4d45c3b33
--- /dev/null
+++ b/src/features/communityRecipes/store.js
@@ -0,0 +1,31 @@
+import { computed, observable } from 'mobx';
+import { FeatureStore } from '../utils/FeatureStore';
+
+const debug = require('debug')('Franz:feature:communityRecipes:store');
+
+export class CommunityRecipesStore extends FeatureStore {
+  @observable isCommunityRecipesIncludedInCurrentPlan = false;
+
+  start(stores, actions) {
+    debug('start');
+    this.stores = stores;
+    this.actions = actions;
+  }
+
+  stop() {
+    debug('stop');
+    super.stop();
+  }
+
+  @computed get communityRecipes() {
+    if (!this.stores) return [];
+
+    return this.stores.recipePreviews.dev.map((r) => {
+      r.isDevRecipe = !!r.author.find(a => a.email === this.stores.user.data.email);
+
+      return r;
+    });
+  }
+}
+
+export default CommunityRecipesStore;
diff --git a/src/features/delayApp/Component.js b/src/features/delayApp/Component.js
index ff0f1f2f8..de5653f04 100644
--- a/src/features/delayApp/Component.js
+++ b/src/features/delayApp/Component.js
@@ -4,29 +4,39 @@ import { inject, observer } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
 import injectSheet from 'react-jss';
 
+import { Button } from '@meetfranz/forms';
 import { gaEvent } from '../../lib/analytics';
 
-import Button from '../../components/ui/Button';
+// import Button from '../../components/ui/Button';
 
 import { config } from '.';
 import styles from './styles';
+import UserStore from '../../stores/UserStore';
 
 const messages = defineMessages({
   headline: {
     id: 'feature.delayApp.headline',
     defaultMessage: '!!!Please purchase license to skip waiting',
   },
+  headlineTrial: {
+    id: 'feature.delayApp.trial.headline',
+    defaultMessage: '!!!Get the free Franz Professional 14 day trial and skip the line',
+  },
   action: {
-    id: 'feature.delayApp.action',
+    id: 'feature.delayApp.upgrade.action',
     defaultMessage: '!!!Get a Franz Supporter License',
   },
+  actionTrial: {
+    id: 'feature.delayApp.trial.action',
+    defaultMessage: '!!!Yes, I want the free 14 day trial of Franz Professional',
+  },
   text: {
     id: 'feature.delayApp.text',
     defaultMessage: '!!!Franz will continue in {seconds} seconds.',
   },
 });
 
-export default @inject('actions') @injectSheet(styles) @observer class DelayApp extends Component {
+export default @inject('stores', 'actions') @injectSheet(styles) @observer class DelayApp extends Component {
   static propTypes = {
     // eslint-disable-next-line
     classes: PropTypes.object.isRequired,
@@ -62,25 +72,37 @@ export default @inject('actions') @injectSheet(styles) @observer class DelayApp
   }
 
   handleCTAClick() {
-    const { actions } = this.props;
+    const { actions, stores } = this.props;
+    const { hadSubscription } = stores.user.data;
+    const { defaultTrialPlan } = stores.features.features;
+
+    if (!hadSubscription) {
+      console.log('directly activate trial');
+      actions.user.activateTrial({ planId: defaultTrialPlan });
 
-    actions.ui.openSettings({ path: 'user' });
+      gaEvent('DelayApp', 'subscribe_click', 'Delay App Feature');
+    } else {
+      actions.ui.openSettings({ path: 'user' });
 
-    gaEvent('DelayApp', 'subscribe_click', 'Delay App Feature');
+      gaEvent('DelayApp', 'subscribe_click', 'Delay App Feature');
+    }
   }
 
   render() {
-    const { classes } = this.props;
+    const { classes, stores } = this.props;
     const { intl } = this.context;
 
+    const { hadSubscription } = stores.user.data;
+
     return (
       <div className={`${classes.container}`}>
-        <h1 className={classes.headline}>{intl.formatMessage(messages.headline)}</h1>
+        <h1 className={classes.headline}>{intl.formatMessage(hadSubscription ? messages.headline : messages.headlineTrial)}</h1>
         <Button
-          label={intl.formatMessage(messages.action)}
+          label={intl.formatMessage(hadSubscription ? messages.action : messages.actionTrial)}
           className={classes.button}
           buttonType="inverted"
           onClick={this.handleCTAClick.bind(this)}
+          busy={stores.user.activateTrialRequest.isExecuting}
         />
         <p className="footnote">
           {intl.formatMessage(messages.text, {
@@ -93,6 +115,9 @@ export default @inject('actions') @injectSheet(styles) @observer class DelayApp
 }
 
 DelayApp.wrappedComponent.propTypes = {
+  stores: PropTypes.shape({
+    user: PropTypes.instanceOf(UserStore).isRequired,
+  }).isRequired,
   actions: PropTypes.shape({
     ui: PropTypes.shape({
       openSettings: PropTypes.func.isRequired,
diff --git a/src/features/delayApp/index.js b/src/features/delayApp/index.js
index 39fae3b20..627537de7 100644
--- a/src/features/delayApp/index.js
+++ b/src/features/delayApp/index.js
@@ -44,7 +44,7 @@ export default function init(stores) {
         config.delayDuration = globalConfig.wait !== undefined ? globalConfig.wait : DEFAULT_FEATURES_CONFIG.needToWaitToProceedConfig.wait;
 
         autorun(() => {
-          if (stores.services.all.length === 0) {
+          if (stores.services.allDisplayed.length === 0) {
             debug('seas', stores.services.all.length);
             shownAfterLaunch = true;
             return;
diff --git a/src/features/serviceLimit/components/LimitReachedInfobox.js b/src/features/serviceLimit/components/LimitReachedInfobox.js
new file mode 100644
index 000000000..fc54dcf85
--- /dev/null
+++ b/src/features/serviceLimit/components/LimitReachedInfobox.js
@@ -0,0 +1,78 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { inject, observer } from 'mobx-react';
+import { defineMessages, intlShape } from 'react-intl';
+import injectSheet from 'react-jss';
+import { Infobox } from '@meetfranz/ui';
+
+import { gaEvent } from '../../../lib/analytics';
+
+const messages = defineMessages({
+  limitReached: {
+    id: 'feature.serviceLimit.limitReached',
+    defaultMessage: '!!!You have added {amount} of {limit} services. Please upgrade your account to add more services.',
+  },
+  action: {
+    id: 'premiumFeature.button.upgradeAccount',
+    defaultMessage: '!!!Upgrade account',
+  },
+});
+
+const styles = theme => ({
+  container: {
+    height: 'auto',
+    background: theme.styleTypes.primary.accent,
+    color: theme.styleTypes.primary.contrast,
+    borderRadius: 0,
+    marginBottom: 0,
+
+    '& > div': {
+      marginBottom: 0,
+    },
+
+    '& button': {
+      color: theme.styleTypes.primary.contrast,
+    },
+  },
+});
+
+
+@inject('stores', 'actions') @injectSheet(styles) @observer
+class LimitReachedInfobox extends Component {
+  static propTypes = {
+    classes: PropTypes.object.isRequired,
+    stores: PropTypes.object.isRequired,
+    actions: PropTypes.object.isRequired,
+  };
+
+  static contextTypes = {
+    intl: intlShape,
+  };
+
+  render() {
+    const { classes, stores, actions } = this.props;
+    const { intl } = this.context;
+
+    const {
+      serviceLimit,
+    } = stores;
+
+    if (!serviceLimit.userHasReachedServiceLimit) return null;
+
+    return (
+      <Infobox
+        icon="mdiInformation"
+        className={classes.container}
+        ctaLabel={intl.formatMessage(messages.action)}
+        ctaOnClick={() => {
+          actions.ui.openSettings({ path: 'user' });
+          gaEvent('Service Limit', 'upgrade', 'Upgrade account');
+        }}
+      >
+        {intl.formatMessage(messages.limitReached, { amount: serviceLimit.serviceCount, limit: serviceLimit.serviceLimit })}
+      </Infobox>
+    );
+  }
+}
+
+export default LimitReachedInfobox;
diff --git a/src/features/serviceLimit/index.js b/src/features/serviceLimit/index.js
new file mode 100644
index 000000000..92ad8bb98
--- /dev/null
+++ b/src/features/serviceLimit/index.js
@@ -0,0 +1,33 @@
+import { reaction } from 'mobx';
+import { ServiceLimitStore } from './store';
+
+const debug = require('debug')('Franz:feature:serviceLimit');
+
+export const DEFAULT_SERVICE_LIMIT = 3;
+
+let store = null;
+
+export const serviceLimitStore = new ServiceLimitStore();
+
+export default function initServiceLimit(stores, actions) {
+  const { features } = stores;
+
+  // Toggle serviceLimit feature
+  reaction(
+    () => (
+      features.features.isServiceLimitEnabled
+    ),
+    (isEnabled) => {
+      if (isEnabled) {
+        debug('Initializing `serviceLimit` feature');
+        store = serviceLimitStore.start(stores, actions);
+      } else if (store) {
+        debug('Disabling `serviceLimit` feature');
+        serviceLimitStore.stop();
+      }
+    },
+    {
+      fireImmediately: true,
+    },
+  );
+}
diff --git a/src/features/serviceLimit/store.js b/src/features/serviceLimit/store.js
new file mode 100644
index 000000000..9836c5f51
--- /dev/null
+++ b/src/features/serviceLimit/store.js
@@ -0,0 +1,41 @@
+import { computed, observable } from 'mobx';
+import { FeatureStore } from '../utils/FeatureStore';
+import { DEFAULT_SERVICE_LIMIT } from '.';
+
+const debug = require('debug')('Franz:feature:serviceLimit:store');
+
+export class ServiceLimitStore extends FeatureStore {
+  @observable isServiceLimitEnabled = false;
+
+  start(stores, actions) {
+    debug('start');
+    this.stores = stores;
+    this.actions = actions;
+
+    this.isServiceLimitEnabled = true;
+  }
+
+  stop() {
+    super.stop();
+
+    this.isServiceLimitEnabled = false;
+  }
+
+  @computed get userHasReachedServiceLimit() {
+    if (!this.isServiceLimitEnabled) return false;
+
+    return this.serviceLimit !== 0 && this.serviceCount >= this.serviceLimit;
+  }
+
+  @computed get serviceLimit() {
+    if (!this.isServiceLimitEnabled || this.stores.features.features.serviceLimitCount === 0) return 0;
+
+    return this.stores.features.features.serviceLimitCount || DEFAULT_SERVICE_LIMIT;
+  }
+
+  @computed get serviceCount() {
+    return this.stores.services.all.length;
+  }
+}
+
+export default ServiceLimitStore;
diff --git a/src/features/serviceProxy/index.js b/src/features/serviceProxy/index.js
index 4bea327ad..55c600de4 100644
--- a/src/features/serviceProxy/index.js
+++ b/src/features/serviceProxy/index.js
@@ -9,17 +9,17 @@ const debug = require('debug')('Franz:feature:serviceProxy');
 
 export const config = observable({
   isEnabled: DEFAULT_FEATURES_CONFIG.isServiceProxyEnabled,
-  isPremium: DEFAULT_FEATURES_CONFIG.isServiceProxyPremiumFeature,
+  isPremium: DEFAULT_FEATURES_CONFIG.isServiceProxyIncludedInCurrentPlan,
 });
 
 export default function init(stores) {
   debug('Initializing `serviceProxy` feature');
 
   autorun(() => {
-    const { isServiceProxyEnabled, isServiceProxyPremiumFeature } = stores.features.features;
+    const { isServiceProxyEnabled, isServiceProxyIncludedInCurrentPlan } = stores.features.features;
 
     config.isEnabled = isServiceProxyEnabled !== undefined ? isServiceProxyEnabled : DEFAULT_FEATURES_CONFIG.isServiceProxyEnabled;
-    config.isPremium = isServiceProxyPremiumFeature !== undefined ? isServiceProxyPremiumFeature : DEFAULT_FEATURES_CONFIG.isServiceProxyPremiumFeature;
+    config.isIncludedInCurrentPlan = isServiceProxyIncludedInCurrentPlan !== undefined ? isServiceProxyIncludedInCurrentPlan : DEFAULT_FEATURES_CONFIG.isServiceProxyIncludedInCurrentPlan;
 
     const services = stores.services.enabled;
     const isPremiumUser = stores.user.data.isPremium;
@@ -30,7 +30,7 @@ export default function init(stores) {
     services.forEach((service) => {
       const s = session.fromPartition(`persist:service-${service.id}`);
 
-      if (config.isEnabled && (isPremiumUser || !config.isPremium)) {
+      if (config.isEnabled && (isPremiumUser || !config.isIncludedInCurrentPlan)) {
         const serviceProxyConfig = proxySettings[service.id];
 
         if (serviceProxyConfig && serviceProxyConfig.isEnabled && serviceProxyConfig.host) {
diff --git a/src/features/shareFranz/Component.js b/src/features/shareFranz/Component.js
index 8d1d595c5..859c0ebe9 100644
--- a/src/features/shareFranz/Component.js
+++ b/src/features/shareFranz/Component.js
@@ -6,6 +6,7 @@ import { defineMessages, intlShape } from 'react-intl';
 import { Button } from '@meetfranz/forms';
 import { H1, Icon } from '@meetfranz/ui';
 
+import { mdiHeart } from '@mdi/js';
 import Modal from '../../components/ui/Modal';
 import { state } from '.';
 import { gaEvent } from '../../lib/analytics';
@@ -116,7 +117,7 @@ export default @injectSheet(styles) @inject('stores') @observer class ShareFranz
         close={this.close.bind(this)}
       >
         <div className={classes.heartContainer}>
-          <Icon icon="mdiHeart" className={classes.heart} size={4} />
+          <Icon icon={mdiHeart} className={classes.heart} size={4} />
         </div>
         <H1 className={classes.headline}>
           {intl.formatMessage(messages.headline)}
diff --git a/src/features/spellchecker/index.js b/src/features/spellchecker/index.js
index 79a2172b4..a07f9f63a 100644
--- a/src/features/spellchecker/index.js
+++ b/src/features/spellchecker/index.js
@@ -5,18 +5,18 @@ import { DEFAULT_FEATURES_CONFIG } from '../../config';
 const debug = require('debug')('Franz:feature:spellchecker');
 
 export const config = observable({
-  isPremium: DEFAULT_FEATURES_CONFIG.isSpellcheckerPremiumFeature,
+  isIncludedInCurrentPlan: DEFAULT_FEATURES_CONFIG.isSpellcheckerIncludedInCurrentPlan,
 });
 
 export default function init(stores) {
   debug('Initializing `spellchecker` feature');
 
   autorun(() => {
-    const { isSpellcheckerPremiumFeature } = stores.features.features;
+    const { isSpellcheckerIncludedInCurrentPlan } = stores.features.features;
 
-    config.isPremium = isSpellcheckerPremiumFeature !== undefined ? isSpellcheckerPremiumFeature : DEFAULT_FEATURES_CONFIG.isSpellcheckerPremiumFeature;
+    config.isIncludedInCurrentPlan = isSpellcheckerIncludedInCurrentPlan !== undefined ? isSpellcheckerIncludedInCurrentPlan : DEFAULT_FEATURES_CONFIG.isSpellcheckerIncludedInCurrentPlan;
 
-    if (!stores.user.data.isPremium && config.isPremium && stores.settings.app.enableSpellchecking) {
+    if (!stores.user.data.isPremium && config.isIncludedInCurrentPlan && stores.settings.app.enableSpellchecking) {
       debug('Override settings.spellcheckerEnabled flag to false');
 
       Object.assign(stores.settings.app, {
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index a82f6895c..e44569be9 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -255,9 +255,9 @@ export default class WorkspacesStore extends FeatureStore {
   _setIsPremiumFeatureReaction = () => {
     const { features, user } = this.stores;
     const { isPremium } = user.data;
-    const { isWorkspacePremiumFeature } = features.features;
-    this.isPremiumFeature = isWorkspacePremiumFeature;
-    this.isPremiumUpgradeRequired = isWorkspacePremiumFeature && !isPremium;
+    const { isWorkspaceIncludedInCurrentPlan } = features.features;
+    this.isPremiumFeature = !isWorkspaceIncludedInCurrentPlan;
+    this.isPremiumUpgradeRequired = !isWorkspaceIncludedInCurrentPlan && !isPremium;
   };
 
   _setWorkspaceBeingEditedReaction = () => {