From a03927bf5a6e79e2f4cddc9f38b207492049abc4 Mon Sep 17 00:00:00 2001
From: MuslemRahimi <moslem_rahimi@hotmail.de>
Date: Thu, 13 Jun 2024 12:32:07 +0200
Subject: [PATCH] ui fixes

---
 src/routes/+layout.svelte                  |   10 +-
 src/routes/+page.svelte                    |   34 +-
 src/routes/hedge-funds/+page.svelte        |    2 -
 src/routes/hedge-funds/+page.ts            |   12 +-
 src/routes/hedge-funds/[slug]/+page.ts     |   12 +-
 src/routes/politicians/+page.ts            |   42 +-
 src/routes/politicians/[slug]/+page.svelte | 1270 ++++++++++----------
 7 files changed, 711 insertions(+), 671 deletions(-)

diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index a9ed20ad..41f8f189 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -566,7 +566,15 @@ class="fixed 2xl:block top-0 left-0 xl:left-auto w-56 sm:{collapse ? 'w-20' : 'w
             <li on:click={() => showSidebar = !showSidebar} class="mb-1 last:mb-0  hover:bg-[#272727] rounded-md {$page.url.pathname=== '/analysts/top-stocks' ? 'text-white bg-[#272727] xl:bg-[#0F0F0F] rounded-md ' : ''}">
               <a href={"/analysts/top-stocks"} for="sidebar" class="block text-slate-400 hover:text-slate-200 transition duration-150 truncate">
                 <span class="text-sm font-medium text-white ">
-                    Top Stocks
+                    Top Analyst Stocks
+                </span>
+              </a>
+            </li>
+
+            <li on:click={() => showSidebar = !showSidebar} class="mb-1 last:mb-0  hover:bg-[#272727] rounded-md {$page.url.pathname=== '/analysts/top-stocks' ? 'text-white bg-[#272727] xl:bg-[#0F0F0F] rounded-md ' : ''}">
+              <a href={"/most-shorted-stocks"} for="sidebar" class="block text-slate-400 hover:text-slate-200 transition duration-150 truncate">
+                <span class="text-sm font-medium text-white ">
+                    Most Shorted Stocks
                 </span>
               </a>
             </li>
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 136c4a37..9a91fd6e 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -7,7 +7,8 @@
   import InfoModal from '$lib/components/InfoModal.svelte';
   import nancyPelosiProfile from '$lib/images/senator/Nancy_Pelosi.png';
   import warrenBuffetProfile from '$lib/images/hedge_funds/0001067983.png';
-  import michaelBurryProfile from '$lib/images/hedge_funds/0001649339.png';
+  //import michaelBurryProfile from '$lib/images/hedge_funds/0001649339.png';
+  import analystAvatar from '$lib/images/hedge_funds/default-avatar.png';
 
   import { screenWidth, numberOfUnreadNotification} from '$lib/store';
 
