Merge branch 'master' of github.com:okfocus/vvalls

1 files changed, 5 insertions, 4 deletions

diff --git a/server/index.js b/server/index.js
index bb242ee..4b628e4 100644
--- a/server/index.js
+++ b/server/index.js
@@ -79,14 +79,11 @@ 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'));
@@ -102,6 +99,10 @@ site.route = function () {
 	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)