Removed Franz paid plans features:

- serviceLimit
- planSelection
- trialStatusBar

and other Franz features that were for different tiers of subscription.

5 files changed, 17 insertions, 389 deletions

diff --git a/src/components/ui/ActivateTrialButton/index.js b/src/components/ui/ActivateTrialButton/index.js
deleted file mode 100644
index 8f4d21f64..000000000
--- a/src/components/ui/ActivateTrialButton/index.js
+++ /dev/null
@@ -1,107 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { inject, observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
-import classnames from 'classnames';
-
-import { Button } from '@meetfranz/forms';
-
-import UserStore from '../../../stores/UserStore';
-import UIStore from '../../../stores/UIStore';
-
-const messages = defineMessages({
-  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',
-  },
-  shortAction: {
-    id: 'feature.delayApp.upgrade.actionShort',
-    defaultMessage: '!!!Upgrade account',
-  },
-  shortActionTrial: {
-    id: 'feature.delayApp.trial.actionShort',
-    defaultMessage: '!!!Activate the free Franz Professional trial',
-  },
-  noStringsAttachedHeadline: {
-    id: 'pricing.trial.terms.headline',
-    defaultMessage: '!!!No strings attached',
-  },
-  noCreditCard: {
-    id: 'pricing.trial.terms.noCreditCard',
-    defaultMessage: '!!!No credit card required',
-  },
-  automaticTrialEnd: {
-    id: 'pricing.trial.terms.automaticTrialEnd',
-    defaultMessage: '!!!Your free trial ends automatically after 14 days',
-  },
-});
-
-@inject('stores', 'actions') @observer
-class ActivateTrialButton extends Component {
-  static propTypes = {
-    className: PropTypes.string,
-    short: PropTypes.bool,
-    gaEventInfo: PropTypes.shape({
-      category: PropTypes.string.isRequired,
-      event: PropTypes.string.isRequired,
-      label: PropTypes.string,
-    }),
-  };
-
-  static defaultProps = {
-    className: '',
-    short: false,
-    gaEventInfo: null,
-  }
-
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  handleCTAClick() {
-    const { actions } = this.props;
-
-    actions.ui.openSettings({ path: 'user' });
-  }
-
-  render() {
-    const { stores, className, short } = this.props;
-    const { intl } = this.context;
-
-    const { hadSubscription } = stores.user.data;
-
-    let label;
-    if (hadSubscription) {
-      label = short ? messages.shortAction : messages.action;
-    } else {
-      label = short ? messages.shortActionTrial : messages.actionTrial;
-    }
-
-    return (
-      <Button
-        label={intl.formatMessage(label)}
-        className={classnames({
-          [className]: className,
-        })}
-        buttonType="inverted"
-        onClick={this.handleCTAClick.bind(this)}
-        busy={stores.user.activateTrialRequest.isExecuting}
-      />
-    );
-  }
-}
-
-export default ActivateTrialButton;
-
-ActivateTrialButton.wrappedComponent.propTypes = {
-  stores: PropTypes.shape({
-    user: PropTypes.instanceOf(UserStore).isRequired,
-  }).isRequired,
-  actions: PropTypes.shape({
-    ui: PropTypes.instanceOf(UIStore).isRequired,
-  }).isRequired,
-};
diff --git a/src/components/ui/FeatureList.js b/src/components/ui/FeatureList.js
index 72c799819..ada15244b 100644
--- a/src/components/ui/FeatureList.js
+++ b/src/components/ui/FeatureList.js
@@ -3,12 +3,11 @@ import PropTypes from 'prop-types';
 import { defineMessages, intlShape } from 'react-intl';
 
 import { FeatureItem } from './FeatureItem';
