startup-systems · noopurP · Sep 26, 2016 · Sep 26, 2016 · Sep 26, 2016 · Sep 26, 2016
diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 # Mashup project
 
+<<<<<<< HEAD
 This project is open-ended!
 
 * [AJAX demos](https://github.com/advanced-js/deck/tree/gh-pages/demos/ajax)
@@ -53,3 +54,10 @@ Within this repository directory in your [virtual machine](https://github.com/st
     ```bash
     npm test -s
     ```
+=======
+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
+>>>>>>> 8b2f4f7182ee3413d13dbc17a42da76c8612a225
diff --git a/ajax_text.txt b/ajax_text.txt
@@ -0,0 +1 @@
+<p id="p1">Image editing, courtesy of Aviary. Try editing snother image</p>
diff --git a/index.html b/index.html
@@ -1,8 +1,49 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <title>Mashup</title>
-  </head>
-  <body>
-  </body>
+    <head>
+        <title>Mashup</title>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
+        <!-- Load Feather code -->
+		<script type="text/javascript" src="http://feather.aviary.com/imaging/v3/editor.js"></script>
+		<!-- Instantiate Feather -->
+		<script type='text/javascript'>
+			var featherEditor = new Aviary.Feather({
+				apiKey: '463822cfe2b94aae9c119ab8ab6179ca',
+				theme: 'light', // Check out our new 'light' and 'light' themes!
+				tools: 'all',
+				appendTo: '',
+				onSave: function(imageID, newURL) {
+							var img = document.getElementById(imageID);
+								img.src = newURL;		
+						},
+				onError: function(errorObj) {
+							alert(errorObj.message);
+						}
+			});
+			function launchEditor(id, src) {
+				featherEditor.launch({
+					image: id,
+					url: src
+				});
+				return false;
+			}
+			function myFunct(){
+				var txt = document.getElementById("myurl").value;
+				document.getElementById("image1").setAttribute("src", txt);
+				launchEditor("image1", txt);
+			}
+			$(document).ready(function(){
+    				$("button").click(function(){
+        				$("#div1").load("ajax_text.txt");
+    				});
+			});
+		</script>
+    </head>
+    <body>
+		<div id='injection_site'></div>
+		<input type="text" id="myurl" placeholder="Enter the url of an image" style="width: 250px; height: 45px"/>
+		<button id="geturl" onclick="myFunct()" style="width: 60px; height: 51px" >GO</button>
+		<img id='image1' src="http://www.stuarthoward.com/images/uploads/projects/1/blank-white__background.png"  alt="Your image"/>
+		<div id="div1"></div>
+    </body>
 </html>
diff --git a/testAjax.js b/testAjax.js
@@ -1,7 +1,6 @@
 const fs = require('fs');
 const globby = require('globby');
 
-
 // get current file path, relative to directory that the script is run from
 const currentFileRelative = () => {
   // based off of http://stackoverflow.com/a/31856198/358804
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<p id="p1">Image editing, courtesy of Aviary. Try editing snother image</p>