@@ -82,15 +155,15 @@ $: {
{#if data?.user?.tier === 'Pro'}
-
+ {#if isLoaded}
{/if}
-
+
+ {:else}
+
+ {/if}
{:else}
diff --git a/src/lib/store.ts b/src/lib/store.ts
index bafe94d9..cb71e678 100644
--- a/src/lib/store.ts
+++ b/src/lib/store.ts
@@ -71,6 +71,7 @@ export const varComponent = writable(
(false));
export const sentimentComponent = writable((false));
export const analystEstimateComponent = writable((false));
export const marketMakerComponent = writable((false));
+export const optionComponent = writable((false));
export const strategyId = writable( (""));
diff --git a/src/routes/etf/[tickerID]/+layout.server.ts b/src/routes/etf/[tickerID]/+layout.server.ts
index c2b8d339..9641d58f 100644
--- a/src/routes/etf/[tickerID]/+layout.server.ts
+++ b/src/routes/etf/[tickerID]/+layout.server.ts
@@ -112,7 +112,6 @@ const promises = [
fetchData(apiURL,'/stock-dividend',params.tickerID),
fetchData(apiURL,'/stock-quote', params.tickerID),
fetchData(apiURL,'/stock-rating', params.tickerID),
- fetchData(apiURL,'/options-bubble',params.tickerID),
fetchData(apiURL,'/wiim',params.tickerID),
fetchData(apiURL,'/one-day-price',params.tickerID),
fetchWatchlist(fastifyURL, locals?.user?.id),
@@ -128,7 +127,6 @@ const promises = [
getStockDividend,
getStockQuote,
getStockTARating,
- getOptionsData,
getWhyPriceMoved,
getOneDayPrice,
getUserWatchlist,
@@ -150,7 +148,6 @@ const promises = [
getStockDividend,
getStockQuote,
getStockTARating,
- getOptionsData,
getWhyPriceMoved,
getOneDayPrice,
getUserWatchlist,
diff --git a/src/routes/etf/[tickerID]/+page.svelte b/src/routes/etf/[tickerID]/+page.svelte
index 51255c05..48d6e475 100644
--- a/src/routes/etf/[tickerID]/+page.svelte
+++ b/src/routes/etf/[tickerID]/+page.svelte
@@ -3,7 +3,7 @@
import {AreaSeries, Chart, PriceLine, CandlestickSeries} from 'svelte-lightweight-charts';
import { TrackingModeExitMode } from 'lightweight-charts';
- import {getCache, setCache, sentimentComponent, varComponent, retailVolumeComponent, trendAnalysisComponent, priceAnalysisComponent, assetType, screenWidth, globalForm, userRegion, numberOfUnreadNotification, displayCompanyName, isCrosshairMoveActive, realtimePrice, priceIncrease, currentPortfolioPrice, currentPrice, clientSideCache, etfTicker, isOpen, isBeforeMarketOpen, isWeekend} from '$lib/store';
+ import {getCache, setCache, optionComponent, sentimentComponent, varComponent, retailVolumeComponent, trendAnalysisComponent, priceAnalysisComponent, assetType, screenWidth, globalForm, userRegion, numberOfUnreadNotification, displayCompanyName, isCrosshairMoveActive, realtimePrice, priceIncrease, currentPortfolioPrice, currentPrice, clientSideCache, etfTicker, isOpen, isBeforeMarketOpen, isWeekend} from '$lib/store';
import { onDestroy, onMount } from 'svelte';
import ETFKeyInformation from '$lib/components/ETFKeyInformation.svelte';
import Lazy from '$lib/components/Lazy.svelte';
@@ -50,7 +50,6 @@
let dividendList = [];
let similarTicker = []
let prePostData = {};
- let optionsDict = {};
let taRating = {};
let previousClose = data?.getStockQuote?.previousClose;
@@ -77,7 +76,6 @@
let Correlation;
let CountrySegmentation;
let SectorSegmentation;
- let OptionsData;
let WIIM;
//let ETFKeyInformation;
@@ -85,19 +83,10 @@
onMount(async() => {
WIIM = (await import('$lib/components/WIIM.svelte')).default;
- OptionsData = (await import('$lib/components/OptionsData.svelte')).default;
- TARating = (await import('$lib/components/TARating.svelte')).default;
- //PricePredictionCard = (await import('$lib/components/PricePredictionCard.svelte')).default;
- //TradingModel = (await import('$lib/components/TradingModel.svelte')).default;
+ TARating = (await import('$lib/components/TARating.svelte')).default;
Correlation = (await import('$lib/components/Correlation.svelte')).default;
CountrySegmentation = (await import('$lib/components/CountrySegmentation.svelte')).default;
SectorSegmentation = (await import('$lib/components/SectorSegmentation.svelte')).default;
- //ShareHolders = (await import('$lib/components/ShareHolders.svelte')).default;
- /*
- if ($screenWidth < 640) {
- ETFKeyInformation = (await import('$lib/components/ETFKeyInformation.svelte')).default;
- }
- */
})
@@ -716,7 +705,6 @@ async function initializePrice() {
topHoldingList = data?.getETFHoldings;
dividendList = data?.getStockDividend;
similarTicker = data?.getSimilarETFs;
- optionsDict = data?.getOptionsData;
previousClose = data?.getStockQuote?.previousClose
taRating = data?.getStockTARating;
@@ -1300,12 +1288,13 @@ async function initializePrice() {
-
- {#if OptionsData}
-
-
-
- {/if}
+
+
+ {#await import('$lib/components/OptionsData.svelte') then {default: Comp}}
+
+ {/await}
+
+
diff --git a/src/routes/stocks/[tickerID]/+layout.server.ts b/src/routes/stocks/[tickerID]/+layout.server.ts
index 7279e687..9e31b582 100644
--- a/src/routes/stocks/[tickerID]/+layout.server.ts
+++ b/src/routes/stocks/[tickerID]/+layout.server.ts
@@ -142,7 +142,6 @@ export const load = async ({ params, locals, cookies, setHeaders}) => {
fetchData(apiURL,'/analyst-summary-rating',params.tickerID),
fetchData(apiURL,'/stock-quote',params.tickerID),
fetchData(apiURL,'/stock-rating',params.tickerID),
- fetchData(apiURL,'/options-bubble',params.tickerID),
fetchData(apiURL,'/bull-bear-say',params.tickerID),
fetchData(apiURL,'/wiim',params.tickerID),
fetchData(apiURL,'/top-etf-ticker-holder',params.tickerID),
@@ -160,7 +159,6 @@ export const load = async ({ params, locals, cookies, setHeaders}) => {
getAnalystRating,
getStockQuote,
getStockTARating,
- getOptionsData,
getBullBearSay,
getWhyPriceMoved,
getTopETFHolder,
@@ -184,7 +182,6 @@ export const load = async ({ params, locals, cookies, setHeaders}) => {
getAnalystRating,
getStockQuote,
getStockTARating,
- getOptionsData,
getBullBearSay,
getWhyPriceMoved,
getTopETFHolder,
diff --git a/src/routes/stocks/[tickerID]/+page.svelte b/src/routes/stocks/[tickerID]/+page.svelte
index dcfdaba3..30d992f8 100644
--- a/src/routes/stocks/[tickerID]/+page.svelte
+++ b/src/routes/stocks/[tickerID]/+page.svelte
@@ -3,7 +3,7 @@
import {AreaSeries, Chart, PriceLine, CandlestickSeries} from 'svelte-lightweight-charts';
import { TrackingModeExitMode } from 'lightweight-charts';
- import {getCache, setCache, marketMakerComponent, analystEstimateComponent, sentimentComponent, screenWidth, displayCompanyName, numberOfUnreadNotification, globalForm, varComponent, shareStatisticsComponent, enterpriseComponent, darkPoolComponent, retailVolumeComponent, shareholderComponent, trendAnalysisComponent, revenueSegmentationComponent, priceAnalysisComponent, fundamentalAnalysisComponent, userRegion, isCrosshairMoveActive, realtimePrice, priceIncrease, currentPortfolioPrice, currentPrice, stockTicker, isOpen, isBeforeMarketOpen, isWeekend} from '$lib/store';
+ import {getCache, setCache, optionComponent, marketMakerComponent, analystEstimateComponent, sentimentComponent, screenWidth, displayCompanyName, numberOfUnreadNotification, globalForm, varComponent, shareStatisticsComponent, enterpriseComponent, darkPoolComponent, retailVolumeComponent, shareholderComponent, trendAnalysisComponent, revenueSegmentationComponent, priceAnalysisComponent, fundamentalAnalysisComponent, userRegion, isCrosshairMoveActive, realtimePrice, priceIncrease, currentPortfolioPrice, currentPrice, stockTicker, isOpen, isBeforeMarketOpen, isWeekend} from '$lib/store';
import { onDestroy, onMount } from 'svelte';
import BullBearSay from '$lib/components/BullBearSay.svelte';
import CommunitySentiment from '$lib/components/CommunitySentiment.svelte';
@@ -32,7 +32,6 @@
let prePostData = {};
let similarstock = [];
let topETFHolder = [];
- let optionsDict = data?.getOptionsData ?? {};
let previousClose = data?.getStockQuote?.previousClose;
let marketMoods = {}
let taRating = {};
@@ -56,7 +55,6 @@
let TARating;
let StockSplits;
let Correlation;
- let OptionsData;
let WIIM;
@@ -67,7 +65,6 @@
TARating = (await import('$lib/components/TARating.svelte')).default;
StockSplits = (await import('$lib/components/StockSplits.svelte')).default;
Correlation = (await import('$lib/components/Correlation.svelte')).default;
- OptionsData = (await import('$lib/components/OptionsData.svelte')).default;
})
@@ -673,7 +670,6 @@ function changeChartType() {
oneMonthPrice = [];
oneYearPrice = [];
threeYearPrice = [];
- optionsDict = {};
prePostData = {};
marketMoods = {};
taRating = {};
@@ -691,7 +687,6 @@ function changeChartType() {
similarstock = data?.getSimilarStock;
topETFHolder = data?.getTopETFHolder;
- optionsDict = data?.getOptionsData;
//previousClose = stockDeck?.at(0)?.previousClose;
@@ -1309,14 +1304,17 @@ function changeChartType() {
{/await}
-
- {#if OptionsData}
-
-
-
- {/if}
-
+
+
+ {#await import('$lib/components/OptionsData.svelte') then {default: Comp}}
+
+ {/await}
+
+
+
+
+