bugfixing

This commit is contained in:
MuslemRahimi 2024-11-05 11:18:37 +01:00
parent 0aa08e6c7c
commit 6bb8ca0872
3 changed files with 111 additions and 549 deletions

View File

@ -3,6 +3,7 @@
import { onMount } from "svelte";
import ArrowLogo from "lucide-svelte/icons/move-up-right";
import HoverStockChart from "$lib/components/HoverStockChart.svelte";
import TableHeader from "$lib/components/Table/TableHeader.svelte";
export let data;
@ -15,43 +16,43 @@
let path;
switch (sector) {
case "Financials":
path = "financial-sector";
path = "financial";
break;
case "Healthcare":
path = "healthcare-sector";
path = "healthcare";
break;
case "Information Technology":
path = "technology-sector";
path = "technology";
break;
case "Technology":
path = "technology-sector";
path = "technology";
break;
case "Financial Services":
path = "financial-sector";
path = "financial";
break;
case "Industrials":
path = "industrials-sector";
path = "industrials";
break;
case "Energy":
path = "energy-sector";
path = "energy";
break;
case "Utilities":
path = "utilities-sector";
path = "utilities";
break;
case "Consumer Cyclical":
path = "consumer-cyclical-sector";
path = "consumer-cyclical";
break;
case "Real Estate":
path = "real-estate-sector";
path = "real-estate";
break;
case "Basic Materials":
path = "basic-materials-sector";
path = "basic-materials";
break;
case "Communication Services":
path = "communication-services-sector";
path = "communication-services";
break;
case "Consumer Defensive":
path = "consumer-defensive-sector";
path = "consumer-defensive";
break;
default:
// Handle default case if needed
@ -117,6 +118,82 @@
});
$: charNumber = 20;
let columns = [
{ key: "date", label: "Date", align: "left" },
{ key: "ticker", label: "Symbol", align: "left" },
{ key: "name", label: "Name", align: "left" },
{ key: "sentiment", label: "Sentiment", align: "right" },
{ key: "returnSince", label: "Return Since", align: "right" },
{ key: "sector", label: "Sector", align: "right" },
];
let sortOrders = {
date: { order: "none", type: "date" },
ticker: { order: "none", type: "string" },
name: { order: "none", type: "string" },
sentiment: { order: "none", type: "string" },
returnSince: { order: "none", type: "number" },
sector: { order: "none", type: "string" },
};
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);
};
</script>
<svelte:head>
@ -199,98 +276,21 @@
</span>
</div>
<div class="w-screen sm:w-full m-auto mt-20 sm:mt-10">
<div class="w-full m-auto mt-20 sm:mt-10">
<div
class="w-screen sm:w-full m-auto rounded-none sm:rounded-lg mb-4 overflow-x-scroll"
class="w-full m-auto rounded-none sm:rounded-lg mb-4 overflow-x-scroll"
>
<table
class="table table-sm table-compact no-scrollbar rounded-none sm:rounded-md w-full bg-[#09090B] border-bg-[#09090B] m-auto"
>
<thead>
<tr class="bg-[#09090B] border-b border-[#27272A]">
<th
class="text-start bg-[#09090B] text-white text-sm sm:text-[1rem] font-semibold"
>
Company Name
</th>
<th
class="text-start bg-[#09090B] text-white text-sm sm:text-[1rem] font-semibold"
>
Date
</th>
<th
class="text-center bg-[#09090B] text-white text-sm sm:text-[1rem] font-semibold"
>
Sentiment
</th>
<th
class="text-end bg-[#09090B] text-white text-sm sm:text-[1rem] font-semibold"
>
Return Since
</th>
<th
class=" text-end bg-[#09090B] text-white text-sm sm:text-[1rem] font-semibold"
>
Sector
</th>
</tr>
<TableHeader {columns} {sortOrders} {sortData} />
</thead>
<tbody>
{#each displayList as item, index}
{#each displayList as item}
<tr
class="sm:hover:bg-[#245073] border-b border-[#27272A] sm:hover:bg-opacity-[0.2] odd:bg-[#27272A]"
>
<td
class="text-sm sm:text-[1rem] text-start whitespace-nowrap"
>
{#if index >= 5 && data?.user?.tier !== "Pro"}
<a class="block relative" href="/pricing">
<span
class="text-base font-semibold text-blue-link blur group-hover:blur-[6px]"
>
XXXX
</span>
<div
class="ml-px max-w-[130px] truncate text-sm text-default blur group-hover:blur-[6px] lg:max-w-[150px]"
>
XXXXXXXXXXXXXXXX
</div>
<div class="absolute top-3 flex items-center">
<svg
class="size-5 text-[#FBCE3C]"
viewBox="0 0 20 20"
fill="currentColor"
style="max-width: 40px;"
>
<path
fill-rule="evenodd"
d="M5 9V7a5 5 0 0110 0v2a2 2 0 012 2v5a2 2 0 01-2 2H5a2 2 0 01-2-2v-5a2 2 0 012-2zm8-2v2H7V7a3 3 0 016 0z"
clip-rule="evenodd"
>
</path>
</svg>
<span
class="ml-1 font-semibold text-muted group-hover:text-default"
>
Upgrade
</span>
</div>
</a>
{:else}
<div class="flex flex-col items-start">
<HoverStockChart symbol={item?.ticker} />
<span class="text-white">
{item?.name?.length > charNumber
? item?.name?.slice(0, charNumber) + "..."
: item?.name}
</span>
</div>
{/if}
</td>
<td
class="text-start text-sm sm:text-[1rem] whitespace-nowrap text-white"
>
@ -302,6 +302,20 @@
})}
</td>
<td
class="text-sm sm:text-[1rem] text-start whitespace-nowrap"
>
<HoverStockChart symbol={item?.ticker} />
</td>
<td
class="text-start text-sm sm:text-[1rem] whitespace-nowrap text-white"
>
{item?.name?.length > charNumber
? item?.name?.slice(0, charNumber) + "..."
: item?.name}
</td>
<td
class="text-sm sm:text-[1rem] whitespace-nowrap {[
'Bullish',
@ -314,7 +328,7 @@
) ||
item?.sentiment?.includes('Sell') === 'Bearish'
? 'text-[#FF2F1F]'
: 'text-[#C6A755]'} text-center"
: 'text-[#C6A755]'} text-end"
>
{item?.sentiment}
</td>
@ -331,7 +345,8 @@
class="text-end text-sm sm:text-[1rem] whitespace-nowrap font-medium"
>
<a
href={"/list/" + sectorSelector(item?.sector)}
href={"/list/sector/" +
sectorSelector(item?.sector)}
class="sm:hover:text-white text-blue-400"
>
{item?.sector}

