Revert 2-package.json-structure (#80)

* Revert "bump electron to 1.4.6"

This reverts commit 7a1b83e.

* Revert "feat(scripts): add && auto rebuild (#78)"

This reverts commit fd88266.

* Revert "future proof rebuild script (#77)"

This reverts commit ad55457.

* Revert "2 package.json structure. closes #75 (#76)"

This reverts commit 82f1649.

* future proof rebuild script (#77)

* feat(scripts): add && auto rebuild (#78)

* bump electron to 1.4.6

.gitignore

@@ -1,5 +1,5 @@
 node_modules
-app/node_modules
-app/public/css/main.css
+public/css/main.css
 .DS_Store
+dmgs
 npm-debug.log

README.md

@@ -11,7 +11,6 @@ WIP desktop app for [dat](https://github.com/maxogden/dat).
 
 ```bash
 $ npm install
-$ (cd app && npm install)
 $ npm run rebuild
 $ npm start
 ```
@@ -42,14 +41,13 @@ There's also the html being generated by [hyperdrive-ui](https://github.com/kari
 ## Directory structure
 
 ```txt
-app/             application files
-  elements/      standalone application-specific elements
-  lib/           generalized components, should be moved out of project later
-  models/        choo models
-  pages/         views that are directly mounted on the router
-  app.js         client side application entry
-  index.js       electron application entry
-scripts/         various scripts used to build and manage the repository
+elements/      standalone application-specific elements
+lib/           generalized components, should be moved out of project later
+models/        choo models
+pages/         views that are directly mounted on the router
+app.js         client side application entry
+index.js       electron application entry
+scripts/       various scripts used to build and manage the repository
 ```
 
 ## FAQ

dist/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

package.json

@@ -5,21 +5,50 @@
   "license": "MIT",
   "repository": "datproject/dat-desktop",
   "description": "Dat Desktop App",
+  "dependencies": {
+    "bulk-require": "^1.0.0",
+    "bytes": "^2.4.0",
+    "bytewise": "^1.1.0",
+    "choo": "^4.0.0-5",
+    "choo-log": "^2.0.1",
+    "collect-stream": "^1.1.1",
+    "dat-design": "^2.0.0",
+    "dat-encoding": "^3.0.0",
+    "electron-default-menu": "^1.0.0",
+    "electron": "1.4.6",
+    "hyperdrive": "^7.3.0",
+    "hyperdrive-archive-swarm": "^3.1.0",
+    "hyperdrive-import-files": "^2.2.0",
+    "insert-css": "^1.0.0",
+    "js-alert": "^1.0.4",
+    "level": "^1.4.0",
+    "level-live-stream": "1.4.11",
+    "minimist": "^1.2.0",
+    "random-access-file": "^1.2.0",
+    "rimraf": "^2.5.2",
+    "sheetify": "^5.1.1",
+    "tachyons": "^4.5.4",
+    "xtend": "^4.0.1",
+    "yo-css": "^1.1.0"
+  },
   "scripts": {
+    "build-app": "electron-packager . Dat --platform=darwin --arch=x64 --out=dist/ --overwrite --extend-info extend.plist --app-bundle-id=com.dat.desktop --icon=public/img/app.icns",
+    "build-dmg": "appdmg dmg.json dist/Dat-$npm_package_version.dmg && rm -Rf dist/Dat-darwin-x64",
+    "deps": "dependency-check package.json app.js",
+    "package": "npm run build-app && npm run build-dmg",
     "rebuild": "./scripts/build rebuild",
-    "clean": "rm -rf node_modules/ && rm -rf app/node_modules/",
+    "clean": "rm -rf node_modules/",
     "build-css": "./scripts/build css",
-    "start": "NODE_ENV=development electron app",
-    "test": "standard app",
-    "postinstall": "./scripts/build postinstall"
+    "start": "NODE_ENV=development electron .",
+    "test": "standard && npm run deps",
+    "postinstall": "./scripts/build postinstall",
+    "watch-css": "nodemon -e scss -x \"npm run build-css\""
   },
   "devDependencies": {
     "appdmg": "^0.4.5",
     "bulkify": "^1.4.2",
-    "dat-design": "^2.0.0",
     "dat-icons": "^1.3.0",
     "dependency-check": "^2.6.0",
-    "electron": "1.4.6",
     "electron-packager": "^7.0.2",
     "node-sass": "^3.8.0",
     "node-sass-magic-importer": "^1.0.1",

scripts/build

@@ -5,7 +5,6 @@ usage () {
 }
 
 rebuild () {
-  cd "./app" || exit 1
   printf '[scripts/build] rebuilding native deps \n'
   electron_version="$(electron --version | sed s/v//)"
   electron_abi="$(electron --abi)"
@@ -26,10 +25,7 @@ build_css () {
 
 postinstall () {
   printf '[scripts/build] installing app deps \n'
-  _currdir="$(pwd)"
-  cd "./app" || exit 1
   npm install
-  cd "$_currdir" || exit 1
   build_css
   rebuild
 }