diff options
author | 2019-02-26 15:38:20 +0100 | |
---|---|---|
committer | 2019-02-26 15:38:20 +0100 | |
commit | b5ad31e316c1074cfa6f57f83e262a607eda9d44 (patch) | |
tree | affcfbc28b8892388ab23d97415902edfc682cab /src/config.js | |
parent | finish basic workspace settings (diff) | |
parent | remove unused packages (diff) | |
download | ferdium-app-b5ad31e316c1074cfa6f57f83e262a607eda9d44.tar.gz ferdium-app-b5ad31e316c1074cfa6f57f83e262a607eda9d44.tar.zst ferdium-app-b5ad31e316c1074cfa6f57f83e262a607eda9d44.zip |
fixes merge conflicts with latest develop
Diffstat (limited to 'src/config.js')
-rw-r--r-- | src/config.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/config.js b/src/config.js index b11952520..30a5a5cc0 100644 --- a/src/config.js +++ b/src/config.js | |||
@@ -1,13 +1,14 @@ | |||
1 | import electron from 'electron'; | 1 | import electron from 'electron'; |
2 | import path from 'path'; | 2 | import path from 'path'; |
3 | import isDevMode from 'electron-is-dev'; | 3 | import isDevMode from 'electron-is-dev'; |
4 | import ms from 'ms'; | ||
4 | 5 | ||
5 | import { asarPath } from './helpers/asar-helpers'; | 6 | import { asarPath } from './helpers/asar-helpers'; |
6 | 7 | ||
7 | const app = process.type === 'renderer' ? electron.remote.app : electron.app; | 8 | const app = process.type === 'renderer' ? electron.remote.app : electron.app; |
8 | const systemPreferences = process.type === 'renderer' ? electron.remote.systemPreferences : electron.systemPreferences; | 9 | const systemPreferences = process.type === 'renderer' ? electron.remote.systemPreferences : electron.systemPreferences; |
9 | 10 | ||
10 | export const CHECK_INTERVAL = 1000 * 3600; // How often should we perform checks | 11 | export const CHECK_INTERVAL = ms('1h'); // How often should we perform checks |
11 | export const LOCAL_API = 'http://localhost:3000'; | 12 | export const LOCAL_API = 'http://localhost:3000'; |
12 | export const DEV_API = 'https://dev.franzinfra.com'; | 13 | export const DEV_API = 'https://dev.franzinfra.com'; |
13 | export const LIVE_API = 'https://api.franzinfra.com'; | 14 | export const LIVE_API = 'https://api.franzinfra.com'; |
@@ -35,8 +36,8 @@ export const DEFAULT_FEATURES_CONFIG = { | |||
35 | isSpellcheckerPremiumFeature: false, | 36 | isSpellcheckerPremiumFeature: false, |
36 | needToWaitToProceed: false, | 37 | needToWaitToProceed: false, |
37 | needToWaitToProceedConfig: { | 38 | needToWaitToProceedConfig: { |
38 | delayOffset: 3600000, | 39 | delayOffset: ms('1h'), |
39 | wait: 10000, | 40 | wait: ms('10s'), |
40 | }, | 41 | }, |
41 | isServiceProxyEnabled: false, | 42 | isServiceProxyEnabled: false, |
42 | isServiceProxyPremiumFeature: true, | 43 | isServiceProxyPremiumFeature: true, |