diff --git a/README.md b/README.md index 589aa35..d13067e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Tracman -###### v 0.4.0 +###### v 0.4.2 node.js application to display a map with user's location. @@ -16,6 +16,11 @@ $ npm start ## Changelog +#### v0.4.2 + +* Fixed Streetview covering buttons +* Fixed error when viewing map of nonexistant user + #### v0.4.1 * Users can view/change email address diff --git a/config/auth.js b/config/auth.js index 46eeabc..788f855 100644 --- a/config/auth.js +++ b/config/auth.js @@ -48,7 +48,7 @@ passport.use(new GoogleStrategy({ (function checkSlug(s,cb) { //console.log('checking ',s); User.findOne({slug:s}, function(err, existingUser){ - if (err) { console.log('Slug check error for ',slug(request.name).toLowerCase(),+':',err); } + if (err) { console.log('No user found for ',slug,':',err); } if (existingUser){ s = ''; while (s.length<6) { diff --git a/config/mail.js b/config/mail.js deleted file mode 100644 index fb6b135..0000000 --- a/config/mail.js +++ /dev/null @@ -1,61 +0,0 @@ -var emailTemplate = require('email-templates').EmailTemplate, - path = require('path'); -var secret = require('./secrets.js'), - templateDir = path.join(__dirname, 'mail'); -var mailgun = require('mailgun-js')({ - apiKey: secret.mailgunAPI, - domain: 'tracman.org' -}); - -var renderMail = function(template, params, next) { - new emailTemplate(path.join(templateDir, template)) - .render(params, function (err, msg) { - if (err) { console.log('Error rendering mail. Params: \n'+params+'\n'+err); } - next(msg); - }); -} - -module.exports = { - mailgun:mailgun, - - sendInvite: function(params, cb){ - renderMail('invite', {id:params.id, name:params.name}, function(msg) { - mailgun.messages().send({ - from: 'Tracman ', - to: params.email, - subject: 'You are invited to use Tracman beta!', - html: msg.html, - text: msg.text - }, cb); - }); - }, - - sendSuggestion: function(params, cb){ - renderMail('suggestion', params, function(msg) { - var name = (params.name)?params.name:'Tracman'; - var email = (params.email)?' <'+params.email+'>':' '; - mailgun.messages().send({ - from: name+email, - to: 'Keith Irwin ', - subject: 'A suggestion for Tracman', - html: msg.html, - text: msg.text - }, cb); - }); - }, - - sendBugReport: function(params, cb){ - renderMail('suggestion', params, function(msg) { - var name = (params.name)?params.name:'Tracman'; - var email = (params.email)?' <'+params.email+'>':' '; - mailgun.messages().send({ - from: name+email, - to: 'Keith Irwin ', - subject: 'A Bug Report for Tracman', - html: msg.html, - text: msg.text - }, cb); - }); - }, - -}; diff --git a/config/mail/bug-report/html.nunjucks b/config/mail/bug-report/html.nunjucks deleted file mode 100644 index e972502..0000000 --- a/config/mail/bug-report/html.nunjucks +++ /dev/null @@ -1,13 +0,0 @@ - - -

Bug Report

-

Source: {{ source }}

-

Error message

-

{{ errorMessage }}

-

Recreation

-

{{ recreation }}

-

Bug details

-

{{ bug }}

-

{{ name }}
{{ email }}

- - diff --git a/config/mail/bug-report/text.nunjucks b/config/mail/bug-report/text.nunjucks deleted file mode 100644 index b89ab36..0000000 --- a/config/mail/bug-report/text.nunjucks +++ /dev/null @@ -1,16 +0,0 @@ -BUG REPORT - - -Source: {{ source }} - -Error message -{{ errorMessage }} - -Recreation -{{ recreation }} - -Bug details -{{ bug }} - -{{ name }} -{{ email }} diff --git a/config/mail/suggestion/html.nunjucks b/config/mail/suggestion/html.nunjucks deleted file mode 100644 index efedc44..0000000 --- a/config/mail/suggestion/html.nunjucks +++ /dev/null @@ -1,7 +0,0 @@ - - -

