From eb24f8ff95007a15a363136e8aa27b77fbfc54fd Mon Sep 17 00:00:00 2001 From: Florian Bauer Date: Wed, 7 Jun 2023 00:07:53 +0200 Subject: [PATCH] Change Color Structure to tailwindCSS Colors --- site/cart.js | 2 +- site/changes.js | 2 +- site/utils.js | 38 ++++++++++++++------------------------ 3 files changed, 16 insertions(+), 26 deletions(-) diff --git a/site/cart.js b/site/cart.js index 1a314f7..37514dc 100644 --- a/site/cart.js +++ b/site/cart.js @@ -85,7 +85,7 @@ async function load() { filtersStore.innerHTML = ` ${customCheckbox("all", "Alle", true, "gray", "gray")} ${STORE_KEYS.map((store) => - customCheckbox(store, stores[store].name, stores[store].name.toLowerCase().endsWith("de") ? false : true, stores[store].color2, "gray") + customCheckbox(store, stores[store].name, stores[store].name.toLowerCase().endsWith("de") ? false : true, stores[store].color, "gray") ).join(" ")} `; diff --git a/site/changes.js b/site/changes.js index be98ff1..7327d67 100644 --- a/site/changes.js +++ b/site/changes.js @@ -51,7 +51,7 @@ async function load() { filtersStore.innerHTML = ` ${customCheckbox(`all`, "Alle", true, "gray", "gray")} ${STORE_KEYS.map((store) => - customCheckbox(store, stores[store].name, stores[store].name.toLowerCase().endsWith("de") ? false : true, stores[store].color2, "gray") + customCheckbox(store, stores[store].name, stores[store].name.toLowerCase().endsWith("de") ? false : true, stores[store].color, "gray") ).join(" ")} `; filtersStore.querySelector("#all").addEventListener("change", () => { diff --git a/site/utils.js b/site/utils.js index 27a5cfc..bfb93b3 100644 --- a/site/utils.js +++ b/site/utils.js @@ -2,71 +2,61 @@ const stores = { billa: { name: "Billa", budgetBrands: ["clever"], - color: "rgb(255 255 225)", - color2: "yellow", + color: "yellow", getUrl: (item) => `https://shop.billa.at${item.url}`, }, spar: { name: "Spar", budgetBrands: ["s-budget"], - color: "rgb(225 244 225)", - color2: "green", + color: "green", getUrl: (item) => `https://www.interspar.at/shop/lebensmittel${item.url}`, }, hofer: { name: "Hofer", budgetBrands: ["milfina"], - color: "rgb(230 230 255)", - color2: "purple", + color: "purple", getUrl: (item) => `https://www.roksh.at/hofer/produkte/${item.url}`, }, lidl: { name: "Lidl", budgetBrands: ["milbona"], - color: "rgb(255 225 225)", - color2: "pink", + color: "pink", getUrl: (item) => `https://www.lidl.at${item.url}`, }, mpreis: { name: "MPREIS", budgetBrands: [], - color: "rgb(255 230 230)", - color2: "rose", + color: "rose", getUrl: (item) => `https://www.mpreis.at/shop/p/${item.id}`, }, dm: { name: "DM", budgetBrands: ["balea"], - color: "rgb(255 240 230)", - color2: "orange", + color: "orange", getUrl: (item) => `https://www.dm.at/product-p${item.id}.html`, }, unimarkt: { name: "Unimarkt", budgetBrands: ["jeden tag", "unipur"], - color: "rgb(179, 217, 255)", - color2: "blue", + color: "blue", getUrl: (item) => `https://shop.unimarkt.at/${item.url}`, }, penny: { name: "Penny", budgetBrands: ["bravo", "echt bio!", "san fabio", "federike", "blik", "berida", "today", "ich bin österreich"], - color: "rgb(255, 180, 180)", - color2: "purple", + color: "purple", getUrl: (item) => `https://www.penny.at/produkte/${item.url}`, }, dmDe: { name: "DM DE", budgetBrands: ["balea"], - color: "rgb(236 254 253)", - color2: "teal", + color: "teal", getUrl: (item) => `https://www.dm.de/product-p${item.id}.html`, }, reweDe: { name: "REWE DE", budgetBrands: ["ja!"], - color: "rgb(236 231 225)", - color2: "stone", + color: "stone", getUrl: (item) => `https://shop.rewe.de/p/${item.name.toLowerCase().replace(/ /g, "-")}/${item.id}`, }, }; @@ -346,15 +336,15 @@ function itemToDOM(item) { ` ); - // row.style["background"] = stores[item.store]?.color; + row.classList.add( - "bg-" + stores[item.store]?.color2 + "-200/50", + "bg-" + stores[item.store]?.color + "-200/50", "grid", "grid-cols-3", "col-span-3", "md:table-row", "border-b", - "border-" + stores[item.store]?.color2 + "-200", + "border-" + stores[item.store]?.color + "-200", "rounded-xl", "mb-3", "border", @@ -551,7 +541,7 @@ function newSearchComponent(parentElement, items, searched, filter, headerModifi `${store}-${id}`, stores[store].name, stores[store].name.toLowerCase().endsWith("de") ? false : true, - stores[store].color2, + stores[store].color, "gray" ) ).join(" ")}