Merge branch 'master' into refactor-top-bar
This commit is contained in:
commit
842cf22300
|
@ -51,8 +51,6 @@ function createWindow () {
|
|||
backgroundColor: '#fff',
|
||||
width: 960,
|
||||
height: 540,
|
||||
minWidth: 960,
|
||||
minHeight: 540,
|
||||
// useContentSize: true,
|
||||
webPreferences: {
|
||||
nodeIntegration: true,
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
import electron from 'electron'
|
||||
import Datastore from 'nedb'
|
||||
const localDataStorage = '/db'
|
||||
// TODO: Add logic for database when electron is not in use
|
||||
const localDataStorage = electron.remote.app.getPath('userData')
|
||||
|
||||
const settingsDb = new Datastore({
|
||||
filename: localDataStorage + '/settings.db',
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
import electron from 'electron'
|
||||
import Datastore from 'nedb'
|
||||
const localDataStorage = '/db'
|
||||
// TODO: Add logic for database when electron is not in use
|
||||
const localDataStorage = electron.remote.app.getPath('userData')
|
||||
|
||||
const subDb = new Datastore({
|
||||
filename: localDataStorage + '/subscriptions.db',
|
||||
|
|
Loading…
Reference in New Issue