diff options
author | Stefan Malzner <stefan@adlk.io> | 2019-09-03 16:33:16 +0200 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2019-09-03 16:33:16 +0200 |
commit | a22f18094a64ff9359923c4a91ffbf81769d35f3 (patch) | |
tree | 6294b7332fbc29623d13532d48dd52fdd59de677 /src/environment.js | |
parent | Add CTA for pro upgrade (diff) | |
parent | Merge branch 'feature/todos' into develop (diff) | |
download | ferdium-app-a22f18094a64ff9359923c4a91ffbf81769d35f3.tar.gz ferdium-app-a22f18094a64ff9359923c4a91ffbf81769d35f3.tar.zst ferdium-app-a22f18094a64ff9359923c4a91ffbf81769d35f3.zip |
Merge branch 'develop' into feature/new-pricing
Diffstat (limited to 'src/environment.js')
-rw-r--r-- | src/environment.js | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/src/environment.js b/src/environment.js index 36d505eed..707449e09 100644 --- a/src/environment.js +++ b/src/environment.js | |||
@@ -1,15 +1,18 @@ | |||
1 | import isDev from 'electron-is-dev'; | 1 | import isDev from 'electron-is-dev'; |
2 | 2 | ||
3 | import { | 3 | import { |
4 | // LIVE_API, | 4 | LIVE_API, |
5 | DEV_API, | 5 | DEV_API, |
6 | LOCAL_API, | 6 | LOCAL_API, |
7 | LOCAL_API_WEBSITE, | 7 | LOCAL_API_WEBSITE, |
8 | DEV_API_WEBSITE, | 8 | DEV_API_WEBSITE, |
9 | // LIVE_API_WEBSITE, | 9 | LIVE_API_WEBSITE, |
10 | // LIVE_WS_API, | 10 | LIVE_WS_API, |
11 | LOCAL_WS_API, | 11 | LOCAL_WS_API, |
12 | DEV_WS_API, | 12 | DEV_WS_API, |
13 | LOCAL_TODOS_FRONTEND_URL, | ||
14 | PRODUCTION_TODOS_FRONTEND_URL, | ||
15 | DEVELOPMENT_TODOS_FRONTEND_URL, | ||
13 | } from './config'; | 16 | } from './config'; |
14 | 17 | ||
15 | export const isDevMode = isDev; | 18 | export const isDevMode = isDev; |
@@ -31,25 +34,26 @@ export const cmdKey = isMac ? 'Cmd' : 'Ctrl'; | |||
31 | let api; | 34 | let api; |
32 | let wsApi; | 35 | let wsApi; |
33 | let web; | 36 | let web; |
37 | let todos; | ||
34 | if (!isDevMode || (isDevMode && useLiveAPI)) { | 38 | if (!isDevMode || (isDevMode && useLiveAPI)) { |
35 | // api = LIVE_API; | 39 | api = LIVE_API; |
36 | // wsApi = LIVE_WS_API; | 40 | wsApi = LIVE_WS_API; |
37 | // web = LIVE_API_WEBSITE; | 41 | web = LIVE_API_WEBSITE; |
38 | // TODO: switch back to live API | 42 | todos = PRODUCTION_TODOS_FRONTEND_URL; |
39 | api = DEV_API; | ||
40 | wsApi = DEV_WS_API; | ||
41 | web = DEV_API_WEBSITE; | ||
42 | } else if (isDevMode && useLocalAPI) { | 43 | } else if (isDevMode && useLocalAPI) { |
43 | api = LOCAL_API; | 44 | api = LOCAL_API; |
44 | wsApi = LOCAL_WS_API; | 45 | wsApi = LOCAL_WS_API; |
45 | web = LOCAL_API_WEBSITE; | 46 | web = LOCAL_API_WEBSITE; |
47 | todos = LOCAL_TODOS_FRONTEND_URL; | ||
46 | } else { | 48 | } else { |
47 | api = DEV_API; | 49 | api = DEV_API; |
48 | wsApi = DEV_WS_API; | 50 | wsApi = DEV_WS_API; |
49 | web = DEV_API_WEBSITE; | 51 | web = DEV_API_WEBSITE; |
52 | todos = DEVELOPMENT_TODOS_FRONTEND_URL; | ||
50 | } | 53 | } |
51 | 54 | ||
52 | export const API = api; | 55 | export const API = api; |
53 | export const API_VERSION = 'v1'; | 56 | export const API_VERSION = 'v1'; |
54 | export const WS_API = wsApi; | 57 | export const WS_API = wsApi; |
55 | export const WEBSITE = web; | 58 | export const WEBSITE = web; |
59 | export const TODOS_FRONTEND = todos; | ||