From 14a9278b4900dc3b0d683fa4760e77dd8e98d5c0 Mon Sep 17 00:00:00 2001 From: Stuiart Stent Date: Tue, 12 Jun 2012 00:15:52 -0400 Subject: [PATCH] big update - restarted app including jquery --- ninja-store/app.js | 20 ++++++++++---- ninja-store/views/items.jade | 24 ++++++++++++++--- ninja-store/views/layout.jade | 49 ++++++++++++----------------------- 3 files changed, 51 insertions(+), 42 deletions(-) diff --git a/ninja-store/app.js b/ninja-store/app.js index 9352978..4def833 100644 --- a/ninja-store/app.js +++ b/ninja-store/app.js @@ -97,24 +97,34 @@ console.log("Express server listening on port %d in %s mode", app.address().port var io = require('socket.io'); io = io.listen(app); io.configure('development', function(){ - io.set("transports", ["xhr-polling"]); - io.set("polling duration", 10); + //io.set("transports", ["xhr-polling"]); + io.set("transports", ["websocket"]); + //io.set("polling duration", 20); + //io.set("polling timeout", 20); + //io.set("log level", 1); + //io.set('heartbeat timeout', 5); + //io.set('heartbeat interval', 5); }); io.sockets.on('connection', function(socket) { console.log('Client connected'); socket.on('data', function(data) { - console.log("data" + JSON.stringify(data)) + //console.log("data" + JSON.stringify(data)) testcollection.insert(data, function(err, result) { if (err) throw err; - if (result) console.log('Added!' + result); + if (result) console.log('Added!'); + testcollection.find().toArray(function(err, result) { + if (err) throw err; + //console.log('This Is What I Got ' +JSON.stringify(result)); + socket.emit('populate', result); + }); }); }); }); function emitdata(channel,data) { - console.log('This Is What I should Emit ' +JSON.stringify(data)); + console.log('This Is What I should Emit'); io.sockets.on('connection', function (socket) { console.log('This Is What I Emit ' +JSON.stringify(data)); socket.emit(channel, data); diff --git a/ninja-store/views/items.jade b/ninja-store/views/items.jade index 8341404..fe7e194 100644 --- a/ninja-store/views/items.jade +++ b/ninja-store/views/items.jade @@ -11,11 +11,16 @@ div(id='Activity',style='display: none',) form#myForm input(type='submit', id='save', value='Save') + input(type='button', id='cancel', value='Cancel') div(Class='ActivityBlock_T', style='display: none') - input(type='button', class='AddNeut', value='Add note Field', data-field='note_area', data-area='note', data-limit='1') - input(type='button', class='AddNeut', value='Add exercise Field', data-field='exercise_area', data-area='exercise', data-limit='1') - input(type='button', class='RemNeut noterem', value='Remove note Field', data-field='note_area', data-area='note', data-limit='0', disabled='disabled') - input(type='button', class='RemNeut exerciserem', value='Remove exercise Field', data-field='exercise_area', data-area='exercise', data-limit='0', disabled='disabled' ) + input(type='button', class='AddNeut', value='Add Note', data-field='note_area', data-area='note', data-limit='1') + input(type='button', class='AddNeut', value='Add Exercise', data-field='exercise_area', data-area='exercise', data-limit='10') + input(type='button', class='AddNeut', value='Add Run', data-field='run_area', data-area='run', data-limit='5') + input(type='button', class='AddNeut', value='Add Bike', data-field='bike_area', data-area='bike', data-limit='5') + input(type='button', class='RemNeut noterem', value='Remove Note', data-field='note_area', data-area='note', data-limit='0', disabled='disabled') + input(type='button', class='RemNeut exerciserem', value='Remove Exercise', data-field='exercise_area', data-area='exercise', data-limit='0', disabled='disabled' ) + input(type='button', class='RemNeut runrem', value='Remove Run', data-field='exercise_area', data-area='exercise', data-limit='0', disabled='disabled' ) + input(type='button', class='RemNeut bikerem', value='Remove Bike', data-field='exercise_area', data-area='exercise', data-limit='0', disabled='disabled' ) ul(class='activity') li(class='activity', style='display: none') label Activity @@ -32,6 +37,17 @@ input(type='text', name='activity.exercise[i].sets', value='Sets', disabled='disabled', class='numericonly') input(type='text', name='activity.exercise[i].reps', value='Reps', disabled='disabled') input(type='text', name='activity.exercise[i].weight', value='Weight', disabled='disabled') + ul(class='run') + li(class='run_T', style='display: none') + label Run + input(type='text', name='activity.run[i].time', value='Time', disabled='disabled') + input(type='text', name='activity.run[i].distance', value='Distance', disabled='disabled') + input(type='text', name='activity.run[i].location', value='Location', disabled='disabled') + ul(class='bike') + li(class='bike_T', style='display: none') + label Bike + input(type='text', name='activity.bike[i].track', value='Track', disabled='disabled') + input(type='text', name='activity.bike[i].time', value='Time', disabled='disabled', class='numericonly') ul#employees diff --git a/ninja-store/views/layout.jade b/ninja-store/views/layout.jade index 664c45b..c408ed5 100644 --- a/ninja-store/views/layout.jade +++ b/ninja-store/views/layout.jade @@ -13,22 +13,26 @@ html link(rel='stylesheet', href="stylesheets/smoothness/jquery-ui-1.8.20.custom.css") script#movieTemplate1(type="text/x-jsrender"). - {{:activity.name}} - {{:_id}} +

Delete

+ {{:activity.name}} {{:date}} + {{if activity.note}} {{for activity.note}}
{{:name}}
{{/for}} + {{/if}} - {{for activity.exercise}} + {{if activity.exercise}} + {{for activity.exercise}}
{{:name}}{{:sets}}{{:reps}}{{:weight}}
{{/for}} + {{/if}} @@ -37,40 +41,12 @@ html script $(function() { //$( "#datepicker" ).datepicker(); - var socket = io.connect('http://localhost:3000'); + var socket = io.connect(); socket.on('populate', function(json) { + console.log('#poulate recieved'); var content = ""; $('#employees').empty(); - //iterate activities - // $.each (json, function (bb) { - // var activity = json[bb].activity; - // content += '

Activity - '+ bb + '

'; - // if (typeof activity.name !== 'undefined') { - // content += '

Name - '+ activity.name + '

'; - // }; - // if (typeof activity.note !== 'undefined') { - // $.each (activity.note, function (cc) { - // content += '

Note - '+ cc + '

'; - // }); - // }; - // if (typeof activity.exercise !== 'undefined') { - // $.each (activity.exercise, function (cc) { - // content += '

Exercise '+ cc +' - name:' + activity.exercise[cc].name +'

'; - // content += '

Exercise '+ cc +' - sets:' + activity.exercise[cc].sets +'

'; - // content += '

Exercise '+ cc +' - reps:' + activity.exercise[cc].reps +'

'; - // content += '

Exercise '+ cc +' - weight:' + activity.exercise[cc].weight +'

'; - // }); - // }; - - // }); - // $(content).appendTo("#employees"); - // $.templates({ - // titleTemplate: "{{:activity.name}}{{:_id}}", - // detailTemplate: "{{:name}}Released: {{:releaseYear}}director: {{:director}}" - // }); - // content = $.render.titleTemplate( json ); - // $( "#employees" ).html( content ); $( "#employees" ).html( $( "#movieTemplate1" ).render( json ) ); @@ -92,6 +68,7 @@ html $(newElem).find('ul.activity li').children('input').attr('disabled',false); $(newElem).find('ul.activity li').attr('style', 'display: block'); $(newElem).find('input.datefield').datepicker() + $(newElem).find('input.datefield').datepicker('setDate', new Date()) $(newElem).appendTo('form#myForm'); }); @@ -157,6 +134,12 @@ html return false; }); + $('#cancel').click(function() { + $('.ActivityBlock').remove(); + $('#Activity').attr('style', 'display: none'); + + return false; + }); });