merge

2 files changed, 20 insertions, 3 deletions

diff --git a/server/lib/middleware.js b/server/lib/middleware.js
index 0bf16ce..870451a 100644
--- a/server/lib/middleware.js
+++ b/server/lib/middleware.js
@@ -40,10 +40,15 @@ var middleware = {
 		res.locals.user = req.user || { _id: undefined }
 		res.locals.config = config
 		res.locals.profile = null
+    res.locals.ogImage = ""
+    res.locals.ogTitle = "Vvalls"
+    res.locals.ogUrl = "http://vvalls.com/"
+    res.locals.ogDescription = "3D gallery space, fully customizable"
+    res.locals.ogAuthor = "Vvalls"
 		res.locals.opt = {}
 		next()
 	},
-
+	
 	ensureProject: function (req, res, next) {
 		if (req.params.slug) {
 			Project.findOne({ slug: req.params.slug }, function(err, project){
diff --git a/server/lib/views/index.js b/server/lib/views/index.js
index 5768ace..7ffadb9 100644
--- a/server/lib/views/index.js
+++ b/server/lib/views/index.js
@@ -38,10 +38,12 @@ var views = module.exports = {
 		}
 		else if (req.isOwner || req.isCollaborator || req.isStaff) {
 			res.locals.opt.editing = true
-			res.render('editor')
+			res.render('editor', {
+        ogUrl: "http://vvalls.com/project/" + req.project.slug + "/",
+			})
 		}
 		else {
-			views.reader(req, res)
+			res.redirect("/project/" + req.project.slug + "/")
 		}
 	},
 
@@ -56,6 +58,10 @@ var views = module.exports = {
 				res.redirect('/')
 				return
 			}
+			var ogImage
+			if (req.project.media.length && req.project.media[0].media.type == "image") {
+			  ogImage = req.project.media[0].media.url
+			}
 			res.render('reader', {
 				name: util.sanitize(req.project.name),
 				description: util.sanitize(req.project.description),
@@ -65,6 +71,9 @@ var views = module.exports = {
 				canEdit: req.isOwner || req.isCollaborator,
 				editlink: "/project/" + req.project.slug + "/edit",
 				noui: !! (req.query.noui === '1'),
+				ogTitle: req.project.name,
+        ogUrl: "http://vvalls.com/project/" + req.project.slug + "/",
+        ogImage: ogImage,
 			})
 		})
 	},
@@ -159,6 +168,9 @@ var views = module.exports = {
 			  isOwnProfile: isOwnProfile,
 				profile: user,
 				projects: projects || [],
+				ogTitle: "Vvalls: Profile of " + user.displayName,
+        ogUrl: "http://vvalls.com/profile/" + user.username + "/",
+        ogImage: user.photo,
 			})
 		}
 	},