commit
4f0b5061a2
|
@ -1,5 +1,5 @@
|
||||||
# Tracman
|
# 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/).
|
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).
|
The github for the associated android app is [Tracman-org/Android](https://github.com/tracman-org/android).
|
||||||
|
|
|
@ -33,7 +33,7 @@ router.get('/:invite', function(req,res,next){
|
||||||
(function checkSlug(s,cb) {
|
(function checkSlug(s,cb) {
|
||||||
console.log('checking ',s);
|
console.log('checking ',s);
|
||||||
User.findOne({slug:s}, function(err, existingUser){
|
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){
|
if (existingUser){
|
||||||
s = '';
|
s = '';
|
||||||
while (s.length<6) {
|
while (s.length<6) {
|
||||||
|
@ -42,8 +42,8 @@ router.get('/:invite', function(req,res,next){
|
||||||
checkSlug(s,cb);
|
checkSlug(s,cb);
|
||||||
} else { cb(s); }
|
} else { cb(s); }
|
||||||
});
|
});
|
||||||
})(slug(request.name), function(newSlug){
|
})(slug(request.name).toLowerCase(), function(newSlug){
|
||||||
new User({ // Create new user
|
newUser = new User({ // Create new user
|
||||||
requestId: request._id,
|
requestId: request._id,
|
||||||
email: '',
|
email: '',
|
||||||
slug: newSlug,
|
slug: newSlug,
|
||||||
|
@ -56,14 +56,10 @@ router.get('/:invite', function(req,res,next){
|
||||||
showAlt: false,
|
showAlt: false,
|
||||||
showStreetview: true
|
showStreetview: true
|
||||||
}
|
}
|
||||||
}).save(function(err) {
|
})
|
||||||
|
newUser.save(function(err) {
|
||||||
if (err) { mw.throwErr(req,err); }
|
if (err) { mw.throwErr(req,err); }
|
||||||
User.findOne({requestId:request._id}, function(err, user) {
|
associateUser(request,newUser);
|
||||||
if (err) { mw.throwErr(req,err); }
|
|
||||||
if (user) {
|
|
||||||
associateUser(request,user);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "tracman",
|
"name": "tracman",
|
||||||
"version": "0.1.3",
|
"version": "0.1.4",
|
||||||
"description": "Tracks user's GPS location",
|
"description": "Tracks user's GPS location",
|
||||||
"main": "server.js",
|
"main": "server.js",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
Loading…
Reference in New Issue