From 211da757666a6f9ee89160472e363bcf4732d1c9 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 10 Oct 2014 16:48:26 -0400
Subject: show max 6 projects at a time

---
 public/assets/javascripts/ui/editor/MediaUpload.js | 1 +
 public/assets/stylesheets/app.css                  | 6 +++++-
 server/lib/api/projects.js                         | 4 ++--
 views/home.ejs                                     | 2 --
 views/profile.ejs                                  | 2 --
 views/projects/list-projects.ejs                   | 7 ++++++-
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/public/assets/javascripts/ui/editor/MediaUpload.js b/public/assets/javascripts/ui/editor/MediaUpload.js
index 3f425c3..bab4679 100644
--- a/public/assets/javascripts/ui/editor/MediaUpload.js
+++ b/public/assets/javascripts/ui/editor/MediaUpload.js
@@ -56,6 +56,7 @@ var MediaUpload = UploadView.extend({
 		console.log(media)
 		this.parent.mediaViewer.add(media, this.parent.mediaViewer.$myMedia)
     this.parent.mediaViewer.$deleteMedia.show()
+    this.parent.mediaViewer.$noMedia.hide()
 	},
 	
 	beforeUpload: function(){
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index fc7512a..c90dad4 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -406,6 +406,8 @@ iframe.embed {
 }
 
 .page .viewMore {
+  clear: both; float: none;
+  margin: 20px auto;
   text-decoration: none;
   font-size: 22px;
   display: block;
@@ -1252,7 +1254,9 @@ border-left: 1px solid black;
 .myMedia.inactive {
   opacity:0;
 }
-
+.noMedia {
+  margin: 40px;
+}
 .foundMedia {
   position:absolute;
   top:0;
diff --git a/server/lib/api/projects.js b/server/lib/api/projects.js
index c04f4f6..47e0458 100644
--- a/server/lib/api/projects.js
+++ b/server/lib/api/projects.js
@@ -67,6 +67,8 @@ var projects = {
 			return docs.create(req, res)
 		}
 
+    var data = util.cleanQuery(req.body)
+
     if (req.files.thumbnail) {
       upload.put("projects", req.files.thumbnail, {
         unacceptable: function(err){
@@ -86,8 +88,6 @@ var projects = {
 			Project.findOne({ _id: _id }, function(err, doc){
 				if (err || ! doc) { return res.json({ error: err }) }
 
-        var data = util.cleanQuery(req.body)
-
         // data.user_id = req.user._id
         data.name = util.sanitize(data.name)
         if (data.name != doc.name) {
diff --git a/views/home.ejs b/views/home.ejs
index 16b00e7..8910070 100755
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -65,8 +65,6 @@
 
 	[[ include projects/list-projects ]]
 
-	<a href="#loadmore" class="viewMore btn">View More</a>
-
 	[[ include partials/confirm-modal ]]	
 	[[ include projects/layouts-modal ]]	
 	[[ include partials/sign-in ]]
diff --git a/views/profile.ejs b/views/profile.ejs
index 2909fb8..1be0702 100644
--- a/views/profile.ejs
+++ b/views/profile.ejs
@@ -49,8 +49,6 @@
 		<h1>[[- profile.username ]] has [[- projects.length ]] project[[- projects.length != 1 ? "s" : "" ]]</h1>
 	
     [[ include projects/list-projects ]]
-
-    <a href="#" class="viewMore btn">view more</a>
   [[ } else { ]]
 	
     <h1>Welcome to VVALLS</h1>
diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs
index 9dbd7d2..eb66449 100644
--- a/views/projects/list-projects.ejs
+++ b/views/projects/list-projects.ejs
@@ -3,7 +3,7 @@
 	<div class="projectList">
 
 		[[ projects.forEach(function(project, i) { ]]
-
+		  [[ if (i > 5) { return } ]]
       [[ if (String(user._id) == String(project.user_id)) { ]]
       <a href="/project/[[- project.slug ]]/edit" class="projectItem">
       [[ } else { ]]
@@ -30,6 +30,11 @@
 
       </a>
 		[[ }) ]]
+
+    [[ if (projects.length > 6) { ]]
+      <a href="#" class="viewMore btn">view more</a>
+    [[ } ]]
+
 	</div>
 
 [[ } ]]
-- 
cgit v1.2.3-70-g09d2