From f439e0d8acbd469f1dc9de4b38f8ac9dcb6488ea Mon Sep 17 00:00:00 2001 From: vantezzen Date: Fri, 18 Oct 2019 21:04:46 +0200 Subject: Add info about teams only being availible on Franz servers --- src/components/settings/team/TeamDashboard.js | 149 ++++++++++++--------- src/containers/settings/TeamScreen.js | 4 +- .../components/settings/team/TeamDashboard.json | 26 ++++ 3 files changed, 117 insertions(+), 62 deletions(-) diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js index 2bf46b48d..3a38d682b 100644 --- a/src/components/settings/team/TeamDashboard.js +++ b/src/components/settings/team/TeamDashboard.js @@ -38,6 +38,14 @@ const messages = defineMessages({ id: 'settings.team.upgradeAction', defaultMessage: '!!!Upgrade your Account', }, + teamsUnavailible: { + id: 'settings.team.teamsUnavailible', + defaultMessage: '!!!Teams are unavailible', + }, + teamsUnavailibleInfo: { + id: 'settings.team.teamsUnavailibleInfo', + defaultMessage: '!!!Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.', + }, }); const styles = { @@ -98,6 +106,7 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon openTeamManagement: PropTypes.func.isRequired, classes: PropTypes.object.isRequired, isProUser: PropTypes.bool.isRequired, + server: PropTypes.string.isRequired, }; static contextTypes = { @@ -112,9 +121,84 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon openTeamManagement, isProUser, classes, + server, } = this.props; const { intl } = this.context; + if (server === 'https://api.franzinfra.com') { + return ( +
+
+ + {intl.formatMessage(messages.headline)} + +
+
+ {isLoading && ( + + )} + + {!isLoading && userInfoRequestFailed && ( + + {intl.formatMessage(messages.userInfoRequestFailed)} + + )} + + {!userInfoRequestFailed && ( + <> + {!isLoading && ( + <> + <> +

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

+ {!isProUser && ( + {intl.formatMessage(globalMessages.proRequired)} + )} +
+
+

{intl.formatMessage(messages.intro)}

+

{intl.formatMessage(messages.copy)}

+
+ Franz for Teams +
+
+ {!isProUser ? ( + + ) : ( +
+ + + )} + + )} +
+ +
+ ); + } return (
@@ -123,68 +207,11 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon
- {isLoading && ( - - )} - - {!isLoading && userInfoRequestFailed && ( - - {intl.formatMessage(messages.userInfoRequestFailed)} - - )} - - {!userInfoRequestFailed && ( - <> - {!isLoading && ( - <> - <> -

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

- {!isProUser && ( - {intl.formatMessage(globalMessages.proRequired)} - )} -
-
-

{intl.formatMessage(messages.intro)}

-

{intl.formatMessage(messages.copy)}

-
- Franz for Teams -
-
- {!isProUser ? ( - - ) : ( -
- - - )} - - )} +

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

+ {intl.formatMessage(messages.teamsUnavailibleInfo)}
-
); } diff --git a/src/containers/settings/TeamScreen.js b/src/containers/settings/TeamScreen.js index f600c9947..1172125fe 100644 --- a/src/containers/settings/TeamScreen.js +++ b/src/containers/settings/TeamScreen.js @@ -19,9 +19,10 @@ export default @inject('stores', 'actions') @observer class TeamScreen extends C } render() { - const { user } = this.props.stores; + const { user, settings } = this.props.stores; const isLoadingUserInfo = user.getUserInfoRequest.isExecuting; + const { server } = settings.app; return ( @@ -31,6 +32,7 @@ export default @inject('stores', 'actions') @observer class TeamScreen extends C retryUserInfoRequest={() => this.reloadData()} openTeamManagement={() => this.handleWebsiteLink('/user/team')} isProUser={user.isPro} + server={server} /> ); diff --git a/src/i18n/messages/src/components/settings/team/TeamDashboard.json b/src/i18n/messages/src/components/settings/team/TeamDashboard.json index 80adadb67..64693933c 100644 --- a/src/i18n/messages/src/components/settings/team/TeamDashboard.json +++ b/src/i18n/messages/src/components/settings/team/TeamDashboard.json @@ -76,5 +76,31 @@ "line": 40, "column": 3 } + }, + { + "id": "settings.team.teamsUnavailible", + "defaultMessage": "!!!Teams are unavailible", + "file": "src/components/settings/team/TeamDashboard.js", + "start": { + "line": 41, + "column": 20 + }, + "end": { + "line": 44, + "column": 3 + } + }, + { + "id": "settings.team.teamsUnavailibleInfo", + "defaultMessage": "!!!Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.", + "file": "src/components/settings/team/TeamDashboard.js", + "start": { + "line": 45, + "column": 24 + }, + "end": { + "line": 48, + "column": 3 + } } ] \ No newline at end of file -- cgit v1.2.3-70-g09d2