diff --git a/src/routes/market-mover/+page.svelte b/src/routes/market-mover/+page.svelte index 6a3e0b83..217468a2 100644 --- a/src/routes/market-mover/+page.svelte +++ b/src/routes/market-mover/+page.svelte @@ -323,7 +323,7 @@ $: charNumber = $screenWidth < 640 ? 20 : 30; Stock Indexes - {getCurrentDateFormatted()} -
+
diff --git a/src/routes/stock-screener/[strategyId]/+page.svelte b/src/routes/stock-screener/[strategyId]/+page.svelte index 09da5ab9..2841d2c6 100644 --- a/src/routes/stock-screener/[strategyId]/+page.svelte +++ b/src/routes/stock-screener/[strategyId]/+page.svelte @@ -89,6 +89,7 @@ const allRules = { cagr5YearRevenue: { label: 'Revenue CAGR 5Y', step: ['200%','100%','50%','20%','10%','5%','1%'], category: 'fund', defaultCondition: 'over', defaultValue: '1%' }, cagr3YearEPS: { label: 'EPS CAGR 3Y', step: ['200%','100%','50%','20%','10%','5%','1%'], category: 'fund', defaultCondition: 'over', defaultValue: '1%' }, cagr5YearEPS: { label: 'EPS CAGR 5Y', step: ['200%','100%','50%','20%','10%','5%','1%'], category: 'fund', defaultCondition: 'over', defaultValue: '1%' }, + returnOnInvestedCapital: { label: 'Return On Capital', step: ['100%','50%','20%','10%','5%','1%'], category: 'fund', defaultCondition: 'over', defaultValue: '1%' }, pe: { label: 'PE Ratio', step: [50,40,30,20,10,5,1], category: 'fund', defaultCondition: 'over', defaultValue: 1 }, diff --git a/src/routes/watchlist/+page.svelte b/src/routes/watchlist/+page.svelte index 672981e5..bb30314c 100644 --- a/src/routes/watchlist/+page.svelte +++ b/src/routes/watchlist/+page.svelte @@ -8,7 +8,7 @@ import { Drawer } from "vaul-svelte"; import Input from '$lib/components/Input.svelte'; import WatchListCard from '$lib/components/WatchListCard.svelte'; import {screenWidth, switchWatchList } from '$lib/store'; -import MiniPlot from '$lib/components/MiniPlot.svelte'; +//import MiniPlot from '$lib/components/MiniPlot.svelte'; import { goto } from '$app/navigation'; import ArrowLogo from "lucide-svelte/icons/move-up-right"; @@ -43,7 +43,7 @@ function getCurrentDateFormatted() { return `${month} ${day}, ${year}`; } - +/* let priceDataSP500; let priceDataNasdaq; let priceDataDowJones; @@ -83,6 +83,7 @@ rawData?.forEach(({ symbol, priceData, changesPercentage, previousClose }) => { break; } }); +*/ let isLoaded = false; @@ -452,7 +453,7 @@ onDestroy( () => { {#if isLoaded} - + {#if allList?.length !== 0}
diff --git a/src/routes/watchlist/+page.ts b/src/routes/watchlist/+page.ts index 0ea928ca..7926142b 100644 --- a/src/routes/watchlist/+page.ts +++ b/src/routes/watchlist/+page.ts @@ -1,3 +1,4 @@ +/* import { getCache, setCache } from '$lib/store'; @@ -36,4 +37,5 @@ export const load = async ({parent}) => { return { getMiniPlotsIndex: await getMiniPlotsIndex(), }; -}; \ No newline at end of file +}; +*/