@@ -164,7 +165,7 @@ onMount( async() => {
                                 <!-- Start Column -->
                                 <div >
 
-                                
+                                  <!--
                                   <div class="text-center mb-5 relative w-fit flex justify-center m-auto">
                                     <a href="/most-shorted-stocks" class="text-white antialiased bg-[#202020] w-full px-4 py-2 rounded-xl m-auto font-medium text-sm flex items-center">
                                       <svg class="w-6 h-6 inline-block mr-2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#f4900c" d="m33.629 16.565l-.092 1.608l-.041.814c-.02.265-.092.529-.142.794l-.285 1.598c-.153.519-.326 1.028-.499 1.547c-.743 2.025-1.791 4.029-3.246 5.698a23.476 23.476 0 0 1-5.006 4.396c-1.903 1.221-3.867 2.167-6.126 2.859l-.385.121l-.427-.142c-1.526-.499-2.798-1.099-4.101-1.832c-1.272-.722-2.503-1.536-3.612-2.524l-.835-.732l-.784-.794c-.529-.519-.987-1.109-1.455-1.689a20.511 20.511 0 0 1-2.3-3.826c-.611-1.353-1.109-2.768-1.404-4.213c-.071-.366-.183-.722-.224-1.089l-.132-1.089c-.071-.733-.193-1.435-.153-2.279c.061-1.618.56-3.175 1.313-4.508a14.016 14.016 0 0 1 2.849-3.48l3.46-3.053l-1.669 4.174c-.57 1.435-.845 3.134-.193 4.202c.315.529.885.814 1.587.824c.733 0 1.475-.203 1.872-.692c.407-.478.438-1.231.183-1.954c-.326-.753-.631-1.77-.59-2.696c0-.946.275-1.893.753-2.717c.488-.824 1.19-1.496 1.984-1.994l1.028-.641l-.285 1.19c-.295 1.221-.081 2.503.733 3.287c.804.784 2.076 1.058 3.103.794c1.028-.275 1.72-1.109 1.76-2.025c.081-.946-.417-2.015-1.058-3.002L16.932 0l3.887 1.628c1.089.448 2.167.956 3.185 1.669c1.007.712 2.004 1.608 2.686 2.788c.712 1.16 1.007 2.584.977 3.836c0 .315-.02.621-.041.926c-.041.305-.051.55-.122.936c-.122.682-.305 1.19-.458 1.709c-.315.997-.519 2.025-.295 2.564c.132.509 1.292.906 2.147.794c.916-.092 1.77-.733 2.371-1.577c.6-.855.916-1.923 1.079-2.981l.132-.834l.295.763c.549 1.383.864 2.859.854 4.344"/><path fill="#ffcc4d" d="M33.146 16.503c-.001-1.463.068-2.222-.507-3.52c-.393 3.824-3.228 5.144-5.792 4.23c-2.402-.857-.783-4.198-.664-5.793c.202-2.703-.01-5.796-5.919-8.369c2.455 3.903.284 6.327-1.993 6.475c-2.526.164-4.84-1.804-3.986-4.997c-2.765 1.693-2.846 4.543-1.993 6.386c.89 1.921-.036 3.518-2.206 3.695c-2.426.199-3.773-2.158-2.531-5.913c-2.151 2.104-3.676 4.837-3.449 7.805C5.142 30.035 17.841 33.93 17.841 33.93s15.319-3.757 15.305-17.427"/><path fill="#dd2e44" d="M30.935 19.489a7.234 7.234 0 0 0-7.233-7.234a7.22 7.22 0 0 0-5.878 3.027a7.22 7.22 0 0 0-5.877-3.027a7.234 7.234 0 0 0-7.234 7.234c0 .566.072 1.114.195 1.643c1.004 6.24 7.943 12.824 12.915 14.632c4.972-1.808 11.911-8.391 12.914-14.631a7.074 7.074 0 0 0 .198-1.644"/><path fill="#ffcc4d" d="M24.312 31.553s1.426-2.769 1.319-5.645c-.038-1.024-.327-2.019-.736-2.958c-.958-2.196-2.806-7.706 1.147-10.661c0 0-.755 1.269-.085 3.581c.265.915.761 1.741 1.35 2.49c1.36 1.732 4.219 6.501-.484 10.948zm-7.659 3.728s-1.581-1.515-2.421-3.652c-.299-.761-.406-1.58-.406-2.398c-.001-1.911-.409-6.529-4.242-7.427c0 0 .957.687 1.205 2.591c.098.753-.001 1.516-.192 2.251c-.441 1.701-.972 5.909 3.886 7.659z"/></svg>
@@ -176,6 +177,7 @@ onMount( async() => {
                                       </span>
                                     </div>
                                   </div>
+                                  -->
                                 
                                 
 
@@ -235,7 +237,7 @@ onMount( async() => {
                                     </div>
                                     {/if}
 
-                                    <!--
+                                    
                                     <div class="w-full max-w-64 sm:max-w-3xl m-auto grid grid-cols-1 md:grid-cols-3 gap-y-3 sm:gap-x-5 mt-10 flex justify-center items-center">
                                       <a href="/politicians/61b59ab669" class="px-4 py-3 text-white bg-[#202327] rounded-lg flex flex-row items-center font-medium transition duration-150 ease-in-out group">
                                         <div class="flex flex-row items-center">
@@ -259,6 +261,18 @@ onMount( async() => {
                                           </div>
                                         </div>
                                       </a>
+                                      <a href="/analysts/5874f5e45064ed0001eb1bc5" class="px-4 py-3 text-white bg-[#202327] rounded-lg flex flex-row items-center font-medium transition duration-150 ease-in-out group">
+                                        <div class="flex flex-row items-center">
+                                          <div class="shadow-lg rounded-full border border-slate-600 w-10 h-10 relative analyst-striped bg-[#737D62] flex items-center justify-center">
+                                            <img style="clip-path: circle(50%);" class="rounded-full w-8" src={analystAvatar} loading="lazy"/>
+                                          </div>
+                                          <div class="flex flex-col items-start ml-2">
+                                            <span class="text-sm text-start">Track Keith Horowitz</span>
+                                            <span class="text-xs text-gray-400">Analyst at Citigroup</span>
+                                          </div>
+                                        </div>
+                                      </a>
+                                      <!--
                                       <a href="/hedge-funds/0001649339" class="px-4 py-3 text-white bg-[#202327] rounded-lg flex flex-row items-center font-medium transition duration-150 ease-in-out group">
                                         <div class="flex flex-row items-center">
                                           <div class="shadow-lg rounded-full border border-slate-600 w-10 h-10 relative hedge-fund-striped bg-[#20202E] flex items-center justify-center">
@@ -270,8 +284,9 @@ onMount( async() => {
                                           </div>
                                         </div>
                                       </a>
-                                    </div>
                                     -->
+                                    </div>
+                                    
 
                                      
               
@@ -852,5 +867,16 @@ onMount( async() => {
     );
 }
 
+.analyst-striped {
+    background-image: repeating-linear-gradient(
+        -45deg,
+        #737D62,
+        #737D62 10px,
+        #677058 10px,
+        #677058 20px
+    );
+}
+
+
 
 </style>
\ No newline at end of file
diff --git a/src/routes/hedge-funds/+page.svelte b/src/routes/hedge-funds/+page.svelte
index 7d149cae..4cbb2a1e 100644
--- a/src/routes/hedge-funds/+page.svelte
+++ b/src/routes/hedge-funds/+page.svelte
@@ -1,11 +1,9 @@
 <script lang='ts'>
   import cardBackground from "$lib/images/bg-hedge-funds.png";
-  import defaultAvatar from "$lib/images/hedge_funds/default-avatar.png";
 
   import { screenWidth, numberOfUnreadNotification } from '$lib/store';
   import { abbreviateNumber } from '$lib/utils';
   import { onMount } from 'svelte';
-  import { compareTwoStrings } from 'string-similarity';
     //  import * as XLSX from 'xlsx';
 
   export let data;
diff --git a/src/routes/hedge-funds/+page.ts b/src/routes/hedge-funds/+page.ts
index 4709707b..2d9609df 100644
--- a/src/routes/hedge-funds/+page.ts
+++ b/src/routes/hedge-funds/+page.ts
@@ -34,15 +34,17 @@ export const load = async () => {
       } else {
         
         output = (await import('$lib/hedge-funds/all-hedge-funds.json'))?.default;
-  
+        
+        await loadImages();
+        output?.forEach(item => {  
+          item.image = images[item?.cik] || defaultAvatar;
+          });
+          
         // Cache the data for this specific tickerID with a specific name 'getHedgeFunds'
         setCache('getHedgeFunds', output, 'getHedgeFunds');
       }
 
-      await loadImages();
-      output?.forEach(item => {  
-        item.image = images[item?.cik] || defaultAvatar;
-        });
+  
     
   
       return output;
diff --git a/src/routes/hedge-funds/[slug]/+page.ts b/src/routes/hedge-funds/[slug]/+page.ts
index f8a5c63b..ec65ac05 100644
--- a/src/routes/hedge-funds/[slug]/+page.ts
+++ b/src/routes/hedge-funds/[slug]/+page.ts
@@ -42,14 +42,16 @@ export const load = async ({ params }) => {
         output = await response.json();
 
         // Cache the data for this specific tickerID with a specific name 'getHedgeFundsData'
+        try {
+          output.holdings = output?.holdings?.filter(item => item?.sharesNumber !== 0 && item?.symbol !== null); //item?.symbol !== null
+        } catch(e) {
+          console.log(e)
+        }
+        
         setCache(params.slug, output, 'getHedgeFundsData');
       }
       
-    try {
-      output.holdings = output?.holdings?.filter(item => item?.sharesNumber !== 0 && item?.symbol !== null); //item?.symbol !== null
-    } catch(e) {
-      console.log(e)
-    }
+
   
     displayCompanyName.update(value => output?.name ?? params.slug)
     return output;
diff --git a/src/routes/politicians/+page.ts b/src/routes/politicians/+page.ts
index ff02ee88..d6b85c48 100644
--- a/src/routes/politicians/+page.ts
+++ b/src/routes/politicians/+page.ts
@@ -57,30 +57,34 @@ export const load = async () => {
       output = await response.json();
 
       // Cache the data for this specific tickerID with a specific name 'getAllPolitician'
+
+      await loadImages();
+      output?.forEach(item => {
+        let representative = item?.representative || '';
+    
+        representative = representative?.replace('Jr', '')
+            .replace(/Dr./g, '')
+            .replace(/Dr_/g, '')
+    
+        const fullName = representative?.replace(/(\s(?:Dr\s)?\w(?:\.|(?=\s)))?\s/g, '_').trim();
+        item.image = images[fullName] || defaultAvatar;
+        item.representative = fullName?.replace(/_/g, ' ');
+        });
+    
+        output = output?.map(item => {
+            const party = getPartyForPoliticians(item?.representative);
+            return {
+                ...item,
+                party: party
+            };
+      });
+
+      
       setCache('', output, 'getAllPolitician');
     }
 
 
-    await loadImages();
-    output?.forEach(item => {
-      let representative = item?.representative || '';
   
-      representative = representative?.replace('Jr', '')
-          .replace(/Dr./g, '')
-          .replace(/Dr_/g, '')
-  
-      const fullName = representative?.replace(/(\s(?:Dr\s)?\w(?:\.|(?=\s)))?\s/g, '_').trim();
-      item.image = images[fullName] || defaultAvatar;
-      item.representative = fullName?.replace(/_/g, ' ');
-      });
-  
-      output = output?.map(item => {
-          const party = getPartyForPoliticians(item?.representative);
-          return {
-              ...item,
-              party: party
-          };
-    });
 
 
     return output;
diff --git a/src/routes/politicians/[slug]/+page.svelte b/src/routes/politicians/[slug]/+page.svelte
index 24773520..d097a81d 100644
--- a/src/routes/politicians/[slug]/+page.svelte
+++ b/src/routes/politicians/[slug]/+page.svelte
@@ -1,661 +1,661 @@
 <script lang='ts'>
-import { goto } from '$app/navigation';
-import { screenWidth, numberOfUnreadNotification } from '$lib/store';
-import republicanBackground from "$lib/images/bg-republican.png";
-import democraticBackground from "$lib/images/bg-democratic.png";
-import otherBackground from "$lib/images/bg-other.png";
-import { getPartyForPoliticians, abbreviateNumber } from '$lib/utils';
-import defaultAvatar from '$lib/images/senator/default-avatar.png';
-import InfiniteLoading from '$lib/components/InfiniteLoading.svelte';
-import { Chart } from 'svelte-echarts'
-
-import { onMount } from 'svelte';
-
-export let data;
-let isLoaded = false;
-let rawData = data?.getPolitician;
-let displayList = [];
-let optionsData = {};
-
-let name = rawData?.at(0)?.representative ?? 'n/a';
-let numOfTrades = rawData?.length;
-let lastTradedDate = rawData?.at(0)?.transactionDate;
-let politicianParty = 'n/a';
-let images = {};
-let buySellRatio = 0
-let totalAmountTraded = 0;
-let politicianImage;
-let politicianDistrict;
-let politicianCongress;
-let numOfAssets = new Set(rawData?.map(item => item?.ticker))?.size;
-
-
-function getYearFromDate(dateString) {
-  return new Date(dateString).getFullYear();
-}
-
-// Function to extract the number from the amount string
-function extractNumberFromAmount(amount) {
-  const dashIndex = amount?.indexOf('-');
-  if (dashIndex !== -1) {
-    const numberAfterDash = amount?.slice(dashIndex + 1);
-    const suffix = numberAfterDash?.slice(-1);
-    let multiplier = 1;
-    if (suffix === 'K') {
-      multiplier = 1e3;
-    } else if (suffix === 'M') {
-      multiplier = 1e6;
-    }
-    const parsedNumber = parseFloat(numberAfterDash?.replace(/[^\d.]/g, '')) * multiplier;
-    return isNaN(parsedNumber) ? 0 : parsedNumber;
+  import { goto } from '$app/navigation';
+  import { screenWidth, numberOfUnreadNotification } from '$lib/store';
+  import republicanBackground from "$lib/images/bg-republican.png";
+  import democraticBackground from "$lib/images/bg-democratic.png";
+  import otherBackground from "$lib/images/bg-other.png";
+  import { getPartyForPoliticians, abbreviateNumber } from '$lib/utils';
+  import defaultAvatar from '$lib/images/senator/default-avatar.png';
+  import InfiniteLoading from '$lib/components/InfiniteLoading.svelte';
+  import { Chart } from 'svelte-echarts'
+  
+  import { onMount } from 'svelte';
+  
+  export let data;
+  let isLoaded = false;
+  let rawData = data?.getPolitician;
+  let displayList = [];
+  let optionsData = {};
+  
+  let name = rawData?.at(0)?.representative ?? 'n/a';
+  let numOfTrades = rawData?.length;
+  let lastTradedDate = rawData?.at(0)?.transactionDate;
+  let politicianParty = 'n/a';
+  let images = {};
+  let buySellRatio = 0
+  let totalAmountTraded = 0;
+  let politicianImage;
+  let politicianDistrict;
+  let politicianCongress;
+  let numOfAssets = new Set(rawData?.map(item => item?.ticker))?.size;
+  
+  
+  function getYearFromDate(dateString) {
+    return new Date(dateString).getFullYear();
   }
-  return 0;
-}
-
-// Calculate the total sum
-totalAmountTraded = rawData?.reduce((sum, item) => {
-  const amount = item?.amount;
-  const parsedAmount = extractNumberFromAmount(amount);
-  return sum + parsedAmount;
-}, 0);
-
-
-
-
-async function infiniteHandler({ detail: { loaded, complete } }) 
-{
-  if (displayList?.length === rawData?.length) {
-      complete();
-    } else {
-      const nextIndex = displayList?.length;
-      const newArticles = rawData?.slice(nextIndex, nextIndex + 20);
-      displayList = [...displayList, ...newArticles];
-      loaded();
+  
+  // Function to extract the number from the amount string
+  function extractNumberFromAmount(amount) {
+    const dashIndex = amount?.indexOf('-');
+    if (dashIndex !== -1) {
+      const numberAfterDash = amount?.slice(dashIndex + 1);
+      const suffix = numberAfterDash?.slice(-1);
+      let multiplier = 1;
+      if (suffix === 'K') {
+        multiplier = 1e3;
+      } else if (suffix === 'M') {
+        multiplier = 1e6;
+      }
+      const parsedNumber = parseFloat(numberAfterDash?.replace(/[^\d.]/g, '')) * multiplier;
+      return isNaN(parsedNumber) ? 0 : parsedNumber;
     }
-}
-
-// Function to load images only when they are viewed
-async function loadImages() {
-    const imageFiles = import.meta.glob('$lib/images/senator/*.png');
-    const imagesPromises = [];
-
-    for (const [path, resolver] of Object?.entries(imageFiles)) {
-      const imageNameMatch = path.match(/\/([^/]+)\.png$/);
-      if (imageNameMatch && imageNameMatch[1] !== 'default-avatar') {
-        imagesPromises?.push(resolver()?.then(module => {
-          images[imageNameMatch[1]] = module.default;
-        }));
+    return 0;
+  }
+  
+  // Calculate the total sum
+  totalAmountTraded = rawData?.reduce((sum, item) => {
+    const amount = item?.amount;
+    const parsedAmount = extractNumberFromAmount(amount);
+    return sum + parsedAmount;
+  }, 0);
+  
+  
+  
+  
+  async function infiniteHandler({ detail: { loaded, complete } }) 
+  {
+    if (displayList?.length === rawData?.length) {
+        complete();
+      } else {
+        const nextIndex = displayList?.length;
+        const newArticles = rawData?.slice(nextIndex, nextIndex + 20);
+        displayList = [...displayList, ...newArticles];
+        loaded();
+      }
+  }
+  
+  // Function to load images only when they are viewed
+  async function loadImages() {
+      const imageFiles = import.meta.glob('$lib/images/senator/*.png');
+      const imagesPromises = [];
+  
+      for (const [path, resolver] of Object?.entries(imageFiles)) {
+        const imageNameMatch = path.match(/\/([^/]+)\.png$/);
+        if (imageNameMatch && imageNameMatch[1] !== 'default-avatar') {
+          imagesPromises?.push(resolver()?.then(module => {
+            images[imageNameMatch[1]] = module.default;
+          }));
+        }
+      }
+  
+      await Promise?.all(imagesPromises);
+    }
+  
+  
+  function normalizer(value) {
+    if (Math?.abs(value) >= 1e12) {
+      return { unit: 'T', denominator: 1e12 };
+    } else if (Math?.abs(value) >= 1e9) {
+      return { unit: 'B', denominator: 1e9 };
+    } else if (Math?.abs(value) >= 1e6) {
+      return { unit: 'M', denominator: 1e6 };
+    } else if (Math?.abs(value) >= 1e5) {
+      return { unit: 'K', denominator: 1e5 };
+    } else {
+      return { unit: '', denominator: 1 };
+    }
+  }
+  
+  async function getPlotOptions() {
+      // Get unique years from the data
+      const uniqueYears = [2017, 2018,2019,2020,2021,2022,2023,2024] //[...new Set(rawData?.map(item => getYearFromDate(item?.transactionDate)))]?.reverse();
+      // Initialize boughtList and soldList arrays
+      const boughtList = [];
+      const soldList = [];
+      const dates = [];
+  
+      // Calculate the total bought and sold amounts for each year
+      uniqueYears?.forEach(year => {
+        const boughtAmount = rawData
+          ?.filter(item => getYearFromDate(item?.transactionDate) === year && item?.type === 'Bought')
+          ?.reduce((sum, item) => sum + extractNumberFromAmount(item?.amount), 0);
+  
+        const soldAmount = rawData
+          ?.filter(item => getYearFromDate(item.transactionDate) === year && item?.type === 'Sold')
+          ?.reduce((sum, item) => sum + extractNumberFromAmount(item?.amount), 0);
+  
+        boughtList.push( boughtAmount );
+        soldList.push( soldAmount );
+  
+        const fiscalYear = "FY" + String(year)?.slice(2);
+        dates?.push(fiscalYear);
+      });
+  
+      
+      const maxBought = Math.max(...boughtList) ?? 0;
+      const maxSold = Math.max(...soldList) ?? 0;
+      const { unit, denominator } = normalizer(maxBought > maxSold ? maxBought : maxSold);
+  
+  
+  
+    const option = {
+      silent: true,
+      grid: {
+          left: $screenWidth < 640 ? '5.2%' : '0.5%',
+          right: $screenWidth < 640 ? '5%' : '0.5%',
+          bottom: '0%',
+          containLabel: true
+      },
+      xAxis: {
+          data: dates,
+          type: 'category',
+          },
+          yAxis: [
+          {
+              type: 'value',
+              splitLine: {
+              show: false, // Disable x-axis grid lines
+              },
+              axisLabel: {
+              color: '#6E7079', // Change label color to white
+              formatter: function (value) {
+                  return '$'+(value / denominator)?.toFixed(0) + unit; // Format value in millions
+                  },
+              },
+          },
+          ],
+      series: [
+          {
+              data: boughtList,
+              type: 'bar',
+              itemStyle: {
+                      color: '#69B3A2' // Change bar color to white
+                },
+              barWidth: '25%',
+            },
+            
+          {
+              data: soldList,
+              type: 'bar',
+              itemStyle: {
+                  color: '#E8864D' // Change bar color to white
+              },
+              barWidth: '25%',
+          },
+      ]
+      };
+  
+  
+  return option;
+  }
+  
+  onMount(async () => {
+    isLoaded = false;
+      await loadImages();
+  
+      if (rawData && rawData.length > 0) {
+      let firstItem = rawData[0];
+      let representative = firstItem?.representative || '';
+  
+      representative = representative?.replace('Jr', '')
+          ?.replace(/Dr./g, '')
+          ?.replace(/Dr_/g, '');
+  
+      const fullName = representative?.replace(/(\s(?:Dr\s)?\w(?:\.|(?=\s)))?\s/g, '_')?.trim();
+      firstItem.image = images[fullName] || defaultAvatar;
+      firstItem.representative = fullName?.replace(/_/g, ' ');
+  
+      const party = getPartyForPoliticians(firstItem?.representative);
+      firstItem.party = party;
+  
+      politicianImage = firstItem?.image;
+      politicianParty = firstItem?.party;
+      politicianDistrict = firstItem?.district;
+      politicianCongress = firstItem?.congress;
+  
+      optionsData = await getPlotOptions();
+  
+      const typeCounts = rawData?.reduce((counts, item) => {
+      counts[item?.type] = (counts[item?.type ] || 0) + 1;
+      return counts;
+  }, {});
+  
+      buySellRatio = typeCounts['Bought'] > 0 && typeCounts['Sold'] === undefined ? 1 : typeCounts['Bought'] === undefined ? 0 : typeCounts["Bought"]/typeCounts["Sold"];
+  
+    displayList = rawData?.slice(0,20) ?? [];
+  
+  }
+  
+    isLoaded = true;
+  
+  });
+  
+  
+  
+    let charNumber = 40;
+    $: {
+      if ($screenWidth < 640)
+      {
+        charNumber = 15;
+      }
+      else {
+        charNumber = 40;
       }
     }
-
-    await Promise?.all(imagesPromises);
-  }
-
-
-function normalizer(value) {
-  if (Math?.abs(value) >= 1e12) {
-    return { unit: 'T', denominator: 1e12 };
-  } else if (Math?.abs(value) >= 1e9) {
-    return { unit: 'B', denominator: 1e9 };
-  } else if (Math?.abs(value) >= 1e6) {
-    return { unit: 'M', denominator: 1e6 };
-  } else if (Math?.abs(value) >= 1e5) {
-    return { unit: 'K', denominator: 1e5 };
-  } else {
-    return { unit: '', denominator: 1 };
-  }
-}
-
-async function getPlotOptions() {
-    // Get unique years from the data
-    const uniqueYears = [2017, 2018,2019,2020,2021,2022,2023,2024] //[...new Set(rawData?.map(item => getYearFromDate(item?.transactionDate)))]?.reverse();
-    // Initialize boughtList and soldList arrays
-    const boughtList = [];
-    const soldList = [];
-    const dates = [];
-
-    // Calculate the total bought and sold amounts for each year
-    uniqueYears?.forEach(year => {
-      const boughtAmount = rawData
-        ?.filter(item => getYearFromDate(item?.transactionDate) === year && item?.type === 'Bought')
-        ?.reduce((sum, item) => sum + extractNumberFromAmount(item?.amount), 0);
-
-      const soldAmount = rawData
-        ?.filter(item => getYearFromDate(item.transactionDate) === year && item?.type === 'Sold')
-        ?.reduce((sum, item) => sum + extractNumberFromAmount(item?.amount), 0);
-
-      boughtList.push( boughtAmount );
-      soldList.push( soldAmount );
-
-      const fiscalYear = "FY" + String(year)?.slice(2);
-      dates?.push(fiscalYear);
-    });
-
     
-    const maxBought = Math.max(...boughtList) ?? 0;
-    const maxSold = Math.max(...soldList) ?? 0;
-    const { unit, denominator } = normalizer(maxBought > maxSold ? maxBought : maxSold);
-
-
-
-  const option = {
-    silent: true,
-    grid: {
-        left: $screenWidth < 640 ? '5.2%' : '0.5%',
-        right: $screenWidth < 640 ? '5%' : '0.5%',
-        bottom: '0%',
-        containLabel: true
-    },
-    xAxis: {
-        data: dates,
-        type: 'category',
-        },
-        yAxis: [
-        {
-            type: 'value',
-            splitLine: {
-            show: false, // Disable x-axis grid lines
-            },
-            axisLabel: {
-            color: '#6E7079', // Change label color to white
-            formatter: function (value) {
-                return '$'+(value / denominator)?.toFixed(0) + unit; // Format value in millions
-                },
-            },
-        },
-        ],
-    series: [
-        {
-            data: boughtList,
-            type: 'bar',
-            itemStyle: {
-                    color: '#69B3A2' // Change bar color to white
-              },
-            barWidth: '25%',
-          },
           
-        {
-            data: soldList,
-            type: 'bar',
-            itemStyle: {
-                color: '#E8864D' // Change bar color to white
-            },
-            barWidth: '25%',
-        },
-    ]
-    };
-
-
-return option;
-}
-
-onMount(async () => {
-  isLoaded = false;
-    await loadImages();
-
-    if (rawData && rawData.length > 0) {
-    let firstItem = rawData[0];
-    let representative = firstItem?.representative || '';
-
-    representative = representative?.replace('Jr', '')
-        ?.replace(/Dr./g, '')
-        ?.replace(/Dr_/g, '');
-
-    const fullName = representative?.replace(/(\s(?:Dr\s)?\w(?:\.|(?=\s)))?\s/g, '_')?.trim();
-    firstItem.image = images[fullName] || defaultAvatar;
-    firstItem.representative = fullName?.replace(/_/g, ' ');
-
-    const party = getPartyForPoliticians(firstItem?.representative);
-    firstItem.party = party;
-
-    politicianImage = firstItem?.image;
-    politicianParty = firstItem?.party;
-    politicianDistrict = firstItem?.district;
-    politicianCongress = firstItem?.congress;
-
-    optionsData = await getPlotOptions();
-
-    const typeCounts = rawData?.reduce((counts, item) => {
-    counts[item?.type] = (counts[item?.type ] || 0) + 1;
-    return counts;
-}, {});
-
-    buySellRatio = typeCounts['Bought'] > 0 && typeCounts['Sold'] === undefined ? 1 : typeCounts['Bought'] === undefined ? 0 : typeCounts["Bought"]/typeCounts["Sold"];
-
-  displayList = rawData?.slice(0,20) ?? [];
-
-}
-
-  isLoaded = true;
-
-});
-
-
-
-  let charNumber = 40;
-  $: {
-    if ($screenWidth < 640)
-    {
-      charNumber = 15;
-    }
-    else {
-      charNumber = 40;
-    }
-  }
-  
-        
-  </script>
-  
-  
-<svelte:head>
-<meta charset="utf-8" />
-<meta name="viewport" content="width=device-width" />
-<title>
-    {$numberOfUnreadNotification > 0 ? `(${$numberOfUnreadNotification})` : ''}  Which stocks is {name} trading? · stocknear
-</title>
-<meta name="description" content={`A list of all trades from the US Politician ${name}.`} />
-
-<!-- Other meta tags -->
-<meta property="og:title" content={`Which stocks is ${name} trading? · stocknear`}/>
-<meta property="og:description" content={`A list of all trades from the US Politician ${name}.`} />
-<meta property="og:image" content="https://stocknear-pocketbase.s3.amazonaws.com/logo/meta_logo.jpg"/>
-<meta property="og:type" content="website"/>
-<!-- Add more Open Graph meta tags as needed -->
-
-<!-- Twitter specific meta tags -->
-<meta name="twitter:card" content="summary_large_image"/>
-<meta name="twitter:title" content={`Which stocks is ${name} trading? · stocknear`}/>
-<meta name="twitter:description" content={`A list of all trades from the US Politician ${name}.`} />
-<meta name="twitter:image" content="https://stocknear-pocketbase.s3.amazonaws.com/logo/meta_logo.jpg"/>
-<!-- Add more Twitter meta tags as needed -->
-
-</svelte:head>
-
-
-
-  <section class="w-full max-w-6xl overflow-hidden m-auto min-h-screen pt-5 pb-60 sm:px-10 xl:px-0">
-
-    <div class="text-sm breadcrumbs ml-4 pb-10">
-      <ul>
-        <li><a href="/" class="text-gray-300">Home</a></li> 
-        <li><a href="/politicians" class="text-gray-300">Politicians</a></li> 
-        <li class="text-gray-300">{name}</li>
-      </ul>
-    </div>
-            
-            
-    <div class="w-full overflow-hidden m-auto px-3 sm:px-0">
-      
-      <div class="flex justify-center w-full m-auto overflow-hidden">
-          <div class="relative flex flex-col sm:flex-row justify-between items-start overflow-hidden w-full">
-
-            <aside class="relative fixed w-full sm:w-1/3">        
-                <!--Start Card-->
-                <div class="w-full bg-[#202020] border border-slate-800 rounded-lg h-auto pb-4">
-                  <div class="flex flex-col relative ">
-                    {#if politicianParty === 'Republican'}
-                    <img class="absolute  w-full m-auto rounded-lg " src={republicanBackground} />
-                    {:else if politicianParty === 'Democratic'}
-                      <img class="absolute w-[500px] m-auto rounded-lg"  src={democraticBackground} />
-                    {:else}
-                      <img class="absolute w-[500px] m-auto rounded-lg" src={otherBackground} />
-                    {/if}
-                    <div class="flex flex-col justify-center items-center rounded-2xl ">
-
-
-                      <div class="mt-10 rounded-full border border-slate-600 w-24 h-24 relative {politicianParty === 'Republican' ? 'republican-striped bg-[#98272B]' : politicianParty === 'Democratic' ? 'democratic-striped bg-[#295AC7]' : 'other-striped bg-[#20202E]'} flex items-center justify-center">
-                        <img style="clip-path: circle(50%);" class="rounded-full w-20"  src={politicianImage} loading="lazy"/>
-                      </div>
-                      <span class="text-white text-lg sm:text-xl font-medium mt-6 mb-2">
-                        {name?.replace('Dr','')}
-                      </span>
-                      <span class="text-white text-md mb-8">
-                        {politicianParty ?? 'n/a'} / {politicianCongress} {#if politicianDistrict !== undefined && politicianDistrict?.length !== 0} / {politicianDistrict} {/if}
-                      </span>
-
-                    </div>
-
-                    <div class="flex flex-row justify-between items-center w-full px-10 pb-4">
-                      <label class="cursor-pointer flex flex-col items-center">
-                        <span class="text-white text-[1rem] font-semibold">{abbreviateNumber(numOfTrades)}</span>
-                        <span class="text-slate-300 font-medium text-sm">Total Trades</span>
-                      </label>
-  
-                      <div class="flex flex-col items-center ">
-                        <span class="text-white text-[1rem] font-semibold">
-                          {lastTradedDate?.length !== undefined ? new Date(lastTradedDate)?.toLocaleString('en-US', { month: 'short', day: 'numeric', year: 'numeric', daySuffix: '2-digit' }) : 'n/a'}
-                        </span>
-                        <span class="text-slate-300 font-medium text-sm">Last Traded</span>
-                      </div>
-                    </div>
-
-
-                </div>
-              </div>
-                <!--End Card-->
-
-                 <!--Start Widget-->
-                 <div class="w-full mt-5 mb-10 m-auto flex justify-center items-center ">
-                  <div class="w-full grid grid-cols-2 gap-y-3 lg:gap-y-3 gap-x-3 ">
-                     <!--Start Total Amount Traded-->  
-                     <div class="flex flex-row items-center flex-wrap w-full px-3 sm:px-5 bg-[#262626] rounded-2xl h-20">
-                      <div class="flex flex-col items-start">
-                          <span class="font-medium text-gray-200 text-sm ">Total Amount</span>
-                          <span class="text-start text-[1rem] font-medium text-white mt-0.5">
-                            ${new Intl.NumberFormat("en", {
-                              minimumFractionDigits: 0,
-                              maximumFractionDigits: 0
-                          }).format(totalAmountTraded)}
-                          </span>
-                      </div>
-                      
-                  </div>
-                  <!--End Total Amount Traded-->
-                    <!--Start Buy/Sell-->  
-                    <div class="flex flex-row items-center flex-wrap w-full px-3 sm:px-4 bg-[#262626] rounded-2xl h-20">
-                      <div class="flex flex-col items-start">
-                          <span class="font-medium text-gray-200 text-sm sm:text-[1rem] ">Buy/Sell</span>
-                          <span class="text-start text-sm sm:text-[1rem] font-medium text-white mt-0.5">
-                            {buySellRatio?.toFixed(3)}
-                          </span>
-                      </div>
-                      <!-- Circular Progress -->
-                        <div class="relative size-12 ml-auto">
-                          <svg class="size-full w-12 h-12" viewBox="0 0 36 36" xmlns="http://www.w3.org/2000/svg">
-                            <!-- Background Circle -->
-                            <circle cx="18" cy="18" r="16" fill="none" class="stroke-current text-[#3E3E3E]" stroke-width="3"></circle>
-                            <!-- Progress Circle inside a group with rotation -->
-                            <g class="origin-center -rotate-90 transform">
-                              <circle cx="18" cy="18" r="16" fill="none" class="stroke-current {buySellRatio >=0.5 ? 'text-[#00FC50]' : 'text-[#EE5365]'} " stroke-width="3" stroke-dasharray="100" stroke-dashoffset={(100- buySellRatio*100) >= 0 ? 100-(buySellRatio*100)?.toFixed(2) : 0}></circle>
-                            </g>
-                          </svg>
-                          <!-- Percentage Text -->
-                          <div class="absolute top-1/2 start-1/2 transform -translate-y-1/2 -translate-x-1/2">
-                            <span class="text-center text-white text-sm">{buySellRatio?.toFixed(2)}</span>
-                          </div>
-                        </div>
-                      <!-- End Circular Progress -->
-            
-                  </div>
-                  <!--End Buy/Sell-->
-                  
-                    </div>
-                  </div>
-                <!--End Widget-->
-
-            </aside>
-
-
-              <main class="w-full mt-10 sm:mt-0 sm:w-3/4 sm:ml-5">
-              
-                {#if isLoaded && Object?.keys(optionsData)?.length !== 0}
-                <div class="p-0 sm:p-10 bg-[#0F0F0F] sm:bg-[#202020] rounded-lg sm:min-h-[330px] mb-10 sm:mb-6">
-
-                  <div class="flex flex-row justify-center sm:justify-start items-center">
-                    <svg class="w-7 h-7 inline-block" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="#849AAE" d="M576 0c17.7 0 32 14.3 32 32v448c0 17.7-14.3 32-32 32s-32-14.3-32-32V32c0-17.7 14.3-32 32-32M448 96c17.7 0 32 14.3 32 32v352c0 17.7-14.3 32-32 32s-32-14.3-32-32V128c0-17.7 14.3-32 32-32m-96 128v256c0 17.7-14.3 32-32 32s-32-14.3-32-32V224c0-17.7 14.3-32 32-32s32 14.3 32 32m-160 64c17.7 0 32 14.3 32 32v160c0 17.7-14.3 32-32 32s-32-14.3-32-32V320c0-17.7 14.3-32 32-32M96 416v64c0 17.7-14.3 32-32 32s-32-14.3-32-32v-64c0-17.7 14.3-32 32-32s32 14.3 32 32"/></svg>
-                    <span class="ml-3 text-white text-xl">Trade Amount by Year</span>
-                  </div>
-                  <div class="app w-full h-[300px] ">
-                    <Chart options={optionsData} class="chart" />
-                  </div>
-
-                  <div class="flex flex-row items-center justify-between mx-auto mt-10 sm:mt-5 w-56 sm:w-80">
-                    <div class="flex flex-col sm:flex-row items-center ml-3 sm:ml-0 w-1/2 justify-center">
-                    <div class="h-full bg-[#313131] transform -translate-x-1/2 " aria-hidden="true"></div>
-                    <div class="w-3 h-3 bg-[#69B3A2] border-4 box-content border-[#313131] rounded-full transform sm:-translate-x-1/2" aria-hidden="true"></div>
-                    <span class="mt-2 sm:mt-0 text-white text-center sm:text-start text-xs sm:text-md inline-block">
-                        Bought
-                    </span>
-                </div>
-                    <div class="flex flex-col sm:flex-row items-center ml-3 sm:ml-0 w-1/2 justify-center">
-                        <div class="h-full bg-[#313131] transform -translate-x-1/2 " aria-hidden="true"></div>
-                        <div class="w-3 h-3 bg-[#E8864D] border-4 box-content border-[#313131] rounded-full transform sm:-translate-x-1/2" aria-hidden="true"></div>
-                        <span class="mt-2 sm:mt-0 text-white text-xs sm:text-md sm:font-medium inline-block">
-                        Sold
-                        </span>
-                    </div>
-            
-                
-            </div>
-
-
-                </div>
-                {/if}
-              <div class="p-0 sm:p-10 bg-[#0F0F0F] sm:bg-[#202020] rounded-lg sm:min-h-[330px]">
-                <div class="w-full m-auto h-auto sm:max-h-[500px] sm:overflow-y-scroll scroller">
-
-
-                  {#if rawData?.length !== 0}
-                  <div class="hidden sm:block">
-                  <span class="text-[#F5F5F5] font-bold text-2xl">
-                    {numOfAssets} Assets
-                  </span>
-
-                    <table class="-ml-2 table table-sm table-compact table-pin-rows table-pin-cols rounded-none sm:rounded-md w-full bg-[#202020] m-auto mt-5 ">
-                      <!-- head -->
-                      <thead>
-                        <tr class="bg-[#202020]">
-                          <th class="shadow-md text-start bg-[#202020] text-white text-sm font-semibold">
-                            Name
-                          </th>
-                          <th class="shadow-md text-start bg-[#202020]  text-white text-sm font-semibold">
-                            Transaction
-                          </th>
-                          <th class="shadow-md text-end bg-[#202020] text-white text-sm font-semibold">
-                            Traded
-                          </th>
-                          <th class="shadow-md text-end bg-[#202020] text-white text-sm font-semibold">
-                            Filed
-                          </th>
-                        </tr>
-                      </thead>
-                      <tbody class="p-0">
-                        {#each displayList as item}
-                            <tr on:click={() => goto(`/${item?.assetType === 'stock' ? 'stocks' : item?.assetType === 'etf' ? 'etf' : 'crypto'}/${item?.ticker}`)} class="sm:hover:bg-[#245073] sm:hover:bg-opacity-[0.2] bg-[#202020] border-b-[#202020] cursor-pointer">
-                              
-                              <td class="text-gray-200 pb-3 border-b border-b-[#202020]">
-                                <div class="flex flex-row items-center">
-                                  <div class="flex-shrink-0 rounded-full w-8 h-8 relative bg-[#202020] flex items-center justify-center">
-                                    <img style="clip-path: circle(50%);" class="avatar w-7 h-7" src={`https://financialmodelingprep.com/image-stock/${item?.ticker}.png`} alt="stock logo"/>
-                                  </div>
-                                  <div class="flex flex-col ml-2">
-                                    <span class="text-blue-400">{item?.ticker?.replace('_',' ')}</span>
-                                    <span class="text-white text-opacity-80 text-xs">{item?.name?.length > 20 ? item?.name?.slice(0,20)+'...' : item?.name}</span>
-                                  </div>
-                                </div>
-                                <!--{item?.firstName} {item?.lastName}-->
-                              </td>
-
-                              <td class="text-start text-xs sm:text-sm text-white border-b border-b-[#202020]">
-                                <div class="flex flex-col items-start">
-                                  <span class="font-semibold">
-                                    {#if item?.type === 'Bought'}
-                                      <span class="text-[#57D7BA]">Purchase</span>
-                                    {:else if item?.type === 'Sold'}
-                                      <span class="text-[#fe5555]">Sale</span>
-                                    {:else if item?.type === 'Exchange'}
-                                      <span class="text-[#C6A755]">Exchange</span>
-                                    {/if}
-                                  </span>
-                                  <span>
-                                    {item?.amount}
-                                  </span>
-                                </div>
-                              </td>
+    </script>
     
-                                <td class="text-end text-sm text-white border-b border-b-[#202020]">
-                                    {new Date(item?.transactionDate)?.toLocaleString('en-US', { month: 'short', day: 'numeric', year: 'numeric', daySuffix: '2-digit' })}
-                                </td>
-
-                                <td class="text-end text-sm text-white border-b border-b-[#202020]">
-                                  {new Date(item?.disclosureDate)?.toLocaleString('en-US', { month: 'short', day: 'numeric', year: 'numeric', daySuffix: '2-digit' })}
-                              </td>
-                            </tr>
-                          {/each}
-                      </tbody>
-                    </table>
+    
+  <svelte:head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width" />
+  <title>
+      {$numberOfUnreadNotification > 0 ? `(${$numberOfUnreadNotification})` : ''}  Which stocks is {name} trading? · stocknear
+  </title>
+  <meta name="description" content={`A list of all trades from the US Politician ${name}.`} />
+  
+  <!-- Other meta tags -->
+  <meta property="og:title" content={`Which stocks is ${name} trading? · stocknear`}/>
+  <meta property="og:description" content={`A list of all trades from the US Politician ${name}.`} />
+  <meta property="og:image" content="https://stocknear-pocketbase.s3.amazonaws.com/logo/meta_logo.jpg"/>
+  <meta property="og:type" content="website"/>
+  <!-- Add more Open Graph meta tags as needed -->
+  
+  <!-- Twitter specific meta tags -->
+  <meta name="twitter:card" content="summary_large_image"/>
+  <meta name="twitter:title" content={`Which stocks is ${name} trading? · stocknear`}/>
+  <meta name="twitter:description" content={`A list of all trades from the US Politician ${name}.`} />
+  <meta name="twitter:image" content="https://stocknear-pocketbase.s3.amazonaws.com/logo/meta_logo.jpg"/>
+  <!-- Add more Twitter meta tags as needed -->
+  
+  </svelte:head>
+  
+  
+  
+    <section class="w-full max-w-6xl overflow-hidden m-auto min-h-screen pt-5 pb-60 sm:px-10 xl:px-0">
+  
+      <div class="text-sm breadcrumbs ml-4 pb-10">
+        <ul>
+          <li><a href="/" class="text-gray-300">Home</a></li> 
+          <li><a href="/politicians" class="text-gray-300">Politicians</a></li> 
+          <li class="text-gray-300">{name}</li>
+        </ul>
+      </div>
+              
+              
+      <div class="w-full overflow-hidden m-auto px-3 sm:px-0">
+        
+        <div class="flex justify-center w-full m-auto overflow-hidden">
+            <div class="relative flex flex-col sm:flex-row justify-between items-start overflow-hidden w-full">
+  
+              <aside class="relative fixed w-full sm:w-1/3">        
+                  <!--Start Card-->
+                  <div class="w-full bg-[#202020] border border-slate-800 rounded-lg h-auto pb-4">
+                    <div class="flex flex-col relative ">
+                      {#if politicianParty === 'Republican'}
+                      <img class="absolute  w-full m-auto rounded-lg " src={republicanBackground} />
+                      {:else if politicianParty === 'Democratic'}
+                        <img class="absolute w-[500px] m-auto rounded-lg"  src={democraticBackground} />
+                      {:else}
+                        <img class="absolute w-[500px] m-auto rounded-lg" src={otherBackground} />
+                      {/if}
+                      <div class="flex flex-col justify-center items-center rounded-2xl ">
+  
+  
+                        <div class="mt-10 rounded-full border border-slate-600 w-24 h-24 relative {politicianParty === 'Republican' ? 'republican-striped bg-[#98272B]' : politicianParty === 'Democratic' ? 'democratic-striped bg-[#295AC7]' : 'other-striped bg-[#20202E]'} flex items-center justify-center">
+                          <img style="clip-path: circle(50%);" class="rounded-full w-20"  src={politicianImage} loading="lazy"/>
+                        </div>
+                        <span class="text-white text-lg sm:text-xl font-medium mt-6 mb-2">
+                          {name?.replace('Dr','')}
+                        </span>
+                        <span class="text-white text-md mb-8">
+                          {politicianParty ?? 'n/a'} / {politicianCongress} {#if politicianDistrict !== undefined && politicianDistrict?.length !== 0} / {politicianDistrict} {/if}
+                        </span>
+  
+                      </div>
+  
+                      <div class="flex flex-row justify-between items-center w-full px-10 pb-4">
+                        <label class="cursor-pointer flex flex-col items-center">
+                          <span class="text-white text-[1rem] font-semibold">{abbreviateNumber(numOfTrades)}</span>
+                          <span class="text-slate-300 font-medium text-sm">Total Trades</span>
+                        </label>
+    
+                        <div class="flex flex-col items-center ">
+                          <span class="text-white text-[1rem] font-semibold">
+                            {lastTradedDate?.length !== undefined ? new Date(lastTradedDate)?.toLocaleString('en-US', { month: 'short', day: 'numeric', year: 'numeric', daySuffix: '2-digit' }) : 'n/a'}
+                          </span>
+                          <span class="text-slate-300 font-medium text-sm">Last Traded</span>
+                        </div>
+                      </div>
+  
+  
                   </div>
+                </div>
+                  <!--End Card-->
+  
+                   <!--Start Widget-->
+                   <div class="w-full mt-5 mb-10 m-auto flex justify-center items-center ">
+                    <div class="w-full grid grid-cols-2 gap-y-3 lg:gap-y-3 gap-x-3 ">
+                       <!--Start Total Amount Traded-->  
+                       <div class="flex flex-row items-center flex-wrap w-full px-3 sm:px-5 bg-[#262626] rounded-2xl h-20">
+                        <div class="flex flex-col items-start">
+                            <span class="font-medium text-gray-200 text-sm ">Total Amount</span>
+                            <span class="text-start text-[1rem] font-medium text-white mt-0.5">
+                              ${new Intl.NumberFormat("en", {
+                                minimumFractionDigits: 0,
+                                maximumFractionDigits: 0
+                            }).format(totalAmountTraded)}
+                            </span>
+                        </div>
+                        
+                    </div>
+                    <!--End Total Amount Traded-->
+                      <!--Start Buy/Sell-->  
+                      <div class="flex flex-row items-center flex-wrap w-full px-3 sm:px-4 bg-[#262626] rounded-2xl h-20">
+                        <div class="flex flex-col items-start">
+                            <span class="font-medium text-gray-200 text-sm sm:text-[1rem] ">Buy/Sell</span>
+                            <span class="text-start text-sm sm:text-[1rem] font-medium text-white mt-0.5">
+                              {buySellRatio?.toFixed(3)}
+                            </span>
+                        </div>
+                        <!-- Circular Progress -->
+                          <div class="relative size-12 ml-auto">
+                            <svg class="size-full w-12 h-12" viewBox="0 0 36 36" xmlns="http://www.w3.org/2000/svg">
+                              <!-- Background Circle -->
+                              <circle cx="18" cy="18" r="16" fill="none" class="stroke-current text-[#3E3E3E]" stroke-width="3"></circle>
+                              <!-- Progress Circle inside a group with rotation -->
+                              <g class="origin-center -rotate-90 transform">
+                                <circle cx="18" cy="18" r="16" fill="none" class="stroke-current {buySellRatio >=0.5 ? 'text-[#00FC50]' : 'text-[#EE5365]'} " stroke-width="3" stroke-dasharray="100" stroke-dashoffset={(100- buySellRatio*100) >= 0 ? 100-(buySellRatio*100)?.toFixed(2) : 0}></circle>
+                              </g>
+                            </svg>
+                            <!-- Percentage Text -->
+                            <div class="absolute top-1/2 start-1/2 transform -translate-y-1/2 -translate-x-1/2">
+                              <span class="text-center text-white text-sm">{buySellRatio?.toFixed(2)}</span>
+                            </div>
+                          </div>
+                        <!-- End Circular Progress -->
+              
+                    </div>
+                    <!--End Buy/Sell-->
+                    
+                      </div>
+                    </div>
+                  <!--End Widget-->
+  
+              </aside>
+  
+  
+                <main class="w-full mt-10 sm:mt-0 sm:w-3/4 sm:ml-5">
+                
+                  {#if isLoaded && Object?.keys(optionsData)?.length !== 0}
+                  <div class="p-0 sm:p-10 bg-[#0F0F0F] sm:bg-[#202020] rounded-lg sm:min-h-[330px] mb-10 sm:mb-6">
+  
+                    <div class="flex flex-row justify-center sm:justify-start items-center">
+                      <svg class="w-7 h-7 inline-block" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="#849AAE" d="M576 0c17.7 0 32 14.3 32 32v448c0 17.7-14.3 32-32 32s-32-14.3-32-32V32c0-17.7 14.3-32 32-32M448 96c17.7 0 32 14.3 32 32v352c0 17.7-14.3 32-32 32s-32-14.3-32-32V128c0-17.7 14.3-32 32-32m-96 128v256c0 17.7-14.3 32-32 32s-32-14.3-32-32V224c0-17.7 14.3-32 32-32s32 14.3 32 32m-160 64c17.7 0 32 14.3 32 32v160c0 17.7-14.3 32-32 32s-32-14.3-32-32V320c0-17.7 14.3-32 32-32M96 416v64c0 17.7-14.3 32-32 32s-32-14.3-32-32v-64c0-17.7 14.3-32 32-32s32 14.3 32 32"/></svg>
+                      <span class="ml-3 text-white text-xl">Trade Amount by Year</span>
+                    </div>
+                    <div class="app w-full h-[300px] ">
+                      <Chart options={optionsData} class="chart" />
+                    </div>
+  
+                    <div class="flex flex-row items-center justify-between mx-auto mt-10 sm:mt-5 w-56 sm:w-80">
+                      <div class="flex flex-col sm:flex-row items-center ml-3 sm:ml-0 w-1/2 justify-center">
+                      <div class="h-full bg-[#313131] transform -translate-x-1/2 " aria-hidden="true"></div>
+                      <div class="w-3 h-3 bg-[#69B3A2] border-4 box-content border-[#313131] rounded-full transform sm:-translate-x-1/2" aria-hidden="true"></div>
+                      <span class="mt-2 sm:mt-0 text-white text-center sm:text-start text-xs sm:text-md inline-block">
+                          Bought
+                      </span>
+                  </div>
+                      <div class="flex flex-col sm:flex-row items-center ml-3 sm:ml-0 w-1/2 justify-center">
+                          <div class="h-full bg-[#313131] transform -translate-x-1/2 " aria-hidden="true"></div>
+                          <div class="w-3 h-3 bg-[#E8864D] border-4 box-content border-[#313131] rounded-full transform sm:-translate-x-1/2" aria-hidden="true"></div>
+                          <span class="mt-2 sm:mt-0 text-white text-xs sm:text-md sm:font-medium inline-block">
+                          Sold
+                          </span>
+                      </div>
+              
                   
-
-                  <div class="sm:hidden flex flex-col justify-center w-full m-auto h-full overflow-hidden mt-3">
-      
-                    <span class="ml-3 text-[#F5F5F5] font-bold text-2xl">
+              </div>
+  
+  
+                  </div>
+                  {/if}
+                <div class="p-0 sm:p-10 bg-[#0F0F0F] sm:bg-[#202020] rounded-lg sm:min-h-[330px]">
+                  <div class="w-full m-auto h-auto sm:max-h-[500px] sm:overflow-y-scroll scroller">
+  
+  
+                    {#if rawData?.length !== 0}
+                    <div class="hidden sm:block">
+                    <span class="text-[#F5F5F5] font-bold text-2xl">
                       {numOfAssets} Assets
                     </span>
-
-                    <!-- Content area -->
-                    <div class="mt-4 w-full overflow-x-auto scroller">
-                      
-
-                      <table class="-ml-2 table mt-3 w-screen">
-                          <thead>
-                            <tr class="">
-                              <th class="shadow-md text-start bg-[#0F0F0F] text-white text-sm font-semibold">
-                                Name
-                              </th>
-                              <th class="shadow-md text-start bg-[#0F0F0F]  text-white text-sm font-semibold">
-                                Transaction
-                              </th>
-                              <th class="shadow-md text-end bg-[#0F0F0F] text-white text-sm font-semibold">
-                                Traded
-                              </th>
-                              <th class="shadow-md text-end bg-[#0F0F0F] text-white text-sm font-semibold">
-                                Filed
-                              </th>
-                            </tr>
-                          </thead>
-                          <tbody>
-                            {#each displayList as item,index}
-                            <!-- row -->
-                            <tr on:click={() => goto(`/${item?.assetType === 'stock' ? 'stocks' : item?.assetType === 'etf' ? 'etf' : 'crypto'}/${item?.ticker}`)} class="w-screen [#0F0F0F] border-b-[#0F0F0F]">
-                              
-                              <td class="text-gray-200 pb-3 border-b border-b-[#0F0F0F] w-32">
-                                <div class="flex flex-row items-center">
-                                  <div class="flex flex-col">
-                                    <span class="text-blue-400 text-sm">{item?.ticker?.replace('_',' ')}</span>
-                                    <span class="text-white text-opacity-80 text-xs">{item?.name?.length > 15 ? item?.name?.slice(0,15)+'...' : item?.name}</span>
+  
+                      <table class="-ml-2 table table-sm table-compact table-pin-rows table-pin-cols rounded-none sm:rounded-md w-full bg-[#202020] m-auto mt-5 ">
+                        <!-- head -->
+                        <thead>
+                          <tr class="bg-[#202020]">
+                            <th class="shadow-md text-start bg-[#202020] text-white text-sm font-semibold">
+                              Name
+                            </th>
+                            <th class="shadow-md text-start bg-[#202020]  text-white text-sm font-semibold">
+                              Transaction
+                            </th>
+                            <th class="shadow-md text-end bg-[#202020] text-white text-sm font-semibold">
+                              Traded
+                            </th>
+                            <th class="shadow-md text-end bg-[#202020] text-white text-sm font-semibold">
+                              Filed
+                            </th>
+                          </tr>
+                        </thead>
+                        <tbody class="p-0">
+                          {#each displayList as item}
+                              <tr on:click={() => goto(`/${item?.assetType === 'stock' ? 'stocks' : item?.assetType === 'etf' ? 'etf' : 'crypto'}/${item?.ticker}`)} class="sm:hover:bg-[#245073] sm:hover:bg-opacity-[0.2] bg-[#202020] border-b-[#202020] cursor-pointer">
+                                
+                                <td class="text-gray-200 pb-3 border-b border-b-[#202020]">
+                                  <div class="flex flex-row items-center">
+                                    <div class="flex-shrink-0 rounded-full w-8 h-8 relative bg-[#202020] flex items-center justify-center">
+                                      <img style="clip-path: circle(50%);" class="avatar w-7 h-7" src={`https://financialmodelingprep.com/image-stock/${item?.ticker}.png`} alt="stock logo"/>
+                                    </div>
+                                    <div class="flex flex-col ml-2">
+                                      <span class="text-blue-400">{item?.ticker?.replace('_',' ')}</span>
+                                      <span class="text-white text-opacity-80 text-xs">{item?.name?.length > 20 ? item?.name?.slice(0,20)+'...' : item?.name}</span>
+                                    </div>
                                   </div>
-                                </div>
-                                <!--{item?.firstName} {item?.lastName}-->
-                              </td>
-    
-                              <td class="text-start text-sm text-white border-b border-b-[#0F0F0F] ">
-                                <div class="flex flex-col items-start">
-                                  <span class="font-semibold">
-                                    {#if item?.type === 'Bought'}
-                                      <span class="text-[#57D7BA]">Purchase</span>
-                                    {:else if item?.type === 'Sold'}
-                                      <span class="text-[#fe5555]">Sale</span>
-                                    {:else if item?.type === 'Exchange'}
-                                      <span class="text-[#C6A755]">Exchange</span>
-                                    {/if}
-                                  </span>
-                                  <span>
-                                    {item?.amount}
-                                  </span>
-                                </div>
-                              </td>
-    
-                                <td class="text-end text-sm text-white border-b border-b-[#0F0F0F]">
-                                    {new Date(item?.transactionDate)?.toLocaleString('en-US', { month: 'short', day: 'numeric', year: 'numeric', daySuffix: '2-digit' })}
+                                  <!--{item?.firstName} {item?.lastName}-->
                                 </td>
-
-                                <td class="text-end text-sm text-white border-b border-b-[#0F0F0F]">
-                                  {new Date(item?.disclosureDate)?.toLocaleString('en-US', { month: 'short', day: 'numeric', year: 'numeric', daySuffix: '2-digit' })}
-                              </td>
-                      
-              
-              
-                            </tr>
-                            
-                        
+  
+                                <td class="text-start text-xs sm:text-sm text-white border-b border-b-[#202020]">
+                                  <div class="flex flex-col items-start">
+                                    <span class="font-semibold">
+                                      {#if item?.type === 'Bought'}
+                                        <span class="text-[#57D7BA]">Purchase</span>
+                                      {:else if item?.type === 'Sold'}
+                                        <span class="text-[#fe5555]">Sale</span>
+                                      {:else if item?.type === 'Exchange'}
+                                        <span class="text-[#C6A755]">Exchange</span>
+                                      {/if}
+                                    </span>
+                                    <span>
+                                      {item?.amount}
+                                    </span>
+                                  </div>
+                                </td>
+      
+                                  <td class="text-end text-sm text-white border-b border-b-[#202020]">
+                                      {new Date(item?.transactionDate)?.toLocaleString('en-US', { month: 'short', day: 'numeric', year: 'numeric', daySuffix: '2-digit' })}
+                                  </td>
+  
+                                  <td class="text-end text-sm text-white border-b border-b-[#202020]">
+                                    {new Date(item?.disclosureDate)?.toLocaleString('en-US', { month: 'short', day: 'numeric', year: 'numeric', daySuffix: '2-digit' })}
+                                </td>
+                              </tr>
                             {/each}
-                          </tbody>
-                        </table>
-                      </div>
-        
-          
-          
-                </div>
-            
-                    <InfiniteLoading on:infinite={infiniteHandler} />
-
-
-                    {:else} 
-                    <div class="flex justify-center items-center m-auto sm:mt-24 mt-32 mb-6">
-                      <div class="text-gray-100 text-sm sm:text-[1rem] sm:rounded-lg h-auto border border-slate-800 p-4">
-                        <svg class="w-5 h-5 inline-block mr-2 flex-shrink-0" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><path fill="#60a5fa" d="M128 24a104 104 0 1 0 104 104A104.11 104.11 0 0 0 128 24m-4 48a12 12 0 1 1-12 12a12 12 0 0 1 12-12m12 112a16 16 0 0 1-16-16v-40a8 8 0 0 1 0-16a16 16 0 0 1 16 16v40a8 8 0 0 1 0 16"/></svg>
-                        No Trading activity found
-                      </div>
+                        </tbody>
+                      </table>
                     </div>
-                    {/if}
-
-                    
-
                     
   
+                    <div class="sm:hidden flex flex-col justify-center w-full m-auto h-full overflow-hidden mt-3">
+        
+                      <span class="ml-3 text-[#F5F5F5] font-bold text-2xl">
+                        {numOfAssets} Assets
+                      </span>
+  
+                      <!-- Content area -->
+                      <div class="mt-4 w-full overflow-x-auto scroller">
+                        
+  
+                        <table class="-ml-2 table mt-3 w-screen">
+                            <thead>
+                              <tr class="">
+                                <th class="shadow-md text-start bg-[#0F0F0F] text-white text-sm font-semibold">
+                                  Name
+                                </th>
+                                <th class="shadow-md text-start bg-[#0F0F0F]  text-white text-sm font-semibold">
+                                  Transaction
+                                </th>
+                                <th class="shadow-md text-end bg-[#0F0F0F] text-white text-sm font-semibold">
+                                  Traded
+                                </th>
+                                <th class="shadow-md text-end bg-[#0F0F0F] text-white text-sm font-semibold">
+                                  Filed
+                                </th>
+                              </tr>
+                            </thead>
+                            <tbody>
+                              {#each displayList as item,index}
+                              <!-- row -->
+                              <tr on:click={() => goto(`/${item?.assetType === 'stock' ? 'stocks' : item?.assetType === 'etf' ? 'etf' : 'crypto'}/${item?.ticker}`)} class="w-screen [#0F0F0F] border-b-[#0F0F0F]">
+                                
+                                <td class="text-gray-200 pb-3 border-b border-b-[#0F0F0F] w-32">
+                                  <div class="flex flex-row items-center">
+                                    <div class="flex flex-col">
+                                      <span class="text-blue-400 text-sm">{item?.ticker?.replace('_',' ')}</span>
+                                      <span class="text-white text-opacity-80 text-xs">{item?.name?.length > 15 ? item?.name?.slice(0,15)+'...' : item?.name}</span>
+                                    </div>
+                                  </div>
+                                  <!--{item?.firstName} {item?.lastName}-->
+                                </td>
+      
+                                <td class="text-start text-sm text-white border-b border-b-[#0F0F0F] ">
+                                  <div class="flex flex-col items-start">
+                                    <span class="font-semibold">
+                                      {#if item?.type === 'Bought'}
+                                        <span class="text-[#57D7BA]">Purchase</span>
+                                      {:else if item?.type === 'Sold'}
+                                        <span class="text-[#fe5555]">Sale</span>
+                                      {:else if item?.type === 'Exchange'}
+                                        <span class="text-[#C6A755]">Exchange</span>
+                                      {/if}
+                                    </span>
+                                    <span>
+                                      {item?.amount}
+                                    </span>
+                                  </div>
+                                </td>
+      
+                                  <td class="text-end text-sm text-white border-b border-b-[#0F0F0F]">
+                                      {new Date(item?.transactionDate)?.toLocaleString('en-US', { month: 'short', day: 'numeric', year: 'numeric', daySuffix: '2-digit' })}
+                                  </td>
+  
+                                  <td class="text-end text-sm text-white border-b border-b-[#0F0F0F]">
+                                    {new Date(item?.disclosureDate)?.toLocaleString('en-US', { month: 'short', day: 'numeric', year: 'numeric', daySuffix: '2-digit' })}
+                                </td>
+                        
+                
+                
+                              </tr>
+                              
+                          
+                              {/each}
+                            </tbody>
+                          </table>
+                        </div>
+          
+            
+            
+                  </div>
+              
+                      <InfiniteLoading on:infinite={infiniteHandler} />
+  
+  
+                      {:else} 
+                      <div class="flex justify-center items-center m-auto sm:mt-24 mt-32 mb-6">
+                        <div class="text-gray-100 text-sm sm:text-[1rem] sm:rounded-lg h-auto border border-slate-800 p-4">
+                          <svg class="w-5 h-5 inline-block mr-2 flex-shrink-0" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><path fill="#60a5fa" d="M128 24a104 104 0 1 0 104 104A104.11 104.11 0 0 0 128 24m-4 48a12 12 0 1 1-12 12a12 12 0 0 1 12-12m12 112a16 16 0 0 1-16-16v-40a8 8 0 0 1 0-16a16 16 0 0 1 16 16v40a8 8 0 0 1 0 16"/></svg>
+                          No Trading activity found
+                        </div>
+                      </div>
+                      {/if}
+  
+                      
+  
+                      
+    
+                  </div>
                 </div>
-              </div>
-              </main>
-          </div>
+                </main>
+            </div>
+        </div>
+    
+      
       </div>
-  
+          
+          
+      
+    </section>
     
-    </div>
-        
-        
     
-  </section>
-  
+      
   
+  <style>
+  .scroller {
+    scrollbar-width: thin;
+  }
+    .app {
+        height: 300px;
+        max-width: 100%; /* Ensure chart width doesn't exceed the container */
     
-
-<style>
-.scroller {
-  scrollbar-width: thin;
-}
-  .app {
-      height: 300px;
-      max-width: 100%; /* Ensure chart width doesn't exceed the container */
+        }
+    
+        @media (max-width: 640px) {
+        .app {
+            height: 230px;
+        }
+        }
+    
+        .chart {
+        width: 100%;
+        }
+    .republican-striped {
+      background-image: repeating-linear-gradient(
+          -45deg,
+          #98272B,
+          #98272B 10px,
+          #840412 10px,
+          #840412 20px
+      );
+  }
   
-      }
+  .democratic-striped {
+      background-image: repeating-linear-gradient(
+          -45deg,
+          #295AC7,
+          #295AC7 10px,
+          #164D9D 10px,
+          #164D9D 20px
+      );
+  }
   
-      @media (max-width: 640px) {
-      .app {
-          height: 230px;
-      }
-      }
-  
-      .chart {
-      width: 100%;
-      }
-  .republican-striped {
-    background-image: repeating-linear-gradient(
-        -45deg,
-        #98272B,
-        #98272B 10px,
-        #840412 10px,
-        #840412 20px
-    );
-}
-
-.democratic-striped {
-    background-image: repeating-linear-gradient(
-        -45deg,
-        #295AC7,
-        #295AC7 10px,
-        #164D9D 10px,
-        #164D9D 20px
-    );
-}
-
-.other-striped {
-    background-image: repeating-linear-gradient(
-        -45deg,
-        #A4A6A8,
-        #A4A6A8 10px,
-        #C0C3C5 10px,
-        #C0C3C5 20px
-    );
-}
-  </style>
\ No newline at end of file
+  .other-striped {
+      background-image: repeating-linear-gradient(
+          -45deg,
+          #A4A6A8,
+          #A4A6A8 10px,
+          #C0C3C5 10px,
+          #C0C3C5 20px
+      );
+  }
+    </style>
\ No newline at end of file