diff options
author | 2019-08-23 13:24:15 +0200 | |
---|---|---|
committer | 2019-08-23 13:24:15 +0200 | |
commit | 151be7d4e939509c27d81490001b28812b8d65e1 (patch) | |
tree | 48afa7206737ce89041c7ba31eaeb19dc0ae3a2b | |
parent | Improve onboarding experience (diff) | |
download | ferdium-app-151be7d4e939509c27d81490001b28812b8d65e1.tar.gz ferdium-app-151be7d4e939509c27d81490001b28812b8d65e1.tar.zst ferdium-app-151be7d4e939509c27d81490001b28812b8d65e1.zip |
Lint
-rw-r--r-- | src/features/announcements/api.js | 2 | ||||
-rw-r--r-- | src/features/apiBase.js | 9 | ||||
-rw-r--r-- | src/features/workspaces/api.js | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/features/announcements/api.js b/src/features/announcements/api.js index 0741c0f87..3cf90fa4a 100644 --- a/src/features/announcements/api.js +++ b/src/features/announcements/api.js | |||
@@ -1,6 +1,6 @@ | |||
1 | import { remote } from 'electron'; | 1 | import { remote } from 'electron'; |
2 | import Request from '../../stores/lib/Request'; | 2 | import Request from '../../stores/lib/Request'; |
3 | import apiBase from '../apiBase' | 3 | import apiBase from '../apiBase'; |
4 | 4 | ||
5 | const debug = require('debug')('Franz:feature:announcements:api'); | 5 | const debug = require('debug')('Franz:feature:announcements:api'); |
6 | 6 | ||
diff --git a/src/features/apiBase.js b/src/features/apiBase.js index 961414668..d4b092995 100644 --- a/src/features/apiBase.js +++ b/src/features/apiBase.js | |||
@@ -2,7 +2,8 @@ | |||
2 | * Get API base URL from store | 2 | * Get API base URL from store |
3 | */ | 3 | */ |
4 | import { | 4 | import { |
5 | API_VERSION | 5 | API_VERSION, |
6 | API, | ||
6 | } from '../environment'; | 7 | } from '../environment'; |
7 | 8 | ||
8 | const apiBase = () => { | 9 | const apiBase = () => { |
@@ -15,10 +16,10 @@ const apiBase = () => { | |||
15 | url = window.ferdi.stores.settings.all.app.server; | 16 | url = window.ferdi.stores.settings.all.app.server; |
16 | } else { | 17 | } else { |
17 | // Use default server url | 18 | // Use default server url |
18 | url = SERVER_URL; | 19 | url = API; |
19 | } | 20 | } |
20 | 21 | ||
21 | return `${url}/${API_VERSION}`; | 22 | return `${url}/${API_VERSION}`; |
22 | } | 23 | }; |
23 | 24 | ||
24 | export default apiBase \ No newline at end of file | 25 | export default apiBase; |
diff --git a/src/features/workspaces/api.js b/src/features/workspaces/api.js index ff0e54a7a..81fd6b65d 100644 --- a/src/features/workspaces/api.js +++ b/src/features/workspaces/api.js | |||
@@ -2,7 +2,7 @@ import { pick } from 'lodash'; | |||
2 | import { sendAuthRequest } from '../../api/utils/auth'; | 2 | import { sendAuthRequest } from '../../api/utils/auth'; |
3 | import Request from '../../stores/lib/Request'; | 3 | import Request from '../../stores/lib/Request'; |
4 | import Workspace from './models/Workspace'; | 4 | import Workspace from './models/Workspace'; |
5 | import apiBase from '../apiBase' | 5 | import apiBase from '../apiBase'; |
6 | 6 | ||
7 | const debug = require('debug')('Franz:feature:workspaces:api'); | 7 | const debug = require('debug')('Franz:feature:workspaces:api'); |
8 | 8 | ||