tesses50
/
freetube
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into refactor-top-bar

This commit is contained in:
Cadence Ember 2020-03-27 16:22:29 +13:00
parent 01caaf2f34 7283d7fb36
commit 842cf22300
No known key found for this signature in database
GPG Key ID: 128B99B1B74A6412
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/index.js
View File

@ -51,8 +51,6 @@ function createWindow () {
backgroundColor: '#fff', backgroundColor: '#fff',
width: 960, width: 960,
height: 540, height: 540,
minWidth: 960,
minHeight: 540,
// useContentSize: true, // useContentSize: true,
webPreferences: { webPreferences: {
nodeIntegration: true, nodeIntegration: true,

4
src/renderer/store/modules/settings.js
View File

@ -1,5 +1,7 @@
import electron from 'electron'
import Datastore from 'nedb' 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({ const settingsDb = new Datastore({
filename: localDataStorage + '/settings.db', filename: localDataStorage + '/settings.db',

4
src/renderer/store/modules/subscriptions.js
View File

@ -1,5 +1,7 @@
import electron from 'electron'
import Datastore from 'nedb' 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({ const subDb = new Datastore({
filename: localDataStorage + '/subscriptions.db', filename: localDataStorage + '/subscriptions.db',