update watchlist page

src/lib/components/WatchListCard.svelte

@@ -508,11 +508,6 @@ if(watchList && isLoaded)
   </span>
 
 
-    <svg  class="w-36 mt-6 sm:w-56" viewBox="0 0 148 69" fill="none" xmlns="http://www.w3.org/2000/svg">
-      <rect opacity="0.1" width="148" height="69" rx="14" fill="white"></rect><rect opacity="0.1" x="8" y="8" width="63" height="24" rx="8" fill="white"></rect><rect opacity="0.1" x="77" y="8" width="63" height="24" rx="8" fill="white"></rect><rect opacity="0.1" x="8" y="36.5" width="63" height="24" rx="8" fill="white"></rect><rect opacity="0.1" x="77" y="37" width="63" height="24" rx="8" fill="white"></rect><rect opacity="0.2" x="17" y="15" width="22" height="4" fill="white"></rect><rect opacity="0.5" x="55" y="15" width="7" height="4" rx="2" fill="#E64141"></rect><rect opacity="0.5" x="124" y="15" width="7" height="4" rx="2" fill="#2DC97E"></rect><rect opacity="0.2" x="86" y="15" width="22" height="4" fill="white"></rect><rect opacity="0.2" x="17" y="43" width="22" height="4" fill="white"></rect><rect opacity="0.5" x="55" y="43" width="7" height="4" rx="2" fill="#2DC97E"></rect><rect opacity="0.5" x="124" y="43" width="7" height="4" rx="2" fill="#E64141"></rect><rect opacity="0.2" x="86" y="43" width="22" height="4" fill="white"></rect><rect opacity="0.1" x="17" y="21" width="45" height="4" fill="white"></rect><rect opacity="0.1" x="86" y="21" width="45" height="4" fill="white"></rect><rect opacity="0.1" x="17" y="49.5" width="45" height="4" fill="white"></rect><rect opacity="0.1" x="86" y="50" width="45" height="4" fill="white"></rect><rect x="6" y="6" width="8" height="8" rx="4" fill="#2C85FD"></rect><rect x="6" y="35" width="8" height="8" rx="4" fill="#2C85FD"></rect><rect x="76" y="6" width="8" height="8" rx="4" fill="#2C85FD"></rect><rect x="76" y="35" width="8" height="8" rx="4" fill="#2C85FD"></rect>
-    </svg>
-    
-
 
     <span class="text-white text-sm sm:text-lg pt-5 m-auto p-4 text-center">
       Fill it up with your favorite stocks and get realtime data and the latest news in one place!

src/routes/+layout.svelte

