aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/features/announcements/api.js2
-rw-r--r--src/features/apiBase.js9
-rw-r--r--src/features/workspaces/api.js2
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 @@
1import { remote } from 'electron'; 1import { remote } from 'electron';
2import Request from '../../stores/lib/Request'; 2import Request from '../../stores/lib/Request';
3import apiBase from '../apiBase' 3import apiBase from '../apiBase';
4 4
5const debug = require('debug')('Franz:feature:announcements:api'); 5const 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 */
4import { 4import {
5 API_VERSION 5 API_VERSION,
6 API,
6} from '../environment'; 7} from '../environment';
7 8
8const apiBase = () => { 9const 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
24export default apiBase \ No newline at end of file 25export 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';
2import { sendAuthRequest } from '../../api/utils/auth'; 2import { sendAuthRequest } from '../../api/utils/auth';
3import Request from '../../stores/lib/Request'; 3import Request from '../../stores/lib/Request';
4import Workspace from './models/Workspace'; 4import Workspace from './models/Workspace';
5import apiBase from '../apiBase' 5import apiBase from '../apiBase';
6 6
7const debug = require('debug')('Franz:feature:workspaces:api'); 7const debug = require('debug')('Franz:feature:workspaces:api');
8 8