Merge branch 'electron'

.babelrc

@@ -0,0 +1,4 @@
+{
+    "plugins": [ "transform-es2015-modules-commonjs", "transform-regenerator" ],
+    "presets": [ "react" ]
+}

.bin/build.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+export NODE_ENV=production
+
+rm -R app
+mkdir app
+mkdir app/css
+touch app/css/style.css
+mkdir app/js
+touch app/js/app.js
+
+cp src/app/html/index.html app/index.html
+
+cp -r src/app/images app/images
+
+echo "starting browserify"
+node_modules/.bin/browserify -e src/app/js/index.js -o "app/js/app.js" -t [ babelify ]
+echo "starting node-sass"
+node_modules/.bin/node-sass src/app/css -o app/css
+# echo "starting uglifyjs"
+# node_modules/.bin/uglifyjs -m -c -o app/js/app.js app/js/app.js
+
+cp package.json app/
+node_modules/.bin/babel -o app/index.js src/electron/index.js
+node_modules/.bin/babel -o app/checkVersion.js src/electron/checkVersion.js
+node_modules/.bin/babel -o app/menu.js src/electron/menu.js

.bin/dev.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+export NODE_ENV=develop
+
+rm -R build
+mkdir build
+mkdir build/css
+touch build/css/style.css
+mkdir build/js
+touch build/js/app.js
+
+cp src/app/html/index.html build/index.html
+
+cp -r src/app/images build/images
+
+echo "starting watchify"
+node_modules/.bin/watchify -e src/app/js/index.js -o "build/js/app.js" -d -v -t [ babelify ] &
+echo "starting node-sass"
+node_modules/.bin/node-sass --source-map true src/app/css -o build/css
+node_modules/.bin/node-sass --source-map true -w src/app/css -o build/css &
+echo "starting browser-sync"
+node_modules/.bin/browser-sync start --files "build/css/*.css, build/js/*.js" --server build

.gitignore

@@ -1,5 +1,4 @@
-node_modules
-bower_components
-build/
-src/compiled
-build_app
+node_modules/
+/build/
+/app/
+/electron/

README.md

@@ -5,13 +5,16 @@ certain topic and/or lets you send socket messages to the server
 ---
 
 ##### Install node modules
-`$ npm install`
+`$ yarn install`
 
 ##### Build for development
-`$ npm run dev`
+`$ yarn run dev`
 
-##### build app for chrome
-`$ npm run build`
+##### build app for electron
+* build
+`$ yarn run build`
+* and run electron
+`$ node_modules/.bin/electron .`
 
 ---
 
@@ -36,6 +39,3 @@ start test server by running `node socketTest/index.js`
 
 
 
-
-
-socket.io.js had to be modified to run inside app