ki9
/
tracman-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#42

master
Keith Irwin 2017-03-05 19:33:27 -05:00
parent 40ac5d4c10
commit 971550c2d0
3 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
config/routes/map.js
View File

@ -1,6 +1,5 @@
var router = require('express').Router(),
mw = require('../middleware.js'),
secret = require('../secrets.js'),
slug = require('slug'),
User = require('../models/user.js');
@ -44,7 +43,6 @@ router.get('/:slug?', function(req,res,next){
} else {
if (user && !mapuser) { mapuser = user; }
res.render('map.html', {
api: secret.mapAPI,
mapuser: mapuser,
user: user,
noFooter: '1',
@ -56,8 +54,8 @@ router.get('/:slug?', function(req,res,next){
});
// Set new user settings
router.post('/:slug?', mw.ensureAuth, function(req,res,next){
// Set new user settings
User.findByIdAndUpdate(req.session.passport.user, {$set:{name: req.body.name,
slug: slug(req.body.slug),
email: req.body.email,
@ -76,8 +74,8 @@ router.post('/:slug?', mw.ensureAuth, function(req,res,next){
});
});
// Delete user account
router.delete('/:slug?', mw.ensureAuth, function(req,res,next){
// Delete user account
User.findByIdAndRemove(
req.session.passport.user,
function(err) {
@ -92,13 +90,4 @@ router.delete('/:slug?', mw.ensureAuth, function(req,res,next){
)
});
// Redirect /id/ to /slug/
router.get('/id/:id', function(req,res,next){
User.findById(req.params.id, function(err, user){
if (err){ mw.throwErr(req,err); }
if (!user){ next(); }
else { res.redirect('/map/'+user.slug+((req.url.indexOf('?')<0)?'':('?'+req.url.split('?')[1]))); }
});
});
module.exports = router;

2
server.js
View File

@ -110,10 +110,12 @@
// Check for tracking users
function checkForUsers(room) {
if (room) {
// Check this room
io.to('app-'+room).emit('activate',
(io.of("/").adapter.rooms[room])?'true':'false'
);
} else {
// Check all rooms
User.find({}, function(err, users){
if (err) { console.log('Sockets error finding all users in all rooms: '+err); }
users.forEach( function(user){

6
views/map.html
View File

@ -321,11 +321,9 @@
</div>
<!--<script src="/static/js/socket.io-1.2.0.js"></script>-->
<!--<script src="https://cdn.socket.io/socket.io-1.2.0.js"></script>-->
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/1.2.0/socket.io.min.js" integrity="sha256-N5fOxBkRkV1GAo/HPKsmtrhO9phIOnBGqCqsXUsRLeI=" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/1.7.3/socket.io.min.js" integrity="sha256-WKvqiY0jZHWQZIohYEmr9KUC5rEaYEOFTq+ByllJK8w=" crossorigin="anonymous"></script>
<!--<script src="/static/js/bundle.js"></script>-->
<script src="https://maps.googleapis.com/maps/api/js?key={{api}}&callback=gmapsCb" async defer></script>
<script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyDvhjcHCt7_zufmaWhvplhPTm65ruhJJEY&callback=gmapsCb" async defer></script>
<script>
/* Variables */ {