Merge pull request #21 from poketrax/v0.4.1

V0.4.1

docs/index.md

@@ -5,7 +5,7 @@ PokeTrax is an open source and free to use Pokémon TCG collection management to
    * Monitor price changes 
    * Search for Cards
 ## Downloads
-[![Windows](assets/windows.png)](https://github.com/poketrax/PokeTrax/releases/download/v0.4.0-beta/PokeTrax.Setup.0.4.0.exe)[![MacOS](assets/macos.png)](https://github.com/poketrax/PokeTrax/releases/download/v0.4.0-beta/PokeTrax-0.4.0.dmg)
+[![Windows](assets/windows.png)](https://github.com/poketrax/PokeTrax/releases/download/v0.4.1-beta/PokeTrax.Setup.0.4.1.exe)[![MacOS](assets/macos.png)](https://github.com/poketrax/PokeTrax/releases/download/v0.4.1-beta/PokeTrax-0.4.1.dmg)
 ## Install Instructions:
 
 * **Windows**

package.json

@@ -1,7 +1,7 @@
 {
   "name": "poketrax",
   "productName": "PokeTrax",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "main": "src/main.js",
   "homepage": ".",
   "private": true,

src/database.js

@@ -1,4 +1,5 @@
 const path = require('path')
+const { app } = require('electron');
 const os = require("os");
 const fs = require('fs');
 const compver = require('compare-version');
@@ -14,6 +15,17 @@ const Database = require('better-sqlite3');
 
 /* Print the working directory for the application to get date files */
 const pwd = () => {
+    if (process.env.NODE_ENV === 'development') {
+        return "./"
+    } else if (process.env.NODE_ENV === 'ci-test') {
+        return path.join(process.env.PWD, "/build")
+    } else if (process.env.NODE_ENV === 'test') {
+        return "./test/data"
+    }
+    return app.getPath("appData")
+}
+
+const appPath = () => {
     if (process.env.NODE_ENV === 'development') {
         return "./"
     } else if (process.env.NODE_ENV === 'ci-test') {
@@ -286,6 +298,7 @@ const init = async () => {
     }
 }
 
+module.exports.appPath = appPath
 module.exports.getCollectionDownload = getCollectionDownload
 module.exports.dbStatus = dbStatus
 module.exports.init = init

src/main.js

@@ -9,7 +9,7 @@ let mainWindow;
 
 function createWindow () {
   const startUrl = process.env.ELECTRON_START_URL ||url.format({
-        pathname: path.join(DB.pwd(), './index.html'),
+        pathname: path.join(DB.appPath(), './index.html'),
         protocol: 'file:',
         slashes: true,
       });