From 9fb0fe9b7ef614d2248b00ea2b964205f3453f41 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 10 Jun 2014 12:00:24 -0400 Subject: split up builder functionality --- .../assets/javascripts/ui/builder/BuilderSettings.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 public/assets/javascripts/ui/builder/BuilderSettings.js (limited to 'public/assets/javascripts/ui/builder/BuilderSettings.js') diff --git a/public/assets/javascripts/ui/builder/BuilderSettings.js b/public/assets/javascripts/ui/builder/BuilderSettings.js new file mode 100644 index 0000000..b598a18 --- /dev/null +++ b/public/assets/javascripts/ui/builder/BuilderSettings.js @@ -0,0 +1,18 @@ + + + + +var BuilderSettings = View.extend({ + el: "#builderSettings", + + events: { + }, + + initialize: function(){ + }, + + toggle: function(){ + this.$el.toggleClass("active") + } + +}) -- cgit v1.2.3-70-g09d2 From e400a34e8a06dcb761959ab126db007ba6832a8a Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 10 Jun 2014 13:00:48 -0400 Subject: refactor mongoose connection to avoid warnings --- .../javascripts/ui/builder/BuilderSettings.js | 3 - server/index.js | 176 +++++++++++---------- server/lib/auth.js | 5 +- 3 files changed, 98 insertions(+), 86 deletions(-) (limited to 'public/assets/javascripts/ui/builder/BuilderSettings.js') diff --git a/public/assets/javascripts/ui/builder/BuilderSettings.js b/public/assets/javascripts/ui/builder/BuilderSettings.js index b598a18..ff8a71b 100644 --- a/public/assets/javascripts/ui/builder/BuilderSettings.js +++ b/public/assets/javascripts/ui/builder/BuilderSettings.js @@ -1,7 +1,4 @@ - - - var BuilderSettings = View.extend({ el: "#builderSettings", diff --git a/server/index.js b/server/index.js index 84d9818..21a1859 100644 --- a/server/index.js +++ b/server/index.js @@ -20,87 +20,101 @@ var http = require('http'), // var io = websocket.listen(config.socketPort) -var app = express(); +var app = express() +var SessionStore var DATABASE_URI = process.env.MONGOLAB_URI || ('mongodb://' + config.hostName + '/vvalls') -mongoose.connect(DATABASE_URI); -var SessionStore = new MongoStore({ mongoose_connection: mongoose.connection }) - -// Configure things -app.set('port', config.port); -app.set('views', path.join(__dirname, '../views')); -app.set('view engine', 'ejs'); -app.use(express.static(path.join(__dirname, '../public'))); -app.use(express.logger('dev')); -app.use(express.json()); -app.use(express.urlencoded()); -app.use(express.cookieParser()); -app.use(express.session({ - key: 'vvalls.sid', - secret: 'flibbertigibbet', - cookie: { domain: '.' + config.hostName, maxAge: 43200000 }, - store: SessionStore -})); -app.use(bodyParser()); -app.use(multer()); -app.use(express.query()); -app.use(express.csrf()); -app.use(express.methodOverride()); -app.use(passport.initialize()); -app.use(passport.session()); -// app.use('/api', middleware.ensureAuthenticated, mers({conn: mongoose.connection}).rest()); -app.use(app.router); -app.get('env') === 'development' && app.use(express.errorHandler()); - - -// Configure user authentication -auth.init() - -// Essential middleware -// app.all('*', middleware.enableCORS); - -app.all('*', middleware.ensureLocals); - -// Initialize views -app.get('/', views.home); -app.get('/about', views.docs); -app.get('/about/:name/edit', views.docs); -app.get('/about/:name', views.docs); -app.get('/login', views.modal); -app.get('/signup', views.modal); -app.post('/auth/signin', auth.loggedInLocal); -app.post('/auth/signup', auth.signup); -app.get('/logout', auth.logout); -app.get('/auth/twitter', auth.login('twitter')); -app.get('/auth/twitter/callback', auth.loggedIn('twitter')); -app.get('/auth/facebook', auth.login('facebook')); -app.get('/auth/facebook/callback', auth.loggedIn('facebook')); -app.get('/profile', views.profile) -app.get('/profile/edit', views.profile) -app.get('/profile/:name', views.profile) - -app.get('/api/profile', middleware.ensureAuthenticated, api.profile.show) -app.put('/api/profile', middleware.ensureAuthenticated, api.profile.update) - -app.get('/project/new', middleware.ensureAuthenticated, views.modal); - -app.get('/staff', middleware.ensureAuthenticated, middleware.ensureIsStaff, views.staff.index); -app.get('/staff/bless', middleware.ensureAuthenticated, views.staff.bless); - -app.get('/api/docs', middleware.ensureAuthenticated, middleware.ensureIsStaff, api.docs.show) -app.post('/api/docs/new', middleware.ensureAuthenticated, middleware.ensureIsStaff, api.docs.create) -app.post('/api/docs/edit', middleware.ensureAuthenticated, middleware.ensureIsStaff, api.docs.update) -app.delete('/api/docs/destroy', middleware.ensureAuthenticated, middleware.ensureIsStaff, api.docs.destroy) - -app.use('/builder', middleware.ensureAuthenticated) -app.get('/builder', views.builder) -app.get('/builder/:name', views.builder) - -/* -auth.initSockets(io) -*/ - -http.createServer(app).listen(app.get('port'), function () { - console.log('Express server listening on port ' + app.get('port')); -}); +// + +var site = {} + +site.init = function(){ + mongoose.connect(DATABASE_URI, {}, site.ready); +} + +site.ready = function(){ + auth.init() + site.setup() + site.route() + site.listen() +} + +site.setup = function(){ + var SessionStore = new MongoStore({ mongoose_connection: mongoose.connection }) + + app.set('port', config.port); + app.set('views', path.join(__dirname, '../views')); + app.set('view engine', 'ejs'); + app.use(express.static(path.join(__dirname, '../public'))); + app.use(express.logger('dev')); + app.use(express.json()); + app.use(express.urlencoded()); + app.use(express.cookieParser()); + app.use(express.session({ + key: 'vvalls.sid', + secret: 'flibbertigibbet', + cookie: { domain: '.' + config.hostName, maxAge: 43200000 }, + store: SessionStore + })); + app.use(bodyParser()); + app.use(multer()); + app.use(express.query()); + app.use(express.csrf()); + app.use(express.methodOverride()); + app.use(passport.initialize()); + app.use(passport.session()); + // app.use('/api', middleware.ensureAuthenticated, mers({conn: mongoose.connection}).rest()); + app.use(app.router); + app.get('env') === 'development' && app.use(express.errorHandler()); + + // Essential middleware + // app.all('*', middleware.enableCORS); + app.all('*', middleware.ensureLocals); + + // auth.initSockets(io, SessionStore) +} + +site.route = function () { + app.get('/', views.home); + app.get('/about', views.docs); + app.get('/about/:name/edit', views.docs); + app.get('/about/:name', views.docs); + app.get('/login', views.modal); + app.get('/signup', views.modal); + app.post('/auth/signin', auth.loggedInLocal); + app.post('/auth/signup', auth.signup); + app.get('/logout', auth.logout); + app.get('/auth/twitter', auth.login('twitter')); + app.get('/auth/twitter/callback', auth.loggedIn('twitter')); + app.get('/auth/facebook', auth.login('facebook')); + app.get('/auth/facebook/callback', auth.loggedIn('facebook')); + app.get('/profile', views.profile) + app.get('/profile/edit', views.profile) + app.get('/profile/:name', views.profile) + + app.get('/api/profile', middleware.ensureAuthenticated, api.profile.show) + app.put('/api/profile', middleware.ensureAuthenticated, api.profile.update) + + app.get('/project/new', middleware.ensureAuthenticated, views.modal); + + app.get('/staff', middleware.ensureAuthenticated, middleware.ensureIsStaff, views.staff.index); + app.get('/staff/bless', middleware.ensureAuthenticated, views.staff.bless); + + app.get('/api/docs', middleware.ensureAuthenticated, middleware.ensureIsStaff, api.docs.show) + app.post('/api/docs/new', middleware.ensureAuthenticated, middleware.ensureIsStaff, api.docs.create) + app.post('/api/docs/edit', middleware.ensureAuthenticated, middleware.ensureIsStaff, api.docs.update) + app.delete('/api/docs/destroy', middleware.ensureAuthenticated, middleware.ensureIsStaff, api.docs.destroy) + + app.use('/builder', middleware.ensureAuthenticated) + app.get('/builder', views.builder) + app.get('/builder/:name', views.builder) +} + +site.listen = function(){ + http.createServer(app).listen(app.get('port'), function () { + console.log('Express server listening on port ' + app.get('port')); + }); +} + +site.init() diff --git a/server/lib/auth.js b/server/lib/auth.js index b710a22..018c9ad 100644 --- a/server/lib/auth.js +++ b/server/lib/auth.js @@ -5,6 +5,7 @@ var passport = require('passport'), TwitterStrategy = require('passport-twitter').Strategy, LocalStrategy = require('passport-local').Strategy, passportSocketIo = require("passport.socketio"), + cookieParser = require('express').cookieParser, crypto = require('crypto'), _ = require('lodash'), util = require('./util'), @@ -33,9 +34,9 @@ var auth = { }, auth.insertFacebookUser)); }, - initSockets: function (io, cookieParser, SessionStore) { + initSockets: function (io, express, SessionStore) { io.set('authorization', passportSocketIo.authorize({ - cookieParser: express.cookieParser, + cookieParser: cookieParser, passport: passport, key: 'vvalls.sid', // the name of the cookie where express/connect stores its session_id secret: 'flibbertigibbet', // the session_secret to parse the cookie -- cgit v1.2.3-70-g09d2 From 08421d8921fcc9842ea70d2e5c6439d1154e6d73 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 10 Jun 2014 16:34:52 -0400 Subject: serialization functions --- public/assets/javascripts/rectangles/_env.js | 24 ++++++------- .../javascripts/rectangles/engine/map/draw.js | 2 ++ .../javascripts/rectangles/engine/rooms/_rooms.js | 42 +++++++++++++++++++++- .../assets/javascripts/rectangles/models/rect.js | 3 ++ .../assets/javascripts/rectangles/models/room.js | 12 +++++-- .../assets/javascripts/rectangles/models/vec2.js | 3 ++ .../javascripts/ui/builder/BuilderSettings.js | 5 +++ 7 files changed, 76 insertions(+), 15 deletions(-) (limited to 'public/assets/javascripts/ui/builder/BuilderSettings.js') diff --git a/public/assets/javascripts/rectangles/_env.js b/public/assets/javascripts/rectangles/_env.js index 86aebdc..46b43a9 100644 --- a/public/assets/javascripts/rectangles/_env.js +++ b/public/assets/javascripts/rectangles/_env.js @@ -22,18 +22,18 @@ environment.init = function(){ map.center.a = 0 map.center.b = 0 - Rooms.add( new Room ({ - rect: new Rect(-500,-500, 500,500), - height: 500, - })) - Rooms.add( new Room ({ - rect: new Rect(600,0, 1100,500), - height: 500, - })) - Rooms.add( new Room ({ - rect: new Rect(450,150, 650,350), - height: 300, - })) +// Rooms.add( new Room ({ +// rect: new Rect(-500,-500, 500,500), +// height: 500, +// })) +// Rooms.add( new Room ({ +// rect: new Rect(600,0, 1100,500), +// height: 500, +// })) +// Rooms.add( new Room ({ +// rect: new Rect(450,150, 650,350), +// height: 300, +// })) app.movements.gravity(true) diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js index f4cb1d2..75e8ad1 100644 --- a/public/assets/javascripts/rectangles/engine/map/draw.js +++ b/public/assets/javascripts/rectangles/engine/map/draw.js @@ -41,6 +41,8 @@ var MapDraw = function(map){ for (var i = 0; i < regions.length; i++) { if (regions[i].dupe) continue ctx.fillStyle = colors[i % colors.length] + ctx.strokeStyle = "#000" + ctx.lineWidth = (1 / map.zoom) fill_region(regions[i]) stroke_sides(regions[i]) } diff --git a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js index efde370..ce1fae7 100644 --- a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js +++ b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js @@ -22,7 +22,7 @@ var Rooms = new function(){ base.add_with_rect = function(rect){ var room = new Room({ rect: rect, - height: quantize(randrange(300,800), 50), + height: 500 // quantize(randrange(300,800), 50), }) base.add(room) } @@ -38,9 +38,49 @@ var Rooms = new function(){ base.forEach = function(f){ return base.values().forEach(f) } + base.map = function(f){ + return base.values().map(f) + } + base.values = function(){ return _.values(base.list) } + + base.serialize = function(){ + var rooms = base.map(function(room){ + return room.serialize() + }) + var rooms_data = { rooms: rooms } + return rooms_data + } + + base.deserialize = function(rooms_data){ + rooms_data.rooms.forEach(function(data){ + var rect = new Rect(data.rect.x[0], data.rect.y[0], data.rect.x[1], data.rect.y[1]) + var room = new Room({ + id: data.id, + rect: rect, + height: data.height + }) + base.add(room) + }) + } + + base.uid = (function(){ + var id = 0 + return function(s){ + s = s || "" + var ss + while (1) { + ss = s + (id++) + if (! (ss in base.list)) { + console.log(ss) + return ss + } + } + } + })() + base.sorted_by_position = function(){ return sort_rooms_by_position( base.values() ) diff --git a/public/assets/javascripts/rectangles/models/rect.js b/public/assets/javascripts/rectangles/models/rect.js index 7a2ac6f..cb14e66 100644 --- a/public/assets/javascripts/rectangles/models/rect.js +++ b/public/assets/javascripts/rectangles/models/rect.js @@ -94,6 +94,9 @@ window.Rect = (function(){ var s = "[" + this.x.toString() + " " + this.y.toString() + "] " + sides return s } + Rect.prototype.serialize = function(){ + return { x: this.x.serialize(), y: this.y.serialize() } + } Rect.prototype.quantize = function(n){ this.x.quantize(n) this.y.quantize(n) diff --git a/public/assets/javascripts/rectangles/models/room.js b/public/assets/javascripts/rectangles/models/room.js index 256889d..d0478b3 100644 --- a/public/assets/javascripts/rectangles/models/room.js +++ b/public/assets/javascripts/rectangles/models/room.js @@ -1,7 +1,7 @@ window.Room = (function(){ var Room = function(opt){ - this.id = opt.id || _.uniqueId("room") + this.id = opt.id || Rooms.uid("room_") this.rect = opt.rect this.regions = [] this.walls = [] @@ -15,7 +15,15 @@ window.Room = (function(){ Room.prototype.toString = function(){ return this.rect.toString() } - + + Room.prototype.serialize = function(){ + return { + id: this.id, + rect: this.rect.serialize(), + height: ~~this.height, + } + } + Room.prototype.reset = function(){ var copy = this.rect.clone() copy.id = this.id diff --git a/public/assets/javascripts/rectangles/models/vec2.js b/public/assets/javascripts/rectangles/models/vec2.js index 9b0447c..e56a010 100644 --- a/public/assets/javascripts/rectangles/models/vec2.js +++ b/public/assets/javascripts/rectangles/models/vec2.js @@ -91,6 +91,9 @@ vec2.prototype.intersection = function(v){ vec2.prototype.toString = function(){ return "[" + ~~this.a + " " + ~~this.b + "]" } +vec2.prototype.serialize = function(){ + return [ ~~this.a, ~~this.b ] +} vec2.prototype.quantize = function(n){ n = n || 10 this.a = quantize(this.a, n) diff --git a/public/assets/javascripts/ui/builder/BuilderSettings.js b/public/assets/javascripts/ui/builder/BuilderSettings.js index ff8a71b..004c1c4 100644 --- a/public/assets/javascripts/ui/builder/BuilderSettings.js +++ b/public/assets/javascripts/ui/builder/BuilderSettings.js @@ -10,6 +10,11 @@ var BuilderSettings = View.extend({ toggle: function(){ this.$el.toggleClass("active") + }, + + save: function(){ + var data = Rooms.serialize() + console.log(data) } }) -- cgit v1.2.3-70-g09d2