Suggestion

-

{{ suggestion }}

-

{{ name }}
{{ email }}

- - diff --git a/config/mail/suggestion/text.nunjucks b/config/mail/suggestion/text.nunjucks deleted file mode 100644 index 5058cc4..0000000 --- a/config/mail/suggestion/text.nunjucks +++ /dev/null @@ -1,6 +0,0 @@ -SUGGESTION - -{{ suggestion }} - -{{ name }} -{{ email }} diff --git a/config/models/request.js b/config/models/request.js deleted file mode 100644 index 8942a2b..0000000 --- a/config/models/request.js +++ /dev/null @@ -1,10 +0,0 @@ -var mongoose = require('mongoose'); - -module.exports = mongoose.model('Request', { - name: {type:String, required:true}, - email: {type:String, required:true, unique:true}, - beg: String, - requestedTime: Date, - granted: Date, - userId: String -}); diff --git a/config/routes/admin.js b/config/routes/admin.js index 5de9693..ed48acb 100644 --- a/config/routes/admin.js +++ b/config/routes/admin.js @@ -1,9 +1,7 @@ var router = require('express').Router(), fs= require('fs'), mw = require('../middleware.js'), - mail = require('../mail.js'), - User = require('../models/user.js'), - Request = require('../models/request.js'); + User = require('../models/user.js'); router.route('/') .all(mw.ensureAdmin, function(req,res,next){ @@ -27,12 +25,7 @@ router.route('/') res.locals.user = found; checkCBC(req,res,err); }); - - Request.find({}).sort({requestedTime:-1}).exec(function(err, found){ - res.locals.requests = found; - checkCBC(req,res,err); - }); - + User.find({}).sort({lastLogin:-1}).exec(function(err, found){ res.locals.users = found; checkCBC(req,res,err); diff --git a/config/routes/index.js b/config/routes/index.js index ab5c0d6..556e664 100644 --- a/config/routes/index.js +++ b/config/routes/index.js @@ -1,9 +1,7 @@ var router = require('express').Router(), mw = require('../middleware.js'), - mail = require('../mail.js'), secret = require('../secrets.js'), - User = require('../models/user.js'), - Request = require('../models/request.js'); + User = require('../models/user.js'); router.route('/') .get(function(req,res,next){ diff --git a/config/routes/map.js b/config/routes/map.js index 421ddb4..c993e31 100644 --- a/config/routes/map.js +++ b/config/routes/map.js @@ -11,8 +11,7 @@ router.get('/:slug?', function(req,res,next){ // Confirm sucessful queries function checkQuery(err,found) { if (err){ mw.throwErr(req,err); } - if (!found){ next(); } - else { return found; } + if (found){ return found; } } // Call renderMap() on completion @@ -40,10 +39,10 @@ router.get('/:slug?', function(req,res,next){ // Show map function renderMap() { // GET /map shows logged-in user's map - if (mapuser==''&&user=='') { + if (!mapuser && !user) { res.redirect('/'); } else { - if (user!=''&&mapuser=='') { mapuser = user; } + if (user!==''&&mapuser==='') { mapuser = user; } res.render('map.html', { api: secret.mapAPI, mapuser: mapuser, diff --git a/package.json b/package.json index 07bc69c..328f34c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tracman", - "version": "0.4.1", + "version": "0.4.2", "description": "Tracks user's GPS location", "main": "server.js", "dependencies": { @@ -8,11 +8,9 @@ "browserify": "^13.0.1", "connect-flash": "^0.1.1", "cookie-parser": "^1.4.1", - "email-templates": "^2.1.0", "express": "^4.13.3", "express-session": "^1.13.0", "kerberos": "0.0.17", - "mailgun-js": "^0.7.7", "moment": "^2.12.0", "mongodb": "^2.1.4", "mongoose": "^4.3.5", diff --git a/views/admin.html b/views/admin.html index edd32a9..d04f60e 100644 --- a/views/admin.html +++ b/views/admin.html @@ -53,41 +53,6 @@