@@ -653,7 +653,7 @@ $: {
               </DropdownMenu.Item>
               <DropdownMenu.Separator />
               <DropdownMenu.Item class="sm:hover:bg-[#27272A]">
-                <a href="/watchlist">
+                <a href="/watchlist/stocks">
                   Watchlist
                 </a>
               </DropdownMenu.Item>

src/routes/api/update-options-watchlist/+server.ts

@@ -6,29 +6,43 @@ export const POST: RequestHandler = async ({ request, locals }) => {
   const { pb } = locals;
 
   let output;
+
   try {
+    // Ensure itemIdList is always an array.
+    const itemIdList = Array.isArray(data?.itemIdList)
+      ? data?.itemIdList
+      : [data?.itemIdList];
+
     const watchList = await pb.collection("optionsWatchlist").getOne(data?.id);
 
-    if (watchList?.optionsId?.includes(data?.itemId)) {
+    // Check if all items in itemIdList are already in the watchlist.
-      // Remove ticker from the watchlist.
+    const allItemsInWatchList = itemIdList.every((item) =>
+      watchList?.optionsId.includes(item)
+    );
+
+    if (allItemsInWatchList) {
+      // Remove tickers from the watchlist.
       const newTickerList = watchList?.optionsId.filter(
-        (item) => item !== data?.itemId
+        (item) => !itemIdList.includes(item)
       );
       output = await pb
         .collection("optionsWatchlist")
         .update(data?.id, { optionsId: newTickerList });
     } else {
-      // Add ticker to the watchlist.
+      // Add new tickers to the watchlist.
-      const newTickerList = [...watchList?.optionsId, data?.itemId];
+      const newTickerList = Array.from(
+        new Set([...watchList?.optionsId, ...itemIdList])
+      );
       output = await pb
         .collection("optionsWatchlist")
         .update(data?.id, { optionsId: newTickerList });
     }
   } catch (e) {
+    // Handle case where watchlist does not exist.
     output = await pb.collection("optionsWatchlist").create(
       serialize({
         user: locals?.user?.id,
-        optionsId: JSON.stringify([data?.itemId]),
+        optionsId: JSON.stringify(data?.itemIdList),
       })
     );
   }

src/routes/options-flow/+page.svelte

@@ -738,7 +738,7 @@ async function addToWatchlist(itemId) {
   if(data?.user?.tier === 'Pro') {
     try {
       const postData = {
-      'itemId': itemId,
+      'itemIdList': [itemId],
       'id': optionsWatchlist?.id
     };
 

src/routes/watchlist/+layout.svelte

@@ -0,0 +1,202 @@
+<script lang='ts'>
+import ScrollToTop from '$lib/components/ScrollToTop.svelte';
+import ArrowLogo from "lucide-svelte/icons/move-up-right";
+import { goto } from '$app/navigation';
+import { page } from '$app/stores';
+
+export let data;
+let cloudFrontUrl = import.meta.env.VITE_IMAGE_URL;
+
+
+function handleMode(i) {
+    activeIdx = i;
+    if(activeIdx === 0) {
+      goto("/watchlist/stocks")
+    } else if (activeIdx === 1) {
+      goto("/watchlist/options")
+    }
+  }
+  
+  const tabs = [
+      {
+        title: "Stocks",
+      },
+      {
+        title: "Options",
+      },
+    ];
+  
+let activeIdx = 0;
+
+  // Subscribe to the $page store to reactively update the activeIdx based on the URL
+  $: if ($page.url.pathname === '/watchlist/stocks') {
+    activeIdx = 0;
+  } else if ($page.url.pathname.startsWith('/watchlist/options')) {
+    activeIdx = 1;
+  } 
+
+</script>
+
+<!-- HEADER FOR BETTER SEO -->
+<svelte:head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width" />
+</svelte:head>
+
+
+
+
+<section class="w-full max-w-3xl sm:max-w-screen-2xl overflow-hidden min-h-screen pt-5 pb-40 lg:px-3">
+          
+  <div class="text-sm sm:text-[1rem] breadcrumbs ml-4">
+    <ul>
+      <li><a href="/" class="text-gray-300">Home</a></li>
+      <li class="text-gray-300">Watchlist</li>
+    </ul>
+  </div>
+          
+  <div class="w-full overflow-hidden m-auto mt-5">
+    
+    <div class="sm:p-0 flex justify-center w-full m-auto overflow-hidden ">
+        <div class="relative flex justify-center items-start overflow-hidden w-full">
+
+
+            <main class="w-full lg:w-3/4 lg:pr-5">
+             
+              <div class="w-full  m-auto sm:bg-[#27272A] sm:rounded-xl h-auto pl-10 pr-10 pt-5 sm:pb-10 sm:pt-10 mt-3 mb-8">
+                <div class="grid grid-cols-1 sm:grid-cols-2 gap-10">
+                <!-- Start Column -->
+                    <div>
+                        <div class="flex flex-row justify-center items-center">
+                        <h1 class="text-4xl sm:text-5xl text-white font-bold mb-5">
+                            Watchlist
+                        </h1>
+                        </div>
+
+                        <span class="text-white text-md font-medium text-center flex justify-center items-center ">
+                        Monitor the performance and recent updates of your favorite options.
+                        </span>
+                    </div>
+                    <!-- End Column -->
+                
+                    <!-- Start Column -->
+                    <div class="hidden sm:block relative m-auto mb-5 mt-5 sm:mb-0 sm:mt-0">
+                        <svg class="w-40 -my-5" viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg">
+                        <defs>
+                            <filter id="glow">
+                            <feGaussianBlur stdDeviation="5" result="glow"/>
+                            <feMerge>
+                                <feMergeNode in="glow"/>
+                                <feMergeNode in="SourceGraphic"/>
+                            </feMerge>
+                            </filter>
+                        </defs>
+                        <path fill="#1E40AF" d="M57.6,-58.7C72.7,-42.6,81.5,-21.3,82,0.5C82.5,22.3,74.7,44.6,59.7,60.1C44.6,75.6,22.3,84.3,0,84.3C-22.3,84.2,-44.6,75.5,-61.1,60.1C-77.6,44.6,-88.3,22.3,-87.6,0.7C-86.9,-20.8,-74.7,-41.6,-58.2,-57.7C-41.6,-73.8,-20.8,-85.2,0.2,-85.4C21.3,-85.6,42.6,-74.7,57.6,-58.7Z" transform="translate(100 100)" filter="url(#glow)" />
+                        </svg>
+                        
+                        <div class="z-1 absolute top-3 right-10 ">
+                        <img class="w-24" src={cloudFrontUrl+(activeIdx === 0 ? "/assets/watchlist_logo.png" : "/assets/options_logo.png") } alt="logo" loading='lazy'>
+                        </div>
+                    </div>
+                    <!-- End Column -->
+                </div>
+          
+               
+          
+          
+              </div>
+  
+
+
+                <div class="bg-[#313131] w-52 sm:w-fit relative m-auto sm:m-0 sm:mr-auto flex sm:flex-wrap items-center justify-center rounded-lg p-1 -mt-3">
+                    {#each tabs as item, i}
+                    <button
+                        on:click={() => handleMode(i)}
+                        class="group relative z-[1] rounded-full px-6 py-1 {activeIdx === i
+                        ? 'z-0'
+                        : ''} "
+                    >
+                        {#if activeIdx === i}
+                            <div
+                            class="absolute inset-0 rounded-lg bg-purple-600"
+                            ></div>
+                        {/if}
+                        <span class="relative text-[1rem] sm:text-lg block font-semibold duration-200 text-white">
+                            {item.title}
+                        </span>
+                    </button>
+                    {/each}
+                    </div>
+
+
+
+
+              <div class="sm:border-b mt-5 border-slate-700" />
+
+                <slot />
+                
+                <ScrollToTop />
+                
+            </main>
+
+             <aside class="hidden lg:block relative fixed w-1/4 ml-4">        
+  
+                {#if data?.user?.tier !== 'Pro' || data?.user?.freeTrial}
+                <div on:click={() => goto('/pricing')} class="w-full bg-[#141417] duration-100 ease-out sm:hover:text-white text-gray-400 sm:hover:border-gray-700 border border-gray-800 rounded-lg h-fit pb-4 mt-4 cursor-pointer">
+                    <div class="w-auto lg:w-full p-1 flex flex-col m-auto px-2 sm:px-0">
+                        <div class="w-full flex justify-between items-center p-3 mt-3">
+                        <h2 class="text-start text-xl font-semibold text-white ml-3">
+                        Pro Subscription 🔥
+                        </h2>
+                        <ArrowLogo class="w-8 h-8 mr-3 flex-shrink-0"/>
+                        </div>
+                        <span class="text-white p-3 ml-3 mr-3">
+                            Upgrade now for unlimited access to all data and tools.
+                        </span>
+                    </div>
+                </div>
+                {/if}
+            
+                <div on:click={() => goto('/price-alert')} class="w-full bg-[#141417] duration-100 ease-out sm:hover:text-white text-gray-400 sm:hover:border-gray-700 border border-gray-800 rounded-lg h-fit pb-4 mt-4 cursor-pointer">
+                    <div class="w-auto lg:w-full p-1 flex flex-col m-auto px-2 sm:px-0">
+                        <div class="w-full flex justify-between items-center p-3 mt-3">
+                        <h2 class="text-start text-xl font-semibold text-white ml-3">
+                        Price Alert ⏰
+                        </h2>
+                        <ArrowLogo class="w-8 h-8 mr-3 flex-shrink-0"/>
+                        </div>
+                        <span class="text-white p-3 ml-3 mr-3">
+                            Customize your alerts to never miss out again
+                        </span>
+                    </div>
+                </div>
+            
+                <div on:click={() => goto('/stock-screener')} class="w-full bg-[#141417] duration-100 ease-out sm:hover:text-white text-gray-400 sm:hover:border-gray-700 border border-gray-800 rounded-lg h-fit pb-4 mt-4 cursor-pointer">
+                    <div class="w-auto lg:w-full p-1 flex flex-col m-auto px-2 sm:px-0">
+                        <div class="w-full flex justify-between items-center p-3 mt-3">
+                        <h2 class="text-start text-xl font-semibold text-white ml-3">
+                        Stock Screener 🔎
+                        </h2>
+                        <ArrowLogo class="w-8 h-8 mr-3 flex-shrink-0"/>
+                        </div>
+                        <span class="text-white p-3 ml-3 mr-3">
+                            Build your Stock Screener to find profitable stocks.
+                        </span>
+                    </div>
+                </div>
+            
+            </aside>
+
+      </div>
+    </div>
+
+  
+  </div>
+      
+      
+  
+</section>
+    
+  
+  
+  

src/routes/watchlist/options/+page.server.ts

@@ -21,13 +21,13 @@ export const load = async ({ locals }) => {
           body: JSON.stringify(postData),
         });
         const output = await response.json();
-        return output;
+        return { id: watchList?.id, optionsList: output };
       } else {
-        return [];
+        return { id: "", optionsList: [] };
       }
     } catch (e) {
       console.error("Error fetching options watchlist or Benzinga data:", e);
-      return [];
+      return { id: "", optionsList: [] };
     }
   };
 

src/routes/watchlist/options/+page.svelte

@@ -1,21 +1,41 @@
 <script lang='ts'>
 import { numberOfUnreadNotification } from '$lib/store';
 
-import {screenWidth } from '$lib/store';
 //import MiniPlot from '$lib/components/MiniPlot.svelte';
 import { abbreviateNumber } from '$lib/utils';
 import { goto } from '$app/navigation';
 import ArrowLogo from "lucide-svelte/icons/move-up-right";
+import { onMount } from 'svelte';
+import toast from 'svelte-french-toast';
 
 let cloudFrontUrl = import.meta.env.VITE_IMAGE_URL;
 
 
 
 export let data;
+let editMode = false;
+let numberOfChecked = 0;
+let deleteOptionsId = [];
 
     let isLoaded = false;
 
-let optionsWatchlist = data?.getOptionsWatchlist
+    function daysLeft(targetDate) {
+  const targetTime = new Date(targetDate).getTime();
+  const currentTime = new Date().getTime();
+  const difference = targetTime - currentTime;
+
+  const millisecondsPerDay = 1000 * 60 * 60 * 24;
+  const daysLeft = Math?.ceil(difference / millisecondsPerDay);
+
+  return daysLeft;
+}
+    
+let optionsWatchlist = data?.getOptionsWatchlist?.optionsList
+
+  
+  function reformatDate(dateString) {
+      return dateString.substring(5, 7) + '/' + dateString.substring(8) + '/' + dateString.substring(2, 4);
+  }
   
     function formatDate(dateStr) {
       // Parse the input date string (YYYY-mm-dd)
@@ -54,6 +74,68 @@ let optionsWatchlist = data?.getOptionsWatchlist
       return formattedTimeString;
     }
 
+async function handleFilter(optionsId) {
+
+  const filterSet = new Set(deleteOptionsId);
+
+  // Check if the new filter already exists in the list
+  if (filterSet?.has(optionsId)) {
+    // If it exists, remove it from the list
+    filterSet?.delete(optionsId);
+  } else {
+    // If it doesn't exist, add it to the list
+    filterSet?.add(optionsId);
+
+  }
+  deleteOptionsId = Array?.from(filterSet);
+  numberOfChecked = deleteOptionsId?.length;
+}
+
+
+    async function handleDelete() {
+
+    if (numberOfChecked === 0) {
+        toast.error(`You need to select symbols before you can delete them`, {
+            style: 'border-radius: 10px; background: #333; color: #fff;  padding: 12px; margin-top: 10px; box-shadow: 0 25px 50px -12px rgb(0 0 0 / 0.25);',
+        });
+    } else if (data?.getOptionsWatchlist?.id?.length === 0) {
+        toast.error(`You need to select symbols before you can delete them`, {
+                    style: 'border-radius: 10px; background: #333; color: #fff;  padding: 12px; margin-top: 10px; box-shadow: 0 25px 50px -12px rgb(0 0 0 / 0.25);',
+        });
+    } else {
+
+        optionsWatchlist = optionsWatchlist?.filter(item => !deleteOptionsId?.includes(item?.id));
+
+        optionsWatchlist = [...optionsWatchlist];
+
+        const postData = {
+        'itemIdList': deleteOptionsId,
+        'id': data?.getOptionsWatchlist?.id
+        };
+
+        const response = await fetch('/api/update-options-watchlist', {
+            method: 'POST',
+            headers: {
+             "Content-Type": "application/json"
+            },
+            body: JSON.stringify(postData)
+        });
+
+        deleteOptionsId = [];
+        numberOfChecked = 0;
+
+    }
+
+}
+
+
+onMount(async () => {
+    if(optionsWatchlist?.length !== 0) {
+        optionsWatchlist?.forEach((item) => {
+        item.dte = daysLeft(item?.date_expiration) }) 
+    };
+    isLoaded = true;
+})
 </script>
 
 
@@ -86,74 +168,52 @@ let optionsWatchlist = data?.getOptionsWatchlist
     
 <section class="w-full max-w-3xl sm:max-w-screen-2xl overflow-hidden min-h-screen pt-5 pb-40 lg:px-3">
                     
-  <div class="text-sm sm:text-[1rem] breadcrumbs ml-4">
-    <ul>
-      <li><a href="/" class="text-gray-300">Home</a></li>
-      <li class="text-gray-300">Options Watchlist</li>
-    </ul>
-  </div>
-          
   <div class="w-full overflow-hidden m-auto mt-5">
     
     <div class="sm:p-0 flex justify-center w-full m-auto overflow-hidden ">
         <div class="relative flex justify-center items-start overflow-hidden w-full">
 
 
-            <main class="w-full lg:w-3/4 lg:pr-5">
+            <main class="w-full">
 
 
-              <div class="w-full m-auto bg-[#27272A] sm:rounded-xl h-auto pl-10 pr-10 pt-5 sm:pb-10 sm:pt-10 mt-3 mb-8">
-                <div class="grid grid-cols-1 sm:grid-cols-2 gap-10">
-  
-      <!-- Start Column -->
-      <div>
-        <div class="flex flex-row justify-center items-center">
-          <h1 class="text-4xl sm:text-5xl text-white font-bold mb-5">
-            Watchlist
-          </h1>
-        </div>
-
-        <span class="text-white text-md font-medium text-center flex justify-center items-center ">
-          Monitor the performance and recent updates of your favorite options.
-        </span>
-      </div>
-      <!-- End Column -->
-  
-      <!-- Start Column -->
-      <div class="relative m-auto mb-5 mt-5 sm:mb-0 sm:mt-0">
-        <svg class="w-40 -my-5" viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg">
-          <defs>
-            <filter id="glow">
-              <feGaussianBlur stdDeviation="5" result="glow"/>
-              <feMerge>
-                <feMergeNode in="glow"/>
-                <feMergeNode in="SourceGraphic"/>
-              </feMerge>
-            </filter>
-          </defs>
-          <path fill="#1E40AF" d="M57.6,-58.7C72.7,-42.6,81.5,-21.3,82,0.5C82.5,22.3,74.7,44.6,59.7,60.1C44.6,75.6,22.3,84.3,0,84.3C-22.3,84.2,-44.6,75.5,-61.1,60.1C-77.6,44.6,-88.3,22.3,-87.6,0.7C-86.9,-20.8,-74.7,-41.6,-58.2,-57.7C-41.6,-73.8,-20.8,-85.2,0.2,-85.4C21.3,-85.6,42.6,-74.7,57.6,-58.7Z" transform="translate(100 100)" filter="url(#glow)" />
-        </svg>
-        
-        <div class="z-1 absolute top-3 right-10 ">
-          <img class="w-24" src={cloudFrontUrl+"/assets/options_logo.png"} alt="logo" loading='lazy'>
-        </div>
-      </div>
-      <!-- End Column -->
-  
-    </div>
-  </div>
-    
     
+    {#if isLoaded}
     {#if optionsWatchlist?.length !== 0}
 
+     <div class="flex flex-row justify-end items-center pr-4 sm:pr-0 pb-2">
+                {#if editMode}
+                <label on:click={handleDelete} class="cursor-pointer bg-[#27272A] sm:hover:bg-[#313131] duratiion-100 transition ease-in-out px-4 py-2 rounded-lg shadow-lg mr-3">
+                    <svg class="inline-block w-5 h-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="white" d="M10 5h4a2 2 0 1 0-4 0M8.5 5a3.5 3.5 0 1 1 7 0h5.75a.75.75 0 0 1 0 1.5h-1.32l-1.17 12.111A3.75 3.75 0 0 1 15.026 22H8.974a3.75 3.75 0 0 1-3.733-3.389L4.07 6.5H2.75a.75.75 0 0 1 0-1.5zm2 4.75a.75.75 0 0 0-1.5 0v7.5a.75.75 0 0 0 1.5 0zM14.25 9a.75.75 0 0 1 .75.75v7.5a.75.75 0 0 1-1.5 0v-7.5a.75.75 0 0 1 .75-.75m-7.516 9.467a2.25 2.25 0 0 0 2.24 2.033h6.052a2.25 2.25 0 0 0 2.24-2.033L18.424 6.5H5.576z"/></svg>
+                    <span class="ml-1 text-white text-sm">
+                        {numberOfChecked}
+                    </span>
+                </label>
+                {/if}
+                <label on:click={() => editMode = !editMode} class="cursor-pointer bg-[#27272A] sm:hover:bg-[#313131] duratiion-100 transition ease-in-out px-4 py-2 rounded-lg shadow-lg">
+                    <svg class="inline-block w-5 h-5" xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 1024 1024"><path fill="white" d="M832 512a32 32 0 1 1 64 0v352a32 32 0 0 1-32 32H160a32 32 0 0 1-32-32V160a32 32 0 0 1 32-32h352a32 32 0 0 1 0 64H192v640h640z"/><path fill="white" d="m469.952 554.24l52.8-7.552L847.104 222.4a32 32 0 1 0-45.248-45.248L477.44 501.44l-7.552 52.8zm422.4-422.4a96 96 0 0 1 0 135.808l-331.84 331.84a32 32 0 0 1-18.112 9.088L436.8 623.68a32 32 0 0 1-36.224-36.224l15.104-105.6a32 32 0 0 1 9.024-18.112l331.904-331.84a96 96 0 0 1 135.744 0z"/></svg>
+                    {#if !editMode}
+                    <span class="ml-1 text-white text-sm">
+                        Edit
+                    </span>
+                    {:else}
+                    <span class="ml-1 text-white text-sm">
+                      Cancel
+                    </span>
+                    {/if}
+                </label>
+    </div>
+
     <!--Start Table-->
             <div class="w-screen sm:w-full rounded-lg overflow-hidden overflow-x-scroll no-scrollbar">
                 <table class="table table-pin-cols table-sm table-compact rounded-none sm:rounded-md w-full border-bg-[#09090B] m-auto mt-4 overflow-x-auto">
             <thead>
               <tr class="">
                 <td class="text-slate-200 font-semibold text-sm text-start">Time</td>
+                <td class="text-slate-200 font-semibold text-sm text-start">Symbol</td>
                 <td class="text-slate-200 font-semibold text-sm text-start">Date</td>
                 <td class="text-slate-200 font-semibold text-sm text-end">Expiry</td>
+                <td class="text-slate-200 font-semibold text-sm text-end">DTE</td>
                 <td class="text-slate-200 font-semibold text-sm text-end">Strike</td>
                 <td class="text-slate-200 font-semibold text-sm text-end">C/P</td>
                 <td class="text-slate-200 font-semibold text-sm text-start">Sent.</td>
@@ -175,9 +235,18 @@ let optionsWatchlist = data?.getOptionsWatchlist
                   {formatTime(item?.time)}
                 </td>
 
+                <td on:click={() => handleFilter(item?.id)} class="flex flex-row items-center text-sm sm:text-[1rem] text-start">
+                    <input type="checkbox" checked={deleteOptionsId?.includes(item?.id) ?? false} class="{!editMode ? 'hidden' : ''} bg-[#2E3238] h-[18px] w-[18px] rounded-sm ring-offset-0 mr-3" />
+                    <a class="inline-block  sm:hover:text-white text-blue-400 text-sm sm:text-[1rem]" href={(!editMode && item?.underlying_type === 'stock') ? `/stocks/${item?.ticker}` : `/etf/${item?.ticker}`} on:click|stopPropagation>
+                        {item?.ticker}
+                    </a>
+                </td>
                 <td class="text-white text-sm sm:text-[1rem] text-start">
                   {formatDate(item?.date)}
                 </td>
+                <td class="text-white text-sm sm:text-[1rem] text-start">
+                  {reformatDate(item?.date_expiration)}
+                </td>
 
                 <td class="text-white text-sm sm:text-[1rem] text-end">
                   {item?.dte < 0 ? 'expired' : item?.dte +'d'}
@@ -210,20 +279,20 @@ let optionsWatchlist = data?.getOptionsWatchlist
                 {abbreviateNumber(item?.cost_basis)}
               </td>
 
-              <td class="text-sm sm:text-[1rem] text-start {item?.type === 'Sweep' ? 'text-[#C6A755]' : 'text-[#976DB7]'}">
+              <td class="text-sm sm:text-[1rem] text-start {item?.option_activity_type === 'Sweep' ? 'text-[#C6A755]' : 'text-[#976DB7]'}">
-                {item?.type}
+                {item?.option_activity_type}
               </td>
 
 
 
-              <td class="text-white text-end">
+              <td class="text-white text-end text-sm sm:text-[1rem] text-end font-medium">
                   {new Intl.NumberFormat("en", {
                       minimumFractionDigits: 0,
                       maximumFractionDigits: 0
                   }).format(item?.volume)}
               </td>
 
-              <td class="text-white text-end">
+              <td class="text-white text-end text-sm sm:text-[1rem] text-end font-medium">
                 {new Intl.NumberFormat("en", {
                   minimumFractionDigits: 0,
                   maximumFractionDigits: 0
@@ -245,7 +314,7 @@ let optionsWatchlist = data?.getOptionsWatchlist
                 
         
         
-              </div>
+            </div>
             <!--End Table-->
     {:else}
    <div class="flex flex-col justify-center items-center m-auto pt-8">
@@ -274,59 +343,21 @@ let optionsWatchlist = data?.getOptionsWatchlist
         </div>
     {/if}
 
+    {:else}
+        <div class="flex justify-center items-center h-80">
+            <div class="relative">
+            <label class="bg-[#09090B] rounded-xl h-14 w-14 flex justify-center items-center absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2">
+                <span class="loading loading-spinner loading-md"></span>
+            </label>
+            </div>
+        </div>
+        {/if}
+  
     
 
   </main>
 
 
-  <aside class="hidden lg:block relative fixed w-1/4 ml-4">        
-  
-    {#if data?.user?.tier !== 'Pro' || data?.user?.freeTrial}
-      <div on:click={() => goto('/pricing')} class="w-full bg-[#141417] duration-100 ease-out sm:hover:text-white text-gray-400 sm:hover:border-gray-700 border border-gray-800 rounded-lg h-fit pb-4 mt-4 cursor-pointer">
-          <div class="w-auto lg:w-full p-1 flex flex-col m-auto px-2 sm:px-0">
-              <div class="w-full flex justify-between items-center p-3 mt-3">
-              <h2 class="text-start text-xl font-semibold text-white ml-3">
-              Pro Subscription 🔥
-              </h2>
-              <ArrowLogo class="w-8 h-8 mr-3 flex-shrink-0"/>
-              </div>
-              <span class="text-white p-3 ml-3 mr-3">
-                  Upgrade now for unlimited access to all data and tools.
-              </span>
-          </div>
-      </div>
-      {/if}
-  
-    <div on:click={() => goto('/price-alert')} class="w-full bg-[#141417] duration-100 ease-out sm:hover:text-white text-gray-400 sm:hover:border-gray-700 border border-gray-800 rounded-lg h-fit pb-4 mt-4 cursor-pointer">
-        <div class="w-auto lg:w-full p-1 flex flex-col m-auto px-2 sm:px-0">
-            <div class="w-full flex justify-between items-center p-3 mt-3">
-            <h2 class="text-start text-xl font-semibold text-white ml-3">
-            Price Alert ⏰
-            </h2>
-            <ArrowLogo class="w-8 h-8 mr-3 flex-shrink-0"/>
-            </div>
-            <span class="text-white p-3 ml-3 mr-3">
-                Customize your alerts to never miss out again
-            </span>
-        </div>
-    </div>
-  
-    <div on:click={() => goto('/stock-screener')} class="w-full bg-[#141417] duration-100 ease-out sm:hover:text-white text-gray-400 sm:hover:border-gray-700 border border-gray-800 rounded-lg h-fit pb-4 mt-4 cursor-pointer">
-        <div class="w-auto lg:w-full p-1 flex flex-col m-auto px-2 sm:px-0">
-            <div class="w-full flex justify-between items-center p-3 mt-3">
-            <h2 class="text-start text-xl font-semibold text-white ml-3">
-            Stock Screener 🔎
-            </h2>
-            <ArrowLogo class="w-8 h-8 mr-3 flex-shrink-0"/>
-            </div>
-            <span class="text-white p-3 ml-3 mr-3">
-                Build your Stock Screener to find profitable stocks.
-            </span>
-        </div>
-    </div>
-  
-  </aside>
-  
   </div>
   </div>
   

src/routes/watchlist/stocks/+page.svelte

@@ -16,7 +16,7 @@ let cloudFrontUrl = import.meta.env.VITE_IMAGE_URL;
 
 
 
-export let data../$types.js;
+export let data;
 
 /*
 
@@ -156,7 +156,7 @@ async function createWatchList(event) {
         clicked?.dispatchEvent(new MouseEvent('click'));
 
         const anchor = document.createElement('a');
-        anchor.href = '/watchlist';
+        anchor.href = '/watchlist/stocks';
         anchor.dispatchEvent(new MouseEvent('click'));
        
       
@@ -371,62 +371,13 @@ onDestroy( () => {
     
 <section class="w-full max-w-3xl sm:max-w-screen-2xl overflow-hidden min-h-screen pt-5 pb-40 lg:px-3">
           
-  <div class="text-sm sm:text-[1rem] breadcrumbs ml-4">
-    <ul>
-      <li><a href="/" class="text-gray-300">Home</a></li>
-      <li class="text-gray-300">Watchlist</li>
-    </ul>
-  </div>
-          
   <div class="w-full overflow-hidden m-auto mt-5">
     
     <div class="sm:p-0 flex justify-center w-full m-auto overflow-hidden ">
         <div class="relative flex justify-center items-start overflow-hidden w-full">
 
 
-            <main class="w-full lg:w-3/4 lg:pr-5">
+            <main class="w-full">
-
-
-              <div class="w-full m-auto bg-[#27272A] sm:rounded-xl h-auto pl-10 pr-10 pt-5 sm:pb-10 sm:pt-10 mt-3 mb-8">
-                <div class="grid grid-cols-1 sm:grid-cols-2 gap-10">
-  
-      <!-- Start Column -->
-      <div>
-        <div class="flex flex-row justify-center items-center">
-          <h1 class="text-4xl sm:text-5xl text-white font-bold mb-5">
-            Watchlist
-          </h1>
-        </div>
-
-        <span class="text-white text-md font-medium text-center flex justify-center items-center ">
-          Monitor the performance and recent updates of your favorite stocks.
-        </span>
-      </div>
-      <!-- End Column -->
-  
-      <!-- Start Column -->
-      <div class="relative m-auto mb-5 mt-5 sm:mb-0 sm:mt-0">
-        <svg class="w-40 -my-5" viewBox="0 0 200 200" xmlns="http://www.w3.org/2000/svg">
-          <defs>
-            <filter id="glow">
-              <feGaussianBlur stdDeviation="5" result="glow"/>
-              <feMerge>
-                <feMergeNode in="glow"/>
-                <feMergeNode in="SourceGraphic"/>
-              </feMerge>
-            </filter>
-          </defs>
-          <path fill="#1E40AF" d="M57.6,-58.7C72.7,-42.6,81.5,-21.3,82,0.5C82.5,22.3,74.7,44.6,59.7,60.1C44.6,75.6,22.3,84.3,0,84.3C-22.3,84.2,-44.6,75.5,-61.1,60.1C-77.6,44.6,-88.3,22.3,-87.6,0.7C-86.9,-20.8,-74.7,-41.6,-58.2,-57.7C-41.6,-73.8,-20.8,-85.2,0.2,-85.4C21.3,-85.6,42.6,-74.7,57.6,-58.7Z" transform="translate(100 100)" filter="url(#glow)" />
-        </svg>
-        
-        <div class="z-1 absolute top-3 right-10 ">
-          <img class="w-24" src={cloudFrontUrl+"/assets/watchlist_icon.png"} alt="logo" loading='lazy'>
-        </div>
-      </div>
-      <!-- End Column -->
-  
-    </div>
-  </div>
 
 
     {#if isLoaded}
@@ -532,53 +483,7 @@ onDestroy( () => {
   </main>
 
 
-  <aside class="hidden lg:block relative fixed w-1/4 ml-4">        
  
-    {#if data?.user?.tier !== 'Pro' || data?.user?.freeTrial}
-      <div on:click={() => goto('/pricing')} class="w-full bg-[#141417] duration-100 ease-out sm:hover:text-white text-gray-400 sm:hover:border-gray-700 border border-gray-800 rounded-lg h-fit pb-4 mt-4 cursor-pointer">
-          <div class="w-auto lg:w-full p-1 flex flex-col m-auto px-2 sm:px-0">
-              <div class="w-full flex justify-between items-center p-3 mt-3">
-              <h2 class="text-start text-xl font-semibold text-white ml-3">
-              Pro Subscription 🔥
-              </h2>
-              <ArrowLogo class="w-8 h-8 mr-3 flex-shrink-0"/>
-              </div>
-              <span class="text-white p-3 ml-3 mr-3">
-                  Upgrade now for unlimited access to all data and tools.
-              </span>
-          </div>
-      </div>
-      {/if}
-  
-    <div on:click={() => goto('/price-alert')} class="w-full bg-[#141417] duration-100 ease-out sm:hover:text-white text-gray-400 sm:hover:border-gray-700 border border-gray-800 rounded-lg h-fit pb-4 mt-4 cursor-pointer">
-        <div class="w-auto lg:w-full p-1 flex flex-col m-auto px-2 sm:px-0">
-            <div class="w-full flex justify-between items-center p-3 mt-3">
-            <h2 class="text-start text-xl font-semibold text-white ml-3">
-            Price Alert ⏰
-            </h2>
-            <ArrowLogo class="w-8 h-8 mr-3 flex-shrink-0"/>
-            </div>
-            <span class="text-white p-3 ml-3 mr-3">
-                Customize your alerts to never miss out again
-            </span>
-        </div>
-    </div>
-  
-    <div on:click={() => goto('/stock-screener')} class="w-full bg-[#141417] duration-100 ease-out sm:hover:text-white text-gray-400 sm:hover:border-gray-700 border border-gray-800 rounded-lg h-fit pb-4 mt-4 cursor-pointer">
-        <div class="w-auto lg:w-full p-1 flex flex-col m-auto px-2 sm:px-0">
-            <div class="w-full flex justify-between items-center p-3 mt-3">
-            <h2 class="text-start text-xl font-semibold text-white ml-3">
-            Stock Screener 🔎
-            </h2>
-            <ArrowLogo class="w-8 h-8 mr-3 flex-shrink-0"/>
-            </div>
-            <span class="text-white p-3 ml-3 mr-3">
-                Build your Stock Screener to find profitable stocks.
-            </span>
-        </div>
-    </div>
-  
-  </aside>
   
   </div>
   </div>