From 24029c27aca6b39af70d6db88e7505ecc90646d5 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Wed, 3 Sep 2014 17:13:54 -0400 Subject: endpoints for staff api --- server/lib/views/index.js | 154 +++++++++++++++++++++++++++++ server/lib/views/staff.js | 246 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 400 insertions(+) create mode 100644 server/lib/views/index.js create mode 100644 server/lib/views/staff.js (limited to 'server/lib/views') diff --git a/server/lib/views/index.js b/server/lib/views/index.js new file mode 100644 index 0000000..99be956 --- /dev/null +++ b/server/lib/views/index.js @@ -0,0 +1,154 @@ +/* jshint node: true */ + +var User = require('../schemas/User'), + Project = require('../schemas/Project'), + Documentation = require('../schemas/Documentation'), + Collaborator = require('../schemas/Collaborator'), + config = require('../../../config'), + marked = require('marked'), + util = require('../util'), + _ = require('lodash'), + moment = require('moment'); + +marked.setOptions({ + renderer: new marked.Renderer(), + gfm: true, + sanitize: true, + smartLists: true, + smartypants: true, +}); + +var views = {} + +views.staff = require('./staff') + +views.editor_new = function (req, res) { + if (! req.user) { + res.redirect('/') + } + else { + res.render('editor') + } +} + +views.editor = function (req, res) { + if (! req.project) { + res.redirect('/') + } + else if (req.isOwner || req.isCollaborator) { + res.render('editor') + } + else { + views.reader(req, res) + } +} + +views.reader = function (req, res) { + if (! req.project) { + res.redirect('/') + } + User.findOne({ _id: req.project.user_id }, function(err, user) { + if (err || ! user) { + console.error(err) + res.redirect('/') + return + } + res.render('reader', { + name: util.sanitize(req.project.name), + description: util.sanitize(req.project.description), + date: moment(req.project.updated_at).format("M/DD/YYYY"), + author: user.displayName, + authorlink: "/profile/" + user.username, + canEdit: req.isOwner || req.isCollaborator, + editlink: "/project/" + req.project.slug + "/edit", + noui: !! (req.query.noui === '1'), + }) + }) +} + +views.builder = function (req, res) { + res.render('builder') +} + +views.modal = function (req, res) { + res.render('modal'); +}; + +views.home = function (req, res) { + if (req.user) { + Project.find({ privacy: false }) + .sort('-created_at') + .limit(20) + .exec(function(err, projects){ + res.render('home', { projects: projects || [] }) + }) + } + else { + res.send("") + } +} + +views.docs = function (req, res){ + var name = req.params.name || "index" + + if (name === "new") { + res.render('docs', { + doc: { name: "new" }, + content: null, + isNew: true + }) + return + } + + Documentation.findOne({ name: name }, function(err, doc) { + if (err || ! doc) { + return res.render('docs', { + doc: { name: util.sanitize(name) }, + content: null, + isNew: true + }) + } + res.render('docs', { + doc: doc, + content: marked(doc.body), + isNew: false + }) + }) +} + +views.profile = function (req, res) { + var username = req.params.username || (req.user && req.user.username) + if (username) { + User.findOne({ username: username }, function (err, user) { + user ? next(user) : done(err, {}, []) + }) + } + else { + done() + } + + function next(user){ + 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") + return project + }) + done(err, user, projects) + }) + } + + function done(err, user, projects){ + if (! user) { return res.redirect('/') } + res.render('profile', { + profile: user, + projects: projects || [], + }) + } +} + +module.exports = views diff --git a/server/lib/views/staff.js b/server/lib/views/staff.js new file mode 100644 index 0000000..5dde58d --- /dev/null +++ b/server/lib/views/staff.js @@ -0,0 +1,246 @@ +/* jshint node: true */ + +var User = require('../schemas/User'), + Project = require('../schemas/Project'), + Media = require('../schemas/Media'), + Collaborator = require('../schemas/Collaborator'), + config = require('../../../config'), + middleware = require('../middleware'), + util = require('../util'), + _ = require('lodash'), + moment = require('moment'); + + +var staff = module.exports = { + + fields: { + user: "_id username displayName created_at updated_at created_ip last_ip", + project: "_id name slug created_at updated_at", + }, + + defaults: { + user: { + _id: "", username: "", displayName: "", + created_at: "", updated_at: "", created_ip: "", last_ip: "", + }, + }, + + middleware: { + + ensureUsers: function(req, res, next){ + var offset = Number(req.params.offset) || 0 + var sort + switch (req.params.sort) { + case 'date': + sort = {'date': -1} + break + default: + sort = {'username': 1} + break + } + User.find({}) + .select(staff.fields.user) + .sort(sort) + .skip(offset) + .limit(50) + .exec(function (err, users) { + res.locals.users = users.map(staff.helpers.user) + next() + }) + }, + + ensureProfile: function(req, res, next){ + var username = req.params.username + if (username) { + User.findOne({ username: username }, function (err, user) { + if (user) { + res.locals.profile = staff.helpers.user(user) + } + else { + res.locals.profile = null + } + next() + }) + } + else { + res.locals.profile = null + next() + } + }, + + ensureUsersCount: function(req, res, next){ + if (! res.locals.profile) { return next() } + User.count({}, function(err, count){ + res.locals.userCount = count || 0 + next() + }) + }, + + ensureProjectsCount: function(req, res, next){ + if (! res.locals.profile) { return next() } + Project.count({}, function(err, count){ + res.locals.projectCount = count || 0 + next() + }) + }, + + ensureProfileProjectCount: function(req, res, next){ + if (! res.locals.profile) { return next() } + Project.count({ user_id: res.locals.profile._id}, function(err, count){ + res.locals.profile.projectCount = count || 0 + next() + }) + }, + + ensureProfileMediaCount: function(req, res, next){ + if (! res.locals.profile) { return next() } + Media.count({ user_id: res.locals.profile._id}, function(err, count){ + res.locals.profile.mediaCount = count || 0 + next() + }) + }, + + ensureProfileProjects: function(req, res, next){ + if (! res.locals.profile) { return next() } + Project.find({ user_id: res.locals.profile._id }, staff.fields.project, function(err, projects){ + res.locals.projects = projects.map(staff.helpers.project) + next() + }) + }, + + ensureProject: function(req, res, next){ + res.locals.project = req.project + next() + }, + + ensureProjectUser: function(req, res, next){ + if (! res.locals.project) { return next() } + User.findOne({ user_id: res.locals.project.user_id }, staff.fields.user, function(err, user){ + res.locals.project.user = user || staff.defaults.user + next() + }) + }, + + ensureProjectCollaborators: function(req, res, next){ + if (! res.locals.project) { + res.locals.collaborators = [] + return next() + } + Collaborator.find({ project_id: res.locals.project._id}, function(err, collaborators){ + res.locals.collaborators = collaborators || [] + next() + }) + }, + }, + + helpers: { + user: function(user){ + user = user.toObject() + user.created_ip = util.num2ip( user.created_ip ) + user.last_ip = util.num2ip( user.last_ip ) + return user + }, + + project: function(project){ + project = project.toObject() + return project + } + }, + + route: function(app){ + app.get('/staff', + middleware.ensureAuthenticated, + middleware.ensureIsStaff, + + staff.middleware.ensureUsersCount, + staff.middleware.ensureProjectsCount, + + staff.index + ); + app.get('/staff/users', + middleware.ensureAuthenticated, + middleware.ensureIsStaff, + + staff.middleware.ensureUsersCount, + staff.middleware.ensureUsers, + + staff.users.index + ); + app.get('/staff/users/:username', + middleware.ensureAuthenticated, + middleware.ensureIsStaff, + + staff.middleware.ensureProfile, + staff.middleware.ensureProfileProjectCount, + staff.middleware.ensureProfileMediaCount, + staff.middleware.ensureProfileProjects, + + staff.users.show + ); + app.get('/staff/projects', + middleware.ensureAuthenticated, + middleware.ensureIsStaff, + + staff.projects.index + ); + app.get('/staff/projects/:name', + middleware.ensureAuthenticated, + middleware.ensureIsStaff, + + middleware.ensureProject, + staff.middleware.ensureProject, + staff.middleware.ensureProjectUser, + staff.middleware.ensureProjectCollaborators, + + staff.projects.show + ); +// app.post('/staff/bless', +// middleware.ensureAuthenticated, +// views.staff.bless +// ); + }, + + index: function(req, res){ + res.render('staff/index') + }, + + bless: function(req, res){ + req.user.isStaff = true + req.user.save(function(){ + res.redirect("/staff") + }) + }, + + // /staff/users/ + // /staff/users/:username + users: { + index: function(req, res){ + res.render('staff/users/index') + }, + show: function(req, res){ + if (res.locals.profile) { + res.render('staff/users/show') + } + else { + res.render('staff/users/show_404') + } + }, + }, + + // /staff/projects/ + // /staff/projects/:name + projects: { + index: function(req, res){ + res.render('staff/projects/index') + }, + show: function(req, res){ + if (res.locals.project) { + res.render('staff/projects/show') + } + else { + res.render('staff/projects/show_404') + } + }, + }, + +} \ No newline at end of file -- cgit v1.2.3-70-g09d2 From 95f62d72945acbac295f2342fd51cea9337d7cb7 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Wed, 3 Sep 2014 18:46:04 -0400 Subject: lastlog --- public/assets/javascripts/ui/site/ProjectList.js | 2 +- public/assets/stylesheets/app.css | 15 ++++--- public/assets/stylesheets/staff.css | 10 +++++ server/lib/auth/index.js | 4 +- server/lib/schemas/User.js | 1 + server/lib/views/staff.js | 52 +++++++++++++++++++++--- views/projects/list-projects.ejs | 2 +- views/staff/_header.ejs | 1 + views/staff/_users.ejs | 15 +++++++ views/staff/_users_recent.ejs | 20 +++++++++ views/staff/index.ejs | 11 ++--- views/staff/users/index.ejs | 2 + 12 files changed, 115 insertions(+), 20 deletions(-) create mode 100644 public/assets/stylesheets/staff.css create mode 100644 views/staff/_users.ejs create mode 100644 views/staff/_users_recent.ejs (limited to 'server/lib/views') diff --git a/public/assets/javascripts/ui/site/ProjectList.js b/public/assets/javascripts/ui/site/ProjectList.js index d772b20..959aa43 100644 --- a/public/assets/javascripts/ui/site/ProjectList.js +++ b/public/assets/javascripts/ui/site/ProjectList.js @@ -1,7 +1,7 @@ var ProjectList = View.extend({ - el: "#projectList", + el: ".projectList", events: { "mouseenter td.border": 'spinOn', diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 5922ab5..25bcf56 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -161,23 +161,25 @@ h5 { text-align:center; } -.page .profile { +.page.profile { color:white; } -.page table { +.page table.profilepage, +.page table.projectList { width: 100%; border-top: 1px solid; margin: 40px 0 0 0; border-spacing: 0; - clear:nboth; + clear: both; } -.page tr { +.page table.profilepage tr, +.page table.projectList tr { height: 400px; } .page table.showcase { height:70vh; } -.page table td.border { +.page table.projectList td.border { position: relative; border-right: 1px solid; } @@ -191,7 +193,8 @@ iframe.embed { z-index: -1; pointer-events: none; } -.page table td { +.page table.profilepage td, +.page table.projectList td { width: 33.3333%; background-size: cover; background-repeat: no-repeat; diff --git a/public/assets/stylesheets/staff.css b/public/assets/stylesheets/staff.css new file mode 100644 index 0000000..0208878 --- /dev/null +++ b/public/assets/stylesheets/staff.css @@ -0,0 +1,10 @@ +* { + font-weight: 300; +} +th, b { + font-weight: bold; +} +#users td { + text-align: left; + padding: 2px 5px; +} \ No newline at end of file diff --git a/server/lib/auth/index.js b/server/lib/auth/index.js index 99af9b5..c2275ff 100644 --- a/server/lib/auth/index.js +++ b/server/lib/auth/index.js @@ -111,6 +111,7 @@ var auth = { return info ? res.json(info) : res.redirect("/login"); } + user.last_seen = new Date () user.last_ip = util.ip2num( req.ip ) user.save(function(err, data){ if (err) console.err('error setting ip for user') }) @@ -173,7 +174,8 @@ var auth = { email: email, created_ip: util.ip2num( req.ip ), last_ip: util.ip2num( req.ip ), - created_at: new Date () + created_at: new Date (), + last_seen: new Date (), } new User(data).save(function(err, user){ if (err || ! data) { return res.json({ error: err }) } diff --git a/server/lib/schemas/User.js b/server/lib/schemas/User.js index b64f8fc..180a140 100644 --- a/server/lib/schemas/User.js +++ b/server/lib/schemas/User.js @@ -64,6 +64,7 @@ var UserSchema = new mongoose.Schema({ isStaff: { type: Boolean, default: false }, created_at: { type: Date }, updated_at: { type: Date }, + last_seen: { type: Date }, created_ip: { type: Number }, last_ip: { type: Number }, }); diff --git a/server/lib/views/staff.js b/server/lib/views/staff.js index 5dde58d..9643626 100644 --- a/server/lib/views/staff.js +++ b/server/lib/views/staff.js @@ -14,7 +14,7 @@ var User = require('../schemas/User'), var staff = module.exports = { fields: { - user: "_id username displayName created_at updated_at created_ip last_ip", + user: "_id username displayName created_at updated_at last_seen created_ip last_ip", project: "_id name slug created_at updated_at", }, @@ -28,11 +28,15 @@ var staff = module.exports = { middleware: { ensureUsers: function(req, res, next){ + var limit = Math.max( Number(req.params.limit) || 50, 200 ) var offset = Number(req.params.offset) || 0 var sort switch (req.params.sort) { case 'date': - sort = {'date': -1} + sort = {'created_at': -1} + break + case 'lastseen': + sort = {'last_seen': -1} break default: sort = {'username': 1} @@ -42,13 +46,44 @@ var staff = module.exports = { .select(staff.fields.user) .sort(sort) .skip(offset) - .limit(50) + .limit(limit) .exec(function (err, users) { res.locals.users = users.map(staff.helpers.user) next() }) }, + ensureRecentUsers: function(req, res, next){ + var dreq = { params: { sort: 'last_seen', limit: 20, offset: 0 } } + staff.middleware.ensureUsers(dreq, res, next) + }, + + ensureProjects: function(req, res, next){ + var offset = Number(req.params.offset) || 0 + var sort + switch (req.params.sort) { + case 'date': + sort = {'date': -1} + break + default: + sort = {'slug': 1} + break + } + Project.find({}) + .select(staff.fields.project) + .sort(sort) + .skip(offset) + .limit(50) + .exec(function (err, projects) { + res.locals.projects = projects.map(staff.helpers.projects) + next() + }) + }, + + ensureProjectsUsers: function(req, res, next){ + + }, + ensureProfile: function(req, res, next){ var username = req.params.username if (username) { @@ -69,7 +104,6 @@ var staff = module.exports = { }, ensureUsersCount: function(req, res, next){ - if (! res.locals.profile) { return next() } User.count({}, function(err, count){ res.locals.userCount = count || 0 next() @@ -77,7 +111,6 @@ var staff = module.exports = { }, ensureProjectsCount: function(req, res, next){ - if (! res.locals.profile) { return next() } Project.count({}, function(err, count){ res.locals.projectCount = count || 0 next() @@ -136,6 +169,7 @@ var staff = module.exports = { helpers: { user: function(user){ user = user.toObject() + user.last_seen = moment( user.last_seen || user.updated_at || user.created_at ).fromNow() user.created_ip = util.num2ip( user.created_ip ) user.last_ip = util.num2ip( user.last_ip ) return user @@ -151,7 +185,8 @@ var staff = module.exports = { app.get('/staff', middleware.ensureAuthenticated, middleware.ensureIsStaff, - + + staff.middleware.ensureRecentUsers, staff.middleware.ensureUsersCount, staff.middleware.ensureProjectsCount, @@ -180,6 +215,11 @@ var staff = module.exports = { app.get('/staff/projects', middleware.ensureAuthenticated, middleware.ensureIsStaff, + + staff.middleware.ensureProjectsCount, + + staff.middleware.ensureProjects, + staff.middleware.ensureProjectsUsers, staff.projects.index ); diff --git a/views/projects/list-projects.ejs b/views/projects/list-projects.ejs index c78bf9f..c41ae07 100644 --- a/views/projects/list-projects.ejs +++ b/views/projects/list-projects.ejs @@ -1,6 +1,6 @@ [[ if (projects.length) { ]] - +
[[ projects.forEach(function(project, i) { ]] diff --git a/views/staff/_header.ejs b/views/staff/_header.ejs index 9311948..d726b02 100644 --- a/views/staff/_header.ejs +++ b/views/staff/_header.ejs @@ -4,6 +4,7 @@ vvalls | staff [[ include ../partials/meta ]] +
diff --git a/views/staff/_users.ejs b/views/staff/_users.ejs new file mode 100644 index 0000000..ab8c9b3 --- /dev/null +++ b/views/staff/_users.ejs @@ -0,0 +1,15 @@ +
+[[ users.forEach(function(user){ ]] + + + + + +[[ }) ]] +
+ [[- user.username ]] + + [[- user.displayName ]] + + [[- user.last_seen ]] +
diff --git a/views/staff/_users_recent.ejs b/views/staff/_users_recent.ejs new file mode 100644 index 0000000..ff3fd55 --- /dev/null +++ b/views/staff/_users_recent.ejs @@ -0,0 +1,20 @@ + + + + +[[ users.forEach(function(user){ ]] + + + + + +[[ }) ]] +
+ recent users +
+ [[- user.username ]] + + [[- user.displayName ]] + + [[- user.last_seen ]] +
diff --git a/views/staff/index.ejs b/views/staff/index.ejs index fbe67a7..0cb67da 100644 --- a/views/staff/index.ejs +++ b/views/staff/index.ejs @@ -1,10 +1,11 @@ [[ include _header ]]

Staff Area

- + +users: [[- userCount ]] +projects: [[- projectCount ]] + +
+[[ include _users_recent ]] [[ include _footer ]] \ No newline at end of file diff --git a/views/staff/users/index.ejs b/views/staff/users/index.ejs index 62c0ae2..fb072d8 100644 --- a/views/staff/users/index.ejs +++ b/views/staff/users/index.ejs @@ -1,4 +1,6 @@ [[ include ../_header ]]

Users

+[[ include _users ]] + [[ include ../_footer ]] -- cgit v1.2.3-70-g09d2 From b2164f9f6001dcac952a3d2b301f1425fdb3cbe9 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 4 Sep 2014 13:50:40 -0400 Subject: admin users views --- public/assets/stylesheets/app.css | 4 ++- public/assets/stylesheets/staff.css | 38 +++++++++++++++++++- server/lib/api/projects.js | 2 ++ server/lib/util.js | 4 ++- server/lib/views/staff.js | 70 ++++++++++++++++++++++++++----------- views/staff/_footer.ejs | 6 ++++ views/staff/_header.ejs | 3 +- views/staff/_projects.ejs | 22 ++++++++++++ views/staff/_stats.ejs | 13 +++++++ views/staff/index.ejs | 14 +++++--- views/staff/projects/index.ejs | 10 ++++++ views/staff/projects/show.ejs | 15 ++++++++ views/staff/projects/show_404.ejs | 8 +++++ views/staff/users/index.ejs | 10 +++++- views/staff/users/show.ejs | 14 +++++++- views/staff/users/show_404.ejs | 8 +++++ 16 files changed, 210 insertions(+), 31 deletions(-) create mode 100644 views/staff/_projects.ejs create mode 100644 views/staff/_stats.ejs (limited to 'server/lib/views') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 25bcf56..17a7dc0 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -164,6 +164,7 @@ h5 { .page.profile { color:white; } +.page table.demo, .page table.profilepage, .page table.projectList { width: 100%; @@ -193,6 +194,7 @@ iframe.embed { z-index: -1; pointer-events: none; } +.page table.demo td, .page table.profilepage td, .page table.projectList td { width: 33.3333%; @@ -241,7 +243,7 @@ iframe.embed { color:white; } -#projectList .editBtn { +.projectList .editBtn { position: absolute; right: 10px; top: 10px; diff --git a/public/assets/stylesheets/staff.css b/public/assets/stylesheets/staff.css index 0208878..2d1f802 100644 --- a/public/assets/stylesheets/staff.css +++ b/public/assets/stylesheets/staff.css @@ -4,7 +4,43 @@ th, b { font-weight: bold; } -#users td { +table { + display: inline-block; + margin-right: 40px; + vertical-align: top; +} +td, th { text-align: left; padding: 2px 5px; +} +.staff .body { + text-align: left; +} +.staff h1 { + text-align: left; + display: inline-block; +} +.staff nav { + display: inline-block; + text-align: left; +} +.staff nav a { + padding-left: 20px; +} +.staff hr { + border: 1px solid #bbb; + margin: 5px auto 10px; +} +.body { + width: 80%; + margin: 0 auto; +} +.jsonview * { + font-family: monospace !important; +} +.staff { + font-size: 15px; +} +.staff .editLinks a { + color: #00f; } \ No newline at end of file diff --git a/server/lib/api/projects.js b/server/lib/api/projects.js index 2a5beff..da41b48 100644 --- a/server/lib/api/projects.js +++ b/server/lib/api/projects.js @@ -41,6 +41,7 @@ var projects = { data.media = JSON.parse(data.media) data.colors = JSON.parse(data.colors) data.startPosition = JSON.parse(data.startPosition) + data.created_at = new Date () upload.put("projects", req.files.thumbnail, { unacceptable: function(err){ @@ -72,6 +73,7 @@ var projects = { data.name = util.sanitize(data.name) data.slug = util.slugify(data.name) data.description = util.sanitize(data.description) + data.updated_at = new Date () if (req.files.thumbnail) { upload.put("projects", req.files.thumbnail, { diff --git a/server/lib/util.js b/server/lib/util.js index 6d43750..791d3e2 100644 --- a/server/lib/util.js +++ b/server/lib/util.js @@ -8,7 +8,6 @@ var nonAlphanumerics = new RegExp('[^-_a-zA-Z0-9]', 'g') var consecutiveDashes = new RegExp("-+", 'g') var entities = new RegExp("[<>&]", 'g') - var util = {} util.trim = function (s){ return (s || "").replace(whitespaceHead,"").replace(whitespaceTail,"") } @@ -19,6 +18,9 @@ util.slugify = function (s){ util.sanitize = function (s){ return (s || "").replace(entities, "") } +util.escape = function (s){ + return (s || "").replace(/&/g, "&").replace(//g, ">") +} util.capitalize = function (s) { return (s || "").split(" ").map(util.capitalizeWord).join(" "); } diff --git a/server/lib/views/staff.js b/server/lib/views/staff.js index 9643626..cf43081 100644 --- a/server/lib/views/staff.js +++ b/server/lib/views/staff.js @@ -15,7 +15,7 @@ var staff = module.exports = { fields: { user: "_id username displayName created_at updated_at last_seen created_ip last_ip", - project: "_id name slug created_at updated_at", + project: "_id name slug user_id privacy created_at updated_at", }, defaults: { @@ -35,9 +35,10 @@ var staff = module.exports = { case 'date': sort = {'created_at': -1} break - case 'lastseen': + case 'last_seen': sort = {'last_seen': -1} break + case 'username': default: sort = {'username': 1} break @@ -63,7 +64,7 @@ var staff = module.exports = { var sort switch (req.params.sort) { case 'date': - sort = {'date': -1} + sort = {'created_at': -1} break default: sort = {'slug': 1} @@ -75,13 +76,34 @@ var staff = module.exports = { .skip(offset) .limit(50) .exec(function (err, projects) { - res.locals.projects = projects.map(staff.helpers.projects) + res.locals.projects = projects.map(staff.helpers.project) next() }) }, + + ensureRecentProjects: function(req, res, next){ + var dreq = { params: { sort: 'created_at', limit: 20, offset: 0 } } + staff.middleware.ensureProjects(dreq, res, next) + }, ensureProjectsUsers: function(req, res, next){ - + if (! res.locals.projects || ! res.locals.projects.length) { return next() } + var dedupe = {}, user_ids + res.locals.projects.forEach(function(project){ + dedupe[ project.user_id ] = dedupe[ project.user_id ] || [] + dedupe[ project.user_id ].push(project) + }) + user_ids = _.keys(dedupe) + User.find({ _id: user_ids }) + .select(staff.fields.user) + .exec(function (err, users) { + users.forEach(function(user){ + dedupe[user._id].forEach(function(project){ + project.user = user + }) + }) + next() + }) }, ensureProfile: function(req, res, next){ @@ -116,7 +138,7 @@ var staff = module.exports = { next() }) }, - + ensureProfileProjectCount: function(req, res, next){ if (! res.locals.profile) { return next() } Project.count({ user_id: res.locals.profile._id}, function(err, count){ @@ -177,6 +199,8 @@ var staff = module.exports = { project: function(project){ project = project.toObject() + project.date = moment( project.updated_at || project.created_at ).format("M/DD/YYYY H:MM") + project.user = {} return project } }, @@ -234,23 +258,19 @@ var staff = module.exports = { staff.projects.show ); -// app.post('/staff/bless', -// middleware.ensureAuthenticated, -// views.staff.bless -// ); + + app.put('/staff/users/:username/bless', + middleware.ensureAuthenticated, + middleware.ensureIsStaff, + + staff.users.bless + ); }, index: function(req, res){ res.render('staff/index') }, - - bless: function(req, res){ - req.user.isStaff = true - req.user.save(function(){ - res.redirect("/staff") - }) - }, - + // /staff/users/ // /staff/users/:username users: { @@ -259,12 +279,20 @@ var staff = module.exports = { }, show: function(req, res){ if (res.locals.profile) { - res.render('staff/users/show') + res.render('staff/users/show', { + profileJSON: util.escape( JSON.stringify( res.locals.profile ) ) + }) } else { res.render('staff/users/show_404') } }, + bless: function(req, res){ + res.locals.profile.isStaff = req.body.isStaff + res.locals.profile.save(function(){ + res.redirect("/staff") + }) + }, }, // /staff/projects/ @@ -275,7 +303,9 @@ var staff = module.exports = { }, show: function(req, res){ if (res.locals.project) { - res.render('staff/projects/show') + res.render('staff/projects/show', { + projectJSON: util.escape( JSON.stringify( res.locals.profile ) ) + }) } else { res.render('staff/projects/show_404') diff --git a/views/staff/_footer.ejs b/views/staff/_footer.ejs index 580828f..c363beb 100644 --- a/views/staff/_footer.ejs +++ b/views/staff/_footer.ejs @@ -1,3 +1,4 @@ + [[ include ../partials/confirm-modal ]] [[ include ../partials/footer ]] @@ -5,4 +6,9 @@ [[ include ../partials/scripts ]] + diff --git a/views/staff/_header.ejs b/views/staff/_header.ejs index d726b02..1880c98 100644 --- a/views/staff/_header.ejs +++ b/views/staff/_header.ejs @@ -7,7 +7,8 @@ -
+
[[ include ../partials/header ]]
+
diff --git a/views/staff/_projects.ejs b/views/staff/_projects.ejs new file mode 100644 index 0000000..83041ae --- /dev/null +++ b/views/staff/_projects.ejs @@ -0,0 +1,22 @@ + +[[ projects.forEach(function(project){ ]] + + + + + + + +[[ }) ]] +
+ [[- project.name ]] + + [view] + [edit] + + [[- project.user.username ]] + + [[- project.date ]] + + [[- project.privacy ? "private" : "" ]] +
diff --git a/views/staff/_stats.ejs b/views/staff/_stats.ejs new file mode 100644 index 0000000..6439ab9 --- /dev/null +++ b/views/staff/_stats.ejs @@ -0,0 +1,13 @@ + + + + + + + + + + + + +
stats
users[[- userCount ]]
projects[[- projectCount ]]
diff --git a/views/staff/index.ejs b/views/staff/index.ejs index 0cb67da..842e086 100644 --- a/views/staff/index.ejs +++ b/views/staff/index.ejs @@ -2,10 +2,14 @@

Staff Area

-users: [[- userCount ]] -projects: [[- projectCount ]] - -
-[[ include _users_recent ]] + + +
+ + [[ include _users_recent ]] + [[ include _stats ]] [[ include _footer ]] \ No newline at end of file diff --git a/views/staff/projects/index.ejs b/views/staff/projects/index.ejs index a27a132..a5a9308 100644 --- a/views/staff/projects/index.ejs +++ b/views/staff/projects/index.ejs @@ -1,4 +1,14 @@ [[ include ../_header ]]

Projects

+ + +
+ +[[ include ../_projects ]] + [[ include ../_footer ]] diff --git a/views/staff/projects/show.ejs b/views/staff/projects/show.ejs index 01b5c76..e821614 100644 --- a/views/staff/projects/show.ejs +++ b/views/staff/projects/show.ejs @@ -1,2 +1,17 @@ [[ include ../_header ]] + +

Project

+ + + +
+ +
+ [[- projectJSON ]] +
+ [[ include ../_footer ]] diff --git a/views/staff/projects/show_404.ejs b/views/staff/projects/show_404.ejs index e0cf0e2..193333f 100644 --- a/views/staff/projects/show_404.ejs +++ b/views/staff/projects/show_404.ejs @@ -1,4 +1,12 @@ [[ include ../_header ]]

Project not found

+ + +
+ [[ include ../_footer ]] diff --git a/views/staff/users/index.ejs b/views/staff/users/index.ejs index fb072d8..ad92fc3 100644 --- a/views/staff/users/index.ejs +++ b/views/staff/users/index.ejs @@ -1,6 +1,14 @@ [[ include ../_header ]]

Users

-[[ include _users ]] + + +
+ +[[ include ../_users ]] [[ include ../_footer ]] diff --git a/views/staff/users/show.ejs b/views/staff/users/show.ejs index b5e1a6c..d306443 100644 --- a/views/staff/users/show.ejs +++ b/views/staff/users/show.ejs @@ -1,4 +1,16 @@ [[ include ../_header ]] -

User: [[ profile.username ]]

+

User: [[- profile.username ]]

+ + + +
+ +
+ [[- profileJSON ]] +
[[ include ../_footer ]] diff --git a/views/staff/users/show_404.ejs b/views/staff/users/show_404.ejs index c52e1e7..3fd20a8 100644 --- a/views/staff/users/show_404.ejs +++ b/views/staff/users/show_404.ejs @@ -1,4 +1,12 @@ [[ include ../_header ]]

User not found

+ + +
+ [[ include ../_footer ]] -- cgit v1.2.3-70-g09d2 From 01eaa246c7aebcea616eccf7989c63ac6f54fdf0 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 4 Sep 2014 15:30:07 -0400 Subject: project view --- public/assets/javascripts/ui/site/ProjectList.js | 1 - public/assets/javascripts/ui/site/StaffView.js | 14 ++++++ public/assets/stylesheets/staff.css | 54 +++++++++++++++++++--- server/lib/views/staff.js | 12 ++--- views/staff/_footer.ejs | 6 ++- views/staff/projects/show.ejs | 57 +++++++++++++++++++++++- 6 files changed, 130 insertions(+), 14 deletions(-) create mode 100644 public/assets/javascripts/ui/site/StaffView.js (limited to 'server/lib/views') diff --git a/public/assets/javascripts/ui/site/ProjectList.js b/public/assets/javascripts/ui/site/ProjectList.js index 959aa43..ee1b89f 100644 --- a/public/assets/javascripts/ui/site/ProjectList.js +++ b/public/assets/javascripts/ui/site/ProjectList.js @@ -24,4 +24,3 @@ var ProjectList = View.extend({ } }) - diff --git a/public/assets/javascripts/ui/site/StaffView.js b/public/assets/javascripts/ui/site/StaffView.js new file mode 100644 index 0000000..115d417 --- /dev/null +++ b/public/assets/javascripts/ui/site/StaffView.js @@ -0,0 +1,14 @@ +var StaffView = View.extend({ + + initialize: function() { + }, + + load: function() { + $(".json").each(function(){ + $(this).JSONView( this.innerText ) + }) + + this.projectList = new ProjectList () + } + +}) diff --git a/public/assets/stylesheets/staff.css b/public/assets/stylesheets/staff.css index 2d1f802..9b9226f 100644 --- a/public/assets/stylesheets/staff.css +++ b/public/assets/stylesheets/staff.css @@ -13,21 +13,24 @@ td, th { text-align: left; padding: 2px 5px; } -.staff .body { +.page { text-align: left; } -.staff h1 { +.footer { + text-align: center; +} +h1 { text-align: left; display: inline-block; } -.staff nav { +nav { display: inline-block; text-align: left; } -.staff nav a { +nav a { padding-left: 20px; } -.staff hr { +hr { border: 1px solid #bbb; margin: 5px auto 10px; } @@ -35,12 +38,53 @@ td, th { width: 80%; margin: 0 auto; } +.jsonview { + border: 1px solid #ddd; + background: rgba(238,238,238,0.5); + padding: 4px; + margin: 0 auto; + max-width: 100%; + overflow-x: auto; + margin-bottom: 20px; + max-height: 60vh; +} .jsonview * { font-family: monospace !important; + font-size: 12px; +} +.jsonview .collapser { + -webkit-user-select: none; + -moz-user-select: none; + user-select: none; } .staff { font-size: 15px; } .staff .editLinks a { color: #00f; +} +#iframe-embed, #iframe-embed tr, #iframe-embed td { + width: 79vw; +} +#iframe-embed td { + padding: 0; +} +h2 { + margin: 20px auto; +} +.avatar { + height: 40px; + width: 40px; + display: inline-block; + background-size: cover; +} +iframe.embed { + position: static; + width: 100%; + height: 44vw; + border: 1px solid black; +} +.page table.projectList, +.page table.projectList td.border { + border: 0; } \ No newline at end of file diff --git a/server/lib/views/staff.js b/server/lib/views/staff.js index cf43081..ae414d7 100644 --- a/server/lib/views/staff.js +++ b/server/lib/views/staff.js @@ -14,7 +14,7 @@ var User = require('../schemas/User'), var staff = module.exports = { fields: { - user: "_id username displayName created_at updated_at last_seen created_ip last_ip", + user: "_id username displayName photo created_at updated_at last_seen created_ip last_ip", project: "_id name slug user_id privacy created_at updated_at", }, @@ -170,8 +170,8 @@ var staff = module.exports = { ensureProjectUser: function(req, res, next){ if (! res.locals.project) { return next() } - User.findOne({ user_id: res.locals.project.user_id }, staff.fields.user, function(err, user){ - res.locals.project.user = user || staff.defaults.user + User.findOne({ _id: res.locals.project.user_id }, staff.fields.user, function(err, user){ + res.locals.projectUser = staff.helpers.user(user) || staff.defaults.user next() }) }, @@ -247,7 +247,7 @@ var staff = module.exports = { staff.projects.index ); - app.get('/staff/projects/:name', + app.get('/staff/projects/:slug', middleware.ensureAuthenticated, middleware.ensureIsStaff, @@ -304,7 +304,9 @@ var staff = module.exports = { show: function(req, res){ if (res.locals.project) { res.render('staff/projects/show', { - projectJSON: util.escape( JSON.stringify( res.locals.profile ) ) + projectJSON: util.escape( JSON.stringify( res.locals.project ) ), + projectUserJSON: util.escape( JSON.stringify( res.locals.projectUser ) ), + collaboratorsJSON: util.escape( JSON.stringify( res.locals.collaborators ) ) }) } else { diff --git a/views/staff/_footer.ejs b/views/staff/_footer.ejs index c363beb..839db4a 100644 --- a/views/staff/_footer.ejs +++ b/views/staff/_footer.ejs @@ -6,9 +6,11 @@ [[ include ../partials/scripts ]] + diff --git a/views/staff/projects/show.ejs b/views/staff/projects/show.ejs index e821614..23e96b2 100644 --- a/views/staff/projects/show.ejs +++ b/views/staff/projects/show.ejs @@ -1,6 +1,6 @@ [[ include ../_header ]] -

Project

+

[[- project.name ]]

diff --git a/views/staff/projects/show_404.ejs b/views/staff/projects/show_404.ejs index 193333f..70320c0 100644 --- a/views/staff/projects/show_404.ejs +++ b/views/staff/projects/show_404.ejs @@ -1,10 +1,12 @@ [[ include ../_header ]] +

Project not found

diff --git a/views/staff/users/index.ejs b/views/staff/users/index.ejs index ad92fc3..8c56565 100644 --- a/views/staff/users/index.ejs +++ b/views/staff/users/index.ejs @@ -1,10 +1,12 @@ [[ include ../_header ]] +

Users

diff --git a/views/staff/users/show.ejs b/views/staff/users/show.ejs index 2315043..afcd761 100644 --- a/views/staff/users/show.ejs +++ b/views/staff/users/show.ejs @@ -5,6 +5,7 @@ home users projects + media
@@ -21,7 +22,7 @@ [[- profile.displayName ]] - [view profile] + [view profile] @@ -43,6 +44,22 @@ [[- profile.last_seen ]] + + + projects + + + [[- profile.projectCount ]] + + + + + media + + + [[- profile.mediaCount ]] + + ip addresses @@ -77,10 +94,3 @@
[[ include ../_footer ]] - \ No newline at end of file diff --git a/views/staff/users/show_404.ejs b/views/staff/users/show_404.ejs index 3fd20a8..bcd0271 100644 --- a/views/staff/users/show_404.ejs +++ b/views/staff/users/show_404.ejs @@ -5,6 +5,7 @@ home users projects + media
-- cgit v1.2.3-70-g09d2 From cccacd39a49f48a9aefe39e0e0bb33529ca80410 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 4 Sep 2014 18:03:07 -0400 Subject: media list --- server/lib/views/staff.js | 5 +++-- views/staff/_media.ejs | 38 +++++++++++++++++++++++++++++++++++++- views/staff/media/show.ejs | 2 +- 3 files changed, 41 insertions(+), 4 deletions(-) (limited to 'server/lib/views') diff --git a/server/lib/views/staff.js b/server/lib/views/staff.js index b9fe78a..a9d85ba 100644 --- a/server/lib/views/staff.js +++ b/server/lib/views/staff.js @@ -164,7 +164,7 @@ var staff = module.exports = { ensureSingleMedia: function(req, res, next){ var id = req.params.id if (id) { - Media.findOne({ _id: id }, function (err, id) { + Media.findOne({ _id: id }, function (err, media) { if (media) { res.locals.media = req.method == "GET" ? staff.helpers.media(media) : media } @@ -270,6 +270,7 @@ var staff = module.exports = { media = media.toObject() media.date = moment( media.updated_at || media.created_at ).format("M/DD/YYYY H:MM") media.user = {} + media.shortUrl = media.url.replace(/^http.:\/\//,"") return media } }, @@ -422,7 +423,7 @@ var staff = module.exports = { res.render('staff/media/index') }, show: function(req, res){ - if (res.locals.project) { + if (res.locals.media) { res.render('staff/media/show', { mediaJSON: util.escape( JSON.stringify( res.locals.media ) ), mediaUserJSON: util.escape( JSON.stringify( res.locals.mediaUser ) ), diff --git a/views/staff/_media.ejs b/views/staff/_media.ejs index 27949aa..19e9d0b 100644 --- a/views/staff/_media.ejs +++ b/views/staff/_media.ejs @@ -1 +1,37 @@ -media \ No newline at end of file + +[[ media.forEach(function(media){ ]] + + + + + + + + + +[[ }) ]] +
+ [view] + + [[- media.user.username ]] + + [[- media.date ]] + + [[- media.width ]]x[[- media.height ]] + + [[- media.type ]] + + [[- media.token ]] + + [[- media.shortUrl ]] +
+ + \ No newline at end of file diff --git a/views/staff/media/show.ejs b/views/staff/media/show.ejs index 43afe14..8257307 100644 --- a/views/staff/media/show.ejs +++ b/views/staff/media/show.ejs @@ -1,6 +1,6 @@ [[ include ../_header ]] -

Media [[- media.type ]]

+

Media: [[- media.type ]]

- + [[ include _users_recent ]] [[ include _stats ]] diff --git a/views/staff/media/index.ejs b/views/staff/media/index.ejs index 76aaafb..516af2d 100644 --- a/views/staff/media/index.ejs +++ b/views/staff/media/index.ejs @@ -11,6 +11,8 @@
+[[ include ../_pagination ]] [[ include ../_media ]] +[[ include ../_pagination ]] [[ include ../_footer ]] diff --git a/views/staff/projects/index.ejs b/views/staff/projects/index.ejs index a6fad6b..482ea25 100644 --- a/views/staff/projects/index.ejs +++ b/views/staff/projects/index.ejs @@ -11,6 +11,8 @@
+[[ include ../_pagination ]] [[ include ../_projects ]] +[[ include ../_pagination ]] [[ include ../_footer ]] diff --git a/views/staff/users/index.ejs b/views/staff/users/index.ejs index 8c56565..f14d666 100644 --- a/views/staff/users/index.ejs +++ b/views/staff/users/index.ejs @@ -11,6 +11,8 @@
+[[ include ../_pagination ]] [[ include ../_users ]] +[[ include ../_pagination ]] [[ include ../_footer ]] diff --git a/views/staff/users/media.ejs b/views/staff/users/media.ejs index 6ea2668..b13e5fb 100644 --- a/views/staff/users/media.ejs +++ b/views/staff/users/media.ejs @@ -11,6 +11,8 @@
+[[ include ../_pagination ]] [[ include ../_media ]] +[[ include ../_pagination ]] [[ include ../_footer ]] diff --git a/views/staff/users/show.ejs b/views/staff/users/show.ejs index 127ca8c..8e9b447 100644 --- a/views/staff/users/show.ejs +++ b/views/staff/users/show.ejs @@ -80,17 +80,14 @@ [[- profile.isStaff ? "yes" : "no" ]] - - - - - - [[ if (String(user._id) != String(profile._id)) { ]] - - [[ } ]] - - + +

+
+ [[ if (String(user._id) != String(profile._id)) { ]] + + [[ } ]] +

Projects

-- cgit v1.2.3-70-g09d2