From 85c2ce9e0a0c7542121357a97705328ff833136e Mon Sep 17 00:00:00 2001 From: Francisco Marques Date: Mon, 5 Oct 2020 15:36:46 +0100 Subject: Improved onboarding flow and settings empty states (#996) --- src/components/services/content/Services.js | 2 +- src/components/settings/services/ServicesDashboard.js | 6 +++--- src/electron/ipc-api/autoUpdate.js | 2 +- src/features/workspaces/components/EditWorkspaceForm.js | 2 +- src/features/workspaces/components/WorkspacesDashboard.js | 2 +- src/i18n/locales/defaultMessages.json | 6 +++--- src/i18n/locales/en-US.json | 6 +++--- .../src/components/settings/services/ServicesDashboard.json | 2 +- .../src/features/workspaces/components/EditWorkspaceForm.json | 2 +- .../src/features/workspaces/components/WorkspacesDashboard.json | 2 +- src/internal-server | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js index 80f17d8f2..da2ee0b9e 100644 --- a/src/components/services/content/Services.js +++ b/src/components/services/content/Services.js @@ -149,7 +149,7 @@ export default @injectSheet(styles) @inject('actions') @observer class Services timeout={300} transitionName="slideUp" > - + { isLoggedIn ? intl.formatMessage(messages.getStarted) : 'Login' } {!isLoggedIn && ( diff --git a/src/components/settings/services/ServicesDashboard.js b/src/components/settings/services/ServicesDashboard.js index 826dbb176..d88be74a4 100644 --- a/src/components/settings/services/ServicesDashboard.js +++ b/src/components/settings/services/ServicesDashboard.js @@ -23,7 +23,7 @@ const messages = defineMessages({ }, noServicesAdded: { id: 'settings.services.noServicesAdded', - defaultMessage: '!!!You haven\'t added any services yet.', + defaultMessage: '!!!Start by adding a service.', }, noServiceFound: { id: 'settings.recipes.nothingFound', @@ -95,7 +95,7 @@ export default @observer class ServicesDashboard extends Component {
- {!isLoading && ( + {services.length !== 0 && !isLoading && ( filterServices({ needle })} @@ -143,7 +143,7 @@ export default @observer class ServicesDashboard extends Component {

- + {intl.formatMessage(messages.noServicesAdded)}

diff --git a/src/electron/ipc-api/autoUpdate.js b/src/electron/ipc-api/autoUpdate.js index 148ca5640..a81bc918f 100644 --- a/src/electron/ipc-api/autoUpdate.js +++ b/src/electron/ipc-api/autoUpdate.js @@ -15,7 +15,7 @@ export default (params) => { try { autoUpdater.autoInstallOnAppQuit = false; autoUpdater.allowPrerelease = Boolean(params.settings.app.get('beta')); - + if (params.settings.app.get('nightly')) { autoUpdater.setFeedURL({ provider: 'github', diff --git a/src/features/workspaces/components/EditWorkspaceForm.js b/src/features/workspaces/components/EditWorkspaceForm.js index b3551a7b9..0f199ffb1 100644 --- a/src/features/workspaces/components/EditWorkspaceForm.js +++ b/src/features/workspaces/components/EditWorkspaceForm.js @@ -48,7 +48,7 @@ const messages = defineMessages({ }, noServicesAdded: { id: 'settings.services.noServicesAdded', - defaultMessage: '!!!You haven\'t added any services yet.', + defaultMessage: '!!!Start by adding a service.', }, discoverServices: { id: 'settings.services.discoverServices', diff --git a/src/features/workspaces/components/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js index b499e02a4..a90bb37e9 100644 --- a/src/features/workspaces/components/WorkspacesDashboard.js +++ b/src/features/workspaces/components/WorkspacesDashboard.js @@ -23,7 +23,7 @@ const messages = defineMessages({ }, noServicesAdded: { id: 'settings.workspaces.noWorkspacesAdded', - defaultMessage: '!!!You haven\'t added any workspaces yet.', + defaultMessage: '!!!You haven\'t created any workspaces yet.', }, workspacesRequestFailed: { id: 'settings.workspaces.workspacesRequestFailed', diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index a9d266a64..801f68cc0 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json @@ -2976,7 +2976,7 @@ } }, { - "defaultMessage": "!!!You haven't added any services yet.", + "defaultMessage": "!!!Start by adding a service.", "end": { "column": 3, "line": 27 @@ -6359,7 +6359,7 @@ } }, { - "defaultMessage": "!!!You haven't added any services yet.", + "defaultMessage": "!!!Start by adding a service.", "end": { "column": 3, "line": 52 @@ -6543,7 +6543,7 @@ } }, { - "defaultMessage": "!!!You haven't added any workspaces yet.", + "defaultMessage": "!!!You haven't created any workspaces yet.", "end": { "column": 3, "line": 27 diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index a346f7d1e..553c30489 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -423,7 +423,7 @@ "settings.services.deletedInfo": "Service has been deleted", "settings.services.discoverServices": "Discover services", "settings.services.headline": "Your services", - "settings.services.noServicesAdded": "You haven't added any services yet.", + "settings.services.noServicesAdded": "Start by adding a service.", "settings.services.servicesRequestFailed": "Could not load your services", "settings.services.tooltip.isDisabled": "Service is disabled", "settings.services.tooltip.isMuted": "All sounds are muted", @@ -462,7 +462,7 @@ "settings.workspace.form.yourWorkspaces": "Your workspaces", "settings.workspaces.deletedInfo": "Workspace has been deleted", "settings.workspaces.headline": "Your workspaces", - "settings.workspaces.noWorkspacesAdded": "You haven't added any workspaces yet.", + "settings.workspaces.noWorkspacesAdded": "You haven't created any workspaces yet.", "settings.workspaces.tryReloadWorkspaces": "Try again", "settings.workspaces.updatedInfo": "Your changes have been saved", "settings.workspaces.workspaceFeatureHeadline": "Less is More: Introducing Ferdi Workspaces", @@ -533,4 +533,4 @@ "workspaceDrawer.workspaceFeatureInfo": "

Ferdi Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.

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.

", "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", "workspaces.switchingIndicator.switchingTo": "Switching to" -} \ No newline at end of file +} diff --git a/src/i18n/messages/src/components/settings/services/ServicesDashboard.json b/src/i18n/messages/src/components/settings/services/ServicesDashboard.json index 140d17a8b..0335c4dd8 100644 --- a/src/i18n/messages/src/components/settings/services/ServicesDashboard.json +++ b/src/i18n/messages/src/components/settings/services/ServicesDashboard.json @@ -27,7 +27,7 @@ }, { "id": "settings.services.noServicesAdded", - "defaultMessage": "!!!You haven't added any services yet.", + "defaultMessage": "!!!Start by adding a service.", "file": "src/components/settings/services/ServicesDashboard.js", "start": { "line": 24, diff --git a/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json b/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json index 4b047eac1..053751c84 100644 --- a/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json +++ b/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json @@ -92,7 +92,7 @@ }, { "id": "settings.services.noServicesAdded", - "defaultMessage": "!!!You haven't added any services yet.", + "defaultMessage": "!!!Start by adding a service.", "file": "src/features/workspaces/components/EditWorkspaceForm.js", "start": { "line": 49, diff --git a/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json b/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json index 87b8942ce..d67bc492d 100644 --- a/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json +++ b/src/i18n/messages/src/features/workspaces/components/WorkspacesDashboard.json @@ -14,7 +14,7 @@ }, { "id": "settings.workspaces.noWorkspacesAdded", - "defaultMessage": "!!!You haven't added any workspaces yet.", + "defaultMessage": "!!!You haven't created any workspaces yet.", "file": "src/features/workspaces/components/WorkspacesDashboard.js", "start": { "line": 24, diff --git a/src/internal-server b/src/internal-server index ae1edff6d..95ae59926 160000 --- a/src/internal-server +++ b/src/internal-server @@ -1 +1 @@ -Subproject commit ae1edff6d5139e5912a8f99dac8da274add7fd78 +Subproject commit 95ae59926dbd88d55a5377be997558a9e112ab49 -- cgit v1.2.3-54-g00ecf