From 62cd5853936a54ceb8472046abbb0f4d81aa4d82 Mon Sep 17 00:00:00 2001
From: MuslemRahimi <moslem_rahimi@hotmail.de>
Date: Wed, 13 Nov 2024 12:10:24 +0100
Subject: [PATCH] add indicator button to stock list

---
 src/lib/components/Table/Table.svelte         |  50 ++--
 src/routes/list/+layout.svelte                |   4 +-
 src/routes/list/+page.svelte                  |   4 +-
 src/routes/list/country/[slug]/+page.svelte   | 192 +--------------
 .../list/dividend-aristocrats/+page.server.ts |  22 --
 .../list/dividend-aristocrats/+page.svelte    | 209 ----------------
 .../list/dividend-kings/+page.server.ts       |  22 --
 src/routes/list/dividend-kings/+page.svelte   | 209 ----------------
 .../list/dividend/[slug]/+page.server.ts      |  28 +++
 src/routes/list/dividend/[slug]/+page.svelte  |  50 ++++
 src/routes/list/exchange/[slug]/+page.svelte  | 174 +-------------
 src/routes/list/index/[slug]/+page.svelte     |   4 -
 .../list/magnificent-seven/+page.server.ts    |   1 +
 .../list/magnificent-seven/+page.svelte       | 167 +------------
 .../list/market-cap/[slug]/+page.svelte       | 197 +---------------
 src/routes/list/reit-stocks/+page.svelte      | 189 ++-------------
 src/routes/list/sector/[slug]/+page.svelte    | 223 +-----------------
 17 files changed, 150 insertions(+), 1595 deletions(-)
 delete mode 100644 src/routes/list/dividend-aristocrats/+page.server.ts
 delete mode 100644 src/routes/list/dividend-aristocrats/+page.svelte
 delete mode 100644 src/routes/list/dividend-kings/+page.server.ts
 delete mode 100644 src/routes/list/dividend-kings/+page.svelte
 create mode 100644 src/routes/list/dividend/[slug]/+page.server.ts
 create mode 100644 src/routes/list/dividend/[slug]/+page.svelte

diff --git a/src/lib/components/Table/Table.svelte b/src/lib/components/Table/Table.svelte
index 1851272a..af2e01ed 100644
--- a/src/lib/components/Table/Table.svelte
+++ b/src/lib/components/Table/Table.svelte
@@ -11,6 +11,23 @@
 
   export let data;
   export let rawData;
+  export let excludedRules = new Set([
+    "volume",
+    "price",
+    "changesPercentage",
+    "revenue",
+    "eps",
+    "marketCap",
+  ]);
+
+  export let defaultList = [
+    { name: "Market Cap", rule: "marketCap" },
+    { name: "Price", rule: "price" },
+    { name: "% Change", rule: "changesPercentage" },
+    { name: "Revenue", rule: "revenue" },
+  ];
+
+  let ruleOfList = defaultList;
 
   let pagePathName = $page?.url?.pathname;
   let testList = [];
@@ -108,20 +125,6 @@
     },
   ];
 
