diff options
author | 2020-10-11 17:10:17 +0200 | |
---|---|---|
committer | 2020-10-11 17:10:17 +0200 | |
commit | 74daa50c4c1a2b083f9c1fe0177bd216855505f9 (patch) | |
tree | ffbb5186d979cb42119120583d682e0442030074 | |
parent | Minify images using ImageOptim (lossless compression) (#1012) (diff) | |
download | ferdium-app-74daa50c4c1a2b083f9c1fe0177bd216855505f9.tar.gz ferdium-app-74daa50c4c1a2b083f9c1fe0177bd216855505f9.tar.zst ferdium-app-74daa50c4c1a2b083f9c1fe0177bd216855505f9.zip |
Merge #722
-rw-r--r-- | src/components/settings/navigation/SettingsNavigation.js | 2 | ||||
-rw-r--r-- | src/components/settings/supportFerdi/SupportFerdiDashboard.js | 164 | ||||
-rw-r--r-- | src/i18n/locales/defaultMessages.json | 172 | ||||
-rw-r--r-- | src/i18n/locales/en-US.json | 22 | ||||
-rw-r--r-- | src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json | 2 | ||||
-rw-r--r-- | src/i18n/messages/src/components/settings/supportFerdi/SupportFerdiDashboard.json | 170 | ||||
-rw-r--r-- | src/styles/settings.scss | 4 | ||||
-rw-r--r-- | src/styles/type.scss | 5 |
8 files changed, 458 insertions, 83 deletions
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js index 6b03f05be..0220731b9 100644 --- a/src/components/settings/navigation/SettingsNavigation.js +++ b/src/components/settings/navigation/SettingsNavigation.js | |||
@@ -40,7 +40,7 @@ const messages = defineMessages({ | |||
40 | }, | 40 | }, |
41 | supportFerdi: { | 41 | supportFerdi: { |
42 | id: 'settings.navigation.supportFerdi', | 42 | id: 'settings.navigation.supportFerdi', |
43 | defaultMessage: '!!!Support Ferdi', | 43 | defaultMessage: '!!!About Ferdi', |
44 | }, | 44 | }, |
45 | logout: { | 45 | logout: { |
46 | id: 'settings.navigation.logout', | 46 | id: 'settings.navigation.logout', |
diff --git a/src/components/settings/supportFerdi/SupportFerdiDashboard.js b/src/components/settings/supportFerdi/SupportFerdiDashboard.js index 57920a4a2..f6fc7c171 100644 --- a/src/components/settings/supportFerdi/SupportFerdiDashboard.js +++ b/src/components/settings/supportFerdi/SupportFerdiDashboard.js | |||
@@ -1,29 +1,70 @@ | |||
1 | import React, { Component } from 'react'; | 1 | import React, { Component } from 'react'; |
2 | import PropTypes from 'prop-types'; | 2 | import { defineMessages, FormattedHTMLMessage, intlShape } from 'react-intl'; |
3 | import { defineMessages, intlShape } from 'react-intl'; | 3 | import { remote } from 'electron'; |
4 | import InfoBar from '../../ui/InfoBar'; | ||
4 | 5 | ||
5 | import Button from '../../ui/Button'; | 6 | const { BrowserWindow } = remote; |
6 | 7 | ||
7 | const messages = defineMessages({ | 8 | const messages = defineMessages({ |
8 | headline: { | 9 | headline: { |
9 | id: 'settings.supportFerdi.headline', | 10 | id: 'settings.supportFerdi.headline', |
10 | defaultMessage: '!!!Support Ferdi', | 11 | defaultMessage: '!!!About Ferdi', |
11 | }, | 12 | }, |
12 | title: { | 13 | title: { |
13 | id: 'settings.supportFerdi.title', | 14 | id: 'settings.supportFerdi.title', |
14 | defaultMessage: '!!!Do you like Ferdi? Spread the love!', | 15 | defaultMessage: '!!!Do you like Ferdi?', |
15 | }, | 16 | }, |
16 | github: { | 17 | aboutIntro: { |
17 | id: 'settings.supportFerdi.github', | 18 | id: 'settings.supportFerdi.aboutIntro', |
18 | defaultMessage: '!!!Star on GitHub', | 19 | defaultMessage: '!!!<p>Ferdi is an open-source and a community-lead application.</p><p>Thanks to the people who make this possbile:</p>', |
19 | }, | 20 | }, |
20 | share: { | 21 | textListContributors: { |
21 | id: 'settings.supportFerdi.share', | 22 | id: 'settings.supportFerdi.textListContributors', |
22 | defaultMessage: '!!!Tell your Friends', | 23 | defaultMessage: '!!!Full list of contributor', |
23 | }, | 24 | }, |
24 | openCollective: { | 25 | textListContributorsHere: { |
25 | id: 'settings.supportFerdi.openCollective', | 26 | id: 'settings.supportFerdi.textListContributorsHere', |
26 | defaultMessage: '!!!Support our Open Collective', | 27 | defaultMessage: '!!!here', |
28 | }, | ||
29 | textVolunteers: { | ||
30 | id: 'settings.supportFerdi.textVolunteers', | ||
31 | defaultMessage: '!!!The development of Ferdi is done by volunteers. People who use Ferdi like you. They maintain, fix, and improve Ferdi in their spare time.', | ||
32 | }, | ||
33 | textSupportWelcome: { | ||
34 | id: 'settings.supportFerdi.textSupportWelcome', | ||
35 | defaultMessage: '!!!Support is always welcome. You can find a list of the help we need', | ||
36 | }, | ||
37 | textSupportWelcomeHere: { | ||
38 | id: 'settings.supportFerdi.textSupportWelcomeHere', | ||
39 | defaultMessage: '!!!here', | ||
40 | }, | ||
41 | textExpenses: { | ||
42 | id: 'settings.supportFerdi.textExpenses', | ||
43 | defaultMessage: '!!!While volunteers do most of the work, we still need to pay for servers and certificates. As a community, we are fully transparent on funds we collect and spend - see our', | ||
44 | }, | ||
45 | textOpenCollective: { | ||
46 | id: 'settings.supportFerdi.textOpenCollective', | ||
47 | defaultMessage: '!!!Open Collective', | ||
48 | }, | ||
49 | textDonation: { | ||
50 | id: 'settings.supportFerdi.textDonation', | ||
51 | defaultMessage: '!!!If you feel like supporting Ferdi development with a donation, you can do so on both,', | ||
52 | }, | ||
53 | textDonationAnd: { | ||
54 | id: 'settings.supportFerdi.textDonationAnd', | ||
55 | defaultMessage: '!!!and', | ||
56 | }, | ||
57 | textGitHubSponsors: { | ||
58 | id: 'settings.supportFerdi.textGitHubSponsors', | ||
59 | defaultMessage: '!!!GitHub Sponsors', | ||
60 | }, | ||
61 | openSurvey: { | ||
62 | id: 'settings.supportFerdi.openSurvey', | ||
63 | defaultMessage: '!!!Open Survey', | ||
64 | }, | ||
65 | bannerText: { | ||
66 | id: 'settings.supportFerdi.bannerText', | ||
67 | defaultMessage: '!!!Do you want to help us improve Ferdi?', | ||
27 | }, | 68 | }, |
28 | }); | 69 | }); |
29 | 70 | ||
@@ -32,12 +73,16 @@ class SupportFerdiDashboard extends Component { | |||
32 | intl: intlShape, | 73 | intl: intlShape, |
33 | }; | 74 | }; |
34 | 75 | ||
35 | static propTypes = { | 76 | openSurveyWindow() { |
36 | openLink: PropTypes.func.isRequired, | 77 | let win = new BrowserWindow({ width: 670, height: 400 }); |
37 | }; | 78 | win.on('closed', () => { |
79 | win = null; | ||
80 | }); | ||
81 | |||
82 | win.loadURL('https://rp28.typeform.com/to/E3phJT'); | ||
83 | } | ||
38 | 84 | ||
39 | render() { | 85 | render() { |
40 | const { openLink } = this.props; | ||
41 | const { intl } = this.context; | 86 | const { intl } = this.context; |
42 | 87 | ||
43 | return ( | 88 | return ( |
@@ -49,22 +94,75 @@ class SupportFerdiDashboard extends Component { | |||
49 | </div> | 94 | </div> |
50 | <div className="settings__body"> | 95 | <div className="settings__body"> |
51 | <h1>{intl.formatMessage(messages.title)}</h1> | 96 | <h1>{intl.formatMessage(messages.title)}</h1> |
52 | <Button | 97 | <div> |
53 | label={intl.formatMessage(messages.github)} | 98 | <p className="settings__support-badges"> |
54 | className="franz-form__button--inverted franz-form__button--large" | 99 | <a href="https://github.com/getferdi/ferdi" target="_blank"><img alt="GitHub Stars" src="https://img.shields.io/github/stars/getferdi/ferdi?style=social" /></a> |
55 | onClick={() => openLink('https://github.com/getferdi/ferdi')} | 100 | <a href="https://twitter.com/getferdi/" target="_blank"><img alt="Twitter Follow" src="https://img.shields.io/twitter/follow/getferdi?label=Follow&style=social" /></a> |
56 | /> | 101 | <a href="https://opencollective.com/getferdi#section-contributors" target="_blank"><img alt="Open Collective backers" src="https://img.shields.io/opencollective/backers/getferdi?logo=open-collective" /></a> |
57 | <Button | 102 | <a href="https://opencollective.com/getferdi#section-contributors" target="_blank"><img alt="Open Collective sponsors" src="https://img.shields.io/opencollective/sponsors/getferdi?logo=open-collective" /></a> |
58 | label={intl.formatMessage(messages.share)} | 103 | </p> |
59 | className="franz-form__button--inverted franz-form__button--large" | 104 | <FormattedHTMLMessage {...messages.aboutIntro} /> |
60 | onClick={() => openLink('https://twitter.com/intent/tweet?text=Ferdi%3A%20A%20messaging%20browser%20that%20allows%20you%20to%20combine%20your%20favourite%20messaging%20services%20into%20one%20application.%0A%0ACheck%20out%20Ferdi%20at%20https%3A//getferdi.com')} | 105 | <br /> |
61 | /> | 106 | <br /> |
62 | <Button | 107 | <p> |
63 | label={intl.formatMessage(messages.openCollective)} | 108 | <a href="#contributors-via-opencollective"> |
64 | className="franz-form__button--inverted franz-form__button--large" | 109 | <img alt="GitHub contributors (non-exhaustive)" width="100%" src="https://opencollective.com/getferdi/contributors.svg?width=642&button=false" /> |
65 | onClick={() => openLink('https://opencollective.com/getferdi')} | 110 | </a> |
66 | /> | 111 | </p> |
112 | <p> | ||
113 | {intl.formatMessage(messages.textListContributors)} | ||
114 | <a href="https://github.com/getferdi/ferdi#contributors-" target="_blank" className="link"> | ||
115 | {' '} | ||
116 | {intl.formatMessage(messages.textListContributorsHere)} | ||
117 | <i className="mdi mdi-open-in-new" /> | ||
118 | </a> | ||
119 | <br /> | ||
120 | <br /> | ||
121 | </p> | ||
122 | <p> | ||
123 | {intl.formatMessage(messages.textVolunteers)} | ||
124 | </p> | ||
125 | <p> | ||
126 | {intl.formatMessage(messages.textSupportWelcome)} | ||
127 | <a href="https://help.getferdi.com/general/support" target="_blank" className="link"> | ||
128 | {' '} | ||
129 | {intl.formatMessage(messages.textSupportWelcomeHere)} | ||
130 | <i className="mdi mdi-open-in-new" /> | ||
131 | </a> | ||
132 | </p> | ||
133 | <p> | ||
134 | {intl.formatMessage(messages.textExpenses)} | ||
135 | <a href="https://opencollective.com/getferdi#section-budget" target="_blank" className="link"> | ||
136 | {' '} | ||
137 | {intl.formatMessage(messages.textOpenCollective)} | ||
138 | <i className="mdi mdi-open-in-new" /> | ||
139 | </a> | ||
140 | </p> | ||
141 | <p> | ||
142 | {intl.formatMessage(messages.textDonation)} | ||
143 | <a href="https://opencollective.com/getferdi#section-contribute" target="_blank" className="link"> | ||
144 | {' '} | ||
145 | {intl.formatMessage(messages.textOpenCollective)} | ||
146 | <i className="mdi mdi-open-in-new" /> | ||
147 | </a> | ||
148 | {' '} | ||
149 | {intl.formatMessage(messages.textDonationAnd)} | ||
150 | <a href="https://github.com/sponsors/getferdi" target="_blank" className="link"> | ||
151 | {' '} | ||
152 | {intl.formatMessage(messages.textGitHubSponsors)} | ||
153 | <i className="mdi mdi-open-in-new" /> | ||
154 | </a> | ||
155 | </p> | ||
156 | </div> | ||
67 | </div> | 157 | </div> |
158 | <InfoBar | ||
159 | sticky | ||
160 | type="primary" | ||
161 | ctaLabel={intl.formatMessage(messages.openSurvey)} | ||
162 | onClick={this.openSurveyWindow} | ||
163 | > | ||
164 | {intl.formatMessage(messages.bannerText)} | ||
165 | </InfoBar> | ||
68 | </div> | 166 | </div> |
69 | ); | 167 | ); |
70 | } | 168 | } |
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index 801f68cc0..c0ce026a6 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json | |||
@@ -2262,7 +2262,7 @@ | |||
2262 | } | 2262 | } |
2263 | }, | 2263 | }, |
2264 | { | 2264 | { |
2265 | "defaultMessage": "!!!Support Ferdi", | 2265 | "defaultMessage": "!!!About Ferdi", |
2266 | "end": { | 2266 | "end": { |
2267 | "column": 3, | 2267 | "column": 3, |
2268 | "line": 44 | 2268 | "line": 44 |
@@ -3480,68 +3480,198 @@ | |||
3480 | { | 3480 | { |
3481 | "descriptors": [ | 3481 | "descriptors": [ |
3482 | { | 3482 | { |
3483 | "defaultMessage": "!!!Support Ferdi", | 3483 | "defaultMessage": "!!!About Ferdi", |
3484 | "end": { | 3484 | "end": { |
3485 | "column": 3, | 3485 | "column": 3, |
3486 | "line": 11 | 3486 | "line": 12 |
3487 | }, | 3487 | }, |
3488 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | 3488 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", |
3489 | "id": "settings.supportFerdi.headline", | 3489 | "id": "settings.supportFerdi.headline", |
3490 | "start": { | 3490 | "start": { |
3491 | "column": 12, | 3491 | "column": 12, |
3492 | "line": 8 | 3492 | "line": 9 |
3493 | } | 3493 | } |
3494 | }, | 3494 | }, |
3495 | { | 3495 | { |
3496 | "defaultMessage": "!!!Do you like Ferdi? Spread the love!", | 3496 | "defaultMessage": "!!!Do you like Ferdi?", |
3497 | "end": { | 3497 | "end": { |
3498 | "column": 3, | 3498 | "column": 3, |
3499 | "line": 15 | 3499 | "line": 16 |
3500 | }, | 3500 | }, |
3501 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | 3501 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", |
3502 | "id": "settings.supportFerdi.title", | 3502 | "id": "settings.supportFerdi.title", |
3503 | "start": { | 3503 | "start": { |
3504 | "column": 9, | 3504 | "column": 9, |
3505 | "line": 12 | 3505 | "line": 13 |
3506 | } | 3506 | } |
3507 | }, | 3507 | }, |
3508 | { | 3508 | { |
3509 | "defaultMessage": "!!!Star on GitHub", | 3509 | "defaultMessage": "!!!<p>Ferdi is an open-source and a community-lead application.</p><p>Thanks to the people who make this possbile:</p>", |
3510 | "end": { | 3510 | "end": { |
3511 | "column": 3, | 3511 | "column": 3, |
3512 | "line": 19 | 3512 | "line": 20 |
3513 | }, | 3513 | }, |
3514 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | 3514 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", |
3515 | "id": "settings.supportFerdi.github", | 3515 | "id": "settings.supportFerdi.aboutIntro", |
3516 | "start": { | 3516 | "start": { |
3517 | "column": 10, | 3517 | "column": 14, |
3518 | "line": 16 | 3518 | "line": 17 |
3519 | } | 3519 | } |
3520 | }, | 3520 | }, |
3521 | { | 3521 | { |
3522 | "defaultMessage": "!!!Tell your Friends", | 3522 | "defaultMessage": "!!!Full list of contributor", |
3523 | "end": { | 3523 | "end": { |
3524 | "column": 3, | 3524 | "column": 3, |
3525 | "line": 23 | 3525 | "line": 24 |
3526 | }, | 3526 | }, |
3527 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | 3527 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", |
3528 | "id": "settings.supportFerdi.share", | 3528 | "id": "settings.supportFerdi.textListContributors", |
3529 | "start": { | 3529 | "start": { |
3530 | "column": 9, | 3530 | "column": 24, |
3531 | "line": 20 | 3531 | "line": 21 |
3532 | } | 3532 | } |
3533 | }, | 3533 | }, |
3534 | { | 3534 | { |
3535 | "defaultMessage": "!!!Support our Open Collective", | 3535 | "defaultMessage": "!!!here", |
3536 | "end": { | 3536 | "end": { |
3537 | "column": 3, | 3537 | "column": 3, |
3538 | "line": 27 | 3538 | "line": 28 |
3539 | }, | ||
3540 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | ||
3541 | "id": "settings.supportFerdi.textListContributorsHere", | ||
3542 | "start": { | ||
3543 | "column": 28, | ||
3544 | "line": 25 | ||
3545 | } | ||
3546 | }, | ||
3547 | { | ||
3548 | "defaultMessage": "!!!The development of Ferdi is done by volunteers. People who use Ferdi like you. They maintain, fix, and improve Ferdi in their spare time.", | ||
3549 | "end": { | ||
3550 | "column": 3, | ||
3551 | "line": 32 | ||
3539 | }, | 3552 | }, |
3540 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | 3553 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", |
3541 | "id": "settings.supportFerdi.openCollective", | 3554 | "id": "settings.supportFerdi.textVolunteers", |
3542 | "start": { | 3555 | "start": { |
3543 | "column": 18, | 3556 | "column": 18, |
3544 | "line": 24 | 3557 | "line": 29 |
3558 | } | ||
3559 | }, | ||
3560 | { | ||
3561 | "defaultMessage": "!!!Support is always welcome. You can find a list of the help we need", | ||
3562 | "end": { | ||
3563 | "column": 3, | ||
3564 | "line": 36 | ||
3565 | }, | ||
3566 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | ||
3567 | "id": "settings.supportFerdi.textSupportWelcome", | ||
3568 | "start": { | ||
3569 | "column": 22, | ||
3570 | "line": 33 | ||
3571 | } | ||
3572 | }, | ||
3573 | { | ||
3574 | "defaultMessage": "!!!here", | ||
3575 | "end": { | ||
3576 | "column": 3, | ||
3577 | "line": 40 | ||
3578 | }, | ||
3579 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | ||
3580 | "id": "settings.supportFerdi.textSupportWelcomeHere", | ||
3581 | "start": { | ||
3582 | "column": 26, | ||
3583 | "line": 37 | ||
3584 | } | ||
3585 | }, | ||
3586 | { | ||
3587 | "defaultMessage": "!!!While volunteers do most of the work, we still need to pay for servers and certificates. As a community, we are fully transparent on funds we collect and spend - see our", | ||
3588 | "end": { | ||
3589 | "column": 3, | ||
3590 | "line": 44 | ||
3591 | }, | ||
3592 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | ||
3593 | "id": "settings.supportFerdi.textExpenses", | ||
3594 | "start": { | ||
3595 | "column": 16, | ||
3596 | "line": 41 | ||
3597 | } | ||
3598 | }, | ||
3599 | { | ||
3600 | "defaultMessage": "!!!Open Collective", | ||
3601 | "end": { | ||
3602 | "column": 3, | ||
3603 | "line": 48 | ||
3604 | }, | ||
3605 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | ||
3606 | "id": "settings.supportFerdi.textOpenCollective", | ||
3607 | "start": { | ||
3608 | "column": 22, | ||
3609 | "line": 45 | ||
3610 | } | ||
3611 | }, | ||
3612 | { | ||
3613 | "defaultMessage": "!!!If you feel like supporting Ferdi development with a donation, you can do so on both,", | ||
3614 | "end": { | ||
3615 | "column": 3, | ||
3616 | "line": 52 | ||
3617 | }, | ||
3618 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | ||
3619 | "id": "settings.supportFerdi.textDonation", | ||
3620 | "start": { | ||
3621 | "column": 16, | ||
3622 | "line": 49 | ||
3623 | } | ||
3624 | }, | ||
3625 | { | ||
3626 | "defaultMessage": "!!!and", | ||
3627 | "end": { | ||
3628 | "column": 3, | ||
3629 | "line": 56 | ||
3630 | }, | ||
3631 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | ||
3632 | "id": "settings.supportFerdi.textDonationAnd", | ||
3633 | "start": { | ||
3634 | "column": 19, | ||
3635 | "line": 53 | ||
3636 | } | ||
3637 | }, | ||
3638 | { | ||
3639 | "defaultMessage": "!!!GitHub Sponsors", | ||
3640 | "end": { | ||
3641 | "column": 3, | ||
3642 | "line": 60 | ||
3643 | }, | ||
3644 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | ||
3645 | "id": "settings.supportFerdi.textGitHubSponsors", | ||
3646 | "start": { | ||
3647 | "column": 22, | ||
3648 | "line": 57 | ||
3649 | } | ||
3650 | }, | ||
3651 | { | ||
3652 | "defaultMessage": "!!!Open Survey", | ||
3653 | "end": { | ||
3654 | "column": 3, | ||
3655 | "line": 64 | ||
3656 | }, | ||
3657 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | ||
3658 | "id": "settings.supportFerdi.openSurvey", | ||
3659 | "start": { | ||
3660 | "column": 14, | ||
3661 | "line": 61 | ||
3662 | } | ||
3663 | }, | ||
3664 | { | ||
3665 | "defaultMessage": "!!!Do you want to help us improve Ferdi?", | ||
3666 | "end": { | ||
3667 | "column": 3, | ||
3668 | "line": 68 | ||
3669 | }, | ||
3670 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | ||
3671 | "id": "settings.supportFerdi.bannerText", | ||
3672 | "start": { | ||
3673 | "column": 14, | ||
3674 | "line": 65 | ||
3545 | } | 3675 | } |
3546 | } | 3676 | } |
3547 | ], | 3677 | ], |
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 553c30489..ee6fc2b29 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -352,7 +352,7 @@ | |||
352 | "settings.navigation.availableServices": "Available services", | 352 | "settings.navigation.availableServices": "Available services", |
353 | "settings.navigation.logout": "Logout", | 353 | "settings.navigation.logout": "Logout", |
354 | "settings.navigation.settings": "Settings", | 354 | "settings.navigation.settings": "Settings", |
355 | "settings.navigation.supportFerdi": "Support Ferdi", | 355 | "settings.navigation.supportFerdi": "About Ferdi", |
356 | "settings.navigation.team": "Manage Team", | 356 | "settings.navigation.team": "Manage Team", |
357 | "settings.navigation.yourServices": "Your services", | 357 | "settings.navigation.yourServices": "Your services", |
358 | "settings.navigation.yourWorkspaces": "Your workspaces", | 358 | "settings.navigation.yourWorkspaces": "Your workspaces", |
@@ -429,11 +429,21 @@ | |||
429 | "settings.services.tooltip.isMuted": "All sounds are muted", | 429 | "settings.services.tooltip.isMuted": "All sounds are muted", |
430 | "settings.services.tooltip.notificationsDisabled": "Notifications are disabled", | 430 | "settings.services.tooltip.notificationsDisabled": "Notifications are disabled", |
431 | "settings.services.updatedInfo": "Your changes have been saved", | 431 | "settings.services.updatedInfo": "Your changes have been saved", |
432 | "settings.supportFerdi.github": "Star on GitHub", | 432 | "settings.supportFerdi.aboutIntro": "<p>Ferdi is an open-source and a community-lead application.</p><p>Thanks to the people who make this possbile:</p>", |
433 | "settings.supportFerdi.headline": "Support Ferdi", | 433 | "settings.supportFerdi.bannerText": "Do you want to help us improve Ferdi?", |
434 | "settings.supportFerdi.openCollective": "Support our Open Collective", | 434 | "settings.supportFerdi.headline": "About Ferdi", |
435 | "settings.supportFerdi.share": "Tell your Friends", | 435 | "settings.supportFerdi.openSurvey": "Open survey", |
436 | "settings.supportFerdi.title": "Do you like Ferdi? Spread the love!", | 436 | "settings.supportFerdi.textDonation": "If you feel like supporting Ferdi development with a donation, you can do so on both,", |
437 | "settings.supportFerdi.textDonationAnd": "and", | ||
438 | "settings.supportFerdi.textExpenses": "While volunteers do most of the work, we still need to pay for servers and certificates. As a community, we are fully transparent on funds we collect and spend - see our", | ||
439 | "settings.supportFerdi.textGitHubSponsors": "GitHub Sponsors", | ||
440 | "settings.supportFerdi.textListContributors": "Full list of contributors", | ||
441 | "settings.supportFerdi.textListContributorsHere": "here", | ||
442 | "settings.supportFerdi.textOpenCollective": "Open Collective", | ||
443 | "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need", | ||
444 | "settings.supportFerdi.textSupportWelcomeHere": "here", | ||
445 | "settings.supportFerdi.textVolunteers": "The development of Ferdi is done by volunteers. People who use Ferdi like you. They maintain, fix, and improve Ferdi in their spare time.", | ||
446 | "settings.supportFerdi.title": "Do you like Ferdi?", | ||
437 | "settings.team.contentHeadline": "Franz Team Management", | 447 | "settings.team.contentHeadline": "Franz Team Management", |
438 | "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.", | 448 | "settings.team.copy": "Franz's Team Management allows you to manage Franz Subscriptions for multiple users. Please keep in mind that having a Franz Premium subscription will give you no advantages in using Ferdi: The only reason you still have access to Team Management is so you can manage your legacy Franz Teams and so that you don't loose any functionality in managing your account.", |
439 | "settings.team.headline": "Team", | 449 | "settings.team.headline": "Team", |
diff --git a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json b/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json index 154cdbe84..d7906fa7d 100644 --- a/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json +++ b/src/i18n/messages/src/components/settings/navigation/SettingsNavigation.json | |||
@@ -79,7 +79,7 @@ | |||
79 | }, | 79 | }, |
80 | { | 80 | { |
81 | "id": "settings.navigation.supportFerdi", | 81 | "id": "settings.navigation.supportFerdi", |
82 | "defaultMessage": "!!!Support Ferdi", | 82 | "defaultMessage": "!!!About Ferdi", |
83 | "file": "src/components/settings/navigation/SettingsNavigation.js", | 83 | "file": "src/components/settings/navigation/SettingsNavigation.js", |
84 | "start": { | 84 | "start": { |
85 | "line": 41, | 85 | "line": 41, |
diff --git a/src/i18n/messages/src/components/settings/supportFerdi/SupportFerdiDashboard.json b/src/i18n/messages/src/components/settings/supportFerdi/SupportFerdiDashboard.json index bf8df6468..d8ec01f17 100644 --- a/src/i18n/messages/src/components/settings/supportFerdi/SupportFerdiDashboard.json +++ b/src/i18n/messages/src/components/settings/supportFerdi/SupportFerdiDashboard.json | |||
@@ -1,66 +1,196 @@ | |||
1 | [ | 1 | [ |
2 | { | 2 | { |
3 | "id": "settings.supportFerdi.headline", | 3 | "id": "settings.supportFerdi.headline", |
4 | "defaultMessage": "!!!Support Ferdi", | 4 | "defaultMessage": "!!!About Ferdi", |
5 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | 5 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", |
6 | "start": { | 6 | "start": { |
7 | "line": 8, | 7 | "line": 9, |
8 | "column": 12 | 8 | "column": 12 |
9 | }, | 9 | }, |
10 | "end": { | 10 | "end": { |
11 | "line": 11, | 11 | "line": 12, |
12 | "column": 3 | 12 | "column": 3 |
13 | } | 13 | } |
14 | }, | 14 | }, |
15 | { | 15 | { |
16 | "id": "settings.supportFerdi.title", | 16 | "id": "settings.supportFerdi.title", |
17 | "defaultMessage": "!!!Do you like Ferdi? Spread the love!", | 17 | "defaultMessage": "!!!Do you like Ferdi?", |
18 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | 18 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", |
19 | "start": { | 19 | "start": { |
20 | "line": 12, | 20 | "line": 13, |
21 | "column": 9 | 21 | "column": 9 |
22 | }, | 22 | }, |
23 | "end": { | 23 | "end": { |
24 | "line": 15, | 24 | "line": 16, |
25 | "column": 3 | 25 | "column": 3 |
26 | } | 26 | } |
27 | }, | 27 | }, |
28 | { | 28 | { |
29 | "id": "settings.supportFerdi.github", | 29 | "id": "settings.supportFerdi.aboutIntro", |
30 | "defaultMessage": "!!!Star on GitHub", | 30 | "defaultMessage": "!!!<p>Ferdi is an open-source and a community-lead application.</p><p>Thanks to the people who make this possbile:</p>", |
31 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | 31 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", |
32 | "start": { | 32 | "start": { |
33 | "line": 16, | 33 | "line": 17, |
34 | "column": 10 | 34 | "column": 14 |
35 | }, | 35 | }, |
36 | "end": { | 36 | "end": { |
37 | "line": 19, | 37 | "line": 20, |
38 | "column": 3 | 38 | "column": 3 |
39 | } | 39 | } |
40 | }, | 40 | }, |
41 | { | 41 | { |
42 | "id": "settings.supportFerdi.share", | 42 | "id": "settings.supportFerdi.textListContributors", |
43 | "defaultMessage": "!!!Tell your Friends", | 43 | "defaultMessage": "!!!Full list of contributor", |
44 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | 44 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", |
45 | "start": { | 45 | "start": { |
46 | "line": 20, | 46 | "line": 21, |
47 | "column": 9 | 47 | "column": 24 |
48 | }, | 48 | }, |
49 | "end": { | 49 | "end": { |
50 | "line": 23, | 50 | "line": 24, |
51 | "column": 3 | 51 | "column": 3 |
52 | } | 52 | } |
53 | }, | 53 | }, |
54 | { | 54 | { |
55 | "id": "settings.supportFerdi.openCollective", | 55 | "id": "settings.supportFerdi.textListContributorsHere", |
56 | "defaultMessage": "!!!Support our Open Collective", | 56 | "defaultMessage": "!!!here", |
57 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | 57 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", |
58 | "start": { | 58 | "start": { |
59 | "line": 24, | 59 | "line": 25, |
60 | "column": 28 | ||
61 | }, | ||
62 | "end": { | ||
63 | "line": 28, | ||
64 | "column": 3 | ||
65 | } | ||
66 | }, | ||
67 | { | ||
68 | "id": "settings.supportFerdi.textVolunteers", | ||
69 | "defaultMessage": "!!!The development of Ferdi is done by volunteers. People who use Ferdi like you. They maintain, fix, and improve Ferdi in their spare time.", | ||
70 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | ||
71 | "start": { | ||
72 | "line": 29, | ||
60 | "column": 18 | 73 | "column": 18 |
61 | }, | 74 | }, |
62 | "end": { | 75 | "end": { |
63 | "line": 27, | 76 | "line": 32, |
77 | "column": 3 | ||
78 | } | ||
79 | }, | ||
80 | { | ||
81 | "id": "settings.supportFerdi.textSupportWelcome", | ||
82 | "defaultMessage": "!!!Support is always welcome. You can find a list of the help we need", | ||
83 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | ||
84 | "start": { | ||
85 | "line": 33, | ||
86 | "column": 22 | ||
87 | }, | ||
88 | "end": { | ||
89 | "line": 36, | ||
90 | "column": 3 | ||
91 | } | ||
92 | }, | ||
93 | { | ||
94 | "id": "settings.supportFerdi.textSupportWelcomeHere", | ||
95 | "defaultMessage": "!!!here", | ||
96 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | ||
97 | "start": { | ||
98 | "line": 37, | ||
99 | "column": 26 | ||
100 | }, | ||
101 | "end": { | ||
102 | "line": 40, | ||
103 | "column": 3 | ||
104 | } | ||
105 | }, | ||
106 | { | ||
107 | "id": "settings.supportFerdi.textExpenses", | ||
108 | "defaultMessage": "!!!While volunteers do most of the work, we still need to pay for servers and certificates. As a community, we are fully transparent on funds we collect and spend - see our", | ||
109 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | ||
110 | "start": { | ||
111 | "line": 41, | ||
112 | "column": 16 | ||
113 | }, | ||
114 | "end": { | ||
115 | "line": 44, | ||
116 | "column": 3 | ||
117 | } | ||
118 | }, | ||
119 | { | ||
120 | "id": "settings.supportFerdi.textOpenCollective", | ||
121 | "defaultMessage": "!!!Open Collective", | ||
122 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | ||
123 | "start": { | ||
124 | "line": 45, | ||
125 | "column": 22 | ||
126 | }, | ||
127 | "end": { | ||
128 | "line": 48, | ||
129 | "column": 3 | ||
130 | } | ||
131 | }, | ||
132 | { | ||
133 | "id": "settings.supportFerdi.textDonation", | ||
134 | "defaultMessage": "!!!If you feel like supporting Ferdi development with a donation, you can do so on both,", | ||
135 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | ||
136 | "start": { | ||
137 | "line": 49, | ||
138 | "column": 16 | ||
139 | }, | ||
140 | "end": { | ||
141 | "line": 52, | ||
142 | "column": 3 | ||
143 | } | ||
144 | }, | ||
145 | { | ||
146 | "id": "settings.supportFerdi.textDonationAnd", | ||
147 | "defaultMessage": "!!!and", | ||
148 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | ||
149 | "start": { | ||
150 | "line": 53, | ||
151 | "column": 19 | ||
152 | }, | ||
153 | "end": { | ||
154 | "line": 56, | ||
155 | "column": 3 | ||
156 | } | ||
157 | }, | ||
158 | { | ||
159 | "id": "settings.supportFerdi.textGitHubSponsors", | ||
160 | "defaultMessage": "!!!GitHub Sponsors", | ||
161 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | ||
162 | "start": { | ||
163 | "line": 57, | ||
164 | "column": 22 | ||
165 | }, | ||
166 | "end": { | ||
167 | "line": 60, | ||
168 | "column": 3 | ||
169 | } | ||
170 | }, | ||
171 | { | ||
172 | "id": "settings.supportFerdi.openSurvey", | ||
173 | "defaultMessage": "!!!Open Survey", | ||
174 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | ||
175 | "start": { | ||
176 | "line": 61, | ||
177 | "column": 14 | ||
178 | }, | ||
179 | "end": { | ||
180 | "line": 64, | ||
181 | "column": 3 | ||
182 | } | ||
183 | }, | ||
184 | { | ||
185 | "id": "settings.supportFerdi.bannerText", | ||
186 | "defaultMessage": "!!!Do you want to help us improve Ferdi?", | ||
187 | "file": "src/components/settings/supportFerdi/SupportFerdiDashboard.js", | ||
188 | "start": { | ||
189 | "line": 65, | ||
190 | "column": 14 | ||
191 | }, | ||
192 | "end": { | ||
193 | "line": 68, | ||
64 | "column": 3 | 194 | "column": 3 |
65 | } | 195 | } |
66 | } | 196 | } |
diff --git a/src/styles/settings.scss b/src/styles/settings.scss index b908305de..147083a5f 100644 --- a/src/styles/settings.scss +++ b/src/styles/settings.scss | |||
@@ -505,3 +505,7 @@ | |||
505 | width: 7px; | 505 | width: 7px; |
506 | } | 506 | } |
507 | } | 507 | } |
508 | |||
509 | .settings__support-badges { | ||
510 | a { margin-right: 10px } | ||
511 | } | ||
diff --git a/src/styles/type.scss b/src/styles/type.scss index 5b1160d0b..7531b2044 100644 --- a/src/styles/type.scss +++ b/src/styles/type.scss | |||
@@ -57,7 +57,10 @@ a, button { | |||
57 | } | 57 | } |
58 | } | 58 | } |
59 | 59 | ||
60 | &.link { color: $theme-brand-primary; } | 60 | &.link { |
61 | color: $theme-brand-primary; | ||
62 | cursor: pointer; | ||
63 | } | ||
61 | } | 64 | } |
62 | 65 | ||
63 | .error-message, .error-message:last-of-type { | 66 | .error-message, .error-message:last-of-type { |