From 8437d9e27ec1147c22a353bd83613f0aa4c9dc80 Mon Sep 17 00:00:00 2001
From: MuslemRahimi <moslem_rahimi@hotmail.de>
Date: Fri, 9 Aug 2024 11:23:24 +0200
Subject: [PATCH] update news page

---
 .../crypto/[tickerID]/news/+page.svelte       | 24 +++++++++++++++++-
 src/routes/etf/[tickerID]/news/+page.svelte   | 24 +++++++++++++++++-
 src/routes/market-news/+page.svelte           |  2 ++
 .../stocks/[tickerID]/news/+page.svelte       | 25 ++++++++++++++++++-
 4 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/src/routes/crypto/[tickerID]/news/+page.svelte b/src/routes/crypto/[tickerID]/news/+page.svelte
index 7fb7a00c..d466a150 100644
--- a/src/routes/crypto/[tickerID]/news/+page.svelte
+++ b/src/routes/crypto/[tickerID]/news/+page.svelte
@@ -1,11 +1,33 @@
 <script lang='ts'>
   import {numberOfUnreadNotification, displayCompanyName, cryptoTicker} from '$lib/store';
-  import { formatDate } from '$lib/utils';
   
   export let data;
   
   
+  const formatDate = (dateString) => {
+// Create a date object for the input dateString
+const inputDate = new Date(dateString);
   
+  // Create a date object for the current time in New York City
+  const nycTime = new Date().toLocaleString("en-US", { timeZone: "America/New_York" });
+  const currentNYCDate = new Date(nycTime);
+  
+  // Calculate the difference in milliseconds
+  const difference = inputDate.getTime() - currentNYCDate.getTime();
+  
+  // Convert the difference to minutes
+  const minutes = Math.abs(Math.round(difference / (1000 * 60)));
+  
+  if (minutes < 60) {
+    return `${minutes} minutes`;
+  } else if (minutes < 1440) {
+    const hours = Math.round(minutes / 60);
+    return `${hours} hour${hours !== 1 ? 's' : ''}`;
+  } else {
+    const days = Math.round(minutes / 1440);
+    return `${days} day${days !== 1 ? 's' : ''}`;
+  }
+};
   
   let rawNews = data?.getStockNews;
   let newsList = rawNews?.slice(0,20) ?? [];
diff --git a/src/routes/etf/[tickerID]/news/+page.svelte b/src/routes/etf/[tickerID]/news/+page.svelte
index a33a001c..cc47dae0 100644
--- a/src/routes/etf/[tickerID]/news/+page.svelte
+++ b/src/routes/etf/[tickerID]/news/+page.svelte
@@ -1,11 +1,33 @@
 <script lang='ts'>
   import {numberOfUnreadNotification, displayCompanyName, etfTicker} from '$lib/store';
-  import { formatDate } from '$lib/utils';
   
   export let data;
   
   
+  const formatDate = (dateString) => {
+// Create a date object for the input dateString
+const inputDate = new Date(dateString);
   
+  // Create a date object for the current time in New York City
+  const nycTime = new Date().toLocaleString("en-US", { timeZone: "America/New_York" });
+  const currentNYCDate = new Date(nycTime);
+  
+  // Calculate the difference in milliseconds
+  const difference = inputDate.getTime() - currentNYCDate.getTime();
+  
+  // Convert the difference to minutes
+  const minutes = Math.abs(Math.round(difference / (1000 * 60)));
+  
+  if (minutes < 60) {
+    return `${minutes} minutes`;
+  } else if (minutes < 1440) {
+    const hours = Math.round(minutes / 60);
+    return `${hours} hour${hours !== 1 ? 's' : ''}`;
+  } else {
+    const days = Math.round(minutes / 1440);
+    return `${days} day${days !== 1 ? 's' : ''}`;
+  }
+};
   
   let rawNews = data?.getStockNews;
   let newsList = rawNews?.slice(0,20) ?? [];
diff --git a/src/routes/market-news/+page.svelte b/src/routes/market-news/+page.svelte
index 1a9fdcb6..a25529a7 100644
--- a/src/routes/market-news/+page.svelte
+++ b/src/routes/market-news/+page.svelte
@@ -35,6 +35,8 @@ const inputDate = new Date(dateString);
     return `${days} day${days !== 1 ? 's' : ''}`;
   }
 };
+
+
 async function infiniteHandler({ detail: { loaded, complete } }) 
 {
   if (news?.length === rawData?.length) {
diff --git a/src/routes/stocks/[tickerID]/news/+page.svelte b/src/routes/stocks/[tickerID]/news/+page.svelte
index 22b2f76d..8ce39db1 100644
--- a/src/routes/stocks/[tickerID]/news/+page.svelte
+++ b/src/routes/stocks/[tickerID]/news/+page.svelte
@@ -1,6 +1,5 @@
 <script lang='ts'>
 import {numberOfUnreadNotification, displayCompanyName, stockTicker} from '$lib/store';
-import { formatDate } from '$lib/utils';
 
 export let data;
 
@@ -10,6 +9,30 @@ export let data;
 let rawNews = data?.getStockNews;
 let newsList = rawNews?.slice(0,20) ?? [];
 
+const formatDate = (dateString) => {
+// Create a date object for the input dateString
+const inputDate = new Date(dateString);
+  
+  // Create a date object for the current time in New York City
+  const nycTime = new Date().toLocaleString("en-US", { timeZone: "America/New_York" });
+  const currentNYCDate = new Date(nycTime);
+  
+  // Calculate the difference in milliseconds
+  const difference = inputDate.getTime() - currentNYCDate.getTime();
+  
+  // Convert the difference to minutes
+  const minutes = Math.abs(Math.round(difference / (1000 * 60)));
+  
+  if (minutes < 60) {
+    return `${minutes} minutes`;
+  } else if (minutes < 1440) {
+    const hours = Math.round(minutes / 60);
+    return `${hours} hour${hours !== 1 ? 's' : ''}`;
+  } else {
+    const days = Math.round(minutes / 1440);
+    return `${days} day${days !== 1 ? 's' : ''}`;
+  }
+};
 
 let videoId = null;