diff options
author | kytwb <412895+kytwb@users.noreply.github.com> | 2021-06-12 19:51:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-12 19:51:28 +0200 |
commit | b0ecce5eab2a6d0eed3ade7c43e252ca9bac7edb (patch) | |
tree | aed0253b61ca035f3388a7d6a369ffe75f195a58 /src/containers/auth | |
parent | Bypassed code signing since that is also incorrect in GH settings. (diff) | |
download | ferdium-app-b0ecce5eab2a6d0eed3ade7c43e252ca9bac7edb.tar.gz ferdium-app-b0ecce5eab2a6d0eed3ade7c43e252ca9bac7edb.tar.zst ferdium-app-b0ecce5eab2a6d0eed3ade7c43e252ca9bac7edb.zip |
Fix active Todos service behaviour (#1481)
* Return false instead of null in isTodosServiceAdded
* Resolve from TODOS_RECIPES_ID instead of hardcoded TODOS_RECIPE_ID
* Fix TodosWebview width toggling when isTodosServiceActive
* Add more todo service recipe IDs
* Refactor todos state management
* Moved todos service URL and recipe ID computation logic to todos/store
* Simplified TodosWebview by delegating to the store for the URL and
removing the (unused) payment logic
* Made the todos service computation logic in the Service model depend
on the logic in todos/store
* Made ServicesStore depend on the todos service logic from the Service
model
* Todos appearance fixes
* Hide double horizontal rules if todo settings are hidden due to an
added todo service
* Hide todos panel border when the panel is hidden or expanded
* Make expanded todos panel obey sidebar width and vertical style
settings
* Make todos/store use isValidExternalURL
* Harden isValidExternalURL against malformed URLs
* Reduce todo URL string duplication in config.js
Co-authored-by: Kristóf Marussy <kristof@marussy.com>
Diffstat (limited to 'src/containers/auth')
-rw-r--r-- | src/containers/auth/SetupAssistantScreen.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/containers/auth/SetupAssistantScreen.js b/src/containers/auth/SetupAssistantScreen.js index 960ed7e33..1c4fa6c22 100644 --- a/src/containers/auth/SetupAssistantScreen.js +++ b/src/containers/auth/SetupAssistantScreen.js | |||
@@ -3,11 +3,11 @@ import React, { Component } from 'react'; | |||
3 | import PropTypes from 'prop-types'; | 3 | import PropTypes from 'prop-types'; |
4 | import { inject, observer } from 'mobx-react'; | 4 | import { inject, observer } from 'mobx-react'; |
5 | 5 | ||
6 | import { DEFAULT_TODO_RECIPE_ID, DEFAULT_TODO_SERVICE_NAME } from '../../config'; | ||
6 | import { sleep } from '../../helpers/async-helpers'; | 7 | import { sleep } from '../../helpers/async-helpers'; |
7 | import SetupAssistant from '../../components/auth/SetupAssistant'; | 8 | import SetupAssistant from '../../components/auth/SetupAssistant'; |
8 | import ServicesStore from '../../stores/ServicesStore'; | 9 | import ServicesStore from '../../stores/ServicesStore'; |
9 | import RecipesStore from '../../stores/RecipesStore'; | 10 | import RecipesStore from '../../stores/RecipesStore'; |
10 | import { TODOS_RECIPE_ID } from '../../features/todos'; | ||
11 | import UserStore from '../../stores/UserStore'; | 11 | import UserStore from '../../stores/UserStore'; |
12 | 12 | ||
13 | export default @inject('stores', 'actions') @observer class SetupAssistantScreen extends Component { | 13 | export default @inject('stores', 'actions') @observer class SetupAssistantScreen extends Component { |
@@ -82,11 +82,11 @@ export default @inject('stores', 'actions') @observer class SetupAssistantScreen | |||
82 | await sleep(100); | 82 | await sleep(100); |
83 | } | 83 | } |
84 | 84 | ||
85 | // Add Franz ToDos | 85 | // Add todo service |
86 | await services._createService({ | 86 | await services._createService({ |
87 | recipeId: TODOS_RECIPE_ID, | 87 | recipeId: DEFAULT_TODO_RECIPE_ID, |
88 | serviceData: { | 88 | serviceData: { |
89 | name: 'Franz ToDos', | 89 | name: DEFAULT_TODO_SERVICE_NAME, |
90 | }, | 90 | }, |
91 | redirect: false, | 91 | redirect: false, |
92 | skipCleanup: true, | 92 | skipCleanup: true, |