View File

@ -1,43 +0,0 @@
export const load = async ({ locals }) => {
const { apiKey, apiURL } = locals;
const getIndustrialsSector = async () => {
const postData = { filterList: "industrials" };
const response = await fetch(apiURL + "/filter-stock-list", {
method: "POST",
headers: {
"Content-Type": "application/json",
"X-API-KEY": apiKey,
},
body: JSON.stringify(postData),
});
const output = await response.json();
return output;
};
const getHistoricalSector = async () => {
const postData = { filterList: "industrials" };
const response = await fetch(apiURL + "/historical-sector-price", {
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 {
getIndustrialsSector: await getIndustrialsSector(),
getHistoricalSector: await getHistoricalSector(),
};
};

View File

@ -1,410 +0,0 @@
<script lang="ts">
import { goto } from "$app/navigation";
import { screenWidth } from "$lib/store";
import { abbreviateNumber } from "$lib/utils";
import InfoModal from "$lib/components/InfoModal.svelte";
import { onMount } from "svelte";
import { Chart } from "svelte-echarts";
import { init, use } from "echarts/core";
import { BarChart } from "echarts/charts";
import { GridComponent, TooltipComponent } from "echarts/components";
import { CanvasRenderer } from "echarts/renderers";
export let data;
let isLoaded = false;
use([BarChart, GridComponent, TooltipComponent, CanvasRenderer]);
let rawData = data?.getIndustrialsSector;
let historicalPrice = data?.getHistoricalSector;
let marketCapList = rawData?.slice(0, 50);
let optionsData;
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];
}
}
function getPlotOptions() {
let dates = [];
let priceList = [];
// Iterate over the data and extract required information
historicalPrice?.forEach((item) => {
dates?.push(item?.date);
priceList?.push(item?.changesPercentage);
});
const option = {
silent: true,
tooltip: {
trigger: "axis",
hideDelay: 100, // Set the delay in milliseconds
},
animation: false,
grid: {
left: "0%",
right: "2%",
bottom: "2%",
top: "5%",
containLabel: true,
},
xAxis: {
type: "category",
boundaryGap: false,
data: dates,
axisLabel: {
color: "#fff",
},
},
yAxis: [
{
type: "value",
splitLine: {
show: false, // Disable x-axis grid lines
},
axisLabel: {
color: "#fff",
formatter: function (value, index) {
if (index % 2 === 0) {
return value?.toFixed(2) + "%"; // Format the sentiment value
} else {
return ""; // Hide this tick
}
},
},
},
],
series: [
{
name: "Daily Change [%]",
data: priceList,
type: "bar",
itemStyle: {
color: (params) => {
// Set color based on positive or negative value
return params.data >= 0 ? "#22C55E" : "#F71F4F";
},
},
},
],
};
return option;
}
onMount(async () => {
optionsData = await getPlotOptions();
isLoaded = true;
window.addEventListener("scroll", handleScroll);
return () => {
window.removeEventListener("scroll", handleScroll);
};
});
let totalMarketCap =
rawData?.reduce((total, stock) => total + stock?.marketCap, 0) ?? 0;
let totalRevenue =
rawData?.reduce((total, stock) => total + stock?.revenue, 0) ?? 0;
let totalProfits =
rawData?.reduce((total, stock) => total + stock?.netIncome, 0) ?? 0;
$: charNumber = $screenWidth < 640 ? 15 : 20;
</script>
<section class="w-full overflow-hidden m-auto">
<div
class="border border-gray-800 w-full sm:flex sm:flex-row sm:items-center m-auto text-gray-100 bg-[#09090B] 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="#FBCE3C"
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
>
A complete list of companies in the Industrials Sector that are publicly traded
on the US stock exchange.
</div>
<div
class="mb-4 grid grid-cols-2 divide-y divide-gray-600 rounded-lg border border-gray-600 bg-[#272727] shadow md:grid-cols-3 divide-x"
>
<div class="p-4 bp:p-5 sm:p-6">
<label
for="stocksInfo"
class="mr-1 cursor-pointer flex flex-row items-center text-white text-[1rem] sm:text-xl font-semibold"
>
Stocks
<InfoModal
title={"Stocks"}
content={"The total number of companies who operate in this sector."}
id={"stocksInfo"}
/>
</label>
<div
class="mt-1 flex flex-col items-baseline justify-start space-y-2 bp:space-y-0"
>
<div
class="flex items-baseline text-lg sm:text-xl font-semibold text-white"
>
{rawData?.length}
</div>
</div>
</div>
<div class="p-4 bp:p-5 sm:p-6">
<label
for="marketCapModal"
class="mr-1 cursor-pointer flex flex-row items-center text-white text-[1rem] sm:text-xl font-semibold"
>
Market Cap
<InfoModal
title={"Market Cap"}
content={"Combined market cap of all companies in this sector."}
id={"marketCapModal"}
/>
</label>
<div
class="mt-1 flex flex-col items-baseline justify-start space-y-2 bp:space-y-0"
>
<div
class="flex items-baseline text-lg sm:text-xl font-semibold text-white"
>
{abbreviateNumber(totalMarketCap, true)}
</div>
</div>
</div>
<div class="p-4 bp:p-5 sm:p-6">
<label
for="revenueInfo"
class="mr-1 cursor-pointer flex flex-row items-center text-white text-[1rem] sm:text-xl font-semibold"
>
Revenue
<InfoModal
title={"Revenue"}
content={"The total revenue of all companies in this sector."}
id={"revenueInfo"}
/>
</label>
<div
class="mt-1 flex flex-col items-baseline justify-start space-y-2 bp:space-y-0"
>
<div
class="flex items-baseline text-lg sm:text-xl font-semibold text-white"
>
{abbreviateNumber(totalRevenue, true)}
</div>
</div>
</div>
<div class="p-4 bp:p-5 sm:p-6">
<label
for="profitsInfo"
class="mr-1 cursor-pointer flex flex-row items-center text-white text-[1rem] sm:text-xl font-semibold"
>
Profits
<InfoModal
title={"Profits"}
content={"The total net income of all companies in this sector."}
id={"profitsInfo"}
/>
</label>
<div
class="mt-1 flex flex-col items-baseline justify-start space-y-2 bp:space-y-0"
>
<div
class="flex items-baseline text-lg sm:text-xl font-semibold text-white"
>
{abbreviateNumber(totalProfits, true)}
</div>
</div>
</div>
<div class="p-4 bp:p-5 sm:p-6">
<label
for="profitMarginInfo"
class="mr-1 cursor-pointer flex flex-row items-center text-white text-[1rem] sm:text-xl font-semibold"
>
Profit Margin
<InfoModal
title={"Profit Margin"}
content={"The industry's profit margin, calculated by dividing the total net income by the total revenue."}
id={"profitMarginInfo"}
/>
</label>
<div
class="mt-1 flex flex-col items-baseline justify-start space-y-2 bp:space-y-0"
>
<div
class="flex items-baseline text-lg sm:text-xl font-semibold text-white"
>
{((totalProfits / totalRevenue) * 100)?.toFixed(2)}%
</div>
</div>
</div>
<div class="p-4 bp:p-5 sm:p-6">
<label
for="peRatioInfo"
class="mr-1 cursor-pointer flex flex-row items-center text-white text-[1rem] sm:text-xl font-semibold"
>
PE Ratio
<InfoModal
title={"PE Ratio"}
content={"The industry's PE Ratio, calculated by dividing the total market cap by the total net income."}
id={"peRatioInfo"}
/>
</label>
<div
class="mt-1 flex flex-col items-baseline justify-start space-y-2 bp:space-y-0"
>
<div
class="flex items-baseline text-lg sm:text-xl font-semibold text-white"
>
{(totalMarketCap / totalProfits)?.toFixed(2)}
</div>
</div>
</div>
</div>
<h2 class="text-white text-xl sm:text-2xl mt-8 font-semibold">
Historical Performance
</h2>
<div class="app w-full h-[300px] mt-5 mb-8">
{#if isLoaded}
<Chart {init} options={optionsData} class="chart" />
{:else}
<div class="flex justify-center items-center h-80">
<div class="relative">
<label
class="bg-[#09090B] rounded-xl h-14 w-14 flex justify-center items-center absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2"
>
<span class="loading loading-spinner loading-md text-gray-400"
></span>
</label>
</div>
</div>
{/if}
</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>
<tr class="border border-slate-800">
<th class="text-white font-semibold text-[1rem]">Symbol</th>
<th class="text-white font-semibold text-[1rem]">Company</th>
<th class="text-white font-semibold text-end text-[1rem]"
>Market Cap</th
>
<th class="text-white font-semibold text-center text-[1rem]"
>Revenue</th
>
<th class="text-white font-semibold text-center text-[1rem]"
>Profits</th
>
<th class="text-white font-semibold text-[1rem] text-end">Price</th>
</tr>
</thead>
<tbody>
{#each marketCapList as item, index}
<!-- row -->
<tr
on:click={() => goto("/stocks/" + item?.symbol)}
class="sm:hover:bg-[#245073] sm:hover:bg-opacity-[0.2] odd:bg-[#27272A] border-b-[#09090B] shake-ticker cursor-pointer"
>
<td
class="text-blue-400 font-medium text-sm sm:text-[1rem] whitespace-nowrap border-b-[#09090B]"
>
{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]"
>
{abbreviateNumber(item?.marketCap, true)}
</td>
<td
class="text-white text-sm sm:text-[1rem] whitespace-nowrap font-medium text-center border-b-[#09090B]"
>
{item?.revenue !== null
? abbreviateNumber(item?.revenue, true)
: "-"}
</td>
<td
class="text-white text-sm sm:text-[1rem] whitespace-nowrap font-medium text-center border-b-[#09090B]"
>
{item?.netIncome !== null
? abbreviateNumber(item?.netIncome, true)
: "-"}
</td>
<td
class="text-white text-sm sm:text-[1rem] whitespace-nowrap border-b-[#09090B]"
>
<div class="flex flex-row justify-end items-center">
<div class="flex flex-col">
<span class="text-white ml-auto"
>${item.price?.toFixed(2)}</span
>
<div class="flex flex-row mt-0.5 ml-auto">
{#if item.changesPercentage >= 0}
<span class="text-[#00FC50]"
>+{item.changesPercentage?.toFixed(2)}%</span
>
{:else}
<span class="text-[#FF2F1F]"
>{item.changesPercentage?.toFixed(2)}%
</span>
{/if}
</div>
</div>
</div>
</td>
</tr>
{/each}
</tbody>
</table>
</div>
</div>
</section>
<style>
.app {
height: 300px;
max-width: 100%; /* Ensure chart width doesn't exceed the container */
}
@media (max-width: 640px) {
.app {
height: 210px;
}
}
.chart {
width: 100%;
}
</style>