From 10d0781359f3bb6cd86161d8a47c332925316a0a Mon Sep 17 00:00:00 2001
From: MuslemRahimi <moslem_rahimi@hotmail.de>
Date: Tue, 30 Jul 2024 23:33:36 +0200
Subject: [PATCH] clean code

---
 src/lib/components/PriceAlert.svelte        |  17 +--
 src/routes/stocks/[tickerID]/+layout.svelte | 155 +++++---------------
 2 files changed, 40 insertions(+), 132 deletions(-)

diff --git a/src/lib/components/PriceAlert.svelte b/src/lib/components/PriceAlert.svelte
index 91a212c9..414d5ed7 100644
--- a/src/lib/components/PriceAlert.svelte
+++ b/src/lib/components/PriceAlert.svelte
@@ -1,6 +1,6 @@
 <script lang='ts'>
     import toast from 'svelte-french-toast';
-    import {userRegion, screenWidth, openPriceAlert, displayCompanyName, stockTicker, etfTicker, cryptoTicker, assetType} from '$lib/store';
+    import {screenWidth, openPriceAlert, displayCompanyName, stockTicker, etfTicker, cryptoTicker, assetType} from '$lib/store';
     import RangeSlider from 'svelte-range-slider-pips';
     
     export let data;
@@ -9,19 +9,6 @@
     let values = [0];
     let displayPrice = (currentPrice*(1+values?.at(0)/100))?.toFixed(2);
 
-    const usRegion = ['cle1','iad1','pdx1','sfo1'];
-    
-    let fastifyURL;
-    
-    userRegion.subscribe(value => {
-        if (usRegion.includes(value)) {
-        fastifyURL  = import.meta.env.VITE_USEAST_FASTIFY_URL;
-        } else {
-        fastifyURL  = import.meta.env.VITE_EU_FASTIFY_URL;
-        }
-    });
-        
-        
     async function handleCreateAlert()
     {
         if (values?.at(0) === 0)
@@ -43,7 +30,7 @@
         }
     
             // Make the POST request to the endpoint