-  let ruleOfList = [
-    { name: "Market Cap", rule: "marketCap" },
-    { name: "Price", rule: "price" },
-    { name: "% Change", rule: "changesPercentage" },
-    { name: "Revenue", rule: "revenue" },
-  ];
-
-  const excludedRules = new Set([
-    "volume",
-    "price",
-    "changesPercentage",
-    "revenue",
-    "eps",
-  ]);
   const proOnlyItems = new Set(
     allRows
       ?.filter((item) => !excludedRules?.has(item?.rule)) // Exclude the items based on the rule
@@ -141,15 +144,23 @@
 
     for (let i = 0; i < updateData.length; i++) {
       if (rawData[i]) {
-        // Check if "rank" is missing in updateData[i] and only add that key if it is
+        // Check if "rank" is missing in updateData[i] and add it if it exists in rawData[i]
         if (!("rank" in updateData[i]) && "rank" in rawData[i]) {
           updateData[i] = {
             ...updateData[i],
             rank: rawData[i]["rank"],
           };
         }
+        // Check if "years" is missing in updateData[i] and add it if it exists in rawData[i]
+        if (!("years" in updateData[i]) && "years" in rawData[i]) {
+          updateData[i] = {
+            ...updateData[i],
+            years: rawData[i]["years"],
+          };
+        }
       }
     }
+
     rawData = updateData;
     stockList = rawData?.slice(0, 50); // Assign to stockList instead of rawData directly
     columns = generateColumns(rawData);
@@ -174,12 +185,7 @@
 
   async function handleResetAll() {
     searchQuery = "";
-    ruleOfList = [
-      { name: "Market Cap", rule: "marketCap" },
-      { name: "Price", rule: "price" },
-      { name: "% Change", rule: "changesPercentage" },
-      { name: "Revenue", rule: "revenue" },
-    ];
+    ruleOfList = defaultList;
     ruleOfList = [...ruleOfList];
     checkedItems = new Set(ruleOfList.map((item) => item.name));
     allRows = sortIndicatorCheckMarks(allRows);
@@ -449,7 +455,7 @@
 <!-- Content area -->
 
 <div class="flex flex-row items-end justify-end w-fit ml-auto mt-5 mb-2">
-  <DownloadData {data} {rawData} title={data?.getParams} />
+  <DownloadData {data} {rawData} title={data?.getParams ?? "data"} />
 
   <DropdownMenu.Root>
     <DropdownMenu.Trigger asChild let:builder>
diff --git a/src/routes/list/+layout.svelte b/src/routes/list/+layout.svelte
index 27db6457..b244b55a 100644
--- a/src/routes/list/+layout.svelte
+++ b/src/routes/list/+layout.svelte
@@ -156,11 +156,11 @@
     },
     {
       title: "Dividend Kings",
-      link: "/list/dividend-kings",
+      link: "/list/dividend/dividend-kings",
     },
     {
       title: "Dividend Aristocrats",
-      link: "/list/dividend-aristocrats",
+      link: "/list/dividend/dividend-aristocrats",
     },
     {
       title: "All Active REITs on the US Stock Market",
diff --git a/src/routes/list/+page.svelte b/src/routes/list/+page.svelte
index 1ab326ec..b3af167c 100644
--- a/src/routes/list/+page.svelte
+++ b/src/routes/list/+page.svelte
@@ -508,7 +508,7 @@
         </li>
         <li class="mb-2 cursor-pointer">
           <a
-            href="/list/dividend-kings"
+            href="/list/dividend/dividend-kings"
             class="sm:hover:text-white text-blue-400 text-lg"
           >
             Dividend Kings
@@ -516,7 +516,7 @@
         </li>
         <li class="mb-2 cursor-pointer">
           <a
-            href="/list/dividend-aristocrats"
+            href="/list/dividend/dividend-aristocrats"
             class="sm:hover:text-white text-blue-400 text-lg"
           >
             Dividend Aristocrats
diff --git a/src/routes/list/country/[slug]/+page.svelte b/src/routes/list/country/[slug]/+page.svelte
index 7a317634..5fc655c5 100644
--- a/src/routes/list/country/[slug]/+page.svelte
+++ b/src/routes/list/country/[slug]/+page.svelte
@@ -1,15 +1,10 @@
 <script lang="ts">
-  import { screenWidth } from "$lib/store";
   import { abbreviateNumber } from "$lib/utils";
-  import { onMount } from "svelte";
-  import HoverStockChart from "$lib/components/HoverStockChart.svelte";
-  import TableHeader from "$lib/components/Table/TableHeader.svelte";
-  import DownloadData from "$lib/components/DownloadData.svelte";
+  import Table from "$lib/components/Table/Table.svelte";
 
   export let data;
 
   let rawData = data?.getCountryCategory;
-  let stockList = rawData?.slice(0, 50);
 
   let totalMarketCap = rawData?.reduce(
     (total, stock) => total + stock?.marketCap,
@@ -29,105 +24,6 @@
     gb: "UK",
     cn: "Chinese",
   };
-  async function handleScroll() {
-    const scrollThreshold = document.body.offsetHeight * 0.8; // 80% of the website height
-    const isBottom = window.innerHeight + window.scrollY >= scrollThreshold;
-    if (isBottom && stockList?.length !== rawData?.length) {
-      const nextIndex = stockList?.length;
-      const filteredNewResults = rawData?.slice(nextIndex, nextIndex + 50);
-      stockList = [...stockList, ...filteredNewResults];
-    }
-  }
-
-  onMount(async () => {
-    window.addEventListener("scroll", handleScroll);
-    return () => {
-      window.removeEventListener("scroll", handleScroll);
-    };
-  });
-
-  let columns = [
-    { key: "rank", label: "Rank", align: "left" },
-    { key: "symbol", label: "Symbol", align: "left" },
-    { key: "name", label: "Name", align: "left" },
-    { key: "marketCap", label: "Market Cap", align: "right" },
-
-    { key: "price", label: "Price", align: "right" },
-    { key: "changesPercentage", label: "% Change", align: "right" },
-
-    { key: "revenue", label: "Revenue", align: "right" },
-  ];
-
-  let sortOrders = {
-    rank: { order: "none", type: "number" },
-    symbol: { order: "none", type: "string" },
-    name: { order: "none", type: "string" },
-    price: { order: "none", type: "number" },
-    changesPercentage: { order: "none", type: "number" },
-
-    marketCap: { order: "none", type: "number" },
-    revenue: { order: "none", type: "number" },
-  };
-
-  const sortData = (key) => {
-    // Reset all other keys to 'none' except the current key
-    for (const k in sortOrders) {
-      if (k !== key) {
-        sortOrders[k].order = "none";
-      }
-    }
-
-    // Cycle through 'none', 'asc', 'desc' for the clicked key
-    const orderCycle = ["none", "asc", "desc"];
-
-    let originalData = data?.getCountryCategory;
-
-    const currentOrderIndex = orderCycle.indexOf(sortOrders[key].order);
-    sortOrders[key].order =
-      orderCycle[(currentOrderIndex + 1) % orderCycle.length];
-    const sortOrder = sortOrders[key].order;
-
-    // Reset to original data when 'none' and stop further sorting
-    if (sortOrder === "none") {
-      stockList = [...originalData]?.slice(0, 50); // Reset to original data (spread to avoid mutation)
-      return;
-    }
-
-    // Define a generic comparison function
-    const compareValues = (a, b) => {
-      const { type } = sortOrders[key];
-      let valueA, valueB;
-
-      switch (type) {
-        case "date":
-          valueA = new Date(a[key]);
-          valueB = new Date(b[key]);
-          break;
-        case "string":
-          valueA = a[key].toUpperCase();
-          valueB = b[key].toUpperCase();
-          return sortOrder === "asc"
-            ? valueA.localeCompare(valueB)
-            : valueB.localeCompare(valueA);
-        case "number":
-        default:
-          valueA = parseFloat(a[key]);
-          valueB = parseFloat(b[key]);
-          break;
-      }
-
-      if (sortOrder === "asc") {
-        return valueA < valueB ? -1 : valueA > valueB ? 1 : 0;
-      } else {
-        return valueA > valueB ? -1 : valueA < valueB ? 1 : 0;
-      }
-    };
-
-    // Sort using the generic comparison function
-    stockList = [...originalData].sort(compareValues)?.slice(0, 50);
-  };
-
-  $: charNumber = $screenWidth < 640 ? 15 : 20;
 </script>
 
 <section class="w-full overflow-hidden m-auto">
@@ -173,89 +69,5 @@
     </div>
   </div>
 
-  <div class="flex flex-row items-end justify-end w-fit ml-auto mt-5 mb-2">
-    <DownloadData
-      {data}
-      rawData={data?.getCountryCategory}
-      title={data?.getParams}
-    />
-  </div>
-
-  <!-- Page wrapper -->
-  <div class="flex justify-center w-full m-auto h-full overflow-hidden">
-    <!-- Content area -->
-    <div class="w-full overflow-x-scroll">
-      <div class="w-full overflow-x-scroll">
-        <table
-          class="table table-sm table-compact rounded-none sm:rounded-md w-full border-bg-[#09090B] m-auto mt-4"
-        >
-          <thead>
-            <TableHeader {columns} {sortOrders} {sortData} />
-          </thead>
-          <tbody>
-            {#each stockList as item, index}
-              <!-- row -->
-              <tr
-                class="sm:hover:bg-[#245073] sm:hover:bg-opacity-[0.2] odd:bg-[#27272A] border-b-[#09090B]"
-              >
-                <td
-                  class="text-white text-center font-medium text-sm sm:text-[1rem] border-b-[#09090B]"
-                >
-                  {item?.rank}
-                </td>
-
-                <td
-                  class="text-sm sm:text-[1rem] whitespace-nowrap border-b-[#09090B]"
-                >
-                  <HoverStockChart symbol={item?.symbol} />
-                </td>
-
-                <td
-                  class="text-gray-200 border-b-[#09090B] text-sm sm:text-[1rem] whitespace-nowrap"
-                >
-                  {item?.name?.length > charNumber
-                    ? item?.name?.slice(0, charNumber) + "..."
-                    : item?.name}
-                </td>
-
-                <td
-                  class="text-white font-medium text-sm sm:text-[1rem] whitespace-nowrap text-end border-b-[#09090B]"
-                >
-                  {abbreviateNumber(item?.marketCap)}
-                </td>
-
-                <td
-                  class="text-white text-end border-b-[#09090B] text-sm sm:text-[1rem] whitespace-nowrap"
-                >
-                  {item.price?.toFixed(2)}
-                </td>
-
-                <td
-                  class="text-white text-end border-b-[#09090B] text-sm sm:text-[1rem] whitespace-nowrap"
-                >
-                  {#if item?.changesPercentage >= 0}
-                    <span class="text-[#00FC50]"
-                      >+{item?.changesPercentage?.toFixed(2)}%</span
-                    >
-                  {:else}
-                    <span class="text-[#FF2F1F]"
-                      >{item?.changesPercentage?.toFixed(2)}%</span
-                    >
-                  {/if}
-                </td>
-
-                <td
-                  class="text-white font-medium text-sm sm:text-[1rem] whitespace-nowrap text-end border-b-[#09090B]"
-                >
-                  {item?.revenue !== null
-                    ? abbreviateNumber(item?.revenue)
-                    : "-"}
-                </td>
-              </tr>
-            {/each}
-          </tbody>
-        </table>
-      </div>
-    </div>
-  </div>
+  <Table {data} rawData={data?.getCountryCategory} />
 </section>
diff --git a/src/routes/list/dividend-aristocrats/+page.server.ts b/src/routes/list/dividend-aristocrats/+page.server.ts
deleted file mode 100644
index 56d4aa45..00000000
--- a/src/routes/list/dividend-aristocrats/+page.server.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-export const load = async ({ locals }) => {
-  const getDividendAristocrats = async () => {
-    const { apiKey, apiURL } = locals;
-
-    const response = await fetch(apiURL + "/dividend-aristocrats", {
-      method: "GET",
-      headers: {
-        "Content-Type": "application/json",
-        "X-API-KEY": apiKey,
-      },
-    });
-
-    const output = await response.json();
-
-    return output;
-  };
-
-  // Make sure to return a promise
-  return {
-    getDividendAristocrats: await getDividendAristocrats(),
-  };
-};
diff --git a/src/routes/list/dividend-aristocrats/+page.svelte b/src/routes/list/dividend-aristocrats/+page.svelte
deleted file mode 100644
index 63ff754d..00000000
--- a/src/routes/list/dividend-aristocrats/+page.svelte
+++ /dev/null
@@ -1,209 +0,0 @@
-<script lang="ts">
-  import { screenWidth } from "$lib/store";
-  import TableHeader from "$lib/components/Table/TableHeader.svelte";
-  import HoverStockChart from "$lib/components/HoverStockChart.svelte";
-  import DownloadData from "$lib/components/DownloadData.svelte";
-  import { onMount } from "svelte";
-
-  export let data;
-  let rawData = data?.getDividendAristocrats;
-  let displayList = rawData?.slice(0, 50);
-
-  async function handleScroll() {
-    const scrollThreshold = document.body.offsetHeight * 0.8; // 80% of the website height
-    const isBottom = window.innerHeight + window.scrollY >= scrollThreshold;
-    if (isBottom && displayList?.length !== rawData?.length) {
-      const nextIndex = displayList?.length;
-      const filteredNewResults = rawData?.slice(nextIndex, nextIndex + 50);
-      displayList = [...displayList, ...filteredNewResults];
-    }
-  }
-
-  onMount(async () => {
-    window.addEventListener("scroll", handleScroll);
-    return () => {
-      window.removeEventListener("scroll", handleScroll);
-    };
-  });
-
-  let columns = [
-    { key: "rank", label: "Rank", align: "center" },
-    { key: "symbol", label: "Symbol", align: "left" },
-    { key: "name", label: "Name", align: "left" },
-    { key: "price", label: "Price", align: "right" },
-    { key: "changesPercentage", label: "% Change", align: "right" },
-    { key: "dividendYield", label: "Div. Yield", align: "right" },
-    { key: "years", label: "Years", align: "right" },
-  ];
-
-  let sortOrders = {
-    rank: { order: "none", type: "number" },
-    symbol: { order: "none", type: "string" },
-    name: { order: "none", type: "string" },
-    price: { order: "none", type: "number" },
-    changesPercentage: { order: "none", type: "number" },
-    dividendYield: { order: "none", type: "number" },
-    years: { order: "none", type: "number" },
-  };
-
-  const sortData = (key) => {
-    // Reset all other keys to 'none' except the current key
-    for (const k in sortOrders) {
-      if (k !== key) {
-        sortOrders[k].order = "none";
-      }
-    }
-
-    // Cycle through 'none', 'asc', 'desc' for the clicked key
-    const orderCycle = ["none", "asc", "desc"];
-
-    let originalData = rawData;
-
-    const currentOrderIndex = orderCycle.indexOf(sortOrders[key].order);
-    sortOrders[key].order =
-      orderCycle[(currentOrderIndex + 1) % orderCycle.length];
-    const sortOrder = sortOrders[key].order;
-
-    // Reset to original data when 'none' and stop further sorting
-    if (sortOrder === "none") {
-      displayList = [...originalData]?.slice(0, 50); // Reset to original data (spread to avoid mutation)
-      return;
-    }
-
-    // Define a generic comparison function
-    const compareValues = (a, b) => {
-      const { type } = sortOrders[key];
-      let valueA, valueB;
-
-      switch (type) {
-        case "date":
-          valueA = new Date(a[key]);
-          valueB = new Date(b[key]);
-          break;
-        case "string":
-          valueA = a[key].toUpperCase();
-          valueB = b[key].toUpperCase();
-          return sortOrder === "asc"
-            ? valueA.localeCompare(valueB)
-            : valueB.localeCompare(valueA);
-        case "number":
-        default:
-          valueA = parseFloat(a[key]);
-          valueB = parseFloat(b[key]);
-          break;
-      }
-
-      if (sortOrder === "asc") {
-        return valueA < valueB ? -1 : valueA > valueB ? 1 : 0;
-      } else {
-        return valueA > valueB ? -1 : valueA < valueB ? 1 : 0;
-      }
-    };
-
-    // Sort using the generic comparison function
-    displayList = [...originalData].sort(compareValues)?.slice(0, 50);
-  };
-
-  $: charNumber = $screenWidth < 640 ? 15 : 40;
-</script>
-
-<section class="w-full overflow-hidden m-auto">
-  <div
-    class="w-full sm:flex sm:flex-row sm:items-center m-auto text-white border border-gray-600 sm:rounded-lg h-auto p-5 mb-4"
-  >
-    <svg
-      class="w-5 h-5 inline-block sm:mr-2 flex-shrink-0"
-      xmlns="http://www.w3.org/2000/svg"
-      viewBox="0 0 256 256"
-      ><path
-        fill="#fff"
-        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
-    >
-
-    Dividend Aristocrats are companies in the S&P500 index that have been
-    raising their dividends every year for 25 or more years. This is a list of
-    all the dividend aristocrats.
-  </div>
-
-  <div class="flex flex-row items-end justify-end w-fit ml-auto mt-5 mb-2">
-    <DownloadData
-      {data}
-      rawData={data?.getDividendAristocrats}
-      title="dividend_aristocrats"
-    />
-  </div>
-
-  <!-- Page wrapper -->
-  <div class="flex justify-center w-full m-auto h-full overflow-hidden">
-    <!-- Content area -->
-
-    <div class="relative flex flex-col flex-1 overflow-x-scroll">
-      <table
-        class="table table-sm sm:table-md table-compact rounded-none sm:rounded-md w-full border-bg-[#09090B] m-auto mt-4"
-      >
-        <thead>
-          <TableHeader {columns} {sortOrders} {sortData} />
-        </thead>
-        <tbody>
-          {#each displayList as item}
-            <!-- row -->
-            <tr
-              class="sm:hover:bg-[#245073] sm:hover:bg-opacity-[0.2] odd:bg-[#27272A] border-b-[#09090B] shake-ticker cursor-pointer"
-            >
-              <td
-                class="text-white font-semibold sm:font-normal text-center text-sm sm:text-[1rem] border-b-[#09090B]"
-              >
-                {item?.rank}
-              </td>
-
-              <td class="text-[1rem] border-b-[#09090B]">
-                <HoverStockChart symbol={item?.symbol} />
-              </td>
-
-              <td
-                class="text-white text-sm sm:text-[1rem] border-b-[#09090B] whitespace-nowrap"
-              >
-                {item?.name?.length > charNumber
-                  ? item?.name?.slice(0, charNumber) + "..."
-                  : item?.name}
-              </td>
-
-              <td
-                class="text-white text-end text-sm sm:text-[1rem] border-b-[#09090B]"
-              >
-                {item?.price}
-              </td>
-
-              <td
-                class="text-white text-end text-sm sm:text-[1rem] border-b-[#09090B]"
-              >
-                {#if item?.changesPercentage >= 0}
-                  <span class="text-[#00FC50]"
-                    >+{item.changesPercentage?.toFixed(2)}%</span
-                  >
-                {:else}
-                  <span class="text-[#FF2F1F]"
-                    >{item.changesPercentage?.toFixed(2)}%
-                  </span>
-                {/if}
-              </td>
-
-              <td
-                class="text-white text-end text-sm sm:text-[1rem] border-b-[#09090B]"
-              >
-                {item?.dividendYield}%
-              </td>
-
-              <td
-                class="text-white text-end text-sm sm:text-[1rem] border-b-[#09090B]"
-              >
-                {item?.years}
-              </td>
-            </tr>
-          {/each}
-        </tbody>
-      </table>
-    </div>
-  </div>
-</section>
diff --git a/src/routes/list/dividend-kings/+page.server.ts b/src/routes/list/dividend-kings/+page.server.ts
deleted file mode 100644
index 352a35ff..00000000
--- a/src/routes/list/dividend-kings/+page.server.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-export const load = async ({ locals }) => {
-  const getDividendKings = async () => {
-    const { apiKey, apiURL } = locals;
-
-    const response = await fetch(apiURL + "/dividend-kings", {
-      method: "GET",
-      headers: {
-        "Content-Type": "application/json",
-        "X-API-KEY": apiKey,
-      },
-    });
-
-    const output = await response.json();
-
-    return output;
-  };
-
-  // Make sure to return a promise
-  return {
-    getDividendKings: await getDividendKings(),
-  };
-};
diff --git a/src/routes/list/dividend-kings/+page.svelte b/src/routes/list/dividend-kings/+page.svelte
deleted file mode 100644
index 914ffc07..00000000
--- a/src/routes/list/dividend-kings/+page.svelte
+++ /dev/null
@@ -1,209 +0,0 @@
-<script lang="ts">
-  import { screenWidth } from "$lib/store";
-  import TableHeader from "$lib/components/Table/TableHeader.svelte";
-  import HoverStockChart from "$lib/components/HoverStockChart.svelte";
-  import DownloadData from "$lib/components/DownloadData.svelte";
-
-  import { onMount } from "svelte";
-
-  export let data;
-  let rawData = data?.getDividendKings;
-  let displayList = rawData?.slice(0, 50);
-
-  async function handleScroll() {
-    const scrollThreshold = document.body.offsetHeight * 0.8; // 80% of the website height
-    const isBottom = window.innerHeight + window.scrollY >= scrollThreshold;
-    if (isBottom && displayList?.length !== rawData?.length) {
-      const nextIndex = displayList?.length;
-      const filteredNewResults = rawData?.slice(nextIndex, nextIndex + 50);
-      displayList = [...displayList, ...filteredNewResults];
-    }
-  }
-
-  onMount(async () => {
-    window.addEventListener("scroll", handleScroll);
-    return () => {
-      window.removeEventListener("scroll", handleScroll);
-    };
-  });
-
-  let columns = [
-    { key: "rank", label: "Rank", align: "center" },
-    { key: "symbol", label: "Symbol", align: "left" },
-    { key: "name", label: "Name", align: "left" },
-    { key: "price", label: "Price", align: "right" },
-    { key: "changesPercentage", label: "% Change", align: "right" },
-    { key: "dividendYield", label: "Div. Yield", align: "right" },
-    { key: "years", label: "Years", align: "right" },
-  ];
-
-  let sortOrders = {
-    rank: { order: "none", type: "number" },
-    symbol: { order: "none", type: "string" },
-    name: { order: "none", type: "string" },
-    price: { order: "none", type: "number" },
-    changesPercentage: { order: "none", type: "number" },
-    dividendYield: { order: "none", type: "number" },
-    years: { order: "none", type: "number" },
-  };
-
-  const sortData = (key) => {
-    // Reset all other keys to 'none' except the current key
-    for (const k in sortOrders) {
-      if (k !== key) {
-        sortOrders[k].order = "none";
-      }
-    }
-
-    // Cycle through 'none', 'asc', 'desc' for the clicked key
-    const orderCycle = ["none", "asc", "desc"];
-
-    let originalData = rawData;
-
-    const currentOrderIndex = orderCycle.indexOf(sortOrders[key].order);
-    sortOrders[key].order =
-      orderCycle[(currentOrderIndex + 1) % orderCycle.length];
-    const sortOrder = sortOrders[key].order;
-
-    // Reset to original data when 'none' and stop further sorting
-    if (sortOrder === "none") {
-      displayList = [...originalData]?.slice(0, 50); // Reset to original data (spread to avoid mutation)
-      return;
-    }
-
-    // Define a generic comparison function
-    const compareValues = (a, b) => {
-      const { type } = sortOrders[key];
-      let valueA, valueB;
-
-      switch (type) {
-        case "date":
-          valueA = new Date(a[key]);
-          valueB = new Date(b[key]);
-          break;
-        case "string":
-          valueA = a[key].toUpperCase();
-          valueB = b[key].toUpperCase();
-          return sortOrder === "asc"
-            ? valueA.localeCompare(valueB)
-            : valueB.localeCompare(valueA);
-        case "number":
-        default:
-          valueA = parseFloat(a[key]);
-          valueB = parseFloat(b[key]);
-          break;
-      }
-
-      if (sortOrder === "asc") {
-        return valueA < valueB ? -1 : valueA > valueB ? 1 : 0;
-      } else {
-        return valueA > valueB ? -1 : valueA < valueB ? 1 : 0;
-      }
-    };
-
-    // Sort using the generic comparison function
-    displayList = [...originalData].sort(compareValues)?.slice(0, 50);
-  };
-
-  $: charNumber = $screenWidth < 640 ? 15 : 40;
-</script>
-
-<section class="w-full overflow-hidden m-auto">
-  <div
-    class="w-full sm:flex sm:flex-row sm:items-center m-auto text-gray-100 border border-gray-800 sm:rounded-lg h-auto p-5 mb-4"
-  >
-    <svg
-      class="w-5 h-5 inline-block sm:mr-2 flex-shrink-0"
-      xmlns="http://www.w3.org/2000/svg"
-      viewBox="0 0 256 256"
-      ><path
-        fill="#fff"
-        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
-    >
-
-    Dividend Kings are companies that have been raising their dividend payments
-    every year for 50 or more years. This is a list of all the dividend kings on
-    the US stock market.
-  </div>
-
-  <div class="flex flex-row items-end justify-end w-fit ml-auto mt-5 mb-2">
-    <DownloadData
-      {data}
-      rawData={data?.getDividendKings}
-      title="dividend_aristocrats"
-    />
-  </div>
-
-  <!-- Page wrapper -->
-  <div class="flex justify-center w-full m-auto h-full overflow-hidden">
-    <!-- Content area -->
-    <div class="relative flex flex-col flex-1 overflow-x-scroll">
-      <table
-        class="table table-sm sm:table-md table-compact rounded-none sm:rounded-md w-full border-bg-[#09090B] m-auto mt-4"
-      >
-        <thead>
-          <TableHeader {columns} {sortOrders} {sortData} />
-        </thead>
-        <tbody>
-          {#each displayList as item}
-            <!-- row -->
-            <tr
-              class="sm:hover:bg-[#245073] sm:hover:bg-opacity-[0.2] odd:bg-[#27272A] border-b-[#09090B] shake-ticker cursor-pointer"
-            >
-              <td
-                class="text-white font-semibold sm:font-normal text-center text-sm sm:text-[1rem] border-b-[#09090B]"
-              >
-                {item?.rank}
-              </td>
-
-              <td class="text-[1rem] border-b-[#09090B]">
-                <HoverStockChart symbol={item?.symbol} />
-              </td>
-
-              <td
-                class="text-white border-b-[#09090B] text-sm sm:text-[1rem] whitespace-nowrap"
-              >
-                {item?.name?.length > charNumber
-                  ? item?.name?.slice(0, charNumber) + "..."
-                  : item?.name}
-              </td>
-
-              <td
-                class="text-white text-end text-sm sm:text-[1rem] border-b-[#09090B]"
-              >
-                {item?.price}
-              </td>
-
-              <td
-                class="text-white text-end text-sm sm:text-[1rem] border-b-[#09090B]"
-              >
-                {#if item?.changesPercentage >= 0}
-                  <span class="text-[#00FC50]"
-                    >+{item.changesPercentage?.toFixed(2)}%</span
-                  >
-                {:else}
-                  <span class="text-[#FF2F1F]"
-                    >{item.changesPercentage?.toFixed(2)}%
-                  </span>
-                {/if}
-              </td>
-
-              <td
-                class="text-white text-end text-sm sm:text-[1rem] border-b-[#09090B]"
-              >
-                {item?.dividendYield}%
-              </td>
-
-              <td
-                class="text-white text-end text-sm sm:text-[1rem] border-b-[#09090B]"
-              >
-                {item?.years}
-              </td>
-            </tr>
-          {/each}
-        </tbody>
-      </table>
-    </div>
-  </div>
-</section>
diff --git a/src/routes/list/dividend/[slug]/+page.server.ts b/src/routes/list/dividend/[slug]/+page.server.ts
new file mode 100644
index 00000000..7bae353f
--- /dev/null
+++ b/src/routes/list/dividend/[slug]/+page.server.ts
@@ -0,0 +1,28 @@
+export const load = async ({ locals, params }) => {
+  const getParams = async () => {
+    return params.slug;
+  };
+  const getDividendCategory = async () => {
+    const { apiKey, apiURL } = locals;
+    const postData = { filterList: params.slug };
+
+    const response = await fetch(apiURL + "/list-category", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "X-API-KEY": apiKey,
+      },
+      body: JSON.stringify(postData),
+    });
+
+    const output = await response.json();
+
+    return output;
+  };
+
+  // Make sure to return a promise
+  return {
+    getDividendCategory: await getDividendCategory(),
+    getParams: await getParams(),
+  };
+};
diff --git a/src/routes/list/dividend/[slug]/+page.svelte b/src/routes/list/dividend/[slug]/+page.svelte
new file mode 100644
index 00000000..d9a9ae70
--- /dev/null
+++ b/src/routes/list/dividend/[slug]/+page.svelte
@@ -0,0 +1,50 @@
+<script lang="ts">
+  import Table from "$lib/components/Table/Table.svelte";
+
+  export let data;
+
+  const excludedRules = new Set([
+    "volume",
+    "price",
+    "changesPercentage",
+    "dividendYield",
+    "eps",
+    "marketCap",
+  ]);
+
+  const defaultList = [
+    { name: "Market Cap", rule: "marketCap" },
+    { name: "Price", rule: "price" },
+    { name: "% Change", rule: "changesPercentage" },
+    { name: "Dividend Yield", rule: "dividendYield" },
+    { name: "Years", rule: "years" },
+  ];
+</script>
+
+<section class="w-full overflow-hidden m-auto">
+  <div
+    class="w-full sm:flex sm:flex-row sm:items-center m-auto text-gray-100 border border-gray-800 sm:rounded-lg h-auto p-5 mb-4"
+  >
+    <svg
+      class="w-5 h-5 inline-block sm:mr-2 flex-shrink-0"
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 256 256"
+      ><path
+        fill="#fff"
+        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
+    >
+
+    Dividend Kings are companies that have been raising their dividend payments
+    every year for 50 or more years. This is a list of all the dividend kings on
+    the US stock market.
+  </div>
+
+  <!-- Page wrapper -->
+  <Table
+    {data}
+    rawData={data?.getDividendCategory}
+    {excludedRules}
+    {defaultList}
+  />
+</section>
diff --git a/src/routes/list/exchange/[slug]/+page.svelte b/src/routes/list/exchange/[slug]/+page.svelte
index 8ca05f27..3e74670b 100644
--- a/src/routes/list/exchange/[slug]/+page.svelte
+++ b/src/routes/list/exchange/[slug]/+page.svelte
@@ -1,10 +1,7 @@
 <script lang="ts">
-  import { screenWidth } from "$lib/store";
   import { abbreviateNumber } from "$lib/utils";
   import { onMount } from "svelte";
-  import HoverStockChart from "$lib/components/HoverStockChart.svelte";
-  import TableHeader from "$lib/components/Table/TableHeader.svelte";
-  import DownloadData from "$lib/components/DownloadData.svelte";
+  import Table from "$lib/components/Table/Table.svelte";
 
   export let data;
 
@@ -42,89 +39,6 @@
       window.removeEventListener("scroll", handleScroll);
     };
   });
-
-  let columns = [
-    { key: "rank", label: "Rank", align: "left" },
-    { key: "symbol", label: "Symbol", align: "left" },
-    { key: "name", label: "Name", align: "left" },
-    { key: "marketCap", label: "Market Cap", align: "right" },
-
-    { key: "price", label: "Price", align: "right" },
-    { key: "changesPercentage", label: "% Change", align: "right" },
-
-    { key: "revenue", label: "Revenue", align: "right" },
-  ];
-
-  let sortOrders = {
-    rank: { order: "none", type: "number" },
-    symbol: { order: "none", type: "string" },
-    name: { order: "none", type: "string" },
-    price: { order: "none", type: "number" },
-    changesPercentage: { order: "none", type: "number" },
-
-    marketCap: { order: "none", type: "number" },
-    revenue: { order: "none", type: "number" },
-  };
-
-  const sortData = (key) => {
-    // Reset all other keys to 'none' except the current key
-    for (const k in sortOrders) {
-      if (k !== key) {
-        sortOrders[k].order = "none";
-      }
-    }
-
-    // Cycle through 'none', 'asc', 'desc' for the clicked key
-    const orderCycle = ["none", "asc", "desc"];
-
-    let originalData = data?.getExchangeCategory;
-
-    const currentOrderIndex = orderCycle.indexOf(sortOrders[key].order);
-    sortOrders[key].order =
-      orderCycle[(currentOrderIndex + 1) % orderCycle.length];
-    const sortOrder = sortOrders[key].order;
-
-    // Reset to original data when 'none' and stop further sorting
-    if (sortOrder === "none") {
-      stockList = [...originalData]?.slice(0, 50); // Reset to original data (spread to avoid mutation)
-      return;
-    }
-
-    // Define a generic comparison function
-    const compareValues = (a, b) => {
-      const { type } = sortOrders[key];
-      let valueA, valueB;
-
-      switch (type) {
-        case "date":
-          valueA = new Date(a[key]);
-          valueB = new Date(b[key]);
-          break;
-        case "string":
-          valueA = a[key].toUpperCase();
-          valueB = b[key].toUpperCase();
-          return sortOrder === "asc"
-            ? valueA.localeCompare(valueB)
-            : valueB.localeCompare(valueA);
-        case "number":
-        default:
-          valueA = parseFloat(a[key]);
-          valueB = parseFloat(b[key]);
-          break;
-      }
-
-      if (sortOrder === "asc") {
-        return valueA < valueB ? -1 : valueA > valueB ? 1 : 0;
-      } else {
-        return valueA > valueB ? -1 : valueA < valueB ? 1 : 0;
-      }
-    };
-
-    // Sort using the generic comparison function
-    stockList = [...originalData].sort(compareValues)?.slice(0, 50);
-  };
-
-  $: charNumber = $screenWidth < 640 ? 15 : 20;
 </script>
 
 <section class="w-full overflow-hidden m-auto">
@@ -170,89 +84,5 @@
     </div>
   </div>
 
-  <div class="flex flex-row items-end justify-end w-fit ml-auto mt-5 mb-2">
-    <DownloadData
-      {data}
-      rawData={data?.getExchangeCategory}
-      title={data?.getParams}
-    />
-  </div>
-
-  <!-- Page wrapper -->
-  <div class="flex justify-center w-full m-auto h-full overflow-hidden">
-    <!-- Content area -->
-    <div class="w-full overflow-x-scroll">
-      <div class="w-full overflow-x-scroll">
-        <table
-          class="table table-sm table-compact rounded-none sm:rounded-md w-full border-bg-[#09090B] m-auto mt-4"
-        >
-          <thead>
-            <TableHeader {columns} {sortOrders} {sortData} />
-          </thead>
-          <tbody>
-            {#each stockList as item, index}
-              <!-- row -->
-              <tr
-                class="sm:hover:bg-[#245073] sm:hover:bg-opacity-[0.2] odd:bg-[#27272A] border-b-[#09090B]"
-              >
-                <td
-                  class="text-white text-center font-medium text-sm sm:text-[1rem] border-b-[#09090B]"
-                >
-                  {item?.rank}
-                </td>
-
-                <td
-                  class="text-sm sm:text-[1rem] whitespace-nowrap border-b-[#09090B]"
-                >
-                  <HoverStockChart symbol={item?.symbol} />
-                </td>
-
-                <td
-                  class="text-gray-200 border-b-[#09090B] text-sm sm:text-[1rem] whitespace-nowrap"
-                >
-                  {item?.name?.length > charNumber
-                    ? item?.name?.slice(0, charNumber) + "..."
-                    : item?.name}
-                </td>
-
-                <td
-                  class="text-white font-medium text-sm sm:text-[1rem] whitespace-nowrap text-end border-b-[#09090B]"
-                >
-                  {abbreviateNumber(item?.marketCap)}
-                </td>
-
-                <td
-                  class="text-white text-end border-b-[#09090B] text-sm sm:text-[1rem] whitespace-nowrap"
-                >
-                  {item.price?.toFixed(2)}
-                </td>
-
-                <td
-                  class="text-white text-end border-b-[#09090B] text-sm sm:text-[1rem] whitespace-nowrap"
-                >
-                  {#if item?.changesPercentage >= 0}
-                    <span class="text-[#00FC50]"
-                      >+{item?.changesPercentage?.toFixed(2)}%</span
-                    >
-                  {:else}
-                    <span class="text-[#FF2F1F]"
-                      >{item?.changesPercentage?.toFixed(2)}%</span
-                    >
-                  {/if}
-                </td>
-
-                <td
-                  class="text-white font-medium text-sm sm:text-[1rem] whitespace-nowrap text-end border-b-[#09090B]"
-                >
-                  {item?.revenue !== null
-                    ? abbreviateNumber(item?.revenue)
-                    : "-"}
-                </td>
-              </tr>
-            {/each}
-          </tbody>
-        </table>
-      </div>
-    </div>
-  </div>
+  <Table {data} rawData={data?.getExchangeCategory} />
 </section>
diff --git a/src/routes/list/index/[slug]/+page.svelte b/src/routes/list/index/[slug]/+page.svelte
index e33d470e..904c86e1 100644
--- a/src/routes/list/index/[slug]/+page.svelte
+++ b/src/routes/list/index/[slug]/+page.svelte
@@ -1,8 +1,6 @@
 <script lang="ts">
-  import { screenWidth } from "$lib/store";
   import { abbreviateNumber } from "$lib/utils";
   import Table from "$lib/components/Table/Table.svelte";
-  import DownloadData from "$lib/components/DownloadData.svelte";
 
   export let data;
 
@@ -25,8 +23,6 @@
     sp500:
       "A list of all stocks in the S&P 500, an index of the 500 largest U.S.-listed companies. There are over 500 tickers, as some companies have multiple symbols.",
   };
-
-  $: charNumber = $screenWidth < 640 ? 15 : 20;
 </script>
 
 <section class="w-full overflow-hidden m-auto">
diff --git a/src/routes/list/magnificent-seven/+page.server.ts b/src/routes/list/magnificent-seven/+page.server.ts
index 6657883a..9e1ddeb5 100644
--- a/src/routes/list/magnificent-seven/+page.server.ts
+++ b/src/routes/list/magnificent-seven/+page.server.ts
@@ -1,4 +1,5 @@
 export const load = async ({ locals }) => {
+  
   const getMagnificentSeven = async () => {
     const { apiURL, apiKey } = locals;
 
diff --git a/src/routes/list/magnificent-seven/+page.svelte b/src/routes/list/magnificent-seven/+page.svelte
index 83e55c62..bf881d93 100644
--- a/src/routes/list/magnificent-seven/+page.svelte
+++ b/src/routes/list/magnificent-seven/+page.svelte
@@ -1,14 +1,9 @@
 <script lang="ts">
-  import { screenWidth } from "$lib/store";
   import { abbreviateNumber } from "$lib/utils";
-  import TableHeader from "$lib/components/Table/TableHeader.svelte";
-  import HoverStockChart from "$lib/components/HoverStockChart.svelte";
-  import InfoModal from "$lib/components/InfoModal.svelte";
-  import DownloadData from "$lib/components/DownloadData.svelte";
+  import Table from "$lib/components/Table/Table.svelte";
 
   export let data;
   let rawData = data?.getMagnificentSeven;
-  let stockList = rawData;
 
   let totalMarketCap =
     rawData?.reduce((total, stock) => total + stock?.marketCap, 0) ?? 0;
@@ -20,87 +15,6 @@
     (rawData?.reduce((total, stock) => total + stock?.pe, 0) ?? 0) /
     rawData?.length
   )?.toFixed(2);
-
-  let columns = [
-    { key: "rank", label: "Rank", align: "center" },
-    { key: "symbol", label: "Symbol", align: "left" },
-    { key: "name", label: "Name", align: "left" },
-    { key: "price", label: "Price", align: "right" },
-    { key: "changesPercentage", label: "% Change", align: "right" },
-
-    { key: "marketCap", label: "Market Cap", align: "right" },
-    { key: "revenue", label: "Revenue", align: "right" },
-  ];
-
-  let sortOrders = {
-    rank: { order: "none", type: "number" },
-    symbol: { order: "none", type: "string" },
-    name: { order: "none", type: "string" },
-    price: { order: "none", type: "number" },
-    changesPercentage: { order: "none", type: "number" },
-    marketCap: { order: "none", type: "number" },
-    revenue: { order: "none", type: "number" },
-  };
-
-  const sortData = (key) => {
-    // Reset all other keys to 'none' except the current key
-    for (const k in sortOrders) {
-      if (k !== key) {
-        sortOrders[k].order = "none";
-      }
-    }
-
-    // Cycle through 'none', 'asc', 'desc' for the clicked key
-    const orderCycle = ["none", "asc", "desc"];
-
-    let originalData = rawData;
-
-    const currentOrderIndex = orderCycle.indexOf(sortOrders[key].order);
-    sortOrders[key].order =
-      orderCycle[(currentOrderIndex + 1) % orderCycle.length];
-    const sortOrder = sortOrders[key].order;
-
-    // Reset to original data when 'none' and stop further sorting
-    if (sortOrder === "none") {
-      stockList = [...originalData]; // Reset to original data (spread to avoid mutation)
-      return;
-    }
-
-    // Define a generic comparison function
-    const compareValues = (a, b) => {
-      const { type } = sortOrders[key];
-      let valueA, valueB;
-
-      switch (type) {
-        case "date":
-          valueA = new Date(a[key]);
-          valueB = new Date(b[key]);
-          break;
-        case "string":
-          valueA = a[key].toUpperCase();
-          valueB = b[key].toUpperCase();
-          return sortOrder === "asc"
-            ? valueA.localeCompare(valueB)
-            : valueB.localeCompare(valueA);
-        case "number":
-        default:
-          valueA = parseFloat(a[key]);
-          valueB = parseFloat(b[key]);
-          break;
-      }
-
-      if (sortOrder === "asc") {
-        return valueA < valueB ? -1 : valueA > valueB ? 1 : 0;
-      } else {
-        return valueA > valueB ? -1 : valueA < valueB ? 1 : 0;
-      }
-    };
-
-    // Sort using the generic comparison function
-    stockList = [...originalData].sort(compareValues);
-  };
-
-  $: charNumber = $screenWidth < 640 ? 15 : 20;
 </script>
 
 <section class="w-full overflow-hidden m-auto">
@@ -157,82 +71,5 @@
     </div>
   </div>
 
-  <div class="flex flex-row items-end justify-end w-fit ml-auto mt-5 mb-2">
-    <DownloadData {data} {rawData} title="magnificent-seven" />
-  </div>
-
-  <!-- Page wrapper -->
-  <div class="flex justify-center w-full m-auto h-full overflow-hidden">
-    <!-- Content area -->
-    <div class="w-full overflow-x-scroll">
-      <table
-        class="table table-sm sm:table-md table-compact rounded-none sm:rounded-md w-full border-bg-[#09090B] m-auto mt-4"
-      >
-        <thead>
-          <TableHeader {columns} {sortOrders} {sortData} />
-        </thead>
-        <tbody>
-          {#each stockList as item}
-            <!-- row -->
-            <tr
-              class="sm:hover:bg-[#245073] sm:hover:bg-opacity-[0.2] odd:bg-[#27272A] border-b-[#09090B] text-white"
-            >
-              <td
-                class="text-center text-sm sm:text-[1rem] whitespace-nowrap font-medium border-b-[#09090B]"
-              >
-                {item?.rank}
-              </td>
-
-              <td
-                class="text-blue-400 text-sm sm:text-[1rem] whitespace-nowrap font-medium border-b-[#09090B]"
-              >
-                <HoverStockChart symbol={item?.symbol} />
-              </td>
-
-              <td
-                class="text-white text-sm sm:text-[1rem] whitespace-nowrap border-b-[#09090B]"
-              >
-                {item?.name?.length > charNumber
-                  ? item?.name?.slice(0, charNumber) + "..."
-                  : item?.name}
-              </td>
-
-              <td
-                class="text-white text-sm sm:text-[1rem] whitespace-nowrap font-medium text-end border-b-[#09090B]"
-              >
-                {item.price?.toFixed(2)}
-              </td>
-
-              <td
-                class="text-white text-end text-sm sm:text-[1rem] border-b-[#09090B]"
-              >
-                {#if item?.changesPercentage >= 0}
-                  <span class="text-[#00FC50]"
-                    >+{item.changesPercentage?.toFixed(2)}%</span
-                  >
-                {:else}
-                  <span class="text-[#FF2F1F]"
-                    >{item.changesPercentage?.toFixed(2)}%
-                  </span>
-                {/if}
-              </td>
-
-              <td
-                class="text-white text-sm sm:text-[1rem] whitespace-nowrap font-medium text-end border-b-[#09090B]"
-              >
-                {item?.marketCap !== null
-                  ? abbreviateNumber(item?.marketCap)
-                  : "-"}
-              </td>
-              <td
-                class="text-white text-sm sm:text-[1rem] whitespace-nowrap font-medium text-end border-b-[#09090B]"
-              >
-                {item?.revenue !== null ? abbreviateNumber(item?.revenue) : "-"}
-              </td>
-            </tr>
-          {/each}
-        </tbody>
-      </table>
-    </div>
-  </div>
+  <Table {data} rawData={data?.getMagnificentSeven} />
 </section>
diff --git a/src/routes/list/market-cap/[slug]/+page.svelte b/src/routes/list/market-cap/[slug]/+page.svelte
index 0cd6fff4..9a6974e3 100644
--- a/src/routes/list/market-cap/[slug]/+page.svelte
+++ b/src/routes/list/market-cap/[slug]/+page.svelte
@@ -1,11 +1,8 @@
 <script lang="ts">
-  import { screenWidth } from "$lib/store";
   import { abbreviateNumber } from "$lib/utils";
-  import { onMount } from "svelte";
+  import Table from "$lib/components/Table/Table.svelte";
+  import { screenWidth } from "$lib/store";
   import { page } from "$app/stores";
-  import HoverStockChart from "$lib/components/HoverStockChart.svelte";
-  import TableHeader from "$lib/components/Table/TableHeader.svelte";
-  import DownloadData from "$lib/components/DownloadData.svelte";
 
   export let data;
 
@@ -52,104 +49,6 @@
     },
   ];
 
-  async function handleScroll() {
-    const scrollThreshold = document.body.offsetHeight * 0.8; // 80% of the website height
-    const isBottom = window.innerHeight + window.scrollY >= scrollThreshold;
-    if (isBottom && marketCapList?.length !== rawData?.length) {
-      const nextIndex = marketCapList?.length;
-      const filteredNewResults = rawData?.slice(nextIndex, nextIndex + 50);
-      marketCapList = [...marketCapList, ...filteredNewResults];
-    }
-  }
-
-  onMount(async () => {
-    window.addEventListener("scroll", handleScroll);
-    return () => {
-      window.removeEventListener("scroll", handleScroll);
-    };
-  });
-
-  let columns = [
-    { key: "rank", label: "Rank", align: "left" },
-    { key: "symbol", label: "Symbol", align: "left" },
-    { key: "name", label: "Name", align: "left" },
-    { key: "marketCap", label: "Market Cap", align: "right" },
-
-    { key: "price", label: "Price", align: "right" },
-    { key: "changesPercentage", label: "% Change", align: "right" },
-
-    { key: "revenue", label: "Revenue", align: "right" },
-  ];
-
-  let sortOrders = {
-    rank: { order: "none", type: "number" },
-    symbol: { order: "none", type: "string" },
-    name: { order: "none", type: "string" },
-    price: { order: "none", type: "number" },
-    changesPercentage: { order: "none", type: "number" },
-
-    marketCap: { order: "none", type: "number" },
-    revenue: { order: "none", type: "number" },
-  };
-
-  const sortData = (key) => {
-    // Reset all other keys to 'none' except the current key
-    for (const k in sortOrders) {
-      if (k !== key) {
-        sortOrders[k].order = "none";
-      }
-    }
-
-    // Cycle through 'none', 'asc', 'desc' for the clicked key
-    const orderCycle = ["none", "asc", "desc"];
-
-    let originalData = data?.getMarketCapCategory;
-
-    const currentOrderIndex = orderCycle.indexOf(sortOrders[key].order);
-    sortOrders[key].order =
-      orderCycle[(currentOrderIndex + 1) % orderCycle.length];
-    const sortOrder = sortOrders[key].order;
-
-    // Reset to original data when 'none' and stop further sorting
-    if (sortOrder === "none") {
-      marketCapList = [...originalData]?.slice(0, 50); // Reset to original data (spread to avoid mutation)
-      return;
-    }
-
-    // Define a generic comparison function
-    const compareValues = (a, b) => {
-      const { type } = sortOrders[key];
-      let valueA, valueB;
-
-      switch (type) {
-        case "date":
-          valueA = new Date(a[key]);
-          valueB = new Date(b[key]);
-          break;
-        case "string":
-          valueA = a[key].toUpperCase();
-          valueB = b[key].toUpperCase();
-          return sortOrder === "asc"
-            ? valueA.localeCompare(valueB)
-            : valueB.localeCompare(valueA);
-        case "number":
-        default:
-          valueA = parseFloat(a[key]);
-          valueB = parseFloat(b[key]);
-          break;
-      }
-
-      if (sortOrder === "asc") {
-        return valueA < valueB ? -1 : valueA > valueB ? 1 : 0;
-      } else {
-        return valueA > valueB ? -1 : valueA < valueB ? 1 : 0;
-      }
-    };
-
-    // Sort using the generic comparison function
-    marketCapList = [...originalData].sort(compareValues)?.slice(0, 50);
-  };
-
   let totalMarketCap = 0;
   let totalRevenue = 0;
 
@@ -169,8 +68,6 @@
     }
   }
 
-  $: charNumber = $screenWidth < 640 ? 15 : 20;
-
   // Get current category from URL params
   $: currentCategory = data?.getParams?.replace("-stocks", "");
   // Filter out current category
@@ -217,7 +114,9 @@
     class="w-full m-auto text-white border border-gray-600 rounded-md h-auto p-5 mb-4"
   >
     {currentCategoryData?.name} stocks have market capitalizations ranging {description}
-    USD, while additional categories include
+    USD.
+    <!--
+    , while additional categories include
     {#each otherCategories as category, i}
       {#if i === otherCategories.length - 1}
         and
@@ -234,6 +133,7 @@
         </a>,
       {/if}
     {/each}
+    -->
   </div>
 
   <div
@@ -271,89 +171,6 @@
     </div>
   </div>
 
-  <div class="flex flex-row items-end justify-end w-fit ml-auto mt-5 mb-2">
-    <DownloadData
-      {data}
-      rawData={data?.getMarketCapCategory}
-      title={data?.getParams}
-    />
-  </div>
-
   <!-- Page wrapper -->
-  <div class="flex justify-center w-full m-auto h-full overflow-hidden">
-    <!-- Content area -->
-    <div class="w-full overflow-x-scroll">
-      <div class="w-full overflow-x-scroll">
-        <table
-          class="table table-sm table-compact rounded-none sm:rounded-md w-full border-bg-[#09090B] m-auto mt-4"
-        >
-          <thead>
-            <TableHeader {columns} {sortOrders} {sortData} />
-          </thead>
-          <tbody>
-            {#each marketCapList as item, index}
-              <!-- row -->
-              <tr
-                class="sm:hover:bg-[#245073] sm:hover:bg-opacity-[0.2] odd:bg-[#27272A] border-b-[#09090B]"
-              >
-                <td
-                  class="text-white text-center font-medium text-sm sm:text-[1rem] border-b-[#09090B]"
-                >
-                  {item?.rank}
-                </td>
-
-                <td
-                  class="text-sm sm:text-[1rem] whitespace-nowrap border-b-[#09090B]"
-                >
-                  <HoverStockChart symbol={item?.symbol} />
-                </td>
-
-                <td
-                  class="text-gray-200 border-b-[#09090B] text-sm sm:text-[1rem] whitespace-nowrap"
-                >
-                  {item?.name?.length > charNumber
-                    ? item?.name?.slice(0, charNumber) + "..."
-                    : item?.name}
-                </td>
-
-                <td
-                  class="text-white font-medium text-sm sm:text-[1rem] whitespace-nowrap text-end border-b-[#09090B]"
-                >
-                  {abbreviateNumber(item?.marketCap)}
-                </td>
-
-                <td
-                  class="text-white text-end border-b-[#09090B] text-sm sm:text-[1rem] whitespace-nowrap"
-                >
-                  {item.price?.toFixed(2)}
-                </td>
-
-                <td
-                  class="text-white text-end border-b-[#09090B] text-sm sm:text-[1rem] whitespace-nowrap"
-                >
-                  {#if item?.changesPercentage >= 0}
-                    <span class="text-[#00FC50]"
-                      >+{item?.changesPercentage?.toFixed(2)}%</span
-                    >
-                  {:else}
-                    <span class="text-[#FF2F1F]"
-                      >{item?.changesPercentage?.toFixed(2)}%</span
-                    >
-                  {/if}
-                </td>
-
-                <td
-                  class="text-white font-medium text-sm sm:text-[1rem] whitespace-nowrap text-end border-b-[#09090B]"
-                >
-                  {item?.revenue !== null
-                    ? abbreviateNumber(item?.revenue)
-                    : "-"}
-                </td>
-              </tr>
-            {/each}
-          </tbody>
-        </table>
-      </div>
-    </div>
-  </div>
+  <Table {data} {rawData} />
 </section>
diff --git a/src/routes/list/reit-stocks/+page.svelte b/src/routes/list/reit-stocks/+page.svelte
index 5c423575..64de1a81 100644
--- a/src/routes/list/reit-stocks/+page.svelte
+++ b/src/routes/list/reit-stocks/+page.svelte
@@ -1,111 +1,23 @@
 <script lang="ts">
-  import { screenWidth } from "$lib/store";
-  import { onMount } from "svelte";
-  import { abbreviateNumber } from "$lib/utils";
-  import TableHeader from "$lib/components/Table/TableHeader.svelte";
-  import HoverStockChart from "$lib/components/HoverStockChart.svelte";
-  import DownloadData from "$lib/components/DownloadData.svelte";
+  import Table from "$lib/components/Table/Table.svelte";
 
   export let data;
-  let rawData = data?.getAllREITS;
-  let stockList = rawData?.slice(0, 50);
 
-  async function handleScroll() {
-    const scrollThreshold = document.body.offsetHeight * 0.8; // 80% of the website height
-    const isBottom = window.innerHeight + window.scrollY >= scrollThreshold;
-    if (isBottom && stockList?.length !== rawData?.length) {
-      const nextIndex = stockList?.length;
-      const filteredNewResults = rawData?.slice(nextIndex, nextIndex + 50);
-      stockList = [...stockList, ...filteredNewResults];
-    }
-  }
+  const excludedRules = new Set([
+    "volume",
+    "price",
+    "changesPercentage",
+    "dividendYield",
+    "eps",
+    "marketCap",
+  ]);
 
-  onMount(async () => {
-    window.addEventListener("scroll", handleScroll);
-    return () => {
-      window.removeEventListener("scroll", handleScroll);
-    };
-  });
-
-  let columns = [
-    { key: "rank", label: "Rank", align: "center" },
-    { key: "symbol", label: "Symbol", align: "left" },
-    { key: "name", label: "Name", align: "left" },
-    { key: "price", label: "Price", align: "right" },
-    { key: "changesPercentage", label: "% Change", align: "right" },
-    { key: "dividendYield", label: "Div. Yield", align: "right" },
-    { key: "marketCap", label: "Market Cap", align: "right" },
+  const defaultList = [
+    { name: "Market Cap", rule: "marketCap" },
+    { name: "Price", rule: "price" },
+    { name: "% Change", rule: "changesPercentage" },
+    { name: "Dividend Yield", rule: "dividendYield" },
   ];
-
-  let sortOrders = {
-    rank: { order: "none", type: "number" },
-    symbol: { order: "none", type: "string" },
-    name: { order: "none", type: "string" },
-    price: { order: "none", type: "number" },
-    changesPercentage: { order: "none", type: "number" },
-    dividendYield: { order: "none", type: "number" },
-    marketCap: { order: "none", type: "number" },
-  };
-
-  const sortData = (key) => {
-    // Reset all other keys to 'none' except the current key
-    for (const k in sortOrders) {
-      if (k !== key) {
-        sortOrders[k].order = "none";
-      }
-    }
-
-    // Cycle through 'none', 'asc', 'desc' for the clicked key
-    const orderCycle = ["none", "asc", "desc"];
-
-    let originalData = rawData;
-
-    const currentOrderIndex = orderCycle.indexOf(sortOrders[key].order);
-    sortOrders[key].order =
-      orderCycle[(currentOrderIndex + 1) % orderCycle.length];
-    const sortOrder = sortOrders[key].order;
-
-    // Reset to original data when 'none' and stop further sorting
-    if (sortOrder === "none") {
-      stockList = [...originalData]?.slice(0, 50); // Reset to original data (spread to avoid mutation)
-      return;
-    }
-
-    // Define a generic comparison function
-    const compareValues = (a, b) => {
-      const { type } = sortOrders[key];
-      let valueA, valueB;
-
-      switch (type) {
-        case "date":
-          valueA = new Date(a[key]);
-          valueB = new Date(b[key]);
-          break;
-        case "string":
-          valueA = a[key].toUpperCase();
-          valueB = b[key].toUpperCase();
-          return sortOrder === "asc"
-            ? valueA.localeCompare(valueB)
-            : valueB.localeCompare(valueA);
-        case "number":
-        default:
-          valueA = parseFloat(a[key]);
-          valueB = parseFloat(b[key]);
-          break;
-      }
-
-      if (sortOrder === "asc") {
-        return valueA < valueB ? -1 : valueA > valueB ? 1 : 0;
-      } else {
-        return valueA > valueB ? -1 : valueA < valueB ? 1 : 0;
-      }
-    };
-
-    // Sort using the generic comparison function
-    stockList = [...originalData].sort(compareValues)?.slice(0, 50);
-  };
-
-  $: charNumber = $screenWidth < 640 ? 20 : 30;
 </script>
 
 <section class="w-full overflow-hidden m-auto">
@@ -126,77 +38,6 @@
     the US stock market.
   </div>
 
-  <div class="flex flex-row items-end justify-end w-fit ml-auto mt-5 mb-2">
-    <DownloadData {data} rawData={data?.getAllREITS} title="all_reits_stocks" />
-  </div>
-
   <!-- Page wrapper -->
-  <div class="flex justify-center w-full m-auto h-full overflow-hidden">
-    <!-- Content area -->
-    <div class="w-full overflow-x-scroll">
-      <table class="table rounded-none sm:rounded-md w-full m-auto mt-4">
-        <thead>
-          <TableHeader {columns} {sortOrders} {sortData} />
-        </thead>
-        <tbody>
-          {#each stockList as item}
-            <!-- row -->
-            <tr
-              class="sm:hover:bg-[#245073] sm:hover:bg-opacity-[0.2] odd:bg-[#27272A] border-b-[#09090B]"
-            >
-              <td
-                class="text-white font-semibold sm:font-normal text-center text-sm sm:text-[1rem] border-b-[#09090B]"
-              >
-                {item?.rank}
-              </td>
-
-              <td class="text-[1rem] border-b-[#09090B]">
-                <HoverStockChart symbol={item?.symbol} />
-              </td>
-
-              <td
-                class="text-white border-b-[#09090B] text-sm sm:text-[1rem] whitespace-nowrap"
-              >
-                {item?.name?.length > charNumber
-                  ? item?.name?.slice(0, charNumber) + "..."
-                  : item?.name}
-              </td>
-
-              <td
-                class="text-white text-end text-sm sm:text-[1rem] border-b-[#09090B]"
-              >
-                {item?.price}
-              </td>
-
-              <td
-                class="text-white text-end text-sm sm:text-[1rem] border-b-[#09090B]"
-              >
-                {#if item?.changesPercentage >= 0}
-                  <span class="text-[#00FC50]"
-                    >+{item.changesPercentage?.toFixed(2)}%</span
-                  >
-                {:else}
-                  <span class="text-[#FF2F1F]"
-                    >{item.changesPercentage?.toFixed(2)}%
-                  </span>
-                {/if}
-              </td>
-
-              <td
-                class="text-white text-end text-sm sm:text-[1rem] border-b-[#09090B]"
-              >
-                {item?.dividendYield}%
-              </td>
-
-              <td
-                class="text-white font-medium text-sm sm:text-[1rem] whitespace-nowrap text-end border-b-[#09090B]"
-              >
-                {abbreviateNumber(item?.marketCap)}
-              </td>
-            </tr>
-          {/each}
-        </tbody>
-      </table>
-    </div>
-  </div>
+  <Table {data} rawData={data?.getAllREITS} {excludedRules} {defaultList} />
 </section>
diff --git a/src/routes/list/sector/[slug]/+page.svelte b/src/routes/list/sector/[slug]/+page.svelte
index 46bb8b33..e9c858f2 100644
--- a/src/routes/list/sector/[slug]/+page.svelte
+++ b/src/routes/list/sector/[slug]/+page.svelte
@@ -1,136 +1,19 @@
 <script lang="ts">
-  import { screenWidth } from "$lib/store";
   import { abbreviateNumber } from "$lib/utils";
-  import { onMount } from "svelte";
-  import { page } from "$app/stores";
-  import HoverStockChart from "$lib/components/HoverStockChart.svelte";
-  import DownloadData from "$lib/components/DownloadData.svelte";
-
-  import TableHeader from "$lib/components/Table/TableHeader.svelte";
+  import Table from "$lib/components/Table/Table.svelte";
 
   export let data;
 
-  let rawData = [];
-  let marketCapList = [];
+  let rawData = data?.getSectorCategory;
 
-  async function handleScroll() {
-    const scrollThreshold = document.body.offsetHeight * 0.8; // 80% of the website height
-    const isBottom = window.innerHeight + window.scrollY >= scrollThreshold;
-    if (isBottom && marketCapList?.length !== rawData?.length) {
-      const nextIndex = marketCapList?.length;
-      const filteredNewResults = rawData?.slice(nextIndex, nextIndex + 50);
-      marketCapList = [...marketCapList, ...filteredNewResults];
-    }
-  }
-
-  onMount(async () => {
-    window.addEventListener("scroll", handleScroll);
-    return () => {
-      window.removeEventListener("scroll", handleScroll);
-    };
-  });
-
-  let columns = [
-    { key: "rank", label: "Rank", align: "left" },
-    { key: "symbol", label: "Symbol", align: "left" },
-    { key: "name", label: "Name", align: "left" },
-    { key: "marketCap", label: "Market Cap", align: "right" },
-
-    { key: "price", label: "Price", align: "right" },
-    { key: "changesPercentage", label: "% Change", align: "right" },
-
-    { key: "revenue", label: "Revenue", align: "right" },
-  ];
-
-  let sortOrders = {
-    rank: { order: "none", type: "number" },
-    symbol: { order: "none", type: "string" },
-    name: { order: "none", type: "string" },
-    price: { order: "none", type: "number" },
-    changesPercentage: { order: "none", type: "number" },
-
-    marketCap: { order: "none", type: "number" },
-    revenue: { order: "none", type: "number" },
-  };
-
-  const sortData = (key) => {
-    // Reset all other keys to 'none' except the current key
-    for (const k in sortOrders) {
-      if (k !== key) {
-        sortOrders[k].order = "none";
-      }
-    }
-
-    // Cycle through 'none', 'asc', 'desc' for the clicked key
-    const orderCycle = ["none", "asc", "desc"];
-
-    let originalData = data?.getSectorCategory;
-
-    const currentOrderIndex = orderCycle.indexOf(sortOrders[key].order);
-    sortOrders[key].order =
-      orderCycle[(currentOrderIndex + 1) % orderCycle.length];
-    const sortOrder = sortOrders[key].order;
-
-    // Reset to original data when 'none' and stop further sorting
-    if (sortOrder === "none") {
-      marketCapList = [...originalData]?.slice(0, 50); // Reset to original data (spread to avoid mutation)
-      return;
-    }
-
-    // Define a generic comparison function
-    const compareValues = (a, b) => {
-      const { type } = sortOrders[key];
-      let valueA, valueB;
-
-      switch (type) {
-        case "date":
-          valueA = new Date(a[key]);
-          valueB = new Date(b[key]);
-          break;
-        case "string":
-          valueA = a[key].toUpperCase();
-          valueB = b[key].toUpperCase();
-          return sortOrder === "asc"
-            ? valueA.localeCompare(valueB)
-            : valueB.localeCompare(valueA);
-        case "number":
-        default:
-          valueA = parseFloat(a[key]);
-          valueB = parseFloat(b[key]);
-          break;
-      }
-
-      if (sortOrder === "asc") {
-        return valueA < valueB ? -1 : valueA > valueB ? 1 : 0;
-      } else {
-        return valueA > valueB ? -1 : valueA < valueB ? 1 : 0;
-      }
-    };
-
-    // Sort using the generic comparison function
-    marketCapList = [...originalData].sort(compareValues)?.slice(0, 50);
-  };
-
-  let totalMarketCap = 0;
-  let totalRevenue = 0;
-
-  $: {
-    if ($page?.url?.pathname) {
-      rawData = data?.getSectorCategory;
-      marketCapList = rawData?.slice(0, 50);
-
-      totalMarketCap = rawData?.reduce(
-        (total, stock) => total + stock?.marketCap,
-        0,
-      );
-      totalRevenue = rawData?.reduce(
-        (total, stock) => total + stock?.revenue,
-        0,
-      );
-    }
-  }
-
-  $: charNumber = $screenWidth < 640 ? 15 : 20;
+  let totalMarketCap = rawData?.reduce(
+    (total, stock) => total + stock?.marketCap,
+    0,
+  );
+  let totalRevenue = rawData?.reduce(
+    (total, stock) => total + stock?.revenue,
+    0,
+  );
 </script>
 
 <section class="w-full overflow-hidden m-auto">
@@ -177,89 +60,5 @@
     </div>
   </div>
 
-  <div class="flex flex-row items-end justify-end w-fit ml-auto mt-5 mb-2">
-    <DownloadData
-      {data}
-      rawData={data?.getSectorCategory}
-      title={data?.getParams}
-    />
-  </div>
-
-  <!-- Page wrapper -->
-  <div class="flex justify-center w-full m-auto h-full overflow-hidden">
-    <!-- Content area -->
-    <div class="w-full overflow-x-scroll">
-      <div class="w-full overflow-x-scroll">
-        <table
-          class="table table-sm table-compact rounded-none sm:rounded-md w-full border-bg-[#09090B] m-auto mt-4"
-        >
-          <thead>
-            <TableHeader {columns} {sortOrders} {sortData} />
-          </thead>
-          <tbody>
-            {#each marketCapList as item}
-              <!-- row -->
-              <tr
-                class="sm:hover:bg-[#245073] sm:hover:bg-opacity-[0.2] odd:bg-[#27272A] border-b-[#09090B]"
-              >
-                <td
-                  class="text-white text-center font-medium text-sm sm:text-[1rem] border-b-[#09090B]"
-                >
-                  {item?.rank}
-                </td>
-
-                <td
-                  class="text-sm sm:text-[1rem] whitespace-nowrap border-b-[#09090B]"
-                >
-                  <HoverStockChart symbol={item?.symbol} />
-                </td>
-
-                <td
-                  class="text-gray-200 border-b-[#09090B] text-sm sm:text-[1rem] whitespace-nowrap"
-                >
-                  {item?.name?.length > charNumber
-                    ? item?.name?.slice(0, charNumber) + "..."
-                    : item?.name}
-                </td>
-
-                <td
-                  class="text-white font-medium text-sm sm:text-[1rem] whitespace-nowrap text-end border-b-[#09090B]"
-                >
-                  {abbreviateNumber(item?.marketCap)}
-                </td>
-
-                <td
-                  class="text-white text-end border-b-[#09090B] text-sm sm:text-[1rem] whitespace-nowrap"
-                >
-                  {item.price?.toFixed(2)}
-                </td>
-
-                <td
-                  class="text-white text-end border-b-[#09090B] text-sm sm:text-[1rem] whitespace-nowrap"
-                >
-                  {#if item?.changesPercentage >= 0}
-                    <span class="text-[#00FC50]"
-                      >+{item?.changesPercentage?.toFixed(2)}%</span
-                    >
-                  {:else}
-                    <span class="text-[#FF2F1F]"
-                      >{item?.changesPercentage?.toFixed(2)}%</span
-                    >
-                  {/if}
-                </td>
-
-                <td
-                  class="text-white font-medium text-sm sm:text-[1rem] whitespace-nowrap text-end border-b-[#09090B]"
-                >
-                  {item?.revenue !== null
-                    ? abbreviateNumber(item?.revenue)
-                    : "-"}
-                </td>
-              </tr>
-            {/each}
-          </tbody>
-        </table>
-      </div>
-    </div>
-  </div>
+  <Table {data} rawData={data?.getSectorCategory} />
 </section>