From a4a9bb55e6aec0f2db50741bf456a9b8e6bc3935 Mon Sep 17 00:00:00 2001 From: Bruce-Yu-Xi Date: Tue, 27 Sep 2016 12:52:11 -0400 Subject: [PATCH 01/18] Update README.md --- README.md | 54 ------------------------------------------------------ 1 file changed, 54 deletions(-) diff --git a/README.md b/README.md index 8501e40..8b13789 100644 --- a/README.md +++ b/README.md @@ -1,55 +1 @@ -# Mashup project -This project is open-ended! - -* [AJAX demos](https://github.com/advanced-js/deck/tree/gh-pages/demos/ajax) -* [inspiration?](http://www.programmableweb.com/mashups) - -## Requirements - -* Build a site that uses data from at least one external API in an interesting, interactive way. (**80%**) -* HTML validation (using the [Nu HTML Checker](https://validator.w3.org/nu/)) must pass. (**10%**) -* JavaScript linting (using the configured [JSHint](http://jshint.com/about/)) must pass. (**10%**) -* Replace this README with a description of the project. - -### Extra credit - -Too easy? - -* Build in an [object-oriented](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Introduction_to_Object-Oriented_JavaScript) way (**10%**) -* Add fancy interactivity/animations (**10%**) - -If you do either of these, please let Aidan know so he can take a look. - -## Tips - -* The JS code should be **non-trivial**. That being said... start simple! (Just get the data to show up on the page.) -* No server-side coding is required, but feel free to create a backend in whatever language if you like, if you need one. -* You are welcome to use any 3rd-party libraries/frameworks – just load them from a CDN (e.g. [cdnjs](http://cdnjs.com)), or put them under the [`vendor/`](vendor/) folder. -* **Do not commit the `client_secret` (or anything else from an API that says "token" or "secret")**, as a hacker could use this to make requests on behalf of you. - -## Finding an API - -A couple things to look for in an API (or at least the endpoints you're using) for this project: - -* Make sure it doesn't require authentication/authorization (e.g. [OAuth](http://oauth.net/)) - at least for the endpoints that you want to use - so that you don't need a server. -* If the API doesn't support cross-domain requests (JSONP or CORS), you will need to use [JSONProxy](https://jsonp.afeld.me/). - -Here is a [list of API suggestions](https://gist.github.com/afeld/4952991). - -## Running tests locally - -Within this repository directory in your [virtual machine](https://github.com/startup-systems/vm): - -1. [Install Node.js 6.x.](https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions) -1. Install the project dependencies. - - ```bash - npm install - ``` - -1. Run the tests. - - ```bash - npm test -s - ``` From ce52995f37155fdda0430a8568b9fa77619b9a31 Mon Sep 17 00:00:00 2001 From: Bruce-Yu-Xi Date: Tue, 27 Sep 2016 15:21:53 -0400 Subject: [PATCH 02/18] Update index.html --- index.html | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/index.html b/index.html index 6524157..887c85a 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,27 @@ Mashup + + TRY googlemap + + + + + +
+ Destiny:
+
+ +
+ + + + + + + + From 833c90279843ecdd8c4a948aed674b22a2ab0fed Mon Sep 17 00:00:00 2001 From: Bruce-Yu-Xi Date: Tue, 27 Sep 2016 15:55:33 -0400 Subject: [PATCH 03/18] Update index.html --- index.html | 47 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 10 deletions(-) diff --git a/index.html b/index.html index 887c85a..f5cbd6f 100644 --- a/index.html +++ b/index.html @@ -7,22 +7,49 @@ +
Destiny:
-
- +
+
- - - - - - - - + +
+ + From 7d863ad3ad9bcd552b90d2fb68ae3831cf20bff8 Mon Sep 17 00:00:00 2001 From: Bruce-Yu-Xi Date: Tue, 27 Sep 2016 15:55:54 -0400 Subject: [PATCH 04/18] Update README.md --- README.md | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/README.md b/README.md index 8b13789..4ea631f 100644 --- a/README.md +++ b/README.md @@ -1 +1,55 @@ + + + + Mashup + + TRY googlemap + + + + + + + + +
+ Destiny:
+
+ +
+ +
+ + + + From 1c7f9642edb7f00e6576dbacce1a5be93d70e550 Mon Sep 17 00:00:00 2001 From: Bruce-Yu-Xi Date: Tue, 27 Sep 2016 16:05:06 -0400 Subject: [PATCH 05/18] Update index.html --- index.html | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/index.html b/index.html index f5cbd6f..0ae6f16 100644 --- a/index.html +++ b/index.html @@ -1,11 +1,9 @@ - Mashup - TRY googlemap - - + TRY googlemap + - + + + + + +
+ Destiny:
+
+ +
+ +
+ + - - - - -
- Destiny:
-
- -
- -
- - - - + + From 1e03c6c4ba0dba0f0f678be43e5651a1c5b140b6 Mon Sep 17 00:00:00 2001 From: Bruce-Yu-Xi Date: Tue, 27 Sep 2016 18:52:34 -0400 Subject: [PATCH 14/18] Update index.html --- index.html | 6 ------ 1 file changed, 6 deletions(-) diff --git a/index.html b/index.html index f7764d1..22e0b75 100644 --- a/index.html +++ b/index.html @@ -1,8 +1,6 @@ - Mashup - TRY googlemap @@ -16,10 +14,6 @@ var result = JSON.parse(data); alert(result.results[0].geometry); }, - success: function (data) { - $("#resultarea").text(data); - var result = JSON.parse(data); - }, error: function () { alert("Wrong input!"); } From cc4ccbee9e7829f47385791434feb99013604c0e Mon Sep 17 00:00:00 2001 From: Bruce-Yu-Xi Date: Tue, 27 Sep 2016 20:39:53 -0400 Subject: [PATCH 15/18] Update index.html --- index.html | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index 22e0b75..599b5bb 100644 --- a/index.html +++ b/index.html @@ -35,11 +35,16 @@ var map; function initMap() { - canter = {lat: 41, lng: -75}; - var geocoder = new google.maps.Geocoder(); - var map = new google.maps.Map(document.getElementById('map'), { - zoom: 7, - }); + var uluru = {lat: 40.7128, lng: -74.0059}; + var geocoder = new google.maps.Geocoder(); + var map = new google.maps.Map(document.getElementById('map'), { + zoom: 6, + center: uluru + }); + var marker = new google.maps.Marker({ + position: uluru, + map: map + }); }