diff options
| -rw-r--r-- | public/assets/javascripts/mx/primitives/mx.vimeo.js | 1 | ||||
| -rw-r--r-- | server/lib/views.js | 13 | ||||
| -rwxr-xr-x | views/home.ejs | 22 | ||||
| -rw-r--r-- | views/profile.ejs | 4 | ||||
| -rw-r--r-- | views/projects/list-projects.ejs | 11 |
5 files changed, 24 insertions, 27 deletions
diff --git a/public/assets/javascripts/mx/primitives/mx.vimeo.js b/public/assets/javascripts/mx/primitives/mx.vimeo.js index 7bc0a26..64d9103 100644 --- a/public/assets/javascripts/mx/primitives/mx.vimeo.js +++ b/public/assets/javascripts/mx/primitives/mx.vimeo.js @@ -99,7 +99,6 @@ MX.Vimeo = MX.Object3D.extend({ if (! this.started || n === 0) { return } - console.log("fukballz", n) if (n < 1) { n = n * this.duration() diff --git a/server/lib/views.js b/server/lib/views.js index 89ad646..81e2ced 100644 --- a/server/lib/views.js +++ b/server/lib/views.js @@ -74,7 +74,12 @@ views.modal = function (req, res) { views.home = function (req, res) { if (req.user) { - res.render('home', {}) + Project.find({ privacy: false }) + .sort('-created_at') + .limit(20) + .exec(function(err, projects){ + res.render('home', { projects: projects || [] }) + }) } else { res.send("<html></html>") @@ -121,7 +126,11 @@ views.profile = function (req, res) { } function next(user){ - Project.find({ user_id: user._id }, function(err, projects){ + var criteria = { user_id: user._id } + if ( ! (req.user && req.user._id && req.user._id == user._id) ) { + criteria.privacy = false + } + Project.find(criteria, function(err, projects){ projects = projects.map(function(project){ project = project.toObject() project.date = moment(project.updated_at).format("M/DD/YYYY") diff --git a/views/home.ejs b/views/home.ejs index 45a6e6f..8b83a8f 100755 --- a/views/home.ejs +++ b/views/home.ejs @@ -24,27 +24,7 @@ <h1>Room Showcase</h1> - <table class="showcase"> - [[ include projects/list-projects ]] - - - <tr> - <td class="border room1"> - <a href="/" class="roomName">Pace Gallery • 7.1.14</a> - </td> - <td class="room1"> - <a href="/" class="roomName">Pace Gallery • 7.1.14</a> - </td> - </tr> - <tr class="room1"> - <td class="border room1"> - <a href="/" class="roomName">Pace Gallery • 7.1.14</a> - </td> - <td class="room1"> - <a href="/" class="roomName">Pace Gallery • 7.1.14</a> - </td> - </tr> - </table> + [[ include projects/list-projects ]] <a href="#loadmore" class="viewMore">View More</a> diff --git a/views/profile.ejs b/views/profile.ejs index 7bdbd51..8dd3c6d 100644 --- a/views/profile.ejs +++ b/views/profile.ejs @@ -38,6 +38,10 @@ </td> </tr> </table> + + [[ if (projects.length) { ]] + <h1>[[- profile.username ]] has [[- projects.length ]] project[[- projects.length != 1 ? "s" : "" ]]</h1> + [[ } ]] [[ include projects/list-projects ]] diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs index 205e778..3c71823 100644 --- a/views/projects/list-projects.ejs +++ b/views/projects/list-projects.ejs @@ -1,17 +1,22 @@ [[ if (projects.length) { ]] - <h1>[[- profile.username ]] has [[- projects.length ]] project[[- projects.length != 1 ? "s" : "" ]]</h1> - + <table> <tr> [[ projects.forEach(function(project, i) { ]] + [[ if (i % 4 == 1) { ]] + </tr><tr> + [[ } ]] <td class="border room1"> + [[ if (i == 0) { ]] <iframe src="/project/[[- project.slug ]]/view?noui=1&mute=1" class="embed"></iframe> - [[ if (profile._id == project.user_id) { ]] + [[ } ]] + [[ if (profile && profile._id == project.user_id) { ]] <div class="editBtn">edit</div> [[ } ]] <a href="/project/[[- project.slug ]]" class="roomName">[[- project.name ]]<br>[[- project.date ]]</a> </td> + [[ }) ]] </tr> |