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. --- .../workspaces/components/WorkspacesDashboard.js | 129 +++++++-------------- 1 file changed, 45 insertions(+), 84 deletions(-) (limited to 'src/features/workspaces/components/WorkspacesDashboard.js') diff --git a/src/features/workspaces/components/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js index cfaacd56e..0c2588c42 100644 --- a/src/features/workspaces/components/WorkspacesDashboard.js +++ b/src/features/workspaces/components/WorkspacesDashboard.js @@ -1,9 +1,9 @@ -import React, { Component, Fragment } from 'react'; +import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { observer, PropTypes as MobxPropTypes, inject } from 'mobx-react'; import { defineMessages, intlShape } from 'react-intl'; import injectSheet from 'react-jss'; -import { Infobox, Badge } from '@meetfranz/ui'; +import { Infobox } from '@meetfranz/ui'; import { mdiCheckboxMarkedCircleOutline } from '@mdi/js'; import Loader from '../../../components/ui/Loader'; @@ -11,10 +11,7 @@ import WorkspaceItem from './WorkspaceItem'; import CreateWorkspaceForm from './CreateWorkspaceForm'; import Request from '../../../stores/lib/Request'; import Appear from '../../../components/ui/effects/Appear'; -import { workspaceStore } from '../index'; import UIStore from '../../../stores/UIStore'; -import globalMessages from '../../../i18n/globalMessages'; -import UpgradeButton from '../../../components/ui/UpgradeButton'; const messages = defineMessages({ headline: { @@ -64,12 +61,6 @@ const styles = () => ({ appear: { height: 'auto', }, - premiumAnnouncement: { - height: 'auto', - }, - premiumAnnouncementContainer: { - display: 'flex', - }, announcementHeadline: { marginBottom: 0, }, @@ -78,12 +69,6 @@ const styles = () => ({ margin: [-8, 0, 0, 20], alignSelf: 'center', }, - upgradeCTA: { - margin: [40, 'auto'], - }, - proRequired: { - margin: [10, 0, 40], - }, }); @inject('stores') @injectSheet(styles) @observer @@ -152,77 +137,53 @@ class WorkspacesDashboard extends Component { )} - {workspaceStore.isPremiumUpgradeRequired && ( -
- -

{intl.formatMessage(messages.workspaceFeatureHeadline)}

- {intl.formatMessage(globalMessages.proRequired)} -
-
-

{intl.formatMessage(messages.workspaceFeatureInfo)}

- -
- -
-
- )} - - {!workspaceStore.isPremiumUpgradeRequired && ( + {/* ===== Create workspace form ===== */} +
+ +
+ {getUserWorkspacesRequest.isExecuting ? ( + + ) : ( <> - {/* ===== Create workspace form ===== */} -
- -
- {getUserWorkspacesRequest.isExecuting ? ( - + {/* ===== Workspace could not be loaded error ===== */} + {getUserWorkspacesRequest.error ? ( + + {intl.formatMessage(messages.workspacesRequestFailed)} + ) : ( <> - {/* ===== Workspace could not be loaded error ===== */} - {getUserWorkspacesRequest.error ? ( - - {intl.formatMessage(messages.workspacesRequestFailed)} - + {workspaces.length === 0 ? ( +
+ {/* ===== Workspaces empty state ===== */} +

+ + + + {intl.formatMessage(messages.noServicesAdded)} +

+
) : ( - <> - {workspaces.length === 0 ? ( -
- {/* ===== Workspaces empty state ===== */} -

- - - - {intl.formatMessage(messages.noServicesAdded)} -

-
- ) : ( - - {/* ===== Workspaces list ===== */} - - {workspaces.map(workspace => ( - onWorkspaceClick(w)} - /> - ))} - -
- )} - + + {/* ===== Workspaces list ===== */} + + {workspaces.map(workspace => ( + onWorkspaceClick(w)} + /> + ))} + +
)} )} -- cgit v1.2.3-70-g09d2