lots of changes

impronunciable · impronunciable · commit 0ff087447c79 · 2012-08-28T11:34:02.000-03:00
diff --git a/public/js/app.js b/public/js/app.js
@@ -1,13 +1,20 @@
 $(function(){
 
-
-  $('.projects').masonry({
-    itemSelector: '.project',
-    columnWidth: function( containerWidth ) {
-      return containerWidth / 4;
+  $('.projects').isotope({
+    itemSelector: '.project'
+    , animationEngine: 'jquery'
+    , masonry: {
+      columnWidth: 100
+    },  getSortData : {
+      date : function ( $elem ) {
+        return $elem.attr('data-date');
+    }, name : function ( $elem ) {
+        return $elem.attr('data-name');
+    }, contribs : function ( $elem ) {
+        return $elem.attr('data-contribs');
     }
 
-  });
+  }});
 
 $('#newProject').click(function(){if(!window.username.length) window.location="http://hackdash.hhba.info/auth/twitter"; })
 
@@ -62,4 +69,14 @@ $('#newProject').click(function(){if(!window.username.length) window.location="h
   }, function(){
     $(this).css('overflow', 'hidden');
   });
+
+  $('.sort').click(function(){
+    var vid = $(this).attr('id');
+    $('.projects').isotope({'sortBy': vid });
+  });
+
+  twttr.anywhere(function (T) {
+    T('.users a').hovercards({linkify: false});
+  });
+
 });
diff --git a/public/js/isotope.min.js b/public/js/isotope.min.js
diff --git a/public/styles/main.css b/public/styles/main.css
@@ -84,3 +84,8 @@ h3 {
     line-height: 27px;
 }
 
+
+#contribs {
+  margin-top: 10px;
+}
+
diff --git a/public/styles/style.css b/public/styles/style.css
@@ -6,3 +6,4 @@ body {
 a {
   color: #00B7FF;
 }
+
diff --git a/routes/index.js b/routes/index.js
@@ -157,10 +157,10 @@ app.get('/decline/:pid/:uid', function(req, res){
 app.post('/projects/new', isAuth, function(req, res){
   if(req.body.title && req.body.description){
     var hash = Math.floor(Math.random() * 9999999 + 1);
-    console.log(req.body);
     var project = {
         id: hash
       , title: req.body.title
+      , created_at: Date.now()
       , owner_id: req.user.id
       , owner_username: req.user.username
       , description: req.body.description
@@ -214,9 +214,16 @@ app.post('/projects/edit/:id', isAuth, isOwner, function(req, res){
 });
 
 app.get('/projects/remove/:id', isAuth, isOwner, function(req, res){
-  client.del('hhba:projects:' + req.params.id, function(err){
-    res.redirect('/dashboard');
-    search.remove(req.params.id);
+  client.get('hhba:projects:' + req.params.id, function(err, project){
+    project = JSON.parse(project);
+    if(project.contributors.length == 1) {
+      client.del('hhba:projects:' + req.params.id, function(err){
+        res.redirect('/dashboard');
+        search.remove(req.params.id);
+      });
+    } else {
+      res.redirect('/dashboard');
+    }
   });
 });
 
@@ -234,7 +241,7 @@ app.get('/search', function(req, res){
         return !!project;
       });
 	var user = req.user || {'username': ''};
-      res.render('dashboard', {projects: projects, user: user});
+      res.render('dashboard', {projects: projects, user: user, q: req.query.q});
     });
   });
 });
diff --git a/views/dashboard.jade b/views/dashboard.jade
@@ -15,10 +15,15 @@ block content
     .span3.logo
       img(src="/images/logo.png", width="225")
 
-    .span3
+    .span3#sort
+      h3 filtrar
+      button.span4.btn-large.sort.btn#date Fecha
+      button.span4.btn-large.sort.btn#name Nombre
+      button.span8.btn-large.sort.btn#contribs Cant. de usuarios
+      
     .span3
       form.well.form-search(action="/search", method="get")
-        input.input-medium.search-query(type="text", name="q")
+        input.input-medium.search-query(type="text", name="q", value=("undefined" == typeof q) ? '' : q)
         button.btn(type="submit") Buscar
 
     .span3
@@ -30,9 +35,9 @@ block content
           img.span12(src="/images/new-project.png")
        
 
-  .row-fluid.projects
+  .row-fluid.projects#projects
     each project, index in projects
-      .project.well
+      .project.well(data-contribs=project.contributors.length, data-name=project.title, data-date=("undefined" == typeof project.created_at) ? 0 : project.created_at)
         if(user.username == "blejman")
           a(href="/projects/remove/"+project.id, style="float:right") x
         h3.title #{project.title}
diff --git a/views/edit.jade b/views/edit.jade
@@ -19,7 +19,8 @@ form.form-horizontal(action="/projects/edit/" + project.id, method="POST")
   .form-actions
     button.btn.btn-primary(type="submit") Guardar
     button.btn.cancel Cerrar
-    a.btn.btn-danger(href="/projects/remove/" + project.id) Borrar proyecto
+    if(project.contributors.length === 1)
+      a.btn.btn-danger(href="/projects/remove/" + project.id) Borrar proyecto
 
 h3 Usuarios pendientes
 
diff --git a/views/layout.jade b/views/layout.jade
@@ -15,4 +15,5 @@ html
     script(src="/js/jquery.min.js")
     script(src="/js/isotope.min.js")
     script(src="/js/bootstrap.min.js")
+    script(src="http://platform.twitter.com/anywhere.js?id=YOUR_API_KEY&v=1")
     script(src="/js/app.js")

Original file line number	Diff line number	Diff line change
`@@ -84,3 +84,8 @@ h3 {`
`84`	`84`	`line-height: 27px;`
`85`	`85`	`}`
`86`	`86`
	`87`	`+`
	`88`	`+#contribs {`
	`89`	`+ margin-top: 10px;`
	`90`	`+}`
	`91`	`+`
Original file line number	Diff line number	Diff line change
`@@ -6,3 +6,4 @@ body {`
`6`	`6`	`a {`
`7`	`7`	`color: #00B7FF;`
`8`	`8`	`}`
	`9`	`+`