Merge branch 'stocknear:main' into main

src/routes/market-mover/+page.svelte

@@ -323,7 +323,7 @@ $: charNumber = $screenWidth < 640 ? 20 : 30;
     Stock Indexes - {getCurrentDateFormatted()}
   </div>
 
-  <div class="w-full -mt-4 sm:mt-0 mb-8 m-auto flex justify-start sm:justify-center items-center p-3 sm:p-0">
+  <div class="w-full sm:hidden -mt-4 sm:mt-0 mb-8 m-auto flex justify-start sm:justify-center items-center p-3 sm:p-0">
     <div class="w-full grid grid-cols-2 md:grid-cols-3 gap-y-3 gap-x-3 ">
     <MiniPlot title="S&P500" priceData = {priceDataSP500} changesPercentage={changeSP500} previousClose={previousCloseSP500}/>
     <MiniPlot title="Nasdaq" priceData = {priceDataNasdaq} changesPercentage={changeNasdaq} previousClose={previousCloseNasdaq}/>

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 },

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}
-
+    <!--
     <div class="text-white text-xs sm:text-sm pb-5 sm:pb-2 pl-3 sm:pl-0">
       Stock Indexes - {getCurrentDateFormatted()}
     </div>
@@ -465,6 +466,7 @@ onDestroy( () => {
       <MiniPlot title="Russel" priceData = {priceDataRussel2000} changesPercentage={changeRussel2000} previousClose={previousCloseRussel2000}/>
       </div>
     </div>
+    -->
 
     {#if allList?.length !== 0}
       <div class="flex flex-row items-center w-full">

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(),
   };
-};
+};
+*/