Reorganized files

public/css/style.css

@@ -0,0 +1,3 @@
+#map {
+  height: 100vh;
+}

public/index.html

@@ -1,6 +1,6 @@
 <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.5/leaflet.css" />
 <script src="http://cdn.leafletjs.com/leaflet-0.7.5/leaflet.js"></script>
-<link rel="stylesheet" href="style.css"/>
+<link rel="stylesheet" href="../css/style.css"/>
 <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
 <link rel="stylesheet" href="//rawgithub.com/domoritz/leaflet-locatecontrol/gh-pages/dist/L.Control.Locate.min.css" />
 <!--[if lt IE 9]>
@@ -11,29 +11,4 @@
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
 </head>
 <div id="map"></div>
-<script>
-var map = L.map('map').setView([33.777220,-84.3962800], 13);
-L.tileLayer('https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={accessToken}', {
-    attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="http://mapbox.com">Mapbox</a>',
-    maxZoom: 18,
-    id: 'michaellin.cif0wpatz19s2sxlv8x48i66b',
-    accessToken: 'pk.eyJ1IjoibWljaGFlbGxpbiIsImEiOiJjaWYwd3BjMGkxOTFtc2FsdXA1aThhMmtvIn0.mdvxgPl2QX1hGygZgQjIlg'
-}).addTo(map);
-L.control.locate().addTo(map);
-var data = $.ajax({
-  url: "/events",
-  data: {"lat" : 33.777220,
-        "lng": -84.3962800,
-        "distance": 2000},
-  success: function (data) {
-    console.log(data);
-    for (event in data.events) {
-      if (data.events[event].venueLocation) {
-        var marker = L.marker([data.events[event].venueLocation.latitude,data.events[event].venueLocation.longitude]).addTo(map);
-        marker.bindPopup(data.events[event].eventName);
-      }
-    }
-  },
-  dataType: "json"
-});
-</script>
+<script src='../js/main.js'></script>

public/js/main.js

@@ -0,0 +1,27 @@
+function start() {
+  var map = L.map('map').setView([33.777220,-84.3962800], 13);
+  L.tileLayer('https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={accessToken}', {
+      attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="http://mapbox.com">Mapbox</a>',
+      maxZoom: 18,
+      id: 'michaellin.cif0wpatz19s2sxlv8x48i66b',
+      accessToken: 'pk.eyJ1IjoibWljaGFlbGxpbiIsImEiOiJjaWYwd3BjMGkxOTFtc2FsdXA1aThhMmtvIn0.mdvxgPl2QX1hGygZgQjIlg'
+  }).addTo(map);
+  L.control.locate().addTo(map);
+  var data = $.ajax({
+    url: "/events",
+    data: {"lat" : 33.777220,
+          "lng": -84.3962800,
+          "distance": 2000},
+    success: function (data) {
+      console.log(data);
+      for (event in data.events) {
+        if (data.events[event].venueLocation) {
+          var marker = L.marker([data.events[event].venueLocation.latitude,data.events[event].venueLocation.longitude]).addTo(map);
+          marker.bindPopup(data.events[event].eventName);
+        }
+      }
+    },
+    dataType: "json"
+  });
+}
+start();

routes/index.js

@@ -1,6 +1,6 @@
 var express = require('express');
 var router = express.Router();
-var facebook = require('../js/facebook');
+var facebook = require('../server/facebook');
 router.get('/events', function(req, res, next) {
   if (!req.query.lat || !req.query.lng || !req.query.distance) {
     res.status(500).send({error: "Please specify the lat, lng, distance, parameters"});

server.js

@@ -2,8 +2,8 @@ var express = require('express');
 var path = require('path');
 var logger = require('morgan');
 var bodyParser = require('body-parser');
-var twitter = require('./js/twitter.js');
-var facebook = require('./js/facebook.js');
+var twitter = require('./server/twitter.js');
+var facebook = require('./server/facebook.js');
 var routes = require('./routes/index');
 var app = express();
 
@@ -13,6 +13,8 @@ app.use('/', routes);
 app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({extended:false}));
 app.use(express.static(path.join(__dirname, 'public')));
+app.use(express.static(path.join(__dirname, 'js')));
+
 
 app.listen(app.get('port'), function(){
   console.log('Express server listening on port ' + app.get('port'));