add assets folder to root to package electron app with icon

kchender · Sep 5, 2020 · da847cc · da847cc
1 parent ad5089c
commit da847cc
Show file tree

Hide file tree

Showing 12 changed files with 3 additions and 7 deletions.
diff --git a/assets/icons/mac/seeqr.icns b/assets/icons/mac/seeqr.icns
diff --git a/assets/icons/png/128x128.png b/assets/icons/png/128x128.png
diff --git a/assets/icons/png/16x16.png b/assets/icons/png/16x16.png
diff --git a/assets/icons/png/256x256.png b/assets/icons/png/256x256.png
diff --git a/assets/icons/png/32x32.png b/assets/icons/png/32x32.png
diff --git a/assets/icons/png/48x48.png b/assets/icons/png/48x48.png
diff --git a/assets/icons/png/64x64.png b/assets/icons/png/64x64.png
diff --git a/assets/icons/win/seeqr.ico b/assets/icons/win/seeqr.ico
diff --git a/database/Dockerfile b/database/Dockerfile
diff --git a/database/docker/busybox/Dockerfile b/database/docker/busybox/Dockerfile
diff --git a/database/docker/postgres/Dockerfile b/database/docker/postgres/Dockerfile
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "main": "./tscToJS/backend/main",
   "scripts": {
     "build": "tsc && webpack",
-    "docker": "cd database && docker-compose up -d",
+    "docker": "docker-compose up -d",
     "start": "concurrently \" cross-env NODE_ENV=production electron --noDevServer . \" \"npm run docker\"",
     "resetContainer": "docker container stop postgres-1 && docker container prune && docker container ls -a",
     "dev": "concurrently \"tsc && cross-env NODE_ENV=development webpack-dev-server --hot\" \"npm run docker\"",
@@ -49,6 +49,7 @@
     "babel-minify-webpack-plugin": "^0.3.1",
     "csp-html-webpack-plugin": "^4.0.0",
     "css-loader": "^3.5.3",
+    "electron": "^9.0.0",
     "electron-devtools-installer": "^3.0.0",
     "electron-packager": "^14.2.1",
     "file-loader": "^6.0.0",
@@ -72,4 +73,4 @@
     "url": "https://github.com/oslabs-beta/SeeQR/issues"
   },
   "homepage": "https://github.com/oslabs-beta/SeeQR"
-}
+}