From 151be7d4e939509c27d81490001b28812b8d65e1 Mon Sep 17 00:00:00 2001 From: vantezzen Date: Fri, 23 Aug 2019 13:24:15 +0200 Subject: Lint --- src/features/announcements/api.js | 2 +- src/features/apiBase.js | 9 +++++---- 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 @@ import { remote } from 'electron'; import Request from '../../stores/lib/Request'; -import apiBase from '../apiBase' +import apiBase from '../apiBase'; const debug = require('debug')('Franz:feature:announcements:api'); 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 @@ * Get API base URL from store */ import { - API_VERSION + API_VERSION, + API, } from '../environment'; const apiBase = () => { @@ -15,10 +16,10 @@ const apiBase = () => { url = window.ferdi.stores.settings.all.app.server; } else { // Use default server url - url = SERVER_URL; + url = API; } return `${url}/${API_VERSION}`; -} +}; -export default apiBase \ No newline at end of file +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'; import { sendAuthRequest } from '../../api/utils/auth'; import Request from '../../stores/lib/Request'; import Workspace from './models/Workspace'; -import apiBase from '../apiBase' +import apiBase from '../apiBase'; const debug = require('debug')('Franz:feature:workspaces:api'); -- cgit v1.2.3-70-g09d2