From 3ccd3af1aa2d49612efe63a147b9a8f97b256611 Mon Sep 17 00:00:00 2001 From: MuslemRahimi Date: Mon, 11 Nov 2024 11:35:36 +0100 Subject: [PATCH] refactor code --- src/lib/store.ts | 1 - src/routes/watchlist/stocks/+page.server.ts | 28 +-------------------- src/routes/watchlist/stocks/+page.svelte | 12 +++------ 3 files changed, 5 insertions(+), 36 deletions(-) diff --git a/src/lib/store.ts b/src/lib/store.ts index 9c09ae7c..cf1eae8a 100644 --- a/src/lib/store.ts +++ b/src/lib/store.ts @@ -120,7 +120,6 @@ export const oauthState = writable(""); export const oauthVerifier = writable(""); export const oauthProvider = writable(""); -export const switchWatchList = writable(false); export const cachedPosts = writable(>{}); export const currentPagePosition = writable(0); diff --git a/src/routes/watchlist/stocks/+page.server.ts b/src/routes/watchlist/stocks/+page.server.ts index 389e5813..2098329a 100644 --- a/src/routes/watchlist/stocks/+page.server.ts +++ b/src/routes/watchlist/stocks/+page.server.ts @@ -1,31 +1,5 @@ export const load = async ({ locals }) => { - /* - const getMiniPlotsIndex = async () => { - let output; - - // Get cached data for the specific tickerID - const cachedData = getCache('', 'getMiniPlotsIndex'); - if (cachedData) { - output = cachedData; - } else { - const {apiKey, apiURL} = await parent(); - - // make the POST request to the endpoint - const response = await fetch(apiURL + '/mini-plots-index', { - method: 'GET', - headers: { - "Content-Type": "application/json", "X-API-KEY": apiKey - }, - }); - - output = await response.json(); - - setCache('', output, 'getMiniPlotsIndex'); - } - - return output; - }; - */ + const getAllWatchlist = async () => { const { pb, user } = locals; diff --git a/src/routes/watchlist/stocks/+page.svelte b/src/routes/watchlist/stocks/+page.svelte index b2fe2808..edbf1bc5 100644 --- a/src/routes/watchlist/stocks/+page.svelte +++ b/src/routes/watchlist/stocks/+page.svelte @@ -3,7 +3,6 @@ searchBarData, screenWidth, numberOfUnreadNotification, - switchWatchList, } from "$lib/store"; import { formatDate, abbreviateNumber } from "$lib/utils"; import toast from "svelte-french-toast"; @@ -17,6 +16,7 @@ export let data; let searchQuery = ""; + let switchWatchlist = false; let editMode = false; let numberOfChecked = 0; let deleteTickerList = []; @@ -425,7 +425,7 @@ function changeWatchList(newWatchList) { displayWatchList = newWatchList; - $switchWatchList = true; + switchWatchlist = true; } function saveRules() { @@ -502,10 +502,6 @@ } }); - onDestroy(() => { - $switchWatchList = false; - }); - function handleWatchlistModal() { const closePopup = document.getElementById("addWatchlist"); closePopup?.dispatchEvent(new MouseEvent("click")); @@ -579,11 +575,11 @@ $: charNumber = $screenWidth < 640 ? 15 : 20; $: { - if ($switchWatchList && typeof window !== "undefined") { + if (switchWatchlist && typeof window !== "undefined") { isLoaded = false; getWatchlistData(); isLoaded = true; - $switchWatchList = false; + switchWatchlist = false; } }