1 files changed, 14 insertions, 4 deletions
diff --git a/bucky/app/index.js b/bucky/app/index.js
index 19435da..63a285d 100644
--- a/bucky/app/index.js
+++ b/bucky/app/index.js
@@ -18,7 +18,11 @@ var upload = require('../util/upload')
 
 var app, server
 
-var federate = require('./federate')
+var federate = require('../util/federate')
+var auth = require('../util/auth.js')
+var middleware = require('../util/middleware.js')
+var api = require('./api.js')
+var pages = require('./pages.js')
 
 var site = module.exports = {}
 site.init = function(){
@@ -50,6 +54,7 @@ site.init = function(){
     saveUninitialized: false,
   }))
 
+  upload.init()
   federate.route(app)
 
   app.use(csurf({
@@ -66,9 +71,13 @@ site.init = function(){
     console.log('Bucky listening at http://' + process.env.HOST_NAME + ':%s', server.address().port)
   })
 
-  upload.init()
+  auth.init()
+
+	app.all('*', middleware.ensureLocals)
 
-  site.route(app)
+  api.route(app)
+  pages.route(app)
+  auth.route(app)
 
   app.set('view engine', 'ejs')
   app.set('views', path.join(__dirname, '../../views'))
@@ -80,4 +89,5 @@ site.init = function(){
   }
 }
 
-site.route = require('./router')
+site.api = require('./api')
+site.pages = require('./pages')