From 1a680725a32ffe9a92f4757314769a0dc58c62ec Mon Sep 17 00:00:00 2001 From: Lukas Bachschwell Date: Tue, 14 Mar 2017 16:02:54 +0100 Subject: [PATCH] unspectacular commit =P --- npm-debug.log | 45 --------------------------------------- package.json | 4 ++-- public/js/back_client.js | 18 ++++++++++++++++ public/js/front_client.js | 6 ++++++ views/admin.hbs | 8 +++++-- views/index.hbs | 4 ++++ 6 files changed, 36 insertions(+), 49 deletions(-) delete mode 100644 npm-debug.log create mode 100644 public/js/back_client.js diff --git a/npm-debug.log b/npm-debug.log deleted file mode 100644 index 00ca549..0000000 --- a/npm-debug.log +++ /dev/null @@ -1,45 +0,0 @@ -0 info it worked if it ends with ok -1 verbose cli [ '/usr/local/bin/node', '/usr/local/bin/npm', 'start' ] -2 info using npm@4.1.2 -3 info using node@v7.1.0 -4 verbose run-script [ 'prestart', 'start', 'poststart' ] -5 info lifecycle uniScore@1.0.0~prestart: uniScore@1.0.0 -6 silly lifecycle uniScore@1.0.0~prestart: no script for prestart, continuing -7 info lifecycle uniScore@1.0.0~start: uniScore@1.0.0 -8 verbose lifecycle uniScore@1.0.0~start: unsafe-perm in lifecycle true -9 verbose lifecycle uniScore@1.0.0~start: PATH: /usr/local/lib/node_modules/npm/bin/node-gyp-bin:/Users/LB/Desktop/z_Projects/uniScore/node_modules/.bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/X11/bin:/usr/local/go/bin:/usr/local/MacGPG2/bin:/Library/TeX/texbin:/Users/LB/.rvm/bin:/Users/LB/pebble-dev/PebbleSDK-3.6/bin:/usr/local/sbin:/Users/LB/Library/Android/sdk/platform-tools:/Users/LB/.meteor:/Users/LB/.rvm/bin:/Users/LB/pebble-dev/PebbleSDK-3.6/bin:/usr/local/sbin:/Users/LB/Library/Android/sdk/platform-tools:/Users/LB/.meteor -10 verbose lifecycle uniScore@1.0.0~start: CWD: /Users/LB/Desktop/z_Projects/uniScore -11 silly lifecycle uniScore@1.0.0~start: Args: [ '-c', 'node ./bin/www' ] -12 silly lifecycle uniScore@1.0.0~start: Returned: code: 1 signal: null -13 info lifecycle uniScore@1.0.0~start: Failed to exec start script -14 verbose stack Error: uniScore@1.0.0 start: `node ./bin/www` -14 verbose stack Exit status 1 -14 verbose stack at EventEmitter. (/usr/local/lib/node_modules/npm/lib/utils/lifecycle.js:279:16) -14 verbose stack at emitTwo (events.js:106:13) -14 verbose stack at EventEmitter.emit (events.js:191:7) -14 verbose stack at ChildProcess. (/usr/local/lib/node_modules/npm/lib/utils/spawn.js:40:14) -14 verbose stack at emitTwo (events.js:106:13) -14 verbose stack at ChildProcess.emit (events.js:191:7) -14 verbose stack at maybeClose (internal/child_process.js:885:16) -14 verbose stack at Process.ChildProcess._handle.onexit (internal/child_process.js:226:5) -15 verbose pkgid uniScore@1.0.0 -16 verbose cwd /Users/LB/Desktop/z_Projects/uniScore -17 error Darwin 16.4.0 -18 error argv "/usr/local/bin/node" "/usr/local/bin/npm" "start" -19 error node v7.1.0 -20 error npm v4.1.2 -21 error code ELIFECYCLE -22 error uniScore@1.0.0 start: `node ./bin/www` -22 error Exit status 1 -23 error Failed at the uniScore@1.0.0 start script 'node ./bin/www'. -23 error Make sure you have the latest version of node.js and npm installed. -23 error If you do, this is most likely a problem with the uniScore package, -23 error not with npm itself. -23 error Tell the author that this fails on your system: -23 error node ./bin/www -23 error You can get information on how to open an issue for this project with: -23 error npm bugs uniScore -23 error Or if that isn't available, you can get their info via: -23 error npm owner ls uniScore -23 error There is likely additional logging output above. -24 verbose exit [ 1, true ] diff --git a/package.json b/package.json index bde708b..7a0cc87 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,6 @@ "version": "1.0.0", "private": true, "scripts": { - "start": "node ./bin/www" }, "dependencies": { "body-parser": "~1.13.2", @@ -14,5 +13,6 @@ "morgan": "~1.6.1", "serve-favicon": "~2.3.0", "socketio": "^1.0.0" - } + }, + "devDependencies": {} } diff --git a/public/js/back_client.js b/public/js/back_client.js new file mode 100644 index 0000000..dedd962 --- /dev/null +++ b/public/js/back_client.js @@ -0,0 +1,18 @@ +// @flow +'use strict'; +// This is the backend client js +let iosocket: object = io.connect(); + +// setup all my handlers +iosocket.on('clientrefresh', () => { + location.reload(); +}); + +iosocket.on('stateChange', () => { + + location.reload(); +}); + +// get my state +let context = 'admin'; +iosocket.emit('loadState',context); diff --git a/public/js/front_client.js b/public/js/front_client.js index 0703576..2abf6ba 100644 --- a/public/js/front_client.js +++ b/public/js/front_client.js @@ -1,4 +1,5 @@ 'use strict'; + let iosocket = io.connect(); // setup all my handlers @@ -14,3 +15,8 @@ iosocket.on('stateChange', () => { // get my state let context = 'main'; iosocket.emit('loadState',context); + + +function createTeam(member1, member2){ + +} diff --git a/views/admin.hbs b/views/admin.hbs index 7913702..ee3364a 100644 --- a/views/admin.hbs +++ b/views/admin.hbs @@ -7,11 +7,15 @@ + + + -

{{title}}

-

Welcome to {{title}}

+

{{Headline}}

+
+
diff --git a/views/index.hbs b/views/index.hbs index 86569b4..1680077 100644 --- a/views/index.hbs +++ b/views/index.hbs @@ -23,5 +23,9 @@ +
+ +
+