aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2019-10-23 14:06:39 +0200
committerLibravatar Stefan Malzner <stefan@adlk.io>2019-10-23 14:06:39 +0200
commitc4f369510632704114c3f162ac61b81a47dad7c5 (patch)
tree95971ba59d701e7b6d5bb31a84fb6a89c725a7e5
parentRemove analytics event in componentDidMount (diff)
downloadferdium-app-c4f369510632704114c3f162ac61b81a47dad7c5.tar.gz
ferdium-app-c4f369510632704114c3f162ac61b81a47dad7c5.tar.zst
ferdium-app-c4f369510632704114c3f162ac61b81a47dad7c5.zip
Add price disclaimer
-rw-r--r--src/features/planSelection/components/PlanSelection.js46
-rw-r--r--src/i18n/locales/defaultMessages.json13
-rw-r--r--src/i18n/locales/en-US.json3
-rw-r--r--src/i18n/messages/src/features/planSelection/components/PlanSelection.json13
4 files changed, 64 insertions, 11 deletions
diff --git a/src/features/planSelection/components/PlanSelection.js b/src/features/planSelection/components/PlanSelection.js
index aff6bf94f..b6bb9d32d 100644
--- a/src/features/planSelection/components/PlanSelection.js
+++ b/src/features/planSelection/components/PlanSelection.js
@@ -6,7 +6,7 @@ import { defineMessages, intlShape } from 'react-intl';
6import { H1, H2, Icon } from '@meetfranz/ui'; 6import { H1, H2, Icon } from '@meetfranz/ui';
7import color from 'color'; 7import color from 'color';
8 8
9import { mdiRocket } from '@mdi/js'; 9import { mdiRocket, mdiArrowRight } from '@mdi/js';
10import PlanItem from './PlanItem'; 10import PlanItem from './PlanItem';
11import { i18nPlanName } from '../../../helpers/plan-helpers'; 11import { i18nPlanName } from '../../../helpers/plan-helpers';
12import { PLANS } from '../../../config'; 12import { PLANS } from '../../../config';
@@ -59,6 +59,10 @@ const messages = defineMessages({
59 id: 'feature.planSelection.fullFeatureList', 59 id: 'feature.planSelection.fullFeatureList',
60 defaultMessage: '!!!Complete comparison of all plans', 60 defaultMessage: '!!!Complete comparison of all plans',
61 }, 61 },
62 pricesBasedOnAnnualPayment: {
63 id: 'feature.planSelection.pricesBasedOnAnnualPayment',
64 defaultMessage: '!!!All prices based on yearly payment',
65 },
62}); 66});
63 67
64const styles = theme => ({ 68const styles = theme => ({
@@ -132,11 +136,23 @@ const styles = theme => ({
132 borderBottom: [1, 'solid', '#CECECE'], 136 borderBottom: [1, 'solid', '#CECECE'],
133 }, 137 },
134 }, 138 },
139 footer: {
140 display: 'flex',
141 color: theme.styleTypes.primary.contrast,
142 marginTop: 20,
143 padding: [0, 15],
144 },
135 fullFeatureList: { 145 fullFeatureList: {
136 marginTop: 40, 146 marginRight: 'auto',
137 textAlign: 'center', 147 textAlign: 'center',
138 display: 'block', 148 display: 'flex',
149 justifyContent: 'center',
150 alignItems: 'center',
139 color: `${theme.styleTypes.primary.contrast} !important`, 151 color: `${theme.styleTypes.primary.contrast} !important`,
152
153 '& svg': {
154 marginRight: 5,
155 },
140 }, 156 },
141 scrollContainer: { 157 scrollContainer: {
142 border: '1px solid red', 158 border: '1px solid red',
@@ -145,6 +161,10 @@ const styles = theme => ({
145 featuredPlan: { 161 featuredPlan: {
146 transform: 'scale(1.05)', 162 transform: 'scale(1.05)',
147 }, 163 },
164 disclaimer: {
165 textAlign: 'right',
166 margin: [10, 15, 0, 0],
167 },
148}); 168});
149 169
150@injectSheet(styles) @observer 170@injectSheet(styles) @observer
@@ -238,13 +258,19 @@ class PlanSelection extends Component {
238 /> 258 />
239 </PlanItem> 259 </PlanItem>
240 </div> 260 </div>
241 <a 261 <div className={classes.footer}>
242 href="https://meetfranz.com/pricing" 262 <a
243 target="_blank" 263 href="https://meetfranz.com/pricing"
244 className={classes.fullFeatureList} 264 target="_blank"
245 > 265 className={classes.fullFeatureList}
246 {intl.formatMessage(messages.fullFeatureList)} 266 >
247 </a> 267 <Icon icon={mdiArrowRight} />
268 {intl.formatMessage(messages.fullFeatureList)}
269 </a>
270 {/* <p className={classes.disclaimer}> */}
271 {intl.formatMessage(messages.pricesBasedOnAnnualPayment)}
272 {/* </p> */}
273 </div>
248 </div> 274 </div>
249 </div> 275 </div>
250 </Appear> 276 </Appear>
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 9b77fe34c..9dfaf959d 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -4136,6 +4136,19 @@
4136 "column": 19, 4136 "column": 19,
4137 "line": 58 4137 "line": 58
4138 } 4138 }
4139 },
4140 {
4141 "defaultMessage": "!!!All prices are based on the yearly plan",
4142 "end": {
4143 "column": 3,
4144 "line": 65
4145 },
4146 "file": "src/features/planSelection/components/PlanSelection.js",
4147 "id": "feature.planSelection.pricesBasedOnAnnualPayment",
4148 "start": {
4149 "column": 30,
4150 "line": 62
4151 }
4139 } 4152 }
4140 ], 4153 ],
4141 "path": "src/features/planSelection/components/PlanSelection.json" 4154 "path": "src/features/planSelection/components/PlanSelection.json"
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 8bef09d4d..6e84d47f7 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -23,6 +23,7 @@
23 "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Franz works best on our Personal and Professional plans. Please have a look and choose the best one for you.", 23 "feature.planSelection.fullscreen.subheadline": "It's time to make a choice. Franz works best on our Personal and Professional plans. Please have a look and choose the best one for you.",
24 "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}?", 24 "feature.planSelection.fullscreen.welcome": "Are you ready to choose, {name}?",
25 "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.", 25 "feature.planSelection.personal.text": "More services, no waiting - ideal for personal use.",
26 "feature.planSelection.pricesBasedOnAnnualPayment": "All prices based on yearly payment",
26 "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.", 27 "feature.planSelection.pro.text": "Unlimited services and professional features for you - and your team.",
27 "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.", 28 "feature.serviceLimit.limitReached": "You have added {amount} out of {limit} services that are included in your plan. Please upgrade your account to add more services.",
28 "feature.shareFranz.action.email": "Send as email", 29 "feature.shareFranz.action.email": "Send as email",
@@ -425,4 +426,4 @@
425 "workspaceDrawer.workspaceFeatureInfo": "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>", 426 "workspaceDrawer.workspaceFeatureInfo": "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>",
426 "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", 427 "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings",
427 "workspaces.switchingIndicator.switchingTo": "Switching to" 428 "workspaces.switchingIndicator.switchingTo": "Switching to"
428} \ No newline at end of file 429}
diff --git a/src/i18n/messages/src/features/planSelection/components/PlanSelection.json b/src/i18n/messages/src/features/planSelection/components/PlanSelection.json
index 685e81e82..7f1de6cfd 100644
--- a/src/i18n/messages/src/features/planSelection/components/PlanSelection.json
+++ b/src/i18n/messages/src/features/planSelection/components/PlanSelection.json
@@ -141,5 +141,18 @@
141 "line": 61, 141 "line": 61,
142 "column": 3 142 "column": 3
143 } 143 }
144 },
145 {
146 "id": "feature.planSelection.pricesBasedOnAnnualPayment",
147 "defaultMessage": "!!!All prices based on yearly payment",
148 "file": "src/features/planSelection/components/PlanSelection.js",
149 "start": {
150 "line": 62,
151 "column": 30
152 },
153 "end": {
154 "line": 65,
155 "column": 3
156 }
144 } 157 }
145] \ No newline at end of file 158] \ No newline at end of file