-            const response = await fetch(fastifyURL+'/create-price-alert', {
+            const response = await fetch(data?.fastifyURL+'/create-price-alert', {
                 method: 'POST',
                 headers: {
                 "Content-Type": "application/json"
diff --git a/src/routes/stocks/[tickerID]/+layout.svelte b/src/routes/stocks/[tickerID]/+layout.svelte
index 54aa4732..fb69f426 100644
--- a/src/routes/stocks/[tickerID]/+layout.svelte
+++ b/src/routes/stocks/[tickerID]/+layout.svelte
@@ -1,6 +1,6 @@
 <script lang='ts'>
 
-  import {searchBarData, globalForm, screenWidth, openPriceAlert, currentPortfolioPrice, realtimePrice, isCrosshairMoveActive, currentPrice, priceIncrease, displayCompanyName, traded, stockTicker, isOpen } from '$lib/store';
+  import {searchBarData, globalForm, screenWidth, openPriceAlert, currentPortfolioPrice, realtimePrice, isCrosshairMoveActive, currentPrice, priceIncrease, displayCompanyName, stockTicker, isOpen } from '$lib/store';
 
   import { onMount, onDestroy, afterUpdate} from "svelte";
   import { goto } from '$app/navigation';
@@ -45,12 +45,13 @@ async function loadSearchData() {
 
     
     let isScrolled = false;
+    let y;
       
     let userWatchList = data?.getUserWatchlist ?? [];
     let isTickerIncluded; 
-    let userPortfolio = data?.getUserPortfolio ?? [];
-    let holdingShares = 0;
-    let availableCash = 0;
+    //let userPortfolio = data?.getUserPortfolio ?? [];
+    //let holdingShares = 0;
+    //let availableCash = 0;
     
     let displaySection = '';
 
@@ -79,7 +80,7 @@ function shareContent(url) {
   
 }
 
-
+/*
 function handleTypeOfTrade(state:string)
 {
   if (state === 'buy')
@@ -92,10 +93,9 @@ function handleTypeOfTrade(state:string)
   {
     const closePopup = document.getElementById("sellTradeModal");
     closePopup?.dispatchEvent(new MouseEvent('click'))
-  }
-
-  
+  } 
 }
+*/
 
 
 function scrollToItem(itemId) {
@@ -134,39 +134,17 @@ function changeSection(state, item) {
 
     
 async function toggleUserWatchlist(watchListId: string) {
-
   try {
-    isTickerIncluded = !isTickerIncluded;
-
     const watchlistIndex = userWatchList?.findIndex(item => item?.id === watchListId);
-
-    if (watchlistIndex !== -1) {
-      const existingTickerIndex = userWatchList[watchlistIndex]?.ticker?.indexOf($stockTicker);
-
-      if (existingTickerIndex !== -1) {
-        // If the $stockTicker exists, remove it from the array
-        userWatchList[watchlistIndex]?.ticker?.splice(existingTickerIndex, 1);
-      } else {
-        // If the $stockTicker doesn't exist, add it to the array
-        userWatchList[watchlistIndex]?.ticker?.push($stockTicker);
-      }
-
-      // Update the userWatchList
-      userWatchList = [...userWatchList];
-    }
-
-
     const postData = {
-      'userId': data?.user?.id,
-      'watchListId': watchListId,
-      'ticker': $stockTicker,
+      userId: data?.user?.id,
+      watchListId,
+      ticker: $stockTicker,
     };
 
-    const response = await fetch(data?.fastifyURL + '/update-watchlist', {
+    const response = await fetch(`${data?.fastifyURL}/update-watchlist`, {
       method: 'POST',
-      headers: {
-        "Content-Type": "application/json"
-      },
+      headers: { "Content-Type": "application/json" },
       body: JSON.stringify(postData),
     });
 
@@ -176,23 +154,23 @@ async function toggleUserWatchlist(watchListId: string) {
 
     const output = (await response.json())?.items;
 
-    // Update the userWatchList with the response from the server
-    if( watchlistIndex !== -1)
-    {
+    if (watchlistIndex !== -1) {
       userWatchList[watchlistIndex] = output;
-      userWatchList = [...userWatchList];
-    }
-    else {
-      userWatchList = [...userWatchList, output];
+    } else {
+      userWatchList.push(output);
     }
 
+    userWatchList = [...userWatchList];
+    isTickerIncluded = !isTickerIncluded;
+
   } catch (error) {
     console.error('An error occurred:', error);
     // Handle the error appropriately (e.g., show an error message to the user)
   }
 }
 
-    
+
+/*
 async function fetchPortfolio()
 {
   const postData = {'userId': data?.user?.id};
@@ -208,16 +186,10 @@ async function fetchPortfolio()
     userPortfolio = (await response.json())?.items;
 
 }
-    
-    
+*/
 
 
 
-function handleScroll() {
-    // Check the scroll position
-    isScrolled = window.scrollY > 0;
-  }
-
   
 function sendMessage(message) {
   if (socket && socket.readyState === WebSocket.OPEN) {
@@ -286,7 +258,7 @@ async function websocketRealtimeData() {
 let LoginPopup;
 let PriceAlert;
 
-    
+
 onMount(async () => {
   
     if(!data?.user)
@@ -300,25 +272,11 @@ onMount(async () => {
       PriceAlert = (await import('$lib/components/PriceAlert.svelte')).default;
     }
    
-    //const startTime = currentDateTime.set({ hour: 15, minute: 30 });
-    //const endTime = currentDateTime.set({ hour: 22, minute: 0 });
-    // Check if it's not a weekend and the current time is within the specified range
-
 
     if ($isOpen) //&& currentDateTime > startTime && currentDateTime < endTime
     {
       await websocketRealtimeData()
     }
-
-  
-    // Add a scroll event listener
-    window.addEventListener('scroll', handleScroll);
-
-    return () => {
-    // Remove the event listener when the component is unmounted
-    window.removeEventListener('scroll', handleScroll);
-    };
-
 });
 
 afterUpdate( async () => {
@@ -356,7 +314,7 @@ onDestroy(() => {
   $currentPortfolioPrice = null;
   $currentPrice = null;
   $priceIncrease = null;
-  $traded = false
+  //$traded = false
   
 });
 
@@ -371,30 +329,13 @@ $: {
     similarstock = data?.getSimilarStock;
     topETFHolder = data?.getTopETFHolder;
     $currentPortfolioPrice = data?.getStockQuote?.price;
-
-    const asyncFunctions = [
-      ];
-
-      Promise.all(asyncFunctions)
-          .then((results) => {
-            
-          })
-          .catch((error) => {
-            console.error('An error occurred:', error);
-          });
-  
-  }
-
-}
-    
-    
-$: {
-  if(userWatchList)
-  {
-    isTickerIncluded = userWatchList?.some(item => item.user === data?.user?.id && item?.ticker?.includes($stockTicker));
   }
 }
+    
+$: isTickerIncluded = userWatchList?.some(item => 
+  item.user === data?.user?.id && item.ticker?.includes($stockTicker));
 
+/*
 $: {
   if(userPortfolio) {
     availableCash = userPortfolio?.at(0)?.availableCash;
@@ -412,6 +353,7 @@ $: {
   }
 }
 
+
 $: {
   if(typeof window !== 'undefined' && $traded && data?.user && $stockTicker?.length !== 0)
   {
@@ -419,21 +361,10 @@ $: {
       $traded = false;
   }
 }
-    
+*/
 
 
-let charNumber = 12;
-
-$: {
-  if($screenWidth < 640)
-  {
-    charNumber = 12;
-  }
-  else {
-    charNumber = 25;
-  }
-}
-    
+$: charNumber = $screenWidth < 640 ? 12 : 25;
 
 $: {
   if($stockTicker && typeof window !== 'undefined' && $page.url.pathname === `/stocks/${$stockTicker}`)
@@ -458,8 +389,13 @@ $: {
   }
 }
 
+
+$: isScrolled = y > 0;
+
 </script>
 
+<svelte:window bind:scrollY={y}/>
+
 <body class="bg-[#09090B] pb-40">    
         <!-- Page wrapper -->
         <div class="flex flex-col min-h-screen overflow-hidden m-auto w-full mt-5 supports-[overflow:clip]:overflow-clip pb-40">
@@ -833,7 +769,7 @@ $: {
 
 <!--Start Type of Trade-->
 
-
+<!--
 <input type="checkbox" id="typeOfTrade" class="modal-toggle" />
 
 <dialog id="typeOfTrade" class="modal modal-bottom sm:modal-middle overflow-hidden">
@@ -897,17 +833,12 @@ $: {
   </div>
   </div>
 </dialog>
-
+-->
 <!--End Type of Trade-->
 
 
   
 
-
-
-
-
-
   <!--Start Add Watchlist Modal-->
   <input type="checkbox" id="addWatchListModal" class="modal-toggle" />
       
@@ -973,16 +904,6 @@ $: {
 
 
 
-
-
-
-
-
-
-
-
-
-
 <style lang='scss'>