diff options
author | Stefan Malzner <stefan@adlk.io> | 2019-10-17 10:58:45 +0200 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2019-10-17 10:58:45 +0200 |
commit | ab78d8ad9097ce92eae337f319245819ba93ca40 (patch) | |
tree | 7690407b22b857a58103eee938bfac7761e19bb0 | |
parent | polishing (diff) | |
download | ferdium-app-ab78d8ad9097ce92eae337f319245819ba93ca40.tar.gz ferdium-app-ab78d8ad9097ce92eae337f319245819ba93ca40.tar.zst ferdium-app-ab78d8ad9097ce92eae337f319245819ba93ca40.zip |
polishing
5 files changed, 17 insertions, 11 deletions
diff --git a/packages/theme/src/themes/default/index.ts b/packages/theme/src/themes/default/index.ts index b484d9972..3decec88f 100644 --- a/packages/theme/src/themes/default/index.ts +++ b/packages/theme/src/themes/default/index.ts | |||
@@ -1,6 +1,7 @@ | |||
1 | import color from 'color'; | 1 | import color from 'color'; |
2 | import { cloneDeep } from 'lodash'; | 2 | import { cloneDeep } from 'lodash'; |
3 | 3 | ||
4 | import { darkgreen } from 'color-name'; | ||
4 | import * as legacyStyles from '../legacy'; | 5 | import * as legacyStyles from '../legacy'; |
5 | 6 | ||
6 | export interface IStyleTypes { | 7 | export interface IStyleTypes { |
@@ -224,7 +225,7 @@ export const signup = { | |||
224 | // Todos | 225 | // Todos |
225 | export const todos = { | 226 | export const todos = { |
226 | todosLayer: { | 227 | todosLayer: { |
227 | borderLeftColor: legacyStyles.themeGrayLighter, | 228 | borderLeftColor: color(legacyStyles.themeGrayLighter).darken(0.1).hex(), |
228 | }, | 229 | }, |
229 | toggleButton: { | 230 | toggleButton: { |
230 | background: styleTypes.primary.accent, | 231 | background: styleTypes.primary.accent, |
@@ -242,10 +243,10 @@ export const todos = { | |||
242 | // TrialStatusBar | 243 | // TrialStatusBar |
243 | export const trialStatusBar = { | 244 | export const trialStatusBar = { |
244 | bar: { | 245 | bar: { |
245 | background: legacyStyles.themeGray, | 246 | background: legacyStyles.themeGrayLightest, |
246 | }, | 247 | }, |
247 | progressBar: { | 248 | progressBar: { |
248 | background: legacyStyles.themeGrayLight, | 249 | background: color(legacyStyles.themeGrayLighter).darken(0.1).hex(), |
249 | progressIndicator: legacyStyles.themeGrayLighter, | 250 | progressIndicator: legacyStyles.themeGrayLight, |
250 | }, | 251 | }, |
251 | }; | 252 | }; |
diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js index b08b52e6f..88ecd55d5 100644 --- a/src/containers/settings/AccountScreen.js +++ b/src/containers/settings/AccountScreen.js | |||
@@ -35,12 +35,15 @@ export default @inject('stores', 'actions') @observer class AccountScreen extend | |||
35 | 35 | ||
36 | render() { | 36 | render() { |
37 | const { user, payment, features } = this.props.stores; | 37 | const { user, payment, features } = this.props.stores; |
38 | const { user: userActions } = this.props.actions; | 38 | const { |
39 | user: userActions, | ||
40 | payment: paymentActions, | ||
41 | } = this.props.actions; | ||
39 | 42 | ||
40 | const isLoadingUserInfo = user.getUserInfoRequest.isExecuting; | 43 | const isLoadingUserInfo = user.getUserInfoRequest.isExecuting; |
41 | const isLoadingPlans = payment.plansRequest.isExecuting; | 44 | const isLoadingPlans = payment.plansRequest.isExecuting; |
42 | 45 | ||
43 | const { upgradeAccount } = payment; | 46 | const { upgradeAccount } = paymentActions; |
44 | 47 | ||
45 | return ( | 48 | return ( |
46 | <ErrorBoundary> | 49 | <ErrorBoundary> |
@@ -57,7 +60,7 @@ export default @inject('stores', 'actions') @observer class AccountScreen extend | |||
57 | isLoadingDeleteAccount={user.deleteAccountRequest.isExecuting} | 60 | isLoadingDeleteAccount={user.deleteAccountRequest.isExecuting} |
58 | isDeleteAccountSuccessful={user.deleteAccountRequest.wasExecuted && !user.deleteAccountRequest.isError} | 61 | isDeleteAccountSuccessful={user.deleteAccountRequest.wasExecuted && !user.deleteAccountRequest.isError} |
59 | openEditAccount={() => this.handleWebsiteLink('/user/profile')} | 62 | openEditAccount={() => this.handleWebsiteLink('/user/profile')} |
60 | upgradeToPro={() => upgradeAccount({ planId: features.features.pricingConfig.pro.yearly.id })} | 63 | upgradeToPro={() => upgradeAccount({ planId: features.features.pricingConfig.plans.pro.yearly.id })} |
61 | openBilling={() => this.handleWebsiteLink('/user/billing')} | 64 | openBilling={() => this.handleWebsiteLink('/user/billing')} |
62 | openInvoices={() => this.handleWebsiteLink('/user/invoices')} | 65 | openInvoices={() => this.handleWebsiteLink('/user/invoices')} |
63 | /> | 66 | /> |
diff --git a/src/features/planSelection/components/PlanSelection.js b/src/features/planSelection/components/PlanSelection.js index cf4474114..9407f6dd3 100644 --- a/src/features/planSelection/components/PlanSelection.js +++ b/src/features/planSelection/components/PlanSelection.js | |||
@@ -16,7 +16,7 @@ import Appear from '../../../components/ui/effects/Appear'; | |||
16 | const messages = defineMessages({ | 16 | const messages = defineMessages({ |
17 | welcome: { | 17 | welcome: { |
18 | id: 'feature.planSelection.fullscreen.welcome', | 18 | id: 'feature.planSelection.fullscreen.welcome', |
19 | defaultMessage: '!!!Welcome back, {name}', | 19 | defaultMessage: '!!!Are you ready to choose, {name}', |
20 | }, | 20 | }, |
21 | subheadline: { | 21 | subheadline: { |
22 | id: 'feature.planSelection.fullscreen.subheadline', | 22 | id: 'feature.planSelection.fullscreen.subheadline', |
@@ -83,6 +83,7 @@ const styles = theme => ({ | |||
83 | 83 | ||
84 | '& h1, & h2': { | 84 | '& h1, & h2': { |
85 | textAlign: 'center', | 85 | textAlign: 'center', |
86 | color: theme.styleTypes.primary.contrast, | ||
86 | }, | 87 | }, |
87 | }, | 88 | }, |
88 | plans: { | 89 | plans: { |
@@ -111,6 +112,7 @@ const styles = theme => ({ | |||
111 | '& svg': { | 112 | '& svg': { |
112 | width: '80px !important', | 113 | width: '80px !important', |
113 | filter: 'drop-shadow( 0px 2px 3px rgba(0, 0, 0, 0.3))', | 114 | filter: 'drop-shadow( 0px 2px 3px rgba(0, 0, 0, 0.3))', |
115 | fill: theme.styleTypes.danger.contrast, | ||
114 | }, | 116 | }, |
115 | }, | 117 | }, |
116 | headline: { | 118 | headline: { |
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index ce35c29a8..8af42554b 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -21,7 +21,7 @@ | |||
21 | "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.", | 21 | "feature.planSelection.fullscreen.dialog.message": "You're about to downgrade to our Free account. Are you sure? Click here instead to get more services and functionality for just {currency}{price} a month.", |
22 | "feature.planSelection.fullscreen.dialog.title": "Downgrade your Franz Plan", | 22 | "feature.planSelection.fullscreen.dialog.title": "Downgrade your Franz Plan", |
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": "Welcome back, {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.pro.text": "Unlimited services and professional features for you - and your team.", | 26 | "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.", | 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.", |
@@ -422,4 +422,4 @@ | |||
422 | "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>", | 422 | "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>", |
423 | "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", | 423 | "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", |
424 | "workspaces.switchingIndicator.switchingTo": "Switching to" | 424 | "workspaces.switchingIndicator.switchingTo": "Switching to" |
425 | } \ No newline at end of file | 425 | } |
diff --git a/src/i18n/messages/src/features/planSelection/components/PlanSelection.json b/src/i18n/messages/src/features/planSelection/components/PlanSelection.json index 76f4ed50b..2e66c8dfe 100644 --- a/src/i18n/messages/src/features/planSelection/components/PlanSelection.json +++ b/src/i18n/messages/src/features/planSelection/components/PlanSelection.json | |||
@@ -1,7 +1,7 @@ | |||
1 | [ | 1 | [ |
2 | { | 2 | { |
3 | "id": "feature.planSelection.fullscreen.welcome", | 3 | "id": "feature.planSelection.fullscreen.welcome", |
4 | "defaultMessage": "!!!Welcome back, {name}", | 4 | "defaultMessage": "!!!Are you ready to choose, {name}", |
5 | "file": "src/features/planSelection/components/PlanSelection.js", | 5 | "file": "src/features/planSelection/components/PlanSelection.js", |
6 | "start": { | 6 | "start": { |
7 | "line": 17, | 7 | "line": 17, |