diff --git a/controllers/api.js b/controllers/api.js index 786673fa57..c6a66bb901 100644 --- a/controllers/api.js +++ b/controllers/api.js @@ -1,3 +1,5 @@ +var geoip = require('geoip-lite'); + var config = require('../config/config.json'); var User = require('../models/User'); @@ -23,14 +25,15 @@ exports.apiBrowser = function(req, res) { exports.foursquare = function(req, res) { + var geo = geoip.lookup('4.17.136.0' || req.connection.remoteAddress); - foursquare.Venues.getTrending(40.7,-74, { limit: 10 }, req.user.tokens.foursquare, function(err, results) { - console.log(results); + foursquare.Venues.getTrending(geo.ll[0], geo.ll[1], { limit: 10 }, req.user.tokens.foursquare, function(err, results) { res.render('api/foursquare', { title: 'Foursquare API', user: req.user, venues: results.venues }); + }); }; diff --git a/controllers/home.js b/controllers/home.js index 16fe803ee2..9b052a386c 100644 --- a/controllers/home.js +++ b/controllers/home.js @@ -1,4 +1,4 @@ -exports.index = function(req, res){ +exports.index = function(req, res) { res.render('index', { user: req.user, title: 'Home' diff --git a/package.json b/package.json index 6494c57070..e554d68864 100755 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "underscore": "latest", "forever": "latest", "node-foursquare": "latest", - + "geoip-lite": "latest", "opencv": "latest" } } \ No newline at end of file diff --git a/views/api/foursquare.jade b/views/api/foursquare.jade index 32f5b9bcd9..834f069c8f 100644 --- a/views/api/foursquare.jade +++ b/views/api/foursquare.jade @@ -6,14 +6,14 @@ block content if !user.tokens.foursquare a.btn.btn-large.btn-primary(href='/auth/foursquare') Get Foursquare Token - ul.nav.nav-tabs + ul.nav.nav-pills(style='margin-bottom: 15px;') li.active - a(href='#trending', data-toggle='tab') Trending Venues + a(href='#venues', data-toggle='tab') Venues li a(href='#nearby', data-toggle='tab') Nearby - .tab-content - #trending.tab-pane.fade.active.in - h4 Locations + div.tab-content + #venues.tab-pane.fade.active.in + h4 Trending ul.list-group for venue in venues li.list-group-item