From 1c1a8b7111b7dea2081f323dc4336ecd864a7823 Mon Sep 17 00:00:00 2001 From: Martin Berka Date: Sat, 22 Jul 2023 19:58:28 +0200 Subject: [PATCH] =?UTF-8?q?Oprava=20parseru,=20ned=C4=9Bliteln=C3=A9=20mez?= =?UTF-8?q?ery=20v=20cen=C3=A1ch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/App.tsx | 6 ++---- server/src/restaurants.ts | 32 ++++++++++++++++---------------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/client/src/App.tsx b/client/src/App.tsx index 60caae2..31bc5dc 100644 --- a/client/src/App.tsx +++ b/client/src/App.tsx @@ -208,10 +208,8 @@ function App() { Poslední změny:

Dnes je {data.date}

diff --git a/server/src/restaurants.ts b/server/src/restaurants.ts index 092a02f..32600af 100644 --- a/server/src/restaurants.ts +++ b/server/src/restaurants.ts @@ -82,25 +82,25 @@ export const getMenuSladovnicka = async (date: Date = new Date(), mock: boolean { amount: "0,25l", name: "Zelná polévka s klobásou", - price: "35 Kč", + price: "35\xA0Kč", isSoup: true, }, { amount: "150g", name: "Hovězí na česneku s bramborovým knedlíkem", - price: "135 Kč", + price: "135\xA0Kč", isSoup: false, }, { amount: "250g", name: "Přírodní holandský řízek s bramborovou kaší, rajčatový salát", - price: "135 Kč", + price: "135\xA0Kč", isSoup: false, }, { amount: "350g", name: "Bagel s vinnou klobásou, cibulový konfit, kysané zelí, slanina a hořčicová mayo, hranolky, curry omáčka", - price: "135 Kč", + price: "135\xA0Kč", isSoup: false, } ] @@ -165,7 +165,7 @@ export const getMenuSladovnicka = async (date: Date = new Date(), mock: boolean results.push({ amount: sanitizeText($(soupCells.get(0)).text()), name: sanitizeText($(soupCells.get(1)).text()), - price: sanitizeText($(soupCells.get(2)).text()), + price: sanitizeText($(soupCells.get(2)).text().replace(' ', '\xA0')), isSoup: true, }); // Hlavní jídla - div -> table -> tbody -> 3x tr @@ -182,7 +182,7 @@ export const getMenuSladovnicka = async (date: Date = new Date(), mock: boolean results.push({ amount: sanitizeText($(foodCells.get(0)).text()), name: sanitizeText($(foodCells.get(1)).text()), - price: sanitizeText($(foodCells.get(2)).text()), + price: sanitizeText($(foodCells.get(2)).text().replace(' ', '\xA0')), isSoup: false, }); }) @@ -202,25 +202,25 @@ export const getMenuUMotliku = async (date: Date = new Date(), mock: boolean = f { amount: "0,33l", name: "Hovězí vývar s nudlemi", - price: "35 Kč", + price: "35\xA0Kč", isSoup: true, }, { amount: "150g", name: "Opečený párek, čočka, sázené vejce, okurka", - price: "135 Kč", + price: "135\xA0Kč", isSoup: false, }, { amount: "150g", name: "Hovězí líčka na červeném víně, bramborová kaše", - price: "145 Kč", + price: "145\xA0Kč", isSoup: false, }, { amount: "150g", name: "Tortilla s trhaným kuřecím masem, uzeným sýrem, dipem a kukuřicí, míchaný salát", - price: "135 Kč", + price: "135\xA0Kč", isSoup: false, }, @@ -266,7 +266,7 @@ export const getMenuUMotliku = async (date: Date = new Date(), mock: boolean = f } const amount = sanitizeText($(children.get(0)).text()); const name = sanitizeText($(children.get(1)).text()); - const price = sanitizeText($(children.get(2)).text()).replace(',-', ''); + const price = sanitizeText($(children.get(2)).text()).replace(',-', '').replace(' ', '\xA0'); results.push({ amount, name, @@ -292,19 +292,19 @@ export const getMenuTechTower = async (date: Date = new Date(), mock: boolean = { amount: "-", name: "Bavorská gulášová polévka s kroupami", - price: "40 Kč", + price: "40\xA0Kč", isSoup: true, }, { amount: "-", name: "Vepřové výpečky, kedlubnové zelí, bramborový knedlík", - price: "120 Kč", + price: "120\xA0Kč", isSoup: false, }, { amount: "-", name: "Hambuger Black Angus s čedarem a slaninou, cibulové kroužky", - price: "220 Kč", + price: "220\xA0Kč", isSoup: false, } ] @@ -347,10 +347,10 @@ export const getMenuTechTower = async (date: Date = new Date(), mock: boolean = } let price = '? Kč'; let name = text; - if (text.endsWith('Kč')) { + if (text.toLowerCase().endsWith('kč')) { const tmp = text.replace('\xA0', ' ').split(' '); const split = [tmp.slice(0, -2).join(' ')].concat(tmp.slice(-2)); - price = split.slice(1).join(" ") + price = `${split.slice(1)[0]}\xA0Kč` name = split[0] } results.push({