added travis.yml,changes link add to localhost instead of heroku

foundry-matrix · Feb 16, 2015 · 63df7c4 · 63df7c4
2 parents a50ef9f + e6661f8
commit 63df7c4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+keys.js
diff --git a/index.html b/index.html
@@ -1,19 +1,25 @@
+
 <html>
+
 	<head>
 <!-- Latest compiled and minified CSS -->
 
 
 <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
 
 <!-- Latest compiled and minified JavaScript -->
+
+
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
+
 	<link rel="icon" type="image/png"  href="http://iconhandbook.co.uk/favicon.ico">
   	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
   	<link href='http://fonts.googleapis.com/css?family=Montserrat' rel='stylesheet' type='text/css'>
   	<link href='http://fonts.googleapis.com/css?family=Lobster' rel='stylesheet' type='text/css'>
   	<style>
 .loader {
+
     text-align: center;
 }
 .loader span {
@@ -137,6 +143,7 @@
   </head>
   <body>
 
+
 <div class="container-fluid">
 <h2 id="title">Nearby stuff</h2>
 <center><button type="button" id="socialfeed" class="btn"/>Start exploring!</button></center>
@@ -194,8 +201,6 @@ <h2 id="title">Nearby stuff</h2>
 		}
 		);
 
-
-
 		function getInstagram(){
 			console.log("running getinstagram");
 			navigator.geolocation.getCurrentPosition(function(position){
@@ -206,7 +211,9 @@ <h2 id="title">Nearby stuff</h2>
                    dataType: 'jsonp',
                    success: function(response){
                    	console.log(response);
+
                    instagram_updates = [];
+
                    var length = response.data.length;
                    for (i=0;i<length;i++){
                    		instagram_updates.push('<div class="col-xs-6 col-sm-4 col-md-3 col-lg-2 instagram_img_div"><a  target="_blank" href="' + response.data[i].link + '"><img class="instagram_img" src="' + response.data[i].images.low_resolution.url + '"></a></div>');
@@ -231,6 +238,7 @@ <h2 id="title">Nearby stuff</h2>
 			    geocode = lat + "," + lon + "," + "1mi";
 			  // OLD ADRESS: http://localhost:3000/fetch?geocode
 				$.getJSON("http://localhost:3000/fetch?geocode=" + geocode, function(data) {
+
 					console.log("Tweets:");
 					console.log(data);
 					var length = data.length;
@@ -249,11 +257,13 @@ <h2 id="title">Nearby stuff</h2>
 
 		function checkIfReady(){
 			if (twitter_ready === true && instagram_ready === true){
+
 				$(".loader").css('display', 'none');					console.log('all fetched!!');					mixArrays();
 					fixHeight();
 					}
 				}
 
+
 				function renderUpdates(){
 					setTimeout(function(){
 						$('#shuffled_content').append(shuffled_updates[j]);
@@ -262,6 +272,7 @@ <h2 id="title">Nearby stuff</h2>
 						if (j < shuffled_updates.length){
 							renderUpdates();
 						}
+
 					},
 					150);
 				}
@@ -294,6 +305,7 @@ <h2 id="title">Nearby stuff</h2>
 
 </script>
 
+
  </form>
   </body>
   </html>
diff --git a/index.js b/index.js
@@ -5,6 +5,9 @@ var index = fs.readFileSync("./index.html").toString();
 var url = require('url');
 var keys= require('./keys.js')
 
+
+
+
 var twitter = new twit(keys.secretkeys);
 
 http.createServer(function (req, res) {