From fbd69ee6cebac1763f10f2003b0bb2a5e788eba7 Mon Sep 17 00:00:00 2001 From: noopurP Date: Mon, 26 Sep 2016 19:03:12 +0000 Subject: [PATCH 1/5] Updated File --- index.html | 49 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index 6524157..3d5c5c7 100644 --- a/index.html +++ b/index.html @@ -1,8 +1,47 @@ - - Mashup - - - + + Mashup + + + + + + + + + + + + +
+ + Image cannot be displayed +

+ + + + From 04ead695825d036a92935e58dd63770d0c547948 Mon Sep 17 00:00:00 2001 From: noopurP Date: Mon, 26 Sep 2016 15:16:52 -0400 Subject: [PATCH 2/5] 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 23faf20ee8fc085f1e2e6b4677508cc88a6150d9 Mon Sep 17 00:00:00 2001 From: noopurP Date: Mon, 26 Sep 2016 16:52:25 -0400 Subject: [PATCH 3/5] Update README.md --- README.md | 43 ++----------------------------------------- 1 file changed, 2 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index ea283d2..6fe3bd9 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 can then 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 8b2f4f7182ee3413d13dbc17a42da76c8612a225 Mon Sep 17 00:00:00 2001 From: noopurP Date: Mon, 26 Sep 2016 16:56:18 -0400 Subject: [PATCH 4/5] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 6fe3bd9..7188a7d 100644 --- a/README.md +++ b/README.md @@ -3,3 +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 04f23defaaaf893a80a9033a0c707ec6528829ce Mon Sep 17 00:00:00 2001 From: noopurP Date: Tue, 27 Sep 2016 23:28:26 +0000 Subject: [PATCH 5/5] Now with AJAX --- ajax_text.txt | 1 + index.html | 6 ++++++ 2 files changed, 7 insertions(+) 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

diff --git a/index.html b/index.html index 241a445..035a903 100644 --- a/index.html +++ b/index.html @@ -32,6 +32,11 @@ document.getElementById("image1").setAttribute("src", txt); launchEditor("image1", txt); } + $(document).ready(function(){ + $("button").click(function(){ + $("#div1").load("ajax_text.txt"); + }); + }); @@ -39,5 +44,6 @@ Your image +