From 04ead695825d036a92935e58dd63770d0c547948 Mon Sep 17 00:00:00 2001 From: noopurP Date: Mon, 26 Sep 2016 15:16:52 -0400 Subject: [PATCH 01/16] Update index.html --- index.html | 49 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index 6524157..c1c35d1 100644 --- a/index.html +++ b/index.html @@ -1,8 +1,47 @@ - - Mashup - - - + + Mashup + + + + + + + + + + + + +
+ + +

+ + + + From 3be8ddfd09f9ada9d64658c7c801eb1da07b1607 Mon Sep 17 00:00:00 2001 From: noopurP Date: Mon, 26 Sep 2016 16:51:14 -0400 Subject: [PATCH 02/16] Update README.md --- README.md | 43 ++----------------------------------------- 1 file changed, 2 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index ea283d2..015281d 100644 --- a/README.md +++ b/README.md @@ -1,44 +1,5 @@ # Mashup project -This project is open-ended! Requirements: +This web app takes an image URL and pulls Creative tools from Aviary to facilitate in-app photo editing. It also saves the newly edited image back to the website and canthen be easily downloaded. -* Build a site that uses data from at least one external API in an interesting, interactive way. -* Replace this README with a description of the project. -* 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. - -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. - -* [AJAX demos](https://github.com/advanced-js/deck/tree/gh-pages/demos/ajax) -* [inspiration?](http://www.programmableweb.com/mashups) - -## 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). - -## Too easy? - -* build in an object-oriented way -* add fancy interactivity/animations - -## 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 - ``` +API used: Aviary From aa0b4c4d93175c8092cebb3c525ff2f116f2c0ca Mon Sep 17 00:00:00 2001 From: noopurP Date: Mon, 26 Sep 2016 16:51:44 -0400 Subject: [PATCH 03/16] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 015281d..6fe3bd9 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Mashup project -This web app takes an image URL and pulls Creative tools from Aviary to facilitate in-app photo editing. It also saves the newly edited image back to the website and canthen be easily downloaded. +This web app takes an image URL and pulls Creative tools from Aviary to facilitate in-app photo editing. It also saves the newly edited image back to the website and can then be easily downloaded. API used: Aviary From ab320b865839af7e4497e4d2748f513ea95c97ca Mon Sep 17 00:00:00 2001 From: noopurP Date: Mon, 26 Sep 2016 16:53:13 -0400 Subject: [PATCH 04/16] Update index.html --- index.html | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/index.html b/index.html index c1c35d1..241a445 100644 --- a/index.html +++ b/index.html @@ -2,11 +2,9 @@ Mashup - - + - - - -
- - -

- - - + + + Your image From ff00f9de6d1ab691a4964197544b6fb0c9957e94 Mon Sep 17 00:00:00 2001 From: noopurP Date: Mon, 26 Sep 2016 16:55:33 -0400 Subject: [PATCH 05/16] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6fe3bd9..4b57459 100644 --- a/README.md +++ b/README.md @@ -3,3 +3,4 @@ This web app takes an image URL and pulls Creative tools from Aviary to facilitate in-app photo editing. It also saves the newly edited image back to the website and can then be easily downloaded. API used: Aviary +References: Aviary guide to using Aviary API From f6c04edae54e78de4deffdb4708a93f1336284dd Mon Sep 17 00:00:00 2001 From: noopurP Date: Mon, 26 Sep 2016 16:55:59 -0400 Subject: [PATCH 06/16] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 4b57459..7188a7d 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,5 @@ This web app takes an image URL and pulls Creative tools from Aviary to facilitate in-app photo editing. It also saves the newly edited image back to the website and can then be easily downloaded. API used: Aviary + References: Aviary guide to using Aviary API From 0fbe0c52d49785de66cd17dc3ac6f8904e047b70 Mon Sep 17 00:00:00 2001 From: noopurP Date: Mon, 26 Sep 2016 18:22:37 -0400 Subject: [PATCH 07/16] Update README.md --- README.md | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7188a7d..8501e40 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,55 @@ # Mashup project -This web app takes an image URL and pulls Creative tools from Aviary to facilitate in-app photo editing. It also saves the newly edited image back to the website and can then be easily downloaded. +This project is open-ended! -API used: Aviary +* [AJAX demos](https://github.com/advanced-js/deck/tree/gh-pages/demos/ajax) +* [inspiration?](http://www.programmableweb.com/mashups) -References: Aviary guide to using Aviary API +## 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 fd655dea0d066315d32b7e5b1ceb3471fe5738d7 Mon Sep 17 00:00:00 2001 From: noopurP Date: Mon, 26 Sep 2016 18:51:17 -0400 Subject: [PATCH 08/16] Update index.html --- index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 241a445..4d1a8f3 100644 --- a/index.html +++ b/index.html @@ -3,6 +3,7 @@ Mashup + @@ -38,6 +39,6 @@
- Your image + From 2d19657a052314ba8971b233ba858500c62fe1bb Mon Sep 17 00:00:00 2001 From: noopurP Date: Mon, 26 Sep 2016 18:54:08 -0400 Subject: [PATCH 09/16] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 4d1a8f3..c21c44a 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ Mashup - + From a8e92b9c9605266d7ab8d77ac1a5a7a054a3fdf2 Mon Sep 17 00:00:00 2001 From: noopurP Date: Mon, 26 Sep 2016 18:58:00 -0400 Subject: [PATCH 10/16] Update index.html --- index.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index c21c44a..139c2f7 100644 --- a/index.html +++ b/index.html @@ -5,7 +5,9 @@ - + + - + - + @@ -42,5 +46,6 @@ Your image +
From 095324417d61e028726ffc96ff84d3f044a2e06c Mon Sep 17 00:00:00 2001 From: noopurP Date: Tue, 27 Sep 2016 19:33:47 -0400 Subject: [PATCH 14/16] Create ajax_text.txt --- ajax_text.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 ajax_text.txt diff --git a/ajax_text.txt b/ajax_text.txt new file mode 100644 index 0000000..d1d81ed --- /dev/null +++ b/ajax_text.txt @@ -0,0 +1 @@ +

Image editing, courtesy of Aviary. Try editing snother image

From f0516ccd4e39539d3442c2f98056667ccdac652b Mon Sep 17 00:00:00 2001 From: noopurP Date: Tue, 27 Sep 2016 19:34:58 -0400 Subject: [PATCH 15/16] Update index.html --- index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index 31f0f04..fec839a 100644 --- a/index.html +++ b/index.html @@ -35,9 +35,9 @@ } $(document).ready(function(){ - $("button").click(function(){ - $("#div1").load("ajax_text.txt"); - }); + $("button").click(function(){ + $("#div1").load("ajax_text.txt"); + }); }); From 70b610f37a09e9f4bd9df5589fea71d8f393b27d Mon Sep 17 00:00:00 2001 From: noopurP Date: Tue, 27 Sep 2016 19:38:28 -0400 Subject: [PATCH 16/16] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index fec839a..7b7d96d 100644 --- a/index.html +++ b/index.html @@ -5,7 +5,7 @@ - +