From ea6794da40a5a835c64c9587dc0c4d73511961d3 Mon Sep 17 00:00:00 2001
From: MuslemRahimi <moslem_rahimi@hotmail.de>
Date: Tue, 16 Jul 2024 14:21:57 +0200
Subject: [PATCH] ui fixes

---
 src/routes/crypto/[tickerID]/+layout.svelte | 25 ++++++++----------
 src/routes/etf/[tickerID]/+layout.svelte    | 29 +++++++++------------
 src/routes/stocks/[tickerID]/+layout.svelte | 28 +++++++++-----------
 3 files changed, 36 insertions(+), 46 deletions(-)

diff --git a/src/routes/crypto/[tickerID]/+layout.svelte b/src/routes/crypto/[tickerID]/+layout.svelte
index a7c3f35c..364d0d55 100644
--- a/src/routes/crypto/[tickerID]/+layout.svelte
+++ b/src/routes/crypto/[tickerID]/+layout.svelte
@@ -310,9 +310,11 @@ onMount(async () => {
       LoginPopup = (await import('$lib/components/LoginPopup.svelte')).default;
     }
     else {
+      /*
       AddPortfolio = (await import('$lib/components/AddPortfolio.svelte')).default;
       BuyTrade = (await import('$lib/components/BuyTrade.svelte')).default;
       SellTrade = (await import('$lib/components/SellTrade.svelte')).default;
+      */
       PriceAlert = (await import('$lib/components/PriceAlert.svelte')).default;
     }
    
@@ -644,6 +646,7 @@ $: {
     
                                         
                                         <!--Start Trade-->
+                                        <!--
                                         <div class="hidden sm:flex ml-auto">
                                         {#if holdingShares !== 0 && data?.user}
                                         
@@ -662,6 +665,7 @@ $: {
                                         </label>
                                         {/if}
                                       </div>
+                                      -->
                                       <!--End Trade-->
                      
                                       </div>
@@ -739,7 +743,7 @@ $: {
                         -->
 
 
-                      
+                      <!--
                         <div class="sm:hidden fixed z-20 bottom-8 sm:bottom-10 right-5">
                           <div class="h-full mx-auto">        
                             <div class="flex items-center justify-end">
@@ -756,6 +760,7 @@ $: {
                             </div>
                           </div>
                         </div>
+                        -->
 
                                           
 
@@ -774,7 +779,7 @@ $: {
 {/if}   
 <!--End Login Modal-->
 
-<!--Start BuyTrade Modal-->
+<!--
 {#if BuyTrade}
 <BuyTrade
   data = {data}
@@ -782,9 +787,7 @@ $: {
   availableCash = {availableCash}
 />
 {/if}
-  <!--End BuyTrade Modal-->
 
-<!--Start SellTrade Modal-->
 {#if SellTrade}
 <SellTrade 
   data = {data}
@@ -793,23 +796,17 @@ $: {
 />
 {/if}
 
-<!--End SellTrade Modal-->
+{#if AddPortfolio}
+<AddPortfolio data={data}/>
+{/if}
+-->
 
-
-<!--Start SellTrade Modal-->
 {#if PriceAlert}
 <PriceAlert 
   data = {data}
 />
 {/if}
 
-<!--End SellTrade Modal-->
-
-<!--Start Add Portfolio Modal-->
-{#if AddPortfolio}
-<AddPortfolio data={data}/>
-{/if}
-<!--End Add Portfolio Modal-->
 
 
 
diff --git a/src/routes/etf/[tickerID]/+layout.svelte b/src/routes/etf/[tickerID]/+layout.svelte
index e7ec7cfb..b6863f47 100644
--- a/src/routes/etf/[tickerID]/+layout.svelte
+++ b/src/routes/etf/[tickerID]/+layout.svelte
@@ -321,9 +321,9 @@ async function fetchPortfolio()
         LoginPopup = (await import('$lib/components/LoginPopup.svelte')).default;
       }
       else {
-        AddPortfolio = (await import('$lib/components/AddPortfolio.svelte')).default;
-        BuyTrade = (await import('$lib/components/BuyTrade.svelte')).default;
-        SellTrade = (await import('$lib/components/SellTrade.svelte')).default;
+        //AddPortfolio = (await import('$lib/components/AddPortfolio.svelte')).default;
+        //BuyTrade = (await import('$lib/components/BuyTrade.svelte')).default;
+        //SellTrade = (await import('$lib/components/SellTrade.svelte')).default;
         PriceAlert = (await import('$lib/components/PriceAlert.svelte')).default;
       }
      
@@ -680,6 +680,7 @@ $: {
         
         
                                             <!--Start Trade-->
+                                            <!--
                                             <div class="hidden sm:flex ml-auto">
                                               {#if holdingShares !== 0 && data?.user}
                                              
@@ -698,6 +699,7 @@ $: {
                                               </label>
                                               {/if}
                                             </div>
+                                            -->
                                             <!--End Trade-->
                        
                                         </div>
@@ -818,7 +820,7 @@ $: {
                           {/if}
                         -->
 
-                        
+                        <!--
                         <div class="sm:hidden fixed z-20 bottom-8 sm:bottom-10 right-5">
                           <div class="h-full mx-auto">        
                             <div class="flex items-center justify-end">
@@ -835,6 +837,7 @@ $: {
                             </div>
                           </div>
                         </div>
+                        -->
 
 
                                             
@@ -854,7 +857,7 @@ $: {
 {/if}   
 <!--End Login Modal-->
 
-<!--Start BuyTrade Modal-->
+<!--
 {#if BuyTrade}
 <BuyTrade
   data = {data}
@@ -862,9 +865,7 @@ $: {
   availableCash = {availableCash}
 />
 {/if}
-  <!--End BuyTrade Modal-->
 
-<!--Start SellTrade Modal-->
 {#if SellTrade}
 <SellTrade 
   data = {data}
@@ -873,7 +874,10 @@ $: {
 />
 {/if}
 
-<!--End SellTrade Modal-->
+{#if AddPortfolio}
+<AddPortfolio data={data}/>
+{/if}
+-->
 
 {#if PriceAlert}
 <PriceAlert 
@@ -882,14 +886,7 @@ $: {
 {/if}
 
   
-<!--Start Add Portfolio Modal-->
-{#if AddPortfolio}
-<AddPortfolio data={data}/>
-{/if}
-<!--End Add Portfolio Modal-->
-  
-  
-  
+
   
   
   
diff --git a/src/routes/stocks/[tickerID]/+layout.svelte b/src/routes/stocks/[tickerID]/+layout.svelte
index 9a45af22..8441a7da 100644
--- a/src/routes/stocks/[tickerID]/+layout.svelte
+++ b/src/routes/stocks/[tickerID]/+layout.svelte
@@ -314,9 +314,9 @@ onMount(async () => {
       LoginPopup = (await import('$lib/components/LoginPopup.svelte')).default;
     }
     else {
-      AddPortfolio = (await import('$lib/components/AddPortfolio.svelte')).default;
-      BuyTrade = (await import('$lib/components/BuyTrade.svelte')).default;
-      SellTrade = (await import('$lib/components/SellTrade.svelte')).default;
+      //AddPortfolio = (await import('$lib/components/AddPortfolio.svelte')).default;
+      //BuyTrade = (await import('$lib/components/BuyTrade.svelte')).default;
+      //SellTrade = (await import('$lib/components/SellTrade.svelte')).default;
       PriceAlert = (await import('$lib/components/PriceAlert.svelte')).default;
     }
    
@@ -661,6 +661,7 @@ $: {
       
                                         
                                         <!--Start Trade-->
+                                        <!--
                                         <div class="hidden sm:flex ml-auto">
                                         {#if holdingShares !== 0 && data?.user}
                                         
@@ -679,6 +680,7 @@ $: {
                                         </label>
                                         {/if}
                                       </div>
+                                      -->
                                       <!--End Trade-->
                      
                                       </div>
@@ -780,7 +782,7 @@ $: {
                         -->
 
 
-                      
+                      <!--
                         <div class="sm:hidden fixed z-20 bottom-8 sm:bottom-10 right-5">
                           <div class="h-full mx-auto">        
                             <div class="flex items-center justify-end">
@@ -797,6 +799,7 @@ $: {
                             </div>
                           </div>
                         </div>
+                      -->
 
                                           
 
@@ -815,7 +818,7 @@ $: {
 {/if}   
 <!--End Login Modal-->
 
-<!--Start BuyTrade Modal-->
+<!--
 {#if BuyTrade}
 <BuyTrade
   data = {data}
@@ -823,9 +826,7 @@ $: {
   availableCash = {availableCash}
 />
 {/if}
-  <!--End BuyTrade Modal-->
 
-<!--Start SellTrade Modal-->
 {#if SellTrade}
 <SellTrade 
   data = {data}
@@ -833,8 +834,10 @@ $: {
   availableCash = {availableCash}
 />
 {/if}
-
-<!--End SellTrade Modal-->
+{#if AddPortfolio}
+<AddPortfolio data={data}/>
+{/if}
+-->
 
 
 <!--Start SellTrade Modal-->
@@ -846,13 +849,6 @@ $: {
 
 <!--End SellTrade Modal-->
 
-<!--Start Add Portfolio Modal-->
-{#if AddPortfolio}
-<AddPortfolio data={data}/>
-{/if}
-<!--End Add Portfolio Modal-->
-
-
 
 
 <!--Start Type of Trade-->