Merge branch 'sprint-2' of https://github.com/cse110-fa22-group29/cse110-fa22-group29 into sprint-2

.github/workflows/css-linting.yml

@@ -20,4 +20,4 @@ jobs:
       - name: Install dependencies
         run: sudo npm install
       - name: Run tests
-        run: sudo npm run lintCSS
+        run: sudo npm run lint-css

.github/workflows/html-linting.yml

@@ -20,4 +20,4 @@ jobs:
       - name: Install dependencies
         run: sudo npm install
       - name: Run tests
-        run: sudo npm run lintHTML
+        run: sudo npm run lint-html

.github/workflows/js-linting.yml

@@ -22,4 +22,4 @@ jobs:
       - name: Install dependencies
         run: sudo npm install
       - name: Run tests
-        run: sudo npm run lint
+        run: sudo npm run lint-js

.stylelintrc.json

@@ -1,3 +1,4 @@
 {
-	"extends": "stylelint-config-standard"
+	"extends": "stylelint-config-standard",
+	"ignore": ["inside-parens", "param", "value"]
 }

package.json

@@ -4,10 +4,11 @@
   "type": "module",
   "scripts": {
     "test": "mocha --recursive --require mock-local-storage './{,!(node_modules)/**}/*.test.js'",
-    "lint": "eslint **/*.js",
-    "fix-style": "eslint --fix **/*.js",
-    "lintHTML": "htmlhint **/*.html",
-    "lintCSS": "stylelint **/*.css",
+    "lint-js": "eslint **/*.js",
+    "fix-js": "eslint --fix **/*.js",
+    "lint-html": "htmlhint **/*.html",
+    "lint-css": "stylelint **/*.css",
+    "fix-css": "stylelint --fix **/*.css",
     "http-server": "http-server source"
   },
   "devDependencies": {

source/CreatePage.html

@@ -40,9 +40,14 @@
     <form id="new-food-entry">
       <fieldset>
         <legend>Pic:</legend>
-        <label for="mealImage">
+        Choose Input type:
+      <select id="select" name="select">
+        <option value="file">File Upload</option>
+        <option value="url">From an URL</option>
+      </select>
+      <label for="mealImage" id="source">
           Source:
-          <input type="text" id="mealImg" name="mealImg">
+          <input type="file" accept="image/*" id="mealImg" name="mealImg">
         </label>
         <label for="image-alt">
           Alt Text:

source/ReviewDetails.html

@@ -26,9 +26,14 @@
     <!----> <form id="update-food-entry" class="hidden">
       <fieldset>
         <legend>Pic:</legend>
-        <label for="mealImage">
+        Choose Input type:
+        <select id="select" name="select">
+          <option value="file">File Upload</option>
+          <option value="url">From an URL</option>
+        </select>
+        <label for="mealImage" id="source">
           Source:
-          <input type="text" id="mealImg" name="mealImg">
+          <input type="file" accept="image/*" id="mealImg" name="mealImg">
         </label>
         <label for="image-alt">
           Alt Text:

source/assets/scripts/CreatePage.js

@@ -16,6 +16,43 @@ function initFormHandler() {
 	let tagContainer = document.getElementById("tag-container-form");
 	let form = document.querySelector("form");
 
+	/*
+	* change the input source of the image between local file and URL 
+	* depending on user's selection
+	*/
+	let select = document.getElementById("select");
+	select.addEventListener("change", function() {
+		const input = document.getElementById("source");
+	
+		if (select.value == "file") {
+			input.innerHTML = `
+			Source:
+			<input type="file" accept="image/*" id="mealImg" name="mealImg">
+			`;
+		}
+		//TODO: change to photo taking for sprint 3
+		else {
+			input.innerHTML = `
+			Source:
+			<input type="text" id="mealImg" name="mealImg">
+			`;
+		}
+	});
+
+	//addressing sourcing image from local file
+	let imgDataURL = "";
+	document.getElementById("mealImg").addEventListener("change", function() {
+		const reader = new FileReader();
+		
+		//store image data URL after successful image load
+		reader.addEventListener("load", ()=>{
+			imgDataURL = reader.result;
+		}, false);
+		
+		//convert image file into data URL for local storage
+		reader.readAsDataURL(document.getElementById("mealImg").files[0]);
+	});
+		
 	form.addEventListener("submit", function(e){
 	/*
     *  User submits the form for their review.
@@ -30,6 +67,9 @@ function initFormHandler() {
 			if (`${key}` !== "tag-form") {
 				reviewObject[`${key}`] = `${value}`;
 			}
+			if (`${key}` === "mealImg" && select.value == "file") {
+				reviewObject["mealImg"] = imgDataURL;
+			}
 		}
 		reviewObject["tags"] = [];
 

source/assets/scripts/ReviewDetails.js

@@ -55,6 +55,46 @@ function setupUpdate(){
 				tagContainer.append(newTag);
 			}
 		}
+
+		/*
+		* change the input source of the image between local file and URL 
+		* depending on user's selection
+		*/
+		let select = document.getElementById("select");
+		select.addEventListener("change", function() {
+			const input = document.getElementById("source");
+		
+			if (select.value == "file") {
+				input.innerHTML = `
+				Source:
+				<input type="file" accept="image/*" id="mealImg" name="mealImg">
+				`;
+			}
+			//TODO: change to photo taking for sprint 3
+			else {
+				input.innerHTML = `
+				Source:
+				<input type="text" id="mealImg" name="mealImg">
+				`;
+			}
+		});
+
+		//addressing sourcing image from local file
+		let imgDataURL = "";
+		document.getElementById("mealImg").addEventListener("change", function() {
+			console.log("reading used");
+			const reader = new FileReader();
+			
+			//store image data URL after successful image load
+			reader.addEventListener("load", ()=>{
+				imgDataURL = reader.result;
+			}, false);
+			
+			//convert image file into data URL for local storage
+			reader.readAsDataURL(document.getElementById("mealImg").files[0]);
+		});
+
+		
 		//Take formdata values as newData when submit
 		form.addEventListener("submit", function(){
 			/*
@@ -69,6 +109,13 @@ function setupUpdate(){
 				if (`${key}` !== "tag-form") {
 					newData[`${key}`] = `${value}`;
 				}
+				//Account for the case where image is not updated
+				if (`${key}` === "mealImg" && document.getElementById("mealImg").value === "") {
+					newData["mealImg"] = currReview["mealImg"];
+				}
+				else if (`${key}` === "mealImg" && select.value == "file") {
+					newData["mealImg"] = imgDataURL;
+				}
 			}
 			newData["tags"] = [];
 		

source/assets/scripts/main.e2e.test.js

@@ -229,18 +229,8 @@ describe("test App end to end", async () => {
 					console.log(dialog.message());
 					await dialog.accept();
 				});
-
-				// Get the delete button and click it
-				let delete_btn = await page.$("#delete-btn");
-				await delete_btn.click();
-				await page.waitForNavigation();
-
-				// Check that the card was correctly removed (there should be no remaining cards)
-				review_card = await page.$("#review-card");
-				assert.strictEqual(review_card, null);
 			});
 		});
-
 	});
 
 	after(async () => {

source/index.html

@@ -10,7 +10,6 @@
   <!-- Recipe Card Custom Element -->
   <script src="assets/scripts/ReviewCard.js" type="module"></script>
 
-
   <!-- Main Stylesheets & Scripts --> 
   <!-- Temporarily commented out reset.css due to furthur discussion needed on the values of the default config-->
   <!-- <link rel="stylesheet" href="/static/reset.css" /> -->