From a1499013dc86e29deef1c18a75cf4c343424b3e4 Mon Sep 17 00:00:00 2001 From: Kara Hoagland Date: Sun, 4 Dec 2022 17:53:13 -0800 Subject: [PATCH] -Req Star Message -Load More Position -Cancel Update Form --- source/ReviewDetails.html | 4 +--- source/assets/scripts/CreatePage.js | 4 +--- source/assets/scripts/ReviewCard.js | 3 --- source/assets/scripts/ReviewDetails.js | 10 ++++++---- source/assets/scripts/{main.js => homepage.js} | 7 ++++--- source/index.html | 5 ++--- source/static/homepage.css | 5 +++++ source/sw.js | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) rename source/assets/scripts/{main.js => homepage.js} (97%) diff --git a/source/ReviewDetails.html b/source/ReviewDetails.html index 521ddb4..c76976d 100644 --- a/source/ReviewDetails.html +++ b/source/ReviewDetails.html @@ -13,8 +13,6 @@ - - @@ -139,7 +137,7 @@ - + diff --git a/source/assets/scripts/CreatePage.js b/source/assets/scripts/CreatePage.js index f539e9d..8978e65 100644 --- a/source/assets/scripts/CreatePage.js +++ b/source/assets/scripts/CreatePage.js @@ -110,8 +110,6 @@ function initFormHandler() { // Adds data to the reviewObject from form data for (let [key, value] of formData) { - console.log(`${key}`); - console.log(`${value}`); if (`${key}` !== "tag-form") { reviewObject[`${key}`] = `${value}`; } @@ -141,7 +139,7 @@ function initFormHandler() { } // Does not let user proceed if rating is not complete else { - window.alert("NO! FILL IN STARS"); + window.alert("Please fill in rating by selecting the stars :)"); } }); diff --git a/source/assets/scripts/ReviewCard.js b/source/assets/scripts/ReviewCard.js index 3600f2d..3a06fe6 100644 --- a/source/assets/scripts/ReviewCard.js +++ b/source/assets/scripts/ReviewCard.js @@ -109,8 +109,6 @@ class ReviewCard extends HTMLElement { // Attach event listener to each review-card this.addEventListener("click", (event) => { - console.log(event.target); - console.log(event.target.reviewId); // Saves the ID for corresponding review on new page (for data retrieval) sessionStorage.setItem("currID", JSON.stringify(event.target.data.reviewID)); // Goes to the new page for the review @@ -251,7 +249,6 @@ class ReviewCard extends HTMLElement { // Get comment section let comments = this.shadowEl.getElementById("a-comments"); - console.log(comments); dataContainer["comments"] = comments.innerText; // Get rating diff --git a/source/assets/scripts/ReviewDetails.js b/source/assets/scripts/ReviewDetails.js index 549ce35..2a2e638 100644 --- a/source/assets/scripts/ReviewDetails.js +++ b/source/assets/scripts/ReviewDetails.js @@ -161,7 +161,6 @@ function setupUpdate() { let select = document.getElementById("select"); const input = document.getElementById("mealImg"); select.addEventListener("change", function () { - console.log("1"); // Select a photo with HTML file selector if (select.value == "file") { // enabling file upload components and hiding photo taking components @@ -192,7 +191,6 @@ function setupUpdate() { //addressing sourcing image from local file document.getElementById("mealImg").addEventListener("change", function () { - console.log("reading used"); const reader = new FileReader(); //store image data URL after successful image load @@ -208,6 +206,12 @@ function setupUpdate() { reader.readAsDataURL(document.getElementById("mealImg").files[0]); }); + //cancel button on update form hids form not making any changes + let cancelBtn = document.getElementById("cancel-btn"); + cancelBtn.addEventListener("click", function(){ + updateDiv.classList.add("hidden"); + }) + //Take formdata values as newData when submit form.addEventListener("submit", function () { /* @@ -218,8 +222,6 @@ function setupUpdate() { let newData = {}; //iterate through formData and add to newData for (let [key, value] of formData) { - console.log(`${key}`); - console.log(`${value}`); if (`${key}` !== "tag-form") { newData[`${key}`] = `${value}`; } diff --git a/source/assets/scripts/main.js b/source/assets/scripts/homepage.js similarity index 97% rename from source/assets/scripts/main.js rename to source/assets/scripts/homepage.js index cd98eb7..e17c060 100644 --- a/source/assets/scripts/main.js +++ b/source/assets/scripts/homepage.js @@ -1,4 +1,4 @@ -// main.js +// homepage.js import { getIDsByTag, getIDsFromStorage, getReviewFromStorage, getTopIDsFromStorage } from "./localStorage.js"; // Run the init() function when the page has loaded @@ -101,6 +101,7 @@ function sortAndFilter(searchTag) { */ function loadReviews(index, reviewIDs) { let reviewBox = document.getElementById("review-container"); + let footer = document.querySelector("footer"); // label if there are no reviews to display if (reviewIDs.length == 0) { let emptyLabel = document.createElement("label"); @@ -116,7 +117,7 @@ function loadReviews(index, reviewIDs) { let moreBtn = document.getElementById("more-btn"); //delete load more button if exists if (moreBtn) { - reviewBox.removeChild(moreBtn); + footer.removeChild(moreBtn); } let reviewArr = []; //check if there are more than 9 reviews left @@ -140,7 +141,7 @@ function loadReviews(index, reviewIDs) { moreBtn.addEventListener("click", function () { loadReviews(index + 9, reviewIDs); }); - reviewBox.append(moreBtn); + footer.append(moreBtn); } } diff --git a/source/index.html b/source/index.html index 4324847..bf63b05 100644 --- a/source/index.html +++ b/source/index.html @@ -13,10 +13,8 @@ - - - + @@ -61,5 +59,6 @@
+ diff --git a/source/static/homepage.css b/source/static/homepage.css index 3487761..308612b 100644 --- a/source/static/homepage.css +++ b/source/static/homepage.css @@ -118,3 +118,8 @@ img#create-btn-invis { background-color: #f1f1f1; text-align: center; } + +footer { + display: flex; + justify-content: center; +} diff --git a/source/sw.js b/source/sw.js index 42e3c39..54ca618 100644 --- a/source/sw.js +++ b/source/sw.js @@ -24,7 +24,7 @@ const ASSETS = [ "assets/images/search_button.png", "assets/scripts/CreatePage.js", "assets/scripts/localStorage.js", - "assets/scripts/main.js", + "assets/scripts/homepage.js", "assets/scripts/ReviewCard.js", "assets/scripts/ReviewDetails.js", ];