Iterate on About Ferdi screen

4 files changed, 32 insertions, 147 deletions

diff --git a/src/components/settings/supportFerdi/SupportFerdiDashboard.tsx b/src/components/settings/supportFerdi/SupportFerdiDashboard.tsx
index acebc979f..948d0c1d1 100644
--- a/src/components/settings/supportFerdi/SupportFerdiDashboard.tsx
+++ b/src/components/settings/supportFerdi/SupportFerdiDashboard.tsx
@@ -1,6 +1,4 @@
 import { defineMessages, useIntl } from 'react-intl';
-import { mdiOpenInNew } from '@mdi/js';
-import { Icon } from '../../ui/icon';
 
 const messages = defineMessages({
   headline: {
@@ -9,60 +7,17 @@ const messages = defineMessages({
   },
   aboutIntro: {
     id: 'settings.supportFerdi.aboutIntro',
-    defaultMessage:
-      '<p>Ferdi is an open-source and a community-lead application.</p><p>Thanks to the people who make this possbile:</p>',
-  },
-  textListContributors: {
-    id: 'settings.supportFerdi.textListContributors',
-    defaultMessage: 'Full list of contributors',
-  },
-  textListContributorsHere: {
-    id: 'settings.supportFerdi.textListContributorsHere',
-    defaultMessage: 'here',
-  },
-  textVolunteers: {
-    id: 'settings.supportFerdi.textVolunteers',
-    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.',
-  },
-  textSupportWelcome: {
-    id: 'settings.supportFerdi.textSupportWelcome',
-    defaultMessage:
-      'Support is always welcome. You can find a list of the help we need',
-  },
-  textSupportWelcomeHere: {
-    id: 'settings.supportFerdi.textSupportWelcomeHere',
-    defaultMessage: 'here',
-  },
-  textExpenses: {
-    id: 'settings.supportFerdi.textExpenses',
-    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',
-  },
-  textOpenCollective: {
-    id: 'settings.supportFerdi.textOpenCollective',
-    defaultMessage: 'Open Collective',
-  },
-  textDonation: {
-    id: 'settings.supportFerdi.textDonation',
-    defaultMessage:
-      'If you feel like supporting Ferdi development with a donation, you can do so on both,',
-  },
-  textDonationAnd: {
-    id: 'settings.supportFerdi.textDonationAnd',
-    defaultMessage: 'and',
-  },
-  textGitHubSponsors: {
-    id: 'settings.supportFerdi.textGitHubSponsors',
-    defaultMessage: 'GitHub Sponsors',
+    defaultMessage: 'Special thanks goes to these awesome people:',
   },
+  about: {
+    id: 'settings.supportFerdi.about',
+    defaultMessage: 'The development of Ferdi is done by contributors. People who use Ferdi like you. They maintain, fix, and improve Ferdi in their spare time.',
+  }
 });
 
 const SupportFerdiDashboard = () => {
   const intl = useIntl();
 
-  const aboutIntro = intl.formatMessage(messages.aboutIntro);
-
   return (
     <div className="settings__main">
       <div className="settings__header">
@@ -74,16 +29,6 @@ const SupportFerdiDashboard = () => {
         <div>
           <p className="settings__support-badges">
             <a
-              href="https://github.com/getferdi/ferdi"
-              target="_blank"
-              rel="noreferrer"
-            >
-              <img
-                alt="GitHub Stars"
-                src="https://img.shields.io/github/stars/getferdi/ferdi?style=social"
-              />
-            </a>
-            <a
               href="https://twitter.com/getferdi/"
               target="_blank"
               rel="noreferrer"
@@ -94,104 +39,44 @@ const SupportFerdiDashboard = () => {
               />
             </a>
             <a
-              href="https://opencollective.com/getferdi#section-contributors"
+              href="https://github.com/getferdi/ferdi"
               target="_blank"
               rel="noreferrer"
             >
               <img
-                alt="Open Collective backers"
-                src="https://img.shields.io/opencollective/backers/getferdi?logo=open-collective"
+                alt="GitHub Stars"
+                src="https://img.shields.io/github/stars/getferdi/ferdi?style=social"
               />
             </a>
+            <a target="_blank" href="https://crowdin.com/project/getferdi">
+              <img src="https://badges.crowdin.net/getferdi/localized.svg" alt="Crowdin"/>
+            </a>
             <a
               href="https://opencollective.com/getferdi#section-contributors"
               target="_blank"
               rel="noreferrer"
             >
               <img
-                alt="Open Collective sponsors"
-                src="https://img.shields.io/opencollective/sponsors/getferdi?logo=open-collective"
-              />
-            </a>
-          </p>
-          <span dangerouslySetInnerHTML={{ __html: aboutIntro }} />
-          <br />
-          <br />
-          <p>
-            <a href="#contributors-via-opencollective">
-              <img
-                alt="GitHub contributors (non-exhaustive)"
-                width="100%"
-                src="https://opencollective.com/getferdi/contributors.svg?width=642&button=false"
+                alt="Open Collective backers"
+                src="https://img.shields.io/opencollective/backers/getferdi?logo=open-collective"
               />
             </a>
           </p>
+          <p>{intl.formatMessage(messages.aboutIntro)}</p>
           <p>
-            {intl.formatMessage(messages.textListContributors)}
             <a
               href="https://github.com/getferdi/ferdi#contributors-"
               target="_blank"
-              className="link"
               rel="noreferrer"
             >
-              {' '}
-              {intl.formatMessage(messages.textListContributorsHere)}
-              <Icon icon={mdiOpenInNew} />
-            </a>
-            <br />
-            <br />
-          </p>
-          <p>{intl.formatMessage(messages.textVolunteers)}</p>
-          <p>
-            {intl.formatMessage(messages.textSupportWelcome)}
-            <a
-              href="https://help.getferdi.com/general/support"
-              target="_blank"
-              className="link"
-              rel="noreferrer"
-            >
-              {' '}
-              {intl.formatMessage(messages.textSupportWelcomeHere)}
-              <Icon icon={mdiOpenInNew} />
-            </a>
-          </p>
-          <p>
-            {intl.formatMessage(messages.textExpenses)}
-            <a
-              href="https://opencollective.com/getferdi#section-budget"
-              target="_blank"
-              className="link"
-              rel="noreferrer"
-            >
-              {' '}
-              {intl.formatMessage(messages.textOpenCollective)}
-              <Icon icon={mdiOpenInNew} />
-            </a>
-          </p>
-          <p>
-            {intl.formatMessage(messages.textDonation)}
-            <a
-              href="https://opencollective.com/getferdi#section-contribute"
-              target="_blank"
-              className="link"
-              rel="noreferrer"
-            >
-              {' '}
-              {intl.formatMessage(messages.textOpenCollective)}
-              <Icon icon={mdiOpenInNew} />
-            </a>{' '}
-            {intl.formatMessage(messages.textDonationAnd)}
-            <a
-              href="https://github.com/sponsors/getferdi"
-              target="_blank"
-              className="link"
-              rel="noreferrer"
-            >
-              {' '}
-              {intl.formatMessage(messages.textGitHubSponsors)}
-              <Icon icon={mdiOpenInNew} />
+              <img
+                alt="GitHub contributors (non-exhaustive)"
+                width="100%"
+                src="https://opencollective.com/getferdi/contributors.svg?width=600&avatarHeight=42&button=off"
+              />
             </a>
           </p>
+          <p className="settings__message">{intl.formatMessage(messages.about)}</p>
         </div>
       </div>
     </div>
diff --git a/src/features/workspaces/components/WorkspaceDrawer.js b/src/features/workspaces/components/WorkspaceDrawer.js
index be546cae0..147d4cf89 100644
--- a/src/features/workspaces/components/WorkspaceDrawer.js
+++ b/src/features/workspaces/components/WorkspaceDrawer.js
@@ -99,7 +99,11 @@ class WorkspaceDrawer extends Component {
 
   componentDidMount() {
     ReactTooltip.rebuild();
-    getUserWorkspacesRequest.execute();
+    try {
+      getUserWorkspacesRequest.execute();
+    } catch (error) {
+      console.log(error);
+    }
   }
 
   render() {
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 24603165b..e09dbe0dd 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -349,18 +349,9 @@
   "settings.services.tooltip.isMuted": "All sounds are muted",
   "settings.services.tooltip.notificationsDisabled": "Notifications are disabled",
   "settings.services.updatedInfo": "Your changes have been saved",
-  "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>",
+  "settings.supportFerdi.about": "The development of Ferdi is done by contributors. People who use Ferdi like you. They maintain, fix, and improve Ferdi in their spare time.",
+  "settings.supportFerdi.aboutIntro": "Special thanks goes to these awesome people:",
   "settings.supportFerdi.headline": "About Ferdi",
-  "settings.supportFerdi.textDonation": "If you feel like supporting Ferdi development with a donation, you can do so on both,",
-  "settings.supportFerdi.textDonationAnd": "and",
-  "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",
-  "settings.supportFerdi.textGitHubSponsors": "GitHub Sponsors",
-  "settings.supportFerdi.textListContributors": "Full list of contributors",
-  "settings.supportFerdi.textListContributorsHere": "here",
-  "settings.supportFerdi.textOpenCollective": "Open Collective",
-  "settings.supportFerdi.textSupportWelcome": "Support is always welcome. You can find a list of the help we need",
-  "settings.supportFerdi.textSupportWelcomeHere": "here",
-  "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.",
   "settings.team.contentHeadline": "Franz Team Management",
   "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.",
   "settings.team.headline": "Team",
diff --git a/src/styles/settings.scss b/src/styles/settings.scss
index 3bfc3586c..8f59fc57a 100644
--- a/src/styles/settings.scss
+++ b/src/styles/settings.scss
@@ -264,6 +264,10 @@
     .proxyHost {
       flex-basis: 70%;
     }
+
+    a {
+      display: inline-block;
+    }
   }
 
   .settings__close {
@@ -579,5 +583,6 @@
 .settings__support-badges {
   a {
     margin-right: 10px;
+    display: inline-block;
   }
 }