Merge pull request Zeukkari#11 from petre2dor/master

Moved FrameController(server) in client
TaijaQ · Nov 8, 2015 · e1b5150 · e1b5150
2 parents 234954c + cce0477
commit e1b5150
Show file tree

Hide file tree

Showing 6 changed files with 347 additions and 39 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
 lib/
 node_modules/
 build/
-npm-debug.log
+npm-debug.log
+output_old/
+output/
diff --git a/server/etc/config.yml → client/etc/config-server.yml b/server/etc/config.yml → client/etc/config-server.yml
diff --git a/client/index.html b/client/index.html
@@ -2,6 +2,7 @@
 <html>
     <head>
         <title>Leapgim</title>
+        <script src="lib/FrameController.js"></script>
         <script src="lib/FeedbackController.js"></script>
         <script src="lib/ActionController.js"></script>
         <script src="lib/GestureController.js"></script>

diff --git a/client/index.js b/client/index.js
@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require('./lib/FrameController');
diff --git a/client/package.json b/client/package.json
@@ -1,39 +1,94 @@
 {
-  "name": "leapgim-client",
-  "author": "Petre Tudor, Timo Aho",
-  "license": "GPL-3.0",
-  "description": "Leap Motion gesture input mapper",
-  "main": "index.html",
-  "node-remote": "127.0.0.1",
-  "scripts": {
-    "nw-gyp": "nw-gyp/bin/nw-gyp.js",
-    "coffee": "node_modules/coffee-script/bin/coffee",
-    "rebuild-robotjs": "( cd node_modules/robotjs && nw-gyp configure rebuild --target=0.12.3 )",
-    "rebuild-zmq": "( cd node_modules/zmq && nw-gyp configure rebuild --target=0.12.3 )",
-    "install": "npm run rebuild-zmq && npm run rebuild-robotjs",
-    "postinstall": "npm run build",
-    "build": "coffee -co lib src/*.coffee",
-    "nw": "node_modules/nw/bin/nw",
-    "start": "npm run build && nw ."
-  },
-  "dependencies": {
-    "coffee-script": "~1.10.0",
-    "exec-sh": "^0.2.0",
-    "nw": "^0.12.3",
-    "robotjs": "^0.3.1",
-    "yamljs": "^0.2.4",
-    "zmq": "^2.13.0"
-  },
-  "devDependencies": {
-    "gulp": "^3.9.0",
-    "gulp-coffee": "^2.3.1",
-    "gulp-sourcemaps": "^1.6.0",
-    "gulp-util": "^3.0.7",
-    "nw-gyp": "^0.12.3"
-  },
-  "repository": {
-
-    "type": "git",
-    "url": "https://github.com/Zeukkari/leapgim.git"
-  }
-}
+    "app_name": "leapgim", 
+    "nodejs": true, 
+    "additional_trust_anchors": [
+        ""
+    ], 
+    "inject-js-end": "", 
+    "node-remote": "127.0.0.1", 
+    "keywords": [], 
+    "devDependencies": {
+        "gulp": "^3.9.0", 
+        "nw-gyp": "^0.12.3", 
+        "gulp-util": "^3.0.7", 
+        "gulp-sourcemaps": "^1.6.0", 
+        "gulp-coffee": "^2.3.1"
+    }, 
+    "author": "Petre Tudor, Timo Aho", 
+    "user-agent": "", 
+    "window": {
+        "fullscreen": false, 
+        "resizable": false, 
+        "show": true, 
+        "always-on-top": false, 
+        "frame": true, 
+        "title": "leapgim", 
+        "kiosk": false, 
+        "kiosk_emulation": false, 
+        "exe_icon": "", 
+        "visible": true, 
+        "transparent": false, 
+        "as_desktop": false, 
+        "width": 640, 
+        "position": "", 
+        "show_in_taskbar": true, 
+        "height": 480, 
+        "mac_icon": "", 
+        "toolbar": false, 
+        "icon": ""
+    }, 
+    "version": "0.1.0", 
+    "inject-js-start": "", 
+    "main": "index.html", 
+    "chromium-args": "", 
+    "webexe_settings": {
+        "linux-x32": false, 
+        "export_dir": "output", 
+        "windows-x64": false, 
+        "uncompressed_folder": false, 
+        "download_dir": "/home/petre/.local/share/Web2Executable/files/downloads", 
+        "nw_compression_level": 9, 
+        "mac-x32": false, 
+        "windows-x32": false, 
+        "mac-x64": true, 
+        "nw_version": "0.12.3", 
+        "force_download": false, 
+        "linux-x64": false
+    }, 
+    "description": "Leap Motion gesture input mapper", 
+    "repository": {
+        "url": "https://github.com/Zeukkari/leapgim.git", 
+        "type": "git"
+    }, 
+    "dependencies": {
+        "coffee-script": "~1.10.0", 
+        "robotjs": "^0.3.1", 
+        "yamljs": "^0.2.4", 
+        "leapjs": "~0.6.4", 
+        "exec-sh": "^0.2.0", 
+        "zmq": "^2.13.0", 
+        "nw": "^0.12.3"
+    }, 
+    "scripts": {
+        "coffee": "node_modules/coffee-script/bin/coffee", 
+        "postinstall": "npm run build", 
+        "nw-gyp": "nw-gyp/bin/nw-gyp.js", 
+        "start": "npm run build && nw .", 
+        "rebuild-robotjs": "( cd node_modules/robotjs && nw-gyp configure rebuild --target=0.12.3 )", 
+        "build": "coffee -co lib src/*.coffee", 
+        "install": "npm run rebuild-zmq && npm run rebuild-robotjs", 
+        "rebuild-zmq": "( cd node_modules/zmq && nw-gyp configure rebuild --target=0.12.3 )", 
+        "nw": "node_modules/nw/bin/nw"
+    }, 
+    "webkit": {
+        "page-cache": false, 
+        "java": false, 
+        "plugin": false
+    }, 
+    "js-flags": "", 
+    "name": "leapgim", 
+    "license": "GPL-3.0", 
+    "single-instance": true, 
+    "snapshot": "", 
+    "node-main": ""
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/usr/bin/env node

		require('./lib/FrameController');