diff options
author | Stefan <stefan@adlk.io> | 2019-06-04 14:26:56 +0200 |
---|---|---|
committer | Stefan <stefan@adlk.io> | 2019-06-04 14:26:56 +0200 |
commit | fd6a1e9ba24c7947af08a30829c860cad4726f67 (patch) | |
tree | 0b6276700ced8d13eaf0a1e3b706a69a5a47b1da /src/config.js | |
parent | fix(Windows): Replace tray icon with high-res version (diff) | |
parent | Merge pull request #1443 from meetfranz/feature/multilingual-announcements (diff) | |
download | ferdium-app-fd6a1e9ba24c7947af08a30829c860cad4726f67.tar.gz ferdium-app-fd6a1e9ba24c7947af08a30829c860cad4726f67.tar.zst ferdium-app-fd6a1e9ba24c7947af08a30829c860cad4726f67.zip |
Merge branch 'develop' of https://github.com/meetfranz/franz into develop
Diffstat (limited to 'src/config.js')
-rw-r--r-- | src/config.js | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/config.js b/src/config.js index 242675762..5bc318545 100644 --- a/src/config.js +++ b/src/config.js | |||
@@ -9,9 +9,21 @@ const app = process.type === 'renderer' ? electron.remote.app : electron.app; | |||
9 | const systemPreferences = process.type === 'renderer' ? electron.remote.systemPreferences : electron.systemPreferences; | 9 | const systemPreferences = process.type === 'renderer' ? electron.remote.systemPreferences : electron.systemPreferences; |
10 | 10 | ||
11 | export const CHECK_INTERVAL = ms('1h'); // How often should we perform checks | 11 | export const CHECK_INTERVAL = ms('1h'); // How often should we perform checks |
12 | |||
12 | export const LOCAL_API = 'http://localhost:3000'; | 13 | export const LOCAL_API = 'http://localhost:3000'; |
13 | export const DEV_API = 'https://dev.franzinfra.com'; | 14 | export const DEV_API = 'https://dev.franzinfra.com'; |
14 | export const LIVE_API = 'https://api.franzinfra.com'; | 15 | export const LIVE_API = 'https://api.franzinfra.com'; |
16 | |||
17 | export const LOCAL_WS_API = 'ws://localhost:3000'; | ||
18 | export const DEV_WS_API = 'wss://dev.franzinfra.com'; | ||
19 | export const LIVE_WS_API = 'wss://api.franzinfra.com'; | ||
20 | |||
21 | export const LOCAL_API_WEBSITE = 'http://localhost:3333'; | ||
22 | export const DEV_API_WEBSITE = 'https://meetfranz.com'; | ||
23 | export const LIVE_API_WEBSITE = 'https://meetfranz.com'; | ||
24 | |||
25 | export const STATS_API = 'https://stats.franzinfra.com'; | ||
26 | |||
15 | export const GA_ID = !isDevMode ? 'UA-74126766-10' : 'UA-74126766-12'; | 27 | export const GA_ID = !isDevMode ? 'UA-74126766-10' : 'UA-74126766-12'; |
16 | 28 | ||
17 | export const DEFAULT_APP_SETTINGS = { | 29 | export const DEFAULT_APP_SETTINGS = { |
@@ -41,6 +53,7 @@ export const DEFAULT_FEATURES_CONFIG = { | |||
41 | }, | 53 | }, |
42 | isServiceProxyEnabled: false, | 54 | isServiceProxyEnabled: false, |
43 | isServiceProxyPremiumFeature: true, | 55 | isServiceProxyPremiumFeature: true, |
56 | isAnnouncementsEnabled: true, | ||
44 | isWorkspacePremiumFeature: true, | 57 | isWorkspacePremiumFeature: true, |
45 | isWorkspaceEnabled: false, | 58 | isWorkspaceEnabled: false, |
46 | }; | 59 | }; |