merge

1 files changed, 26 insertions, 14 deletions

diff --git a/server/index.js b/server/index.js
index 6331ca8..0d85c30 100644
--- a/server/index.js
+++ b/server/index.js
@@ -61,6 +61,7 @@ site.setup = function(){
 	app.use(passport.initialize());
 	app.use(passport.session());
 	app.use(app.router);
+	app.enable('trust proxy')
 	app.get('env') === 'development' && app.use(express.errorHandler());
 
 	// Essential middleware
@@ -78,22 +79,30 @@ site.setup = function(){
 
 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('/logout', auth.logout);
 	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('/auth/usernameTaken', auth.views.usernameTaken);
+	app.post('/auth/usernameTaken', auth.usernameFixed);
+	app.get('/auth/password', auth.views.resetPassword);
+	app.post('/auth/password', auth.resetPassword);
+	app.get('/auth/forgotPassword', views.modal);
+	app.post('/auth/forgotPassword', auth.forgotPassword);
+
 	app.get('/profile', views.profile)
 	app.get('/profile/edit', views.profile)
 	app.get('/profile/:name', views.profile)
 
+	app.get('/about', views.docs);
+	app.get('/about/:name/edit', views.docs);
+	app.get('/about/:name', views.docs);
+
 	app.get('/api/profile', middleware.ensureAuthenticated, api.profile.show)
 	app.put('/api/profile', middleware.ensureAuthenticated, api.profile.update)
 
@@ -112,24 +121,27 @@ site.route = function () {
 	app.get('/project/new', middleware.ensureAuthenticated, views.modal)
 	app.get('/project/new/:layout', middleware.ensureAuthenticated, views.editor)
 	app.get('/project/:slug', middleware.ensureProject, views.editor)
+	app.get('/project/:slug/view', middleware.ensureProject, views.reader)
 
-	app.get('/api/layouts', middleware.ensureAuthenticated, api.layouts.index)
-	app.get('/api/layouts/:slug', middleware.ensureAuthenticated, api.layouts.show)
-	app.post('/api/layouts/new', middleware.ensureAuthenticated, middleware.ensureIsStaff, api.layouts.create)
-	app.post('/api/layouts/edit', middleware.ensureAuthenticated, middleware.ensureIsStaff, api.layouts.update)
-	app.delete('/api/layouts/destroy', middleware.ensureAuthenticated, middleware.ensureIsStaff, api.layouts.destroy)
+	app.get('/api/layout', middleware.ensureAuthenticated, api.layouts.index)
+	app.get('/api/layout/:slug', middleware.ensureAuthenticated, api.layouts.show)
+	app.post('/api/layout/new', middleware.ensureAuthenticated, middleware.ensureIsStaff, api.layouts.create)
+	app.post('/api/layout/edit', middleware.ensureAuthenticated, middleware.ensureIsStaff, api.layouts.update)
+	app.delete('/api/layout/destroy', middleware.ensureAuthenticated, middleware.ensureIsStaff, api.layouts.destroy)
 
-	app.get('/api/projects', middleware.ensureAuthenticated, api.projects.index)
-	app.get('/api/projects/:slug', api.projects.show)
-	app.post('/api/projects/new', middleware.ensureAuthenticated, api.projects.create)
-	app.post('/api/projects/edit', middleware.ensureAuthenticated, api.projects.update)
-	app.delete('/api/projects/destroy', middleware.ensureAuthenticated, api.projects.destroy)
+	app.get('/api/project', middleware.ensureAuthenticated, api.projects.index)
+	app.get('/api/project/:slug', api.projects.show)
+	app.post('/api/project/new', middleware.ensureAuthenticated, api.projects.create)
+	app.post('/api/project/edit', middleware.ensureAuthenticated, api.projects.update)
+	app.delete('/api/project/destroy', middleware.ensureAuthenticated, api.projects.destroy)
 
 	app.get('/api/media/user', middleware.ensureAuthenticated, api.media.user)
 	app.post('/api/media/new', middleware.ensureAuthenticated, api.media.create)
 	app.post('/api/media/upload', middleware.ensureAuthenticated, api.media.upload)
 	app.delete('/api/media/destroy', middleware.ensureAuthenticated, api.media.destroy)
 
+	app.get('/test/*', middleware.ensureAuthenticated, middleware.ensureIsStaff, views.modal)
+
 }