From e4b17138c079679b3a8b41aca7186c9b37306c55 Mon Sep 17 00:00:00 2001 From: MuslemRahimi Date: Wed, 30 Oct 2024 20:42:29 +0100 Subject: [PATCH] ui fixes --- .../corporate-lobbying-tracker/+page.svelte | 194 +++++++----------- 1 file changed, 77 insertions(+), 117 deletions(-) diff --git a/src/routes/corporate-lobbying-tracker/+page.svelte b/src/routes/corporate-lobbying-tracker/+page.svelte index 3f0aa51d..9f391772 100644 --- a/src/routes/corporate-lobbying-tracker/+page.svelte +++ b/src/routes/corporate-lobbying-tracker/+page.svelte @@ -8,21 +8,8 @@ export let data; - let isLoaded = false; - let rawData = []; - let displayList = []; - - let order = "highToLow"; - - const sortByAmount = (tickerList) => { - return tickerList?.sort(function (a, b) { - if (order === "highToLow") { - return b?.amount - a?.amount; - } else { - return a?.amount - b?.amount; - } - }); - }; + let rawData = data?.getCorporateLobbyingTracker ?? []; + let displayList = rawData?.slice(0, 50) ?? []; async function infiniteHandler({ detail: { loaded, complete } }) { if (displayList?.length === rawData?.length) { @@ -48,21 +35,6 @@ return `${year}/${month}/${day} ${hours}:${minutes} ${ampm}`; } - onMount(() => { - rawData = data?.getCorporateLobbyingTracker ?? []; - displayList = rawData?.slice(0, 50) ?? []; - isLoaded = true; - }); - - function changeOrder(state: string) { - if (state === "highToLow") { - order = "lowToHigh"; - } else { - order = "highToLow"; - } - - displayList = sortByAmount(rawData)?.slice(0, 50); - } $: charNumber = $screenWidth < 640 ? 15 : 20; @@ -206,102 +178,90 @@ Track the latest lobbying spendings of US stock companies

- {#if isLoaded} +
-
- - - - - - {#each displayList as item, index} - + + + + {#each displayList as item, index} + + + {formatDate(item?.date)} + - + + + + + + + {:else} + {item?.changesPercentage <= -1000 + ? item?.changesPercentage + : item?.changesPercentage?.toFixed(2)}% + + {/if} + - - - - - - - - - {/each} - -
- - {formatDate(item?.date)} - + - + + {item?.name?.length > charNumber + ? item?.name?.slice(0, charNumber) + "..." + : item?.name} + + {item?.price} + + {#if item?.changesPercentage >= 0} + +{item?.changesPercentage >= 1000 + ? item?.changesPercentage + : item?.changesPercentage?.toFixed(2)}% - {item?.ticker} - - - {item?.name?.length > charNumber - ? item?.name?.slice(0, charNumber) + "..." - : item?.name} - - {item?.price} - - {#if item?.changesPercentage >= 0} - +{item?.changesPercentage >= 1000 - ? item?.changesPercentage - : item?.changesPercentage?.toFixed(2)}% - {:else} - {item?.changesPercentage <= -1000 - ? item?.changesPercentage - : item?.changesPercentage?.toFixed(2)}% - - {/if} - - ${new Intl.NumberFormat("en", { - minimumFractionDigits: 0, - maximumFractionDigits: 0, - }).format(item?.amount)} -
-
- + + ${new Intl.NumberFormat("en", { + minimumFractionDigits: 0, + maximumFractionDigits: 0, + }).format(item?.amount)} + + + {/each} + +
- {:else} -
-
- -
-
- {/if} + +
+