From 2373bedea1dbd9194ec1295ba5f185fabba15e88 Mon Sep 17 00:00:00 2001 From: Keith Irwin Date: Sat, 7 May 2016 20:38:01 +0000 Subject: [PATCH 1/2] updated for v0.1.4 --- README.md | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0f93acc..7328a24 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Tracman -###### v 0.1.3 +###### v 0.1.4 node.js application to display a map with user's location. Live at [tracman.org](https://tracman.org/). The github for the associated android app is [Tracman-org/Android](https://github.com/tracman-org/android). diff --git a/package.json b/package.json index 4afc539..d3e9fe6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tracman", - "version": "0.1.3", + "version": "0.1.4", "description": "Tracks user's GPS location", "main": "server.js", "dependencies": { From c271fad61a210fa993b4504d2ea14dbf9475f025 Mon Sep 17 00:00:00 2001 From: Keith Irwin Date: Sat, 7 May 2016 21:09:25 +0000 Subject: [PATCH 2/2] Try to fix #13 again --- config/routes/invite.js | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/config/routes/invite.js b/config/routes/invite.js index c31f03d..224c522 100644 --- a/config/routes/invite.js +++ b/config/routes/invite.js @@ -33,7 +33,7 @@ router.get('/:invite', function(req,res,next){ (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),+':',err); } + if (err) { console.log('Slug check error for ',slug(request.name).toLowerCase(),+':',err); } if (existingUser){ s = ''; while (s.length<6) { @@ -42,8 +42,8 @@ router.get('/:invite', function(req,res,next){ checkSlug(s,cb); } else { cb(s); } }); - })(slug(request.name), function(newSlug){ - new User({ // Create new user + })(slug(request.name).toLowerCase(), function(newSlug){ + newUser = new User({ // Create new user requestId: request._id, email: '', slug: newSlug, @@ -56,14 +56,10 @@ router.get('/:invite', function(req,res,next){ showAlt: false, showStreetview: true } - }).save(function(err) { + }) + newUser.save(function(err) { if (err) { mw.throwErr(req,err); } - User.findOne({requestId:request._id}, function(err, user) { - if (err) { mw.throwErr(req,err); } - if (user) { - associateUser(request,user); - } - }); + associateUser(request,newUser); }); }); }