From df1dde35e0a3484100538cc001bd4d57b6a7f610 Mon Sep 17 00:00:00 2001 From: Keith Irwin Date: Sun, 5 Mar 2017 16:58:30 -0500 Subject: [PATCH 01/17] Quick fixes --- config/routes/index.js | 1 - package.json | 2 +- server.js | 0 test.js | 0 views/map.html | 6 ++++-- views/templates/base.html | 13 +++++++++++++ views/templates/header.html | 8 ++++---- 7 files changed, 22 insertions(+), 8 deletions(-) mode change 100644 => 100755 server.js mode change 100644 => 100755 test.js diff --git a/config/routes/index.js b/config/routes/index.js index d939521..8063662 100644 --- a/config/routes/index.js +++ b/config/routes/index.js @@ -1,6 +1,5 @@ var router = require('express').Router(), mw = require('../middleware.js'), - secret = require('../secrets.js'), User = require('../models/user.js'); router.route('/') diff --git a/package.json b/package.json index 8b7f0a2..0085740 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "dev": "nodemon server.js", "deploy": "ssh -t khp 'rsync -aP --delete --exclude-from /srv/tracman/.gitignore --exclude .git kptow:/srv/c9/tracman/ /srv/tracman && sudo systemctl reload-or-restart tracman'", "drydeploy": "rsync --dry-run -vaP --delete --exclude-from /srv/c9/tracman/.gitignore --exclude .git /srv/c9/tracman/ khp:/srv/tracman", - "revert": "ssh -t khp 'rsync -aP --delete --exclude-from /srv/tracman/.gitignore --exclude .git /srv/tracman/ kptow:/srv/c9/tracman && sudo systemctl reload-or-restart tracman'", + "revert": "ssh -t khp 'rsync -aP --delete --exclude-from /srv/tracman/.gitignore --exclude .git /srv/tracman/ kptow:/srv/c9/tracman'", "dryrevert": "rsync --dry-run -vaP --delete --exclude-from /srv/c9/tracman/.gitignore --exclude .git khp:/srv/tracman/ /srv/c9/tracman", "log": "ssh -t khp 'journalctl -u tracman'", "restart": "ssh -t khp 'sudo systemctl reload-or-restart tracman'" diff --git a/server.js b/server.js old mode 100644 new mode 100755 diff --git a/test.js b/test.js old mode 100644 new mode 100755 diff --git a/views/map.html b/views/map.html index d02956a..b43674b 100644 --- a/views/map.html +++ b/views/map.html @@ -321,8 +321,10 @@ - - + + + + + + + + diff --git a/views/templates/header.html b/views/templates/header.html index d0faa66..a730c60 100644 --- a/views/templates/header.html +++ b/views/templates/header.html @@ -27,10 +27,10 @@ -
- Tracman is going through a server migration and various technical issues. Sorry for the inconvienence!
You can encourage me to work on it by making a donation. + {% if error %}
@@ -42,4 +42,4 @@ Success! {{ success | safe }}
-{% endif %} \ No newline at end of file +{% endif %} From 40ac5d4c10b002a971cb44c74e0a64400f5e5696 Mon Sep 17 00:00:00 2001 From: Keith Irwin Date: Sun, 5 Mar 2017 17:20:00 -0500 Subject: [PATCH 02/17] Bumped version --- README.md | 8 ++++++-- package.json | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 865cc74..76d17fe 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # Tracman -###### v 0.4.3 +###### v 0.4.5 node.js application to display a map with user's location. ## Installation ```sh -$ git clone https://github.com/Tracman-org/Server.git && (cd server && exec npm install) +$ git clone https://github.com/Tracman-org/Server.git && (cd Server && exec npm install) ``` ## Running @@ -16,6 +16,10 @@ $ npm start ## Changelog +#### v0.4.5 + +* + #### v0.4.3 * Fixed memory store [#21](https://github.com/Tracman-org/Server/issues/21) diff --git a/package.json b/package.json index 0085740..459260f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tracman", - "version": "0.4.3", + "version": "0.4.5", "description": "Tracks user's GPS location", "main": "server.js", "dependencies": { From 971550c2d06f147751d3bd498c0970b96ebe61ab Mon Sep 17 00:00:00 2001 From: Keith Irwin Date: Sun, 5 Mar 2017 19:33:27 -0500 Subject: [PATCH 03/17] #42 --- config/routes/map.js | 15 ++------------- server.js | 2 ++ views/map.html | 6 ++---- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/config/routes/map.js b/config/routes/map.js index 2921eb3..6ef8781 100644 --- a/config/routes/map.js +++ b/config/routes/map.js @@ -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; \ No newline at end of file diff --git a/server.js b/server.js index 74f03c7..b26512c 100755 --- a/server.js +++ b/server.js @@ -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){ diff --git a/views/map.html b/views/map.html index b43674b..625504e 100644 --- a/views/map.html +++ b/views/map.html @@ -321,11 +321,9 @@
- - - + - + - + -
- -
- -
-
-
-
-
- -
- -
-
-
-
-
- -
- -
- tracman.org/map/ -
-
-
-
- -
- -
-
-
-
-
- -
- -
-
-
-
-
- -
- -
- -
-
- -
- -
-
-
-
- -
- -
-
-
-
- -
- -
-
-
-
- - - -
- - cancel -
-
- - {% if not user.isPro %}

Want to try Tracman Pro? It's free during beta testing.

{% endif %} -

Would you like to submit a suggestion or bug report?

- - -
-
- -
- -

Help

- - {% if newuser %}

Welcome to Tracman! Here's how to get started.

{% endif %} - -

Set sets your location once using this device's geolocation. On a GPS-enabled phone, the location will be set to its coordinates.

- -

Track sets your location as above, but continues to track your location as long as you keep this window open. On a phone, this can drain the battery fast, so be careful!

- -

Clear clears your location instantly. Anyone looking at your map will see a blank screen instead. Use this to hide your location.

- - {% if newuser %}

Share your location by sending the URL to anyone. They won't need an account to view the map.

{% endif %} - - OK -
- - {% endif %} -
@@ -322,13 +86,11 @@
- +
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+ tracman.org/map/ +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+ +
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+ + + +
+ + cancel +
+ +
+ + {% if not user.isPro %}

Want to try Tracman Pro? It's free during beta testing.

{% endif %} +

Would you like to submit a suggestion or bug report?

+ + + +{% endblock %} \ No newline at end of file diff --git a/views/templates/header.html b/views/templates/header.html index a730c60..c89238d 100644 --- a/views/templates/header.html +++ b/views/templates/header.html @@ -11,10 +11,9 @@