From 3067e76c281d3692fcdb439ba460f50a047f8535 Mon Sep 17 00:00:00 2001 From: wireless_purple Date: Mon, 15 Jul 2024 22:19:15 +0000 Subject: [PATCH] fix watcher, layout changes --- src/lib/server/context.js | 9 +- src/routes/+layout.svelte | 33 +++-- src/routes/market/[market]/+page.svelte | 5 +- static/haveno-reto_logo.svg | 119 ++++++++++++++++++ .../{haveno_logo_icon.png => haveno_logo.png} | Bin ...mbol-on-white-1280.png => monero_logo.png} | Bin 6 files changed, 152 insertions(+), 14 deletions(-) create mode 100644 static/haveno-reto_logo.svg rename static/{haveno_logo_icon.png => haveno_logo.png} (100%) rename static/{monero-symbol-on-white-1280.png => monero_logo.png} (100%) diff --git a/src/lib/server/context.js b/src/lib/server/context.js index 9f4f5f5..947d18e 100644 --- a/src/lib/server/context.js +++ b/src/lib/server/context.js @@ -60,19 +60,18 @@ Bun.file(`${import.meta.env.VITE_DB_PATH}/traditional_currency_list.json`) const watcher = watch(import.meta.env.VITE_DB_PATH, async (_, filename) => { const file = Bun.file(import.meta.env.VITE_DB_PATH + filename); - const contents = await file.json(); switch (filename) { case "offers_statistics.json": - offers.set(formatOffers(contents)); + offers.set(formatOffers(await file.json())); break; case "trade_statistics.json": - trades.set(formatTrades(contents)); + trades.set(formatTrades(await file.json())); break; case "crypto_currency_list.json": - crypto.set(formatCrypto(contents)); + crypto.set(formatCrypto(await file.json())); break; case "traditional_currency_list.json": - fiat.set(formatFiat(contents)); + fiat.set(formatFiat(await file.json())); break; } }); diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 49a6d2b..5b5d490 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -15,22 +15,28 @@ Object.groupBy ||= (values, keyFinder) => {
-
- - +
+ + haveno.exchange haveno.markets - - + + xmrchain.net
-
- +
+ Data from: + + + haveno-reto + + Donations to haveno.markets: + 84LnuW3YpCQirNMN6y6Px1E3DfwnqwXVRARi9eHjzeSVFJqEQmJCxkP5WpkysbcktqUNhXxQLowhJGSknNjJWZNQ7FKp5bu
@@ -52,6 +58,7 @@ Object.groupBy ||= (values, keyFinder) => { .footer { background-color:#4444; margin-top:auto; + text-align:center; } .col{ display:flex; @@ -134,4 +141,16 @@ Object.groupBy ||= (values, keyFinder) => { padding:.2em 0; } } + .header > * { + display:flex; + width:33.3%; + align-items: center; + justify-content: center; + gap:.2em; + } + @media only screen and (max-width: 600px){ + .header > * { + width:initial; + } + } \ No newline at end of file diff --git a/src/routes/market/[market]/+page.svelte b/src/routes/market/[market]/+page.svelte index 1640179..92b4e77 100644 --- a/src/routes/market/[market]/+page.svelte +++ b/src/routes/market/[market]/+page.svelte @@ -65,6 +65,7 @@ const gridLayout = { }; const marketPair = isMoneroQuote(market) ? `${market}/XMR` : `XMR/${market}`; +const BUY_SELL = isMoneroQuote(market) ? ["SELL", "BUY"] : ["BUY", "SELL"]; {marketPair} - Haveno Markets @@ -88,7 +89,7 @@ const marketPair = isMoneroQuote(market) ? `${market}/XMR` : `XMR/${market}`; Amount (XMR) Amount ({market}) - {#each data.offers["BUY"]?.toSorted((a,b) => a.price < b.price ? 1 : -1)||[] as offer} + {#each data.offers[BUY_SELL[0]]?.toSorted((a,b) => a.price < b.price ? 1 : -1)||[] as offer} {formatPrice(offer.price, market, false, false)} {formatPrice(offer.amount, "XMR", false, false)} @@ -105,7 +106,7 @@ const marketPair = isMoneroQuote(market) ? `${market}/XMR` : `XMR/${market}`; Amount (XMR) Amount ({market}) - {#each data.offers["SELL"]?.toSorted((a,b) => a.price > b.price ? 1 : -1)||[] as offer} + {#each data.offers[BUY_SELL[1]]?.toSorted((a,b) => a.price > b.price ? 1 : -1)||[] as offer} {formatPrice(offer.price, market, false, false)} {formatPrice(offer.amount, "XMR", false, false)} diff --git a/static/haveno-reto_logo.svg b/static/haveno-reto_logo.svg new file mode 100644 index 0000000..72dcdc2 --- /dev/null +++ b/static/haveno-reto_logo.svg @@ -0,0 +1,119 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/static/haveno_logo_icon.png b/static/haveno_logo.png similarity index 100% rename from static/haveno_logo_icon.png rename to static/haveno_logo.png diff --git a/static/monero-symbol-on-white-1280.png b/static/monero_logo.png similarity index 100% rename from static/monero-symbol-on-white-1280.png rename to static/monero_logo.png