diff --git a/brainstorm.js b/brainstorm.js new file mode 100644 index 0000000..9527ebe --- /dev/null +++ b/brainstorm.js @@ -0,0 +1,27 @@ +//Server side brainstorm. + +module.exports = function(app, sequelize) { + var io = require('socket.io')(app); + + io.on('connection', function(socket) { + //TODO: Handle new connections. + + //socket.emit("name", {param: 'value'}); + + //socket.on("name", function(data) {}); + socket.on("query", function(params) { + var model = sequelize.models[params.class]; + + if(model) { + + } + else { + + } + }); + + socket.on('disconnect', function() { + //TODO: ? + }); + }); +}; \ No newline at end of file diff --git a/downloaded tools/bootstrap-switch-master.zip b/downloaded tools/bootstrap-switch-master.zip new file mode 100644 index 0000000..d2bc2ef Binary files /dev/null and b/downloaded tools/bootstrap-switch-master.zip differ diff --git a/downloaded tools/bootstrap-toggle-master.zip b/downloaded tools/bootstrap-toggle-master.zip new file mode 100644 index 0000000..bd2715b Binary files /dev/null and b/downloaded tools/bootstrap-toggle-master.zip differ diff --git a/package.json b/package.json index ecf090d..94db093 100644 --- a/package.json +++ b/package.json @@ -1,38 +1,39 @@ { - "name": "PetitTeton", - "version": "1.0.0", - "private": true, - "scripts": { - "1. start": "node server.js", - "3. update-db": "sequelize db:migrate", - "4. create-db-migration": "sequelize migration:create", - "2. install": "npm install" - }, - "dependencies": { - "bcrypt-nodejs": "^0.0.3", - "bluebird": "^3.4.0", - "body-parser": "^1.15.1", - "connect-flash": "^0.1.1", - "cookie-parser": "~1.3.3", - "debug": "~2.1.1", - "ejs": "~2.4.1", - "express": "~4.11.1", - "express-session": "~1.0.4", - "html": "latest", - "method-override": "~1.0.2", - "moment": "latest", - "morgan": "~1.5.1", - "node-phantom": "latest", - "nodemailer": "~1.0", - "passport": "^0.3.2", - "passport-local": "^1.0.0", - "pg": "^4.4.3", - "pg-hstore": "^2.3.2", - "sequelize": "^3.0", - "sequelize-cli": "^2.4.0", - "serve-favicon": "~2.2.0", - "session-file-store": "~0.0.24", - "stylus": "~0.42.3", - "swig": "~1.4.2" - } + "name": "PetitTeton", + "version": "1.0.0", + "private": true, + "scripts": { + "1. start": "node server.js", + "3. update-db": "sequelize db:migrate", + "4. create-db-migration": "sequelize migration:create", + "2. install": "npm install" + }, + "dependencies": { + "bcrypt-nodejs": "^0.0.3", + "bluebird": "^3.4.0", + "body-parser": "^1.15.1", + "connect-flash": "^0.1.1", + "cookie-parser": "~1.3.3", + "debug": "~2.1.1", + "ejs": "~2.4.1", + "express": "~4.11.1", + "express-session": "~1.0.4", + "html": "latest", + "method-override": "~1.0.2", + "moment": "latest", + "morgan": "~1.5.1", + "node-phantom": "latest", + "nodemailer": "~1.0", + "passport": "^0.3.2", + "passport-local": "^1.0.0", + "pg": "^4.4.3", + "pg-hstore": "^2.3.2", + "sequelize": "^3.0", + "sequelize-cli": "^2.4.0", + "serve-favicon": "~2.2.0", + "session-file-store": "~0.0.24", + "stylus": "~0.42.3", + "swig": "~1.4.2", + "socket.io": "^1.4.8" + } } diff --git a/public/admin/Venues.html b/public/admin/Venues.html index 20e90d4..2e9d592 100644 --- a/public/admin/Venues.html +++ b/public/admin/Venues.html @@ -98,16 +98,16 @@ dataTable.refresh(); //---- Create Dialog ---- - $("#createButton").on("click", function(event) { - $("#createDialog").modal(); + $("#venues #createButton").on("click", function(event) { + $("#venues #createDialog").modal(); }); - $("#createDialog_CreateButton").on("click", function(event) { + $("#venues #createDialog_CreateButton").on("click", function(event) { try { $.post("/admin/venues/create", { - name: $("#createDialog_NameField").val() + name: $("#venues #createDialog_NameField").val() }, function(data) { if(data.result == "success") { - $("#createDialog").modal("hide"); + $("#venues #createDialog").modal("hide"); dataTable.refresh(); } else { @@ -118,24 +118,24 @@ alert(e); } }); - $("#createDialog").on('shown.bs.modal', function() { + $("#venues #createDialog").on('shown.bs.modal', function() { $('#createDialog_NameField').focus(); }); //---------------------------- //---- Delete Dialog ---- - $("#deleteButton").on("click", function(event) { + $("#venues #deleteButton").on("click", function(event) { //debugger; if(dataTable.getSelectedRow() != null) { - $("#deleteDialog_NameField").html(dataTable.getSelectedRow().data("model").name); - $("#deleteDialog").modal(); + $("#venues #deleteDialog_NameField").html(dataTable.getSelectedRow().data("model").name); + $("#venues #deleteDialog").modal(); } }); - $("#deleteDialog_DeleteButton").on("click", function(event) { + $("#venues #deleteDialog_DeleteButton").on("click", function(event) { if(dataTable.getSelectedRow() != null) { $.post("/admin/venues/delete", {id: dataTable.getSelectedRow().data("model").id}, function(data) { if(data.result == "success") { - $("#deleteDialog").modal("hide"); + $("#venues #deleteDialog").modal("hide"); dataTable.refresh(); } else { @@ -147,21 +147,21 @@ //----------------------------- //----- Edit Dialog ---- - $("#editButton").on("click", function(event) { + $("#venues #editButton").on("click", function(event) { //debugger; if(dataTable.getSelectedRow() != null) { $('#editDialog_NameField').val(dataTable.getSelectedRow().data("model").name); - $("#editDialog").modal(); + $("#venues #editDialog").modal(); } }); - $("#editDialog_SaveButton").on("click", function(event) { + $("#venues #editDialog_SaveButton").on("click", function(event) { if(dataTable.getSelectedRow() != null) { $.post("/admin/venues/edit", { id: dataTable.getSelectedRow().data("model").id, - name: $("#editDialog_NameField").val() + name: $("#venues #editDialog_NameField").val() }, function(data) { if(data.result == "success") { - $("#editDialog").modal("hide"); + $("#venues #editDialog").modal("hide"); dataTable.refresh(); } else { @@ -170,7 +170,7 @@ }, "json"); } }); - $("#editDialog").on('shown.bs.modal', function() { + $("#venues #editDialog").on('shown.bs.modal', function() { $('#editDialog_NameField').focus().select(); }); //--------------------- diff --git a/public/admin/categories.html b/public/admin/categories.html index c57b552..781eb08 100644 --- a/public/admin/categories.html +++ b/public/admin/categories.html @@ -97,16 +97,16 @@ dataTable.refresh(); //---- Create Dialog ---- - $("#createButton").on("click", function(event) { - $("#createDialog").modal(); + $("#categories #createButton").on("click", function(event) { + $("#categories #createDialog").modal(); }); - $("#createDialog_CreateButton").on("click", function(event) { + $("#categories #createDialog_CreateButton").on("click", function(event) { try { $.post("/admin/categories/create", { - name: $("#createDialog_NameField").val() + name: $("#categories #createDialog_NameField").val() }, function(data) { if(data.result == "success") { - $("#createDialog").modal("hide"); + $("#categories #createDialog").modal("hide"); dataTable.refresh(); } else { @@ -117,24 +117,24 @@ alert(e); } }); - $("#createDialog").on('shown.bs.modal', function() { + $("#categories #createDialog").on('shown.bs.modal', function() { $('#createDialog_NameField').focus(); }); //---------------------------- //---- Delete Dialog ---- - $("#deleteButton").on("click", function(event) { + $("#categories #deleteButton").on("click", function(event) { //debugger; if(dataTable.getSelectedRow() != null) { - $("#deleteDialog_NameField").html(dataTable.getSelectedRow().data("model").name); - $("#deleteDialog").modal(); + $("#categories #deleteDialog_NameField").html(dataTable.getSelectedRow().data("model").name); + $("#categories #deleteDialog").modal(); } }); - $("#deleteDialog_DeleteButton").on("click", function(event) { + $("#categories #deleteDialog_DeleteButton").on("click", function(event) { if(dataTable.getSelectedRow() != null) { $.post("/admin/categories/delete", {id: dataTable.getSelectedRow().data("model").id}, function(data) { if(data.result == "success") { - $("#deleteDialog").modal("hide"); + $("#categories #deleteDialog").modal("hide"); dataTable.refresh(); } else { @@ -146,21 +146,21 @@ //----------------------------- //----- Edit Dialog ---- - $("#editButton").on("click", function(event) { + $("#categories #editButton").on("click", function(event) { //debugger; if(dataTable.getSelectedRow() != null) { $('#editDialog_NameField').val(dataTable.getSelectedRow().data("model").name); - $("#editDialog").modal(); + $("#categories #editDialog").modal(); } }); - $("#editDialog_SaveButton").on("click", function(event) { + $("#categories #editDialog_SaveButton").on("click", function(event) { if(dataTable.getSelectedRow() != null) { $.post("/admin/categories/edit", { id: dataTable.getSelectedRow().data("model").id, - name: $("#editDialog_NameField").val() + name: $("#categories #editDialog_NameField").val() }, function(data) { if(data.result == "success") { - $("#editDialog").modal("hide"); + $("#categories #editDialog").modal("hide"); dataTable.refresh(); } else { @@ -169,7 +169,7 @@ }, "json"); } }); - $("#editDialog").on('shown.bs.modal', function() { + $("#categories #editDialog").on('shown.bs.modal', function() { $('#editDialog_NameField').focus().select(); }); //--------------------- diff --git a/public/admin/index.ejs b/public/admin/index.ejs index 642a3d1..8e44700 100644 --- a/public/admin/index.ejs +++ b/public/admin/index.ejs @@ -33,8 +33,12 @@ + + + +