Skip to content

Commit ec3f386

Browse files
committedAug 3, 2016
at least the google requests are working now.
1 parent db82406 commit ec3f386

File tree

4 files changed

+40
-11
lines changed

4 files changed

+40
-11
lines changed
 

‎package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"main": "server.js",
66
"dependencies": {
77
"async": "^2.0.1",
8-
"express": "^4.14.0"
8+
"express": "^4.14.0",
9+
"express-request-proxy": "^2.0.0"
910
},
1011
"devDependencies": {},
1112
"scripts": {

‎scripts/model/model.js

+5-10
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,11 @@
2828

2929
modelHikes.callTrailAPI = function() {
3030
console.log('trail api running');
31+
var trailsURL = '/trailsAPI';
32+
console.log(trailsURL);
3133
$.ajax({
32-
url: 'https://trailapi-trailapi.p.mashape.com/?limit=800&q[state_cont]=Washington',
34+
url: trailsURL,
3335
method: 'GET',
34-
headers: {
35-
'X-Mashape-Key': MashapeAPIKey,
36-
'Accept': 'text/plain'
37-
},
3836
success: function(data, message, xhr) {
3937
console.log(data);
4038
data.places.map(function(current) {
@@ -61,25 +59,22 @@
6159
});
6260
});
6361
}
64-
}).done(function(){
65-
// modelHikes.getLatLng();
6662
});
6763
};
6864

6965
modelHikes.getLatLng = function(zipCode) {
7066
if(modelHikes.zipResults.length > 1) {
7167
modelHikes.zipResults.length = 0;
7268
}
73-
var authKey = googleAPIKey;
69+
var googleURL = '/theGoogles/' + 'maps/api/geocode/json?address=' + zipCode;
7470
$.ajax({
75-
url: 'http://maps.googleapis.com/maps/api/geocode/json?address=' + zipCode + '?key=' + authKey,
71+
url: googleURL,
7672
method: 'POST',
7773
success: function(data){
7874
var results = data.results;
7975
var geoResult = results[0];
8076
modelHikes.zipResults.push(geoResult.geometry.location.lat);
8177
modelHikes.zipResults.push(geoResult.geometry.location.lng);
82-
// return [geoResult.geometry.location.lat, geoResult.geometry.location.lng];
8378
filtersView.Run();
8479
}
8580
});

‎server.js

+30
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,39 @@
11
var async = require('async');
22

33
var express = require('express'),
4+
requestProxy = require('express-request-proxy'),
45
port = process.env.PORT || 3000,
56
app = express();
67

8+
var proxyTrailsAPI = function(request, response) {
9+
console.log(request);
10+
(
11+
requestProxy({
12+
url: 'https://trailapi-trailapi.p.mashape.com/' + '?limit=800&q[state_cont]=Washington' + '&mashape-key=' + process.env.MASHAPE_API_KEY + '&accept=text/plain'
13+
// headers: {
14+
// 'mashape-key': process.env.MASHAPE_API_KEY,
15+
// 'Accept': 'text/plain'
16+
// }
17+
})
18+
)(request, response);
19+
};
20+
21+
var proxyGoogleAPI = function(request, response) {
22+
console.log('routing Google API request for', request.params[0]);
23+
(
24+
requestProxy({
25+
url: 'https://maps.googleapis.com/' + request.params[0],
26+
headers: {
27+
'key': process.env.GOOGLE_API_KEY
28+
}
29+
})
30+
)(request, response);
31+
};
32+
33+
app.get('/trailsAPI', proxyTrailsAPI);
34+
35+
app.post('/theGoogles/*', proxyGoogleAPI);
36+
737
app.use(express.static('./'));
838

939
app.get('*', function(request, response) {

‎styles/module-search.css

+3
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,7 @@
1616
margin-left: .5em;
1717
border: none;
1818
border-radius: 5px;
19+
font-family: 'Architects Daughter', cursive;
20+
text-transform: uppercase;
21+
letter-spacing: .2rem;
1922
}

0 commit comments

Comments
 (0)
Please sign in to comment.