-import { PLANS } from '../../config';
 
 const messages = defineMessages({
   availableRecipes: {
     id: 'pricing.features.recipes',
-    defaultMessage: '!!!Choose from more than 70 Services',
+    defaultMessage: '!!!Choose from more than 70 Services', // TODO: Make this dynamic
   },
   accountSync: {
     id: 'pricing.features.accountSync',
@@ -22,14 +21,6 @@ const messages = defineMessages({
     id: 'pricing.features.unlimitedServices',
     defaultMessage: '!!!Add unlimited services',
   },
-  upToThreeServices: {
-    id: 'pricing.features.upToThreeServices',
-    defaultMessage: '!!!Add up to 3 services',
-  },
-  upToSixServices: {
-    id: 'pricing.features.upToSixServices',
-    defaultMessage: '!!!Add up to 6 services',
-  },
   spellchecker: {
     id: 'pricing.features.spellchecker',
     defaultMessage: '!!!Spellchecker support',
@@ -58,31 +49,17 @@ const messages = defineMessages({
     id: 'pricing.features.teamManagement',
     defaultMessage: '!!!Team Management',
   },
-  appDelays: {
-    id: 'pricing.features.appDelays',
-    defaultMessage: '!!!No Waiting Screens',
-  },
-  adFree: {
-    id: 'pricing.features.adFree',
-    defaultMessage: '!!!Forever ad-free',
-  },
-  appDelayEnabled: {
-    id: 'pricing.features.appDelaysEnabled',
-    defaultMessage: '!!!Occasional Waiting Screens',
-  },
 });
 
 export class FeatureList extends Component {
   static propTypes = {
     className: PropTypes.string,
     featureClassName: PropTypes.string,
-    plan: PropTypes.oneOf(Object.keys(PLANS)),
   };
 
   static defaultProps = {
     className: '',
     featureClassName: '',
-    plan: false,
   }
 
   static contextTypes = {
@@ -93,49 +70,25 @@ export class FeatureList extends Component {
     const {
       className,
       featureClassName,
-      plan,
     } = this.props;
     const { intl } = this.context;
 
-    const features = [];
-    if (plan === PLANS.FREE) {
-      features.push(
-        messages.appDelayEnabled,
-        messages.upToThreeServices,
-        messages.availableRecipes,
-        messages.accountSync,
-        messages.desktopNotifications,
-      );
-    } else if (plan === PLANS.PERSONAL) {
-      features.push(
-        messages.upToSixServices,
-        messages.spellchecker,
-        messages.appDelays,
-        messages.adFree,
-      );
-    } else if (plan === PLANS.PRO) {
-      features.push(
-        messages.unlimitedServices,
-        messages.workspaces,
-        messages.customWebsites,
-        // messages.onPremise,
-        messages.thirdPartyServices,
-        // messages.serviceProxies,
-      );
-    } else {
-      features.push(
-        messages.unlimitedServices,
-        messages.spellchecker,
-        messages.workspaces,
-        messages.customWebsites,
-        messages.onPremise,
-        messages.thirdPartyServices,
-        messages.serviceProxies,
-        messages.teamManagement,
-        messages.appDelays,
-        messages.adFree,
-      );
-    }
+    const features = [
+      messages.availableRecipes,
+      messages.accountSync,
+      messages.desktopNotifications,
+
+      messages.spellchecker,
+
+      messages.workspaces,
+      messages.customWebsites,
+      messages.thirdPartyServices,
+
+      messages.unlimitedServices,
+      messages.onPremise,
+      messages.serviceProxies,
+      messages.teamManagement,
+    ];
 
     return (
       <ul className={className}>
diff --git a/src/components/ui/PremiumFeatureContainer/index.js b/src/components/ui/PremiumFeatureContainer/index.js
deleted file mode 100644
index 1e100f9d8..000000000
--- a/src/components/ui/PremiumFeatureContainer/index.js
+++ /dev/null
@@ -1,101 +0,0 @@
-import React, { Component } from 'react';
-import { inject, observer } from 'mobx-react';
-import PropTypes from 'prop-types';
-import { defineMessages, intlShape } from 'react-intl';
-import injectSheet from 'react-jss';
-
-import { oneOrManyChildElements } from '../../../prop-types';
-
-import UserStore from '../../../stores/UserStore';
-
-import styles from './styles';
-import FeaturesStore from '../../../stores/FeaturesStore';
-import UIStore from '../../../stores/UIStore';
-
-const messages = defineMessages({
-  action: {
-    id: 'premiumFeature.button.upgradeAccount',
-    defaultMessage: '!!!Upgrade account',
-  },
-});
-
-@inject('stores', 'actions') @injectSheet(styles) @observer
-class PremiumFeatureContainer extends Component {
-  static propTypes = {
-    classes: PropTypes.object.isRequired,
-    condition: PropTypes.oneOfType([
-      PropTypes.bool,
-      PropTypes.func,
-    ]),
-    gaEventInfo: PropTypes.shape({
-      category: PropTypes.string.isRequired,
-      event: PropTypes.string.isRequired,
-      label: PropTypes.string,
-    }),
-  };
-
-  static defaultProps = {
-    condition: null,
-    gaEventInfo: null,
-  };
-
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  render() {
-    const {
-      classes,
-      children,
-      actions,
-      condition,
-      stores,
-    } = this.props;
-
-    const { intl } = this.context;
-
-    let showWrapper = !!condition;
-
-    if (condition === null) {
-      showWrapper = !stores.user.data.isPremium;
-    } else if (typeof condition === 'function') {
-      showWrapper = condition({
-        isPremium: stores.user.data.isPremium,
-        features: stores.features.features,
-      });
-    }
-
-    return showWrapper ? (
-      <div className={classes.container}>
-        <div className={classes.titleContainer}>
-          <p className={classes.title}>Premium Feature</p>
-          <button
-            className={classes.actionButton}
-            type="button"
-            onClick={() => {
-              actions.ui.openSettings({ path: 'user' });
-            }}
-          >
-            {intl.formatMessage(messages.action)}
-          </button>
-        </div>
-        <div className={classes.content}>
-          {children}
-        </div>
-      </div>
-    ) : children;
-  }
-}
-
-PremiumFeatureContainer.wrappedComponent.propTypes = {
-  children: oneOrManyChildElements.isRequired,
-  stores: PropTypes.shape({
-    user: PropTypes.instanceOf(UserStore).isRequired,
-    features: PropTypes.instanceOf(FeaturesStore).isRequired,
-  }).isRequired,
-  actions: PropTypes.shape({
-    ui: PropTypes.instanceOf(UIStore).isRequired,
-  }).isRequired,
-};
-
-export default PremiumFeatureContainer;
diff --git a/src/components/ui/PremiumFeatureContainer/styles.js b/src/components/ui/PremiumFeatureContainer/styles.js
deleted file mode 100644
index 41881e044..000000000
--- a/src/components/ui/PremiumFeatureContainer/styles.js
+++ /dev/null
@@ -1,34 +0,0 @@
-export default theme => ({
-  container: {
-    background: theme.colorSubscriptionContainerBackground,
-    border: theme.colorSubscriptionContainerBorder,
-    margin: [0, 0, 20, -20],
-    padding: 20,
-    'border-radius': theme.borderRadius,
-    pointerEvents: 'none',
-    height: 'auto',
-  },
-  titleContainer: {
-    display: 'flex',
-  },
-  title: {
-    'font-weight': 'bold',
-    color: theme.colorSubscriptionContainerTitle,
-  },
-  actionButton: {
-    background: theme.colorSubscriptionContainerActionButtonBackground,
-    color: theme.colorSubscriptionContainerActionButtonColor,
-    'margin-left': 'auto',
-    'border-radius': theme.borderRadiusSmall,
-    padding: [4, 8],
-    'font-size': 12,
-    pointerEvents: 'initial',
-  },
-  content: {
-    opacity: 0.5,
-    'margin-top': 20,
-    '& > :last-child': {
-      'margin-bottom': 0,
-    },
-  },
-});
diff --git a/src/components/ui/UpgradeButton/index.js b/src/components/ui/UpgradeButton/index.js
deleted file mode 100644
index eade46cfd..000000000
--- a/src/components/ui/UpgradeButton/index.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { inject, observer } from 'mobx-react';
-import { defineMessages, intlShape } from 'react-intl';
-
-import { Button } from '@meetfranz/forms';
-
-import UserStore from '../../../stores/UserStore';
-import ActivateTrialButton from '../ActivateTrialButton';
-import UIStore from '../../../stores/UIStore';
-
-const messages = defineMessages({
-  upgradeToPro: {
-    id: 'global.upgradeButton.upgradeToPro',
-    defaultMessage: '!!!Upgrade to Franz Professional',
-  },
-});
-
-@inject('stores', 'actions') @observer
-class UpgradeButton extends Component {
-  static propTypes = {
-    // eslint-disable-next-line
-    classes: PropTypes.object.isRequired,
-    className: PropTypes.string,
-    gaEventInfo: PropTypes.shape({
-      category: PropTypes.string.isRequired,
-      event: PropTypes.string.isRequired,
-      label: PropTypes.string,
-    }),
-    requiresPro: PropTypes.bool,
-  };
-
-  static defaultProps = {
-    className: '',
-    gaEventInfo: null,
-    requiresPro: false,
-  }
-
-  static contextTypes = {
-    intl: intlShape,
-  };
-
-  handleCTAClick() {
-    const { actions } = this.props;
-
-    actions.ui.openSettings({ path: 'user' });
-  }
-
-  render() {
-    const { stores, requiresPro } = this.props;
-    const { intl } = this.context;
-
-    const { isPremium, isPersonal } = stores.user;
-
-    if (isPremium && isPersonal && requiresPro) {
-      return (
-        <Button
-          label={intl.formatMessage(messages.upgradeToPro)}
-          onClick={this.handleCTAClick.bind(this)}
-          className={this.props.className}
-          buttonType="inverted"
-        />
-      );
-    }
-
-    if (!isPremium) {
-      return <ActivateTrialButton {...this.props} />;
-    }
-
-    return null;
-  }
-}
-
-export default UpgradeButton;
-
-UpgradeButton.wrappedComponent.propTypes = {
-  stores: PropTypes.shape({
-    user: PropTypes.instanceOf(UserStore).isRequired,
-  }).isRequired,
-  actions: PropTypes.shape({
-    ui: PropTypes.instanceOf(UIStore).isRequired,
-  }).isRequired,
-};