sstent/node
1
0
Fork 0
mirror of https://github.com/sstent/node.git synced 2026-01-25 14:42:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

added dynamic tab load

Browse Source
This commit is contained in:
Stuiart Stent
2012-06-12 09:03:14 -04:00
parent 0daf1d451f
commit 2452f7a74a
3 changed files with 49 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/app.js
View File

@@ -61,12 +61,22 @@ io.sockets.on('connection', function(socket) {
console.log('Client connected'); console.log('Client connected');
// socket.on('getactivites', function(data) { // socket.on('getactivites', function(data) {
console.log('getactivites') // console.log('getactivites')
// testcollection.find().toArray(function(err, result) {
// if (err) throw err;
// socket.emit('populateactivities', result);
// });
// });
socket.on('getactivites', function(data) {
console.log('getactivitesoooo')
testcollection.find().toArray(function(err, result) { testcollection.find().toArray(function(err, result) {
if (err) throw err; if (err) throw err;
socket.emit('populateactivities', result); socket.emit('populateactivities', result);
}); });
// }); });
//////////////////////// ////////////////////////
socket.on('addactivity', function(data) { socket.on('addactivity', function(data) {
console.log('addactivity' + JSON.stringify(data)) console.log('addactivity' + JSON.stringify(data))
@@ -90,15 +100,15 @@ io.sockets.on('connection', function(socket) {
}); });
/////////////////// ///////////////////
socket.on('getexercises', function(data) { socket.on('getexercises', function(data) {
console.log('getactivites') console.log('emit exercises')
exercisecollection.find().toArray(function(err, result) { exercisecollection.find().toArray(function(err, result) {
if (err) throw err; if (err) throw err;
socket.emit('populateexercises', result); socket.emit('populateexercises', result);
}); });
}); });
//////////////// ////////////////
socket.on('getexpressotracks', function(data) { socket.on('getexpresso', function(data) {
console.log('getactivites') console.log('emit expresso')
expressocollection.find().toArray(function(err, result) { expressocollection.find().toArray(function(err, result) {
if (err) throw err; if (err) throw err;
socket.emit('populateexpresso', result); socket.emit('populateexpresso', result);

41
app/index.html
View File

@@ -37,7 +37,7 @@
$(document).ready(function() { $(document).ready(function() {
var socket = io.connect(); var socket = io.connect();
socket.emit('populateactivities', 'please'); socket.emit('getactivites', 'please');
socket.on('populateactivities', function(json) { socket.on('populateactivities', function(json) {
console.log('#poulate recieved'); console.log('#poulate recieved');
@@ -69,8 +69,34 @@
// ); // );
$( "#tabs" ).tabs();
$( "#tabs" ).tabs('select' , 0);
//sets buttons to be jquery buttons
$("button").button();
//sets datepickers
$( "#datepicker" ).datepicker();
$( "#tabs" ).bind( "tabsselect", function(event, ui) {
//console.log('index ' + ui.index );
//console.log('tab ' + ui.tab );
//console.log('panel ' + ui.panel );
if (ui.index == 0) {
console.log('send stuff ' + ui.index );
socket.emit('getactivites', 'please');
};
if (ui.index == 2) {
console.log('send stuff ' + ui.index );
socket.emit('getexercises', 'please');
};
if (ui.index == 3) {
console.log('send stuff ' + ui.index );
socket.emit('getexpresso', 'please');
};
});
$('#ActivityList').delegate('a.activitydelete', 'click', function() { $('#ActivityList').delegate('a.activitydelete', 'click', function() {
@@ -111,12 +137,7 @@ $('ul').on('click', '.delete',function() {
}); });
$( "#tabs" ).tabs();
$( "#tabs" ).tabs('select' , 0);
//sets buttons to be jquery buttons
$("button").button();
//sets datepickers
$( "#datepicker" ).datepicker();
$("button").button(); $("button").button();
//adds selectable element //adds selectable element
@@ -172,7 +193,7 @@ $("button").click(function() {
</head> </head>
<body> <body>
<div id="container"> <div id="container">
<div id="logo"><img src="/images/logo.png"/></div> <div id="logo"><H1>Workout Tracker</h1></div>
<div id="display"> <div id="display">
<ul> <ul>
@@ -210,7 +231,7 @@ $("button").click(function() {
<div id="tabs"> <div id="tabs">
<ul> <ul>
<li><a href="#Activities">Activities</a></li> <li><a id="Activities_tab" href="#Activities">Activities</a></li>
<li><a href="#Activity">Add Activity</a></li> <li><a href="#Activity">Add Activity</a></li>
<li><a href="#ExerciseEditor">Edit Exercises</a></li> <li><a href="#ExerciseEditor">Edit Exercises</a></li>
<li><a href="#ExpressoEditor">Edit Expresso Tracks</a></li> <li><a href="#ExpressoEditor">Edit Expresso Tracks</a></li>

3
app/static/stylesheets/style.css
View File

@@ -8,6 +8,7 @@ a {
} }
#container { #container {
width: 90%; width: 90%;
height: 90%;
margin: 0 auto; margin: 0 auto;
padding: 40px 20px; padding: 40px 20px;
background: #fff; background: #fff;
@@ -18,6 +19,8 @@ a {
text-align: center; text-align: center;
} }
#display { #display {
width: 90%;
height: 90%
margin: 20px 0 50px; margin: 20px 0 50px;
} }
label { label {