merge

3 files changed, 6 insertions, 3 deletions

diff --git a/server/index.js b/server/index.js
index ad437ff..e6afdb8 100644
--- a/server/index.js
+++ b/server/index.js
@@ -120,8 +120,9 @@ site.route = function () {
 	app.get('/project', middleware.ensureAuthenticated, views.modal)
 	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', middleware.ensureProject, views.reader)
 	app.get('/project/:slug/view', middleware.ensureProject, views.reader)
+	app.get('/project/:slug/edit', middleware.ensureProject, views.editor)
 
 	app.get('/api/layout', middleware.ensureAuthenticated, api.layouts.index)
 	app.get('/api/layout/:slug', middleware.ensureAuthenticated, api.layouts.show)
diff --git a/server/lib/middleware.js b/server/lib/middleware.js
index aec54ad..27b9c04 100644
--- a/server/lib/middleware.js
+++ b/server/lib/middleware.js
@@ -36,7 +36,7 @@ var middleware = {
 	ensureLocals: function (req, res, next) {
 		res.locals.token = req.csrfToken();
 		res.locals.logged_in = req.isAuthenticated()
-		res.locals.user = req.user || {}
+		res.locals.user = req.user || { id: undefined }
 		res.locals.config = config
 		res.locals.profile = null
 		res.locals.opt = {}
diff --git a/server/lib/views.js b/server/lib/views.js
index 81e2ced..b776582 100644
--- a/server/lib/views.js
+++ b/server/lib/views.js
@@ -36,6 +36,7 @@ views.editor = function (req, res) {
 				date: moment(req.project.updated_at).format("M/DD/YYYY"),
 				author: user.displayName,
 				authorlink: "/profile/" + user.username,
+				noui: !! (req.query.noui === '1'),
 			})
 		})
 	}
@@ -45,7 +46,7 @@ views.editor = function (req, res) {
 }
 
 views.reader = function (req, res) {
-	if (! req.user && ! req.project) {
+	if (! req.project) {
 		res.redirect('/')
 	}
 	User.findOne({ _id: req.project.user_id }, function(err, user) {
@@ -60,6 +61,7 @@ views.reader = function (req, res) {
 			date: moment(req.project.updated_at).format("M/DD/YYYY"),
 			author: user.displayName,
 			authorlink: "/profile/" + user.username,
+			noui: !! (req.query.noui === '1'),
 		})
 	})
 }