aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/components/settings/team/TeamDashboard.js2
-rw-r--r--src/components/ui/UpgradeButton/index.js1
-rw-r--r--src/features/workspaces/components/WorkspacesDashboard.js4
-rw-r--r--src/features/workspaces/containers/WorkspacesScreen.js11
-rw-r--r--src/i18n/messages/src/components/settings/team/TeamDashboard.json24
-rw-r--r--src/i18n/messages/src/components/ui/UpgradeButton/index.json4
6 files changed, 16 insertions, 30 deletions
diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js
index 51a3f375d..a9df980d7 100644
--- a/src/components/settings/team/TeamDashboard.js
+++ b/src/components/settings/team/TeamDashboard.js
@@ -9,9 +9,7 @@ import { Badge } from '@meetfranz/ui';
9import Loader from '../../ui/Loader'; 9import Loader from '../../ui/Loader';
10import Button from '../../ui/Button'; 10import Button from '../../ui/Button';
11import Infobox from '../../ui/Infobox'; 11import Infobox from '../../ui/Infobox';
12import PremiumFeatureContainer from '../../ui/PremiumFeatureContainer';
13import globalMessages from '../../../i18n/globalMessages'; 12import globalMessages from '../../../i18n/globalMessages';
14import ActivateTrialButton from '../../ui/ActivateTrialButton';
15import UpgradeButton from '../../ui/UpgradeButton'; 13import UpgradeButton from '../../ui/UpgradeButton';
16 14
17const messages = defineMessages({ 15const messages = defineMessages({
diff --git a/src/components/ui/UpgradeButton/index.js b/src/components/ui/UpgradeButton/index.js
index 4aa494e38..73762f0bf 100644
--- a/src/components/ui/UpgradeButton/index.js
+++ b/src/components/ui/UpgradeButton/index.js
@@ -2,7 +2,6 @@ import React, { Component } from 'react';
2import PropTypes from 'prop-types'; 2import PropTypes from 'prop-types';
3import { inject, observer } from 'mobx-react'; 3import { inject, observer } from 'mobx-react';
4import { defineMessages, intlShape } from 'react-intl'; 4import { defineMessages, intlShape } from 'react-intl';
5import classnames from 'classnames';
6 5
7import { Button } from '@meetfranz/forms'; 6import { Button } from '@meetfranz/forms';
8import { gaEvent } from '../../../lib/analytics'; 7import { gaEvent } from '../../../lib/analytics';
diff --git a/src/features/workspaces/components/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js
index fc636dd95..70e213912 100644
--- a/src/features/workspaces/components/WorkspacesDashboard.js
+++ b/src/features/workspaces/components/WorkspacesDashboard.js
@@ -50,7 +50,7 @@ const messages = defineMessages({
50 }, 50 },
51}); 51});
52 52
53const styles = theme => ({ 53const styles = () => ({
54 table: { 54 table: {
55 width: '100%', 55 width: '100%',
56 '& td': { 56 '& td': {
@@ -96,8 +96,6 @@ class WorkspacesDashboard extends Component {
96 onCreateWorkspaceSubmit: PropTypes.func.isRequired, 96 onCreateWorkspaceSubmit: PropTypes.func.isRequired,
97 onWorkspaceClick: PropTypes.func.isRequired, 97 onWorkspaceClick: PropTypes.func.isRequired,
98 workspaces: MobxPropTypes.arrayOrObservableArray.isRequired, 98 workspaces: MobxPropTypes.arrayOrObservableArray.isRequired,
99 isPersonalUser: PropTypes.bool.isRequired,
100 onUpgradeAccount: PropTypes.func.isRequired,
101 }; 99 };
102 100
103 static contextTypes = { 101 static contextTypes = {
diff --git a/src/features/workspaces/containers/WorkspacesScreen.js b/src/features/workspaces/containers/WorkspacesScreen.js
index 5fbb0c31d..affbd230d 100644
--- a/src/features/workspaces/containers/WorkspacesScreen.js
+++ b/src/features/workspaces/containers/WorkspacesScreen.js
@@ -10,38 +10,29 @@ import {
10 getUserWorkspacesRequest, 10 getUserWorkspacesRequest,
11 updateWorkspaceRequest, 11 updateWorkspaceRequest,
12} from '../api'; 12} from '../api';
13import UserStore from '../../../stores/UserStore';
14 13
15@inject('stores', 'actions') @observer 14@inject('stores', 'actions') @observer
16class WorkspacesScreen extends Component { 15class WorkspacesScreen extends Component {
17 static propTypes = { 16 static propTypes = {
18 stores: PropTypes.shape({
19 user: PropTypes.instanceOf(UserStore),
20 }).isRequired,
21 actions: PropTypes.shape({ 17 actions: PropTypes.shape({
22 workspace: PropTypes.shape({ 18 workspace: PropTypes.shape({
23 edit: PropTypes.func.isRequired, 19 edit: PropTypes.func.isRequired,
24 }), 20 }),
25 ui: PropTypes.shape({
26 openSettings: PropTypes.func.isRequired,
27 }),
28 }).isRequired, 21 }).isRequired,
29 }; 22 };
30 23
31 render() { 24 render() {
32 const { stores, actions } = this.props; 25 const { actions } = this.props;
33 return ( 26 return (
34 <ErrorBoundary> 27 <ErrorBoundary>
35 <WorkspacesDashboard 28 <WorkspacesDashboard
36 workspaces={workspaceStore.workspaces} 29 workspaces={workspaceStore.workspaces}
37 isPersonalUser={stores.user.isPersonal}
38 getUserWorkspacesRequest={getUserWorkspacesRequest} 30 getUserWorkspacesRequest={getUserWorkspacesRequest}
39 createWorkspaceRequest={createWorkspaceRequest} 31 createWorkspaceRequest={createWorkspaceRequest}
40 deleteWorkspaceRequest={deleteWorkspaceRequest} 32 deleteWorkspaceRequest={deleteWorkspaceRequest}
41 updateWorkspaceRequest={updateWorkspaceRequest} 33 updateWorkspaceRequest={updateWorkspaceRequest}
42 onCreateWorkspaceSubmit={data => actions.workspaces.create(data)} 34 onCreateWorkspaceSubmit={data => actions.workspaces.create(data)}
43 onWorkspaceClick={w => actions.workspaces.edit({ workspace: w })} 35 onWorkspaceClick={w => actions.workspaces.edit({ workspace: w })}
44 onUpgradeAccount={() => actions.ui.openSettings({ path: 'user' })}
45 /> 36 />
46 </ErrorBoundary> 37 </ErrorBoundary>
47 ); 38 );
diff --git a/src/i18n/messages/src/components/settings/team/TeamDashboard.json b/src/i18n/messages/src/components/settings/team/TeamDashboard.json
index 6ef3789c4..01d033044 100644
--- a/src/i18n/messages/src/components/settings/team/TeamDashboard.json
+++ b/src/i18n/messages/src/components/settings/team/TeamDashboard.json
@@ -4,11 +4,11 @@
4 "defaultMessage": "!!!Team", 4 "defaultMessage": "!!!Team",
5 "file": "src/components/settings/team/TeamDashboard.js", 5 "file": "src/components/settings/team/TeamDashboard.js",
6 "start": { 6 "start": {
7 "line": 18, 7 "line": 16,
8 "column": 12 8 "column": 12
9 }, 9 },
10 "end": { 10 "end": {
11 "line": 21, 11 "line": 19,
12 "column": 3 12 "column": 3
13 } 13 }
14 }, 14 },
@@ -17,11 +17,11 @@
17 "defaultMessage": "!!!Franz for Teams", 17 "defaultMessage": "!!!Franz for Teams",
18 "file": "src/components/settings/team/TeamDashboard.js", 18 "file": "src/components/settings/team/TeamDashboard.js",
19 "start": { 19 "start": {
20 "line": 22, 20 "line": 20,
21 "column": 19 21 "column": 19
22 }, 22 },
23 "end": { 23 "end": {
24 "line": 25, 24 "line": 23,
25 "column": 3 25 "column": 3
26 } 26 }
27 }, 27 },
@@ -30,11 +30,11 @@
30 "defaultMessage": "!!!You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.", 30 "defaultMessage": "!!!You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
31 "file": "src/components/settings/team/TeamDashboard.js", 31 "file": "src/components/settings/team/TeamDashboard.js",
32 "start": { 32 "start": {
33 "line": 26, 33 "line": 24,
34 "column": 9 34 "column": 9
35 }, 35 },
36 "end": { 36 "end": {
37 "line": 29, 37 "line": 27,
38 "column": 3 38 "column": 3
39 } 39 }
40 }, 40 },
@@ -43,11 +43,11 @@
43 "defaultMessage": "!!!Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!", 43 "defaultMessage": "!!!Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
44 "file": "src/components/settings/team/TeamDashboard.js", 44 "file": "src/components/settings/team/TeamDashboard.js",
45 "start": { 45 "start": {
46 "line": 30, 46 "line": 28,
47 "column": 8 47 "column": 8
48 }, 48 },
49 "end": { 49 "end": {
50 "line": 33, 50 "line": 31,
51 "column": 3 51 "column": 3
52 } 52 }
53 }, 53 },
@@ -56,11 +56,11 @@
56 "defaultMessage": "!!!Manage your Team on meetfranz.com", 56 "defaultMessage": "!!!Manage your Team on meetfranz.com",
57 "file": "src/components/settings/team/TeamDashboard.js", 57 "file": "src/components/settings/team/TeamDashboard.js",
58 "start": { 58 "start": {
59 "line": 34, 59 "line": 32,
60 "column": 16 60 "column": 16
61 }, 61 },
62 "end": { 62 "end": {
63 "line": 37, 63 "line": 35,
64 "column": 3 64 "column": 3
65 } 65 }
66 }, 66 },
@@ -69,11 +69,11 @@
69 "defaultMessage": "!!!Upgrade your Account", 69 "defaultMessage": "!!!Upgrade your Account",
70 "file": "src/components/settings/team/TeamDashboard.js", 70 "file": "src/components/settings/team/TeamDashboard.js",
71 "start": { 71 "start": {
72 "line": 38, 72 "line": 36,
73 "column": 17 73 "column": 17
74 }, 74 },
75 "end": { 75 "end": {
76 "line": 41, 76 "line": 39,
77 "column": 3 77 "column": 3
78 } 78 }
79 } 79 }
diff --git a/src/i18n/messages/src/components/ui/UpgradeButton/index.json b/src/i18n/messages/src/components/ui/UpgradeButton/index.json
index 87e0bc913..28e44cb66 100644
--- a/src/i18n/messages/src/components/ui/UpgradeButton/index.json
+++ b/src/i18n/messages/src/components/ui/UpgradeButton/index.json
@@ -4,11 +4,11 @@
4 "defaultMessage": "!!!Upgrade to Franz Professional", 4 "defaultMessage": "!!!Upgrade to Franz Professional",
5 "file": "src/components/ui/UpgradeButton/index.js", 5 "file": "src/components/ui/UpgradeButton/index.js",
6 "start": { 6 "start": {
7 "line": 14, 7 "line": 13,
8 "column": 16 8 "column": 16
9 }, 9 },
10 "end": { 10 "end": {
11 "line": 17, 11 "line": 16,
12 "column": 3 12 "column": 3
13 } 13 }
14 } 14 }