mirror of
				https://github.com/cse110-fa22-group29/cse110-fa22-group29.git
				synced 2025-10-30 19:46:49 +00:00 
			
		
		
		
	Merge branch 'filter-sort' of https://github.com/cse110-fa22-group29/cse110-fa22-group29 into filter-sort
This commit is contained in:
		| @@ -97,10 +97,10 @@ function initFormHandler() { | |||||||
| 				let tagLabel = document.createElement("label"); | 				let tagLabel = document.createElement("label"); | ||||||
| 				tagLabel.innerHTML = tagField.value; | 				tagLabel.innerHTML = tagField.value; | ||||||
| 				tagLabel.setAttribute("class","tag"); | 				tagLabel.setAttribute("class","tag"); | ||||||
| 				tagSet.add(tagField.value.toLowerCase()); | 				tagSet.add(tagSetVal); | ||||||
| 				tagLabel.addEventListener("click",()=> { | 				tagLabel.addEventListener("click",()=> { | ||||||
| 					tagContainer.removeChild(tagLabel); | 					tagContainer.removeChild(tagLabel); | ||||||
| 					tagSet.delete(tagField.value.toLowerCase()); | 					tagSet.delete(tagSetVal); | ||||||
| 				}); | 				}); | ||||||
| 		 | 		 | ||||||
| 				tagContainer.append(tagLabel); | 				tagContainer.append(tagLabel); | ||||||
|   | |||||||
| @@ -158,7 +158,7 @@ class ReviewCard extends HTMLElement { | |||||||
|  |  | ||||||
| 		//image setup | 		//image setup | ||||||
| 		let mealImg = document.createElement("img"); | 		let mealImg = document.createElement("img"); | ||||||
| 		mealImg.setAttribute("id", "a-mealImg"); | 		mealImg.setAttribute("id", "a-meal-img"); | ||||||
| 		mealImg.setAttribute("alt","Meal Photo Corrupted"); | 		mealImg.setAttribute("alt","Meal Photo Corrupted"); | ||||||
| 		mealImg.setAttribute("src",data["mealImg"]); | 		mealImg.setAttribute("src",data["mealImg"]); | ||||||
| 		mealImg.addEventListener("error", function(e) { | 		mealImg.addEventListener("error", function(e) { | ||||||
| @@ -170,7 +170,7 @@ class ReviewCard extends HTMLElement { | |||||||
| 		let meallabelDiv = document.createElement("div"); | 		let meallabelDiv = document.createElement("div"); | ||||||
| 		meallabelDiv.setAttribute("class", "meal-name-div"); | 		meallabelDiv.setAttribute("class", "meal-name-div"); | ||||||
| 		let mealLabel = document.createElement("label"); | 		let mealLabel = document.createElement("label"); | ||||||
| 		mealLabel.setAttribute("id", "a-mealName"); | 		mealLabel.setAttribute("id", "a-meal-name"); | ||||||
| 		mealLabel.setAttribute("class","meal-name"); | 		mealLabel.setAttribute("class","meal-name"); | ||||||
| 		mealLabel.innerHTML = data["mealName"]; | 		mealLabel.innerHTML = data["mealName"]; | ||||||
| 		meallabelDiv.append(mealLabel); | 		meallabelDiv.append(mealLabel); | ||||||
| @@ -252,11 +252,11 @@ class ReviewCard extends HTMLElement { | |||||||
| 		dataContainer["reviewID"] = this.reviewID; | 		dataContainer["reviewID"] = this.reviewID; | ||||||
|  |  | ||||||
| 		//get image | 		//get image | ||||||
| 		let mealImg = this.shadowEl.getElementById("a-mealImg"); | 		let mealImg = this.shadowEl.getElementById("a-meal-img"); | ||||||
| 		dataContainer["mealImg"] = mealImg.getAttribute("src"); | 		dataContainer["mealImg"] = mealImg.getAttribute("src"); | ||||||
|  |  | ||||||
| 		//get meal name | 		//get meal name | ||||||
| 		let mealLabel = this.shadowEl.getElementById("a-mealName"); | 		let mealLabel = this.shadowEl.getElementById("a-meal-name"); | ||||||
| 		dataContainer["mealName"] = mealLabel.innerHTML; | 		dataContainer["mealName"] = mealLabel.innerHTML; | ||||||
|  |  | ||||||
| 		//get comment section | 		//get comment section | ||||||
|   | |||||||
| @@ -40,13 +40,13 @@ export async function setReviewForm(page, review) { | |||||||
|  */ |  */ | ||||||
| export async function checkCorrectness(root, prefix, expected){ | export async function checkCorrectness(root, prefix, expected){ | ||||||
| 	// Get the review image and check src | 	// Get the review image and check src | ||||||
| 	let img = await root.$(`#${prefix}-mealImg`); | 	let img = await root.$(`#${prefix}-meal-img`); | ||||||
| 	let imgSrc = await img.getProperty("src"); | 	let imgSrc = await img.getProperty("src"); | ||||||
| 	// Check src | 	// Check src | ||||||
| 	assert.strictEqual(await imgSrc.jsonValue(), expected.imgSrc); | 	assert.strictEqual(await imgSrc.jsonValue(), expected.imgSrc); | ||||||
|  |  | ||||||
| 	// Get the title, comment, and restaurant | 	// Get the title, comment, and restaurant | ||||||
| 	let title = await root.$(`#${prefix}-mealName`); | 	let title = await root.$(`#${prefix}-meal-name`); | ||||||
| 	let title_text = await title.getProperty("innerText"); | 	let title_text = await title.getProperty("innerText"); | ||||||
| 	let comment = await root.$(`#${prefix}-comments`); | 	let comment = await root.$(`#${prefix}-comments`); | ||||||
| 	let comment_text = await comment.getProperty("innerText"); | 	let comment_text = await comment.getProperty("innerText"); | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user