From 45373f655f68fdd0b320cde175b6108454ad4731 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Sat, 17 Jul 2021 20:32:22 +0530 Subject: Removed Franz paid plans features: - serviceLimit - planSelection - trialStatusBar and other Franz features that were for different tiers of subscription. --- .../services/content/ServiceRestricted.js | 78 ---------------------- src/components/services/content/Services.js | 5 +- 2 files changed, 1 insertion(+), 82 deletions(-) delete mode 100644 src/components/services/content/ServiceRestricted.js (limited to 'src/components/services') diff --git a/src/components/services/content/ServiceRestricted.js b/src/components/services/content/ServiceRestricted.js deleted file mode 100644 index 4b8d926aa..000000000 --- a/src/components/services/content/ServiceRestricted.js +++ /dev/null @@ -1,78 +0,0 @@ -import React, { Component } from 'react'; -import PropTypes from 'prop-types'; -import { observer } from 'mobx-react'; -import { defineMessages, intlShape } from 'react-intl'; - -import { serviceLimitStore } from '../../../features/serviceLimit'; -import Button from '../../ui/Button'; -import { RESTRICTION_TYPES } from '../../../models/Service'; - -const messages = defineMessages({ - headlineServiceLimit: { - id: 'service.restrictedHandler.serviceLimit.headline', - defaultMessage: '!!!You have reached your service limit.', - }, - textServiceLimit: { - id: 'service.restrictedHandler.serviceLimit.text', - defaultMessage: '!!!Please upgrade your account to use more than {count} services.', - }, - headlineCustomUrl: { - id: 'service.restrictedHandler.customUrl.headline', - defaultMessage: '!!!Franz Professional Plan required', - }, - textCustomUrl: { - id: 'service.restrictedHandler.customUrl.text', - defaultMessage: '!!!Please upgrade to the Franz Professional plan to use custom urls & self hosted services.', - }, - action: { - id: 'service.restrictedHandler.action', - defaultMessage: '!!!Upgrade Account', - }, -}); - -export default @observer class ServiceRestricted extends Component { - static propTypes = { - name: PropTypes.string.isRequired, - upgrade: PropTypes.func.isRequired, - type: PropTypes.number.isRequired, - }; - - static contextTypes = { - intl: intlShape, - }; - - countdownInterval = null; - - countdownIntervalTimeout = 1000; - - render() { - const { - name, - upgrade, - type, - } = this.props; - const { intl } = this.context; - - return ( -
- {type === RESTRICTION_TYPES.SERVICE_LIMIT && ( - <> -

{intl.formatMessage(messages.headlineServiceLimit)}

-

{intl.formatMessage(messages.textServiceLimit, { count: serviceLimitStore.serviceLimit })}

- - )} - {type === RESTRICTION_TYPES.CUSTOM_URL && ( - <> -

{intl.formatMessage(messages.headlineCustomUrl)}

-

{intl.formatMessage(messages.textCustomUrl)}

- - )} -
- ); - } -} diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js index caa3cf9aa..6e46a60d2 100644 --- a/src/components/services/content/Services.js +++ b/src/components/services/content/Services.js @@ -54,7 +54,6 @@ export default @injectSheet(styles) @inject('actions') @observer class Services openSettings: PropTypes.func.isRequired, update: PropTypes.func.isRequired, userHasCompletedSignup: PropTypes.bool.isRequired, - hasActivatedTrial: PropTypes.bool.isRequired, classes: PropTypes.object.isRequired, actions: PropTypes.object.isRequired, isSpellcheckerEnabled: PropTypes.bool.isRequired, @@ -109,7 +108,6 @@ export default @injectSheet(styles) @inject('actions') @observer class Services openSettings, update, userHasCompletedSignup, - hasActivatedTrial, classes, isSpellcheckerEnabled, } = this.props; @@ -123,7 +121,7 @@ export default @injectSheet(styles) @inject('actions') @observer class Services return (
- {(userHasCompletedSignup || hasActivatedTrial) && ( + {userHasCompletedSignup && (
openSettings({ path: 'user' })} isSpellcheckerEnabled={isSpellcheckerEnabled} /> ))} -- cgit v1.2.3-70-g09d2