diff options
author | Francisco Marques <franciscopcmarques@gmail.com> | 2020-10-05 15:36:46 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-05 15:36:46 +0100 |
commit | 85c2ce9e0a0c7542121357a97705328ff833136e (patch) | |
tree | 51af89af37bca3e60c53f0eccad9c0ff82ca08bf | |
parent | docs: add tofran as a contributor (#1000) (diff) | |
download | ferdium-app-85c2ce9e0a0c7542121357a97705328ff833136e.tar.gz ferdium-app-85c2ce9e0a0c7542121357a97705328ff833136e.tar.zst ferdium-app-85c2ce9e0a0c7542121357a97705328ff833136e.zip |
Improved onboarding flow and settings empty states (#996)
11 files changed, 16 insertions, 16 deletions
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 | |||
149 | timeout={300} | 149 | timeout={300} |
150 | transitionName="slideUp" | 150 | transitionName="slideUp" |
151 | > | 151 | > |
152 | <Link to={isLoggedIn ? '/settings/services' : '/auth/welcome'} className="button"> | 152 | <Link to={isLoggedIn ? '/settings/recipes' : '/auth/welcome'} className="button"> |
153 | { isLoggedIn ? intl.formatMessage(messages.getStarted) : 'Login' } | 153 | { isLoggedIn ? intl.formatMessage(messages.getStarted) : 'Login' } |
154 | </Link> | 154 | </Link> |
155 | {!isLoggedIn && ( | 155 | {!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({ | |||
23 | }, | 23 | }, |
24 | noServicesAdded: { | 24 | noServicesAdded: { |
25 | id: 'settings.services.noServicesAdded', | 25 | id: 'settings.services.noServicesAdded', |
26 | defaultMessage: '!!!You haven\'t added any services yet.', | 26 | defaultMessage: '!!!Start by adding a service.', |
27 | }, | 27 | }, |
28 | noServiceFound: { | 28 | noServiceFound: { |
29 | id: 'settings.recipes.nothingFound', | 29 | id: 'settings.recipes.nothingFound', |
@@ -95,7 +95,7 @@ export default @observer class ServicesDashboard extends Component { | |||
95 | </div> | 95 | </div> |
96 | <LimitReachedInfobox /> | 96 | <LimitReachedInfobox /> |
97 | <div className="settings__body"> | 97 | <div className="settings__body"> |
98 | {!isLoading && ( | 98 | {services.length !== 0 && !isLoading && ( |
99 | <SearchInput | 99 | <SearchInput |
100 | placeholder={intl.formatMessage(messages.searchService)} | 100 | placeholder={intl.formatMessage(messages.searchService)} |
101 | onChange={needle => filterServices({ needle })} | 101 | onChange={needle => filterServices({ needle })} |
@@ -143,7 +143,7 @@ export default @observer class ServicesDashboard extends Component { | |||
143 | <div className="align-middle settings__empty-state"> | 143 | <div className="align-middle settings__empty-state"> |
144 | <p className="settings__empty-text"> | 144 | <p className="settings__empty-text"> |
145 | <span className="emoji"> | 145 | <span className="emoji"> |
146 | <img src="./assets/images/emoji/sad.png" alt="" /> | 146 | <img src="./assets/images/emoji/star.png" alt="" /> |
147 | </span> | 147 | </span> |
148 | {intl.formatMessage(messages.noServicesAdded)} | 148 | {intl.formatMessage(messages.noServicesAdded)} |
149 | </p> | 149 | </p> |
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) => { | |||
15 | try { | 15 | try { |
16 | autoUpdater.autoInstallOnAppQuit = false; | 16 | autoUpdater.autoInstallOnAppQuit = false; |
17 | autoUpdater.allowPrerelease = Boolean(params.settings.app.get('beta')); | 17 | autoUpdater.allowPrerelease = Boolean(params.settings.app.get('beta')); |
18 | 18 | ||
19 | if (params.settings.app.get('nightly')) { | 19 | if (params.settings.app.get('nightly')) { |
20 | autoUpdater.setFeedURL({ | 20 | autoUpdater.setFeedURL({ |
21 | provider: 'github', | 21 | 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({ | |||
48 | }, | 48 | }, |
49 | noServicesAdded: { | 49 | noServicesAdded: { |
50 | id: 'settings.services.noServicesAdded', | 50 | id: 'settings.services.noServicesAdded', |
51 | defaultMessage: '!!!You haven\'t added any services yet.', | 51 | defaultMessage: '!!!Start by adding a service.', |
52 | }, | 52 | }, |
53 | discoverServices: { | 53 | discoverServices: { |
54 | id: 'settings.services.discoverServices', | 54 | 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({ | |||
23 | }, | 23 | }, |
24 | noServicesAdded: { | 24 | noServicesAdded: { |
25 | id: 'settings.workspaces.noWorkspacesAdded', | 25 | id: 'settings.workspaces.noWorkspacesAdded', |
26 | defaultMessage: '!!!You haven\'t added any workspaces yet.', | 26 | defaultMessage: '!!!You haven\'t created any workspaces yet.', |
27 | }, | 27 | }, |
28 | workspacesRequestFailed: { | 28 | workspacesRequestFailed: { |
29 | id: 'settings.workspaces.workspacesRequestFailed', | 29 | 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 @@ | |||
2976 | } | 2976 | } |
2977 | }, | 2977 | }, |
2978 | { | 2978 | { |
2979 | "defaultMessage": "!!!You haven't added any services yet.", | 2979 | "defaultMessage": "!!!Start by adding a service.", |
2980 | "end": { | 2980 | "end": { |
2981 | "column": 3, | 2981 | "column": 3, |
2982 | "line": 27 | 2982 | "line": 27 |
@@ -6359,7 +6359,7 @@ | |||
6359 | } | 6359 | } |
6360 | }, | 6360 | }, |
6361 | { | 6361 | { |
6362 | "defaultMessage": "!!!You haven't added any services yet.", | 6362 | "defaultMessage": "!!!Start by adding a service.", |
6363 | "end": { | 6363 | "end": { |
6364 | "column": 3, | 6364 | "column": 3, |
6365 | "line": 52 | 6365 | "line": 52 |
@@ -6543,7 +6543,7 @@ | |||
6543 | } | 6543 | } |
6544 | }, | 6544 | }, |
6545 | { | 6545 | { |
6546 | "defaultMessage": "!!!You haven't added any workspaces yet.", | 6546 | "defaultMessage": "!!!You haven't created any workspaces yet.", |
6547 | "end": { | 6547 | "end": { |
6548 | "column": 3, | 6548 | "column": 3, |
6549 | "line": 27 | 6549 | "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 @@ | |||
423 | "settings.services.deletedInfo": "Service has been deleted", | 423 | "settings.services.deletedInfo": "Service has been deleted", |
424 | "settings.services.discoverServices": "Discover services", | 424 | "settings.services.discoverServices": "Discover services", |
425 | "settings.services.headline": "Your services", | 425 | "settings.services.headline": "Your services", |
426 | "settings.services.noServicesAdded": "You haven't added any services yet.", | 426 | "settings.services.noServicesAdded": "Start by adding a service.", |
427 | "settings.services.servicesRequestFailed": "Could not load your services", | 427 | "settings.services.servicesRequestFailed": "Could not load your services", |
428 | "settings.services.tooltip.isDisabled": "Service is disabled", | 428 | "settings.services.tooltip.isDisabled": "Service is disabled", |
429 | "settings.services.tooltip.isMuted": "All sounds are muted", | 429 | "settings.services.tooltip.isMuted": "All sounds are muted", |
@@ -462,7 +462,7 @@ | |||
462 | "settings.workspace.form.yourWorkspaces": "Your workspaces", | 462 | "settings.workspace.form.yourWorkspaces": "Your workspaces", |
463 | "settings.workspaces.deletedInfo": "Workspace has been deleted", | 463 | "settings.workspaces.deletedInfo": "Workspace has been deleted", |
464 | "settings.workspaces.headline": "Your workspaces", | 464 | "settings.workspaces.headline": "Your workspaces", |
465 | "settings.workspaces.noWorkspacesAdded": "You haven't added any workspaces yet.", | 465 | "settings.workspaces.noWorkspacesAdded": "You haven't created any workspaces yet.", |
466 | "settings.workspaces.tryReloadWorkspaces": "Try again", | 466 | "settings.workspaces.tryReloadWorkspaces": "Try again", |
467 | "settings.workspaces.updatedInfo": "Your changes have been saved", | 467 | "settings.workspaces.updatedInfo": "Your changes have been saved", |
468 | "settings.workspaces.workspaceFeatureHeadline": "Less is More: Introducing Ferdi Workspaces", | 468 | "settings.workspaces.workspaceFeatureHeadline": "Less is More: Introducing Ferdi Workspaces", |
@@ -533,4 +533,4 @@ | |||
533 | "workspaceDrawer.workspaceFeatureInfo": "<p>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.</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>", | 533 | "workspaceDrawer.workspaceFeatureInfo": "<p>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.</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>", |
534 | "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", | 534 | "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", |
535 | "workspaces.switchingIndicator.switchingTo": "Switching to" | 535 | "workspaces.switchingIndicator.switchingTo": "Switching to" |
536 | } \ No newline at end of file | 536 | } |
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 @@ | |||
27 | }, | 27 | }, |
28 | { | 28 | { |
29 | "id": "settings.services.noServicesAdded", | 29 | "id": "settings.services.noServicesAdded", |
30 | "defaultMessage": "!!!You haven't added any services yet.", | 30 | "defaultMessage": "!!!Start by adding a service.", |
31 | "file": "src/components/settings/services/ServicesDashboard.js", | 31 | "file": "src/components/settings/services/ServicesDashboard.js", |
32 | "start": { | 32 | "start": { |
33 | "line": 24, | 33 | "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 @@ | |||
92 | }, | 92 | }, |
93 | { | 93 | { |
94 | "id": "settings.services.noServicesAdded", | 94 | "id": "settings.services.noServicesAdded", |
95 | "defaultMessage": "!!!You haven't added any services yet.", | 95 | "defaultMessage": "!!!Start by adding a service.", |
96 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", | 96 | "file": "src/features/workspaces/components/EditWorkspaceForm.js", |
97 | "start": { | 97 | "start": { |
98 | "line": 49, | 98 | "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 @@ | |||
14 | }, | 14 | }, |
15 | { | 15 | { |
16 | "id": "settings.workspaces.noWorkspacesAdded", | 16 | "id": "settings.workspaces.noWorkspacesAdded", |
17 | "defaultMessage": "!!!You haven't added any workspaces yet.", | 17 | "defaultMessage": "!!!You haven't created any workspaces yet.", |
18 | "file": "src/features/workspaces/components/WorkspacesDashboard.js", | 18 | "file": "src/features/workspaces/components/WorkspacesDashboard.js", |
19 | "start": { | 19 | "start": { |
20 | "line": 24, | 20 | "line": 24, |
diff --git a/src/internal-server b/src/internal-server | |||
Subproject ae1edff6d5139e5912a8f99dac8da274add7fd7 | Subproject 95ae59926dbd88d55a5377be997558a9e112ab4 | ||