From 1c879db9d9a7ca0fee786cdc43c05d0a7af84044 Mon Sep 17 00:00:00 2001
From: Bill <billsonnn@live.com>
Date: Fri, 24 Sep 2021 04:48:59 -0400
Subject: [PATCH] Catalog updates

---
 src/views/catalog/views/CatalogViews.scss     |  3 +-
 .../catalog/views/gift/CatalogGiftView.scss   |  1 +
 .../navigation/CatalogNavigationView.scss     | 10 ------
 .../item/CatalogNavigationItemView.scss       | 18 ----------
 .../set/CatalogNavigationSetView.scss         | 14 --------
 .../page-details/CatalogPageDetailsView.tsx   |  6 ++--
 .../catalog/views/page/CatalogPageView.scss   |  3 --
 .../views/page/layout/CatalogLayout.scss      |  4 +--
 .../default/CatalogLayoutDefaultView.scss     |  0
 .../default/CatalogLayoutDefaultView.tsx      |  2 +-
 .../layout/pets/CatalogLayoutPetView.scss     | 10 ------
 .../CatalogPetNameApprovalView.scss           |  0
 .../page/offer/CatalogPageOfferView.scss      | 33 -------------------
 .../page/offers/CatalogPageOffersView.scss    |  3 --
 .../CatalogProductPreviewView.scss            |  0
 .../CatalogProductPreviewView.tsx             | 16 +++++----
 .../page/purchase/CatalogPurchaseView.scss    |  2 --
 .../CatalogPurchaseButtonView.scss            |  0
 .../CatalogLayoutSearchResultView.scss        |  2 --
 .../offer/CatalogSearchResultOfferView.scss   |  0
 .../offers/CatalogSearchResultOffersView.scss |  3 --
 .../views/search/CatalogSearchView.scss       |  0
 22 files changed, 17 insertions(+), 113 deletions(-)
 delete mode 100644 src/views/catalog/views/navigation/item/CatalogNavigationItemView.scss
 delete mode 100644 src/views/catalog/views/navigation/set/CatalogNavigationSetView.scss
 delete mode 100644 src/views/catalog/views/page/layout/default/CatalogLayoutDefaultView.scss
 delete mode 100644 src/views/catalog/views/page/layout/pets/CatalogLayoutPetView.scss
 delete mode 100644 src/views/catalog/views/page/layout/pets/name-approval/CatalogPetNameApprovalView.scss
 delete mode 100644 src/views/catalog/views/page/offer/CatalogPageOfferView.scss
 delete mode 100644 src/views/catalog/views/page/offers/CatalogPageOffersView.scss
 delete mode 100644 src/views/catalog/views/page/product-preview/CatalogProductPreviewView.scss
 delete mode 100644 src/views/catalog/views/page/purchase/purchase-button/CatalogPurchaseButtonView.scss
 delete mode 100644 src/views/catalog/views/page/search-result/CatalogLayoutSearchResultView.scss
 delete mode 100644 src/views/catalog/views/page/search-result/offer/CatalogSearchResultOfferView.scss
 delete mode 100644 src/views/catalog/views/page/search-result/offers/CatalogSearchResultOffersView.scss
 delete mode 100644 src/views/catalog/views/search/CatalogSearchView.scss

diff --git a/src/views/catalog/views/CatalogViews.scss b/src/views/catalog/views/CatalogViews.scss
index 0a5f6295..f6973ade 100644
--- a/src/views/catalog/views/CatalogViews.scss
+++ b/src/views/catalog/views/CatalogViews.scss
@@ -1,5 +1,4 @@
 @import './catalog-icon/CatalogIconView';
+@import './gift/CatalogGiftView';
 @import './navigation/CatalogNavigationView';
 @import './page/CatalogPageView';
-@import './search/CatalogSearchView';
-@import './gift/CatalogGiftView';
diff --git a/src/views/catalog/views/gift/CatalogGiftView.scss b/src/views/catalog/views/gift/CatalogGiftView.scss
index 9f43a086..db61d248 100644
--- a/src/views/catalog/views/gift/CatalogGiftView.scss
+++ b/src/views/catalog/views/gift/CatalogGiftView.scss
@@ -1,4 +1,5 @@
 .nitro-catalog-gift {
+    width: 325px;
     
     .gift-preview {
         width: 80px;
diff --git a/src/views/catalog/views/navigation/CatalogNavigationView.scss b/src/views/catalog/views/navigation/CatalogNavigationView.scss
index e75d5f61..cd6cc820 100644
--- a/src/views/catalog/views/navigation/CatalogNavigationView.scss
+++ b/src/views/catalog/views/navigation/CatalogNavigationView.scss
@@ -18,14 +18,4 @@
             padding: 1px;
         }
     }
-
-    // border-color: $grid-border-color !important;
-    // background-color: $grid-bg-color !important;
-
-    // .navigation-container {
-    //     overflow-y: auto;
-    // }
 }
-
-@import './item/CatalogNavigationItemView';
-@import './set/CatalogNavigationSetView';
diff --git a/src/views/catalog/views/navigation/item/CatalogNavigationItemView.scss b/src/views/catalog/views/navigation/item/CatalogNavigationItemView.scss
deleted file mode 100644
index b5adfc1c..00000000
--- a/src/views/catalog/views/navigation/item/CatalogNavigationItemView.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-.catalog-navigation-item-container {
-
-    .catalog-navigation-item {
-        font-size: $font-size-sm;
-        border-radius: $border-radius;
-
-        i.fas {
-            color: $black;
-            font-size: 10px;
-            padding: 1px;
-        }
-
-        &.active {
-            padding: 1px 2px;
-            background-color: $grid-active-bg-color;
-        }
-    }
-}
diff --git a/src/views/catalog/views/navigation/set/CatalogNavigationSetView.scss b/src/views/catalog/views/navigation/set/CatalogNavigationSetView.scss
deleted file mode 100644
index 56d8034c..00000000
--- a/src/views/catalog/views/navigation/set/CatalogNavigationSetView.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-.catalog-navigation-set-container {
-
-    .catalog-navigation-set-container {
-        padding-left: 5px;
-
-        .catalog-navigation-item-container {
-            padding-right: 0px !important;
-        }
-    }
-
-    > :last-child {
-        padding-bottom: 0px !important;
-    }
-}
diff --git a/src/views/catalog/views/page-details/CatalogPageDetailsView.tsx b/src/views/catalog/views/page-details/CatalogPageDetailsView.tsx
index c5269380..390aed62 100644
--- a/src/views/catalog/views/page-details/CatalogPageDetailsView.tsx
+++ b/src/views/catalog/views/page-details/CatalogPageDetailsView.tsx
@@ -11,9 +11,9 @@ export const CatalogPageDetailsView: FC<CatalogPageDetailsViewProps> = props =>
     const imageUrl = GetCatalogPageImage(pageParser, 1);
 
     return (
-        <div className="d-flex flex-column justify-content-center align-items-center gap-2 w-100 h-100">
-            { imageUrl && <img alt="" src={ imageUrl } /> }
-            <div className="d-flex flex-column fs-6 text-center text-black lh-sm" dangerouslySetInnerHTML={ { __html: GetCatalogPageText(pageParser, 0) } } />
+        <div className="d-flex flex-column justify-content-center align-items-center overflow-hidden h-100">
+            { imageUrl && <img className="" alt="" src={ imageUrl } /> }
+            <div className="d-flex flex-column fs-6 text-center text-black lh-sm overflow-auto" dangerouslySetInnerHTML={ { __html: GetCatalogPageText(pageParser, 0) } } />
         </div>
     );
 }
diff --git a/src/views/catalog/views/page/CatalogPageView.scss b/src/views/catalog/views/page/CatalogPageView.scss
index 2281883f..7a24edf7 100644
--- a/src/views/catalog/views/page/CatalogPageView.scss
+++ b/src/views/catalog/views/page/CatalogPageView.scss
@@ -1,5 +1,2 @@
 @import './layout/CatalogLayout';
-@import './offer/CatalogPageOfferView';
-@import './offers/CatalogPageOffersView';
 @import './purchase/CatalogPurchaseView';
-@import './search-result/CatalogLayoutSearchResultView';
diff --git a/src/views/catalog/views/page/layout/CatalogLayout.scss b/src/views/catalog/views/page/layout/CatalogLayout.scss
index addcc8e6..d71c9f8a 100644
--- a/src/views/catalog/views/page/layout/CatalogLayout.scss
+++ b/src/views/catalog/views/page/layout/CatalogLayout.scss
@@ -1,5 +1,3 @@
-@import './default/CatalogLayoutDefaultView';
 @import './frontpage4/CatalogLayoutFrontpage4View';
-@import './pets/CatalogLayoutPetView';
-@import './vip-buy/CatalogLayoutVipBuyView';
 @import './info-loyalty/CatalogLayoutInfoLoyaltyView.scss';
+@import './vip-buy/CatalogLayoutVipBuyView';
diff --git a/src/views/catalog/views/page/layout/default/CatalogLayoutDefaultView.scss b/src/views/catalog/views/page/layout/default/CatalogLayoutDefaultView.scss
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/views/catalog/views/page/layout/default/CatalogLayoutDefaultView.tsx b/src/views/catalog/views/page/layout/default/CatalogLayoutDefaultView.tsx
index 415ac9fa..86d2bd1b 100644
--- a/src/views/catalog/views/page/layout/default/CatalogLayoutDefaultView.tsx
+++ b/src/views/catalog/views/page/layout/default/CatalogLayoutDefaultView.tsx
@@ -17,7 +17,7 @@ export const CatalogLayoutDefaultView: FC<CatalogLayoutDefaultViewProps> = props
             <div className="d-flex flex-column col-7 h-100">
                 <CatalogPageOffersView offers={ pageParser.offers } />
             </div>
-            <div className="position-relative d-flex flex-column col-5">
+            <div className="position-relative d-flex flex-column col-5 gap-2 h-100 overflow-hidden">
                 <CatalogProductPreviewView pageParser={ pageParser } activeOffer={ activeOffer } roomPreviewer={ roomPreviewer } />
             </div>
         </div>
diff --git a/src/views/catalog/views/page/layout/pets/CatalogLayoutPetView.scss b/src/views/catalog/views/page/layout/pets/CatalogLayoutPetView.scss
deleted file mode 100644
index 268769fb..00000000
--- a/src/views/catalog/views/page/layout/pets/CatalogLayoutPetView.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-.nitro-catalog-layout-pets {
-
-    .color-button {
-        position: absolute;
-        left: 5px;
-        bottom: 5px;
-    }
-
-    @import './name-approval/CatalogPetNameApprovalView';
-}
diff --git a/src/views/catalog/views/page/layout/pets/name-approval/CatalogPetNameApprovalView.scss b/src/views/catalog/views/page/layout/pets/name-approval/CatalogPetNameApprovalView.scss
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/views/catalog/views/page/offer/CatalogPageOfferView.scss b/src/views/catalog/views/page/offer/CatalogPageOfferView.scss
deleted file mode 100644
index 7008f0e2..00000000
--- a/src/views/catalog/views/page/offer/CatalogPageOfferView.scss
+++ /dev/null
@@ -1,33 +0,0 @@
-.catalog-offer-item-container {
-    height: 48px;
-    max-height: 48px;
-
-    .catalog-offer-item {
-        width: 100%;
-        height: 100%;
-        border-color: $grid-border-color !important;
-        background-color: $grid-bg-color;
-        background-position: center;
-        background-repeat: no-repeat;
-        overflow: hidden;
-    
-        &.active {
-            border-color: $grid-active-border-color !important;
-            background-color: $grid-active-bg-color;
-        }
-    
-        .badge {
-            top: 2px;
-            right: 2px;
-            font-size: 8px;
-        }
-
-        .avatar-image {
-            width: 100% !important;
-            height: 100% !important;
-            background-position: center;
-            background-repeat: no-repeat;
-            background-position-y: -32px !important;
-        }
-    }
-}
diff --git a/src/views/catalog/views/page/offers/CatalogPageOffersView.scss b/src/views/catalog/views/page/offers/CatalogPageOffersView.scss
deleted file mode 100644
index 28192aa4..00000000
--- a/src/views/catalog/views/page/offers/CatalogPageOffersView.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.catalog-offers-container {
-    overflow-y: auto;
-}
diff --git a/src/views/catalog/views/page/product-preview/CatalogProductPreviewView.scss b/src/views/catalog/views/page/product-preview/CatalogProductPreviewView.scss
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/views/catalog/views/page/product-preview/CatalogProductPreviewView.tsx b/src/views/catalog/views/page/product-preview/CatalogProductPreviewView.tsx
index 3b31ea71..1e278f58 100644
--- a/src/views/catalog/views/page/product-preview/CatalogProductPreviewView.tsx
+++ b/src/views/catalog/views/page/product-preview/CatalogProductPreviewView.tsx
@@ -16,12 +16,16 @@ export const CatalogProductPreviewView: FC<CatalogProductPreviewViewProps> = pro
 
     return (
         <>
-            <CatalogRoomPreviewerView roomPreviewer={ roomPreviewer } height={ 140 } />
-            { product.uniqueLimitedItem &&
-                <LimitedEditionCompletePlateView uniqueLimitedItemsLeft={ product.uniqueLimitedItemsLeft } uniqueLimitedSeriesSize={ product.uniqueLimitedSeriesSize } /> }
-            <div className="fs-6 text-black mt-1 overflow-hidden">{ GetOfferName(activeOffer) }</div>
-            { children }
-            <CatalogPurchaseView offer={ activeOffer } pageId={ pageParser.pageId } extra={ extra } disabled={ disabled } />
+            <div className="position-relative d-flex flex-column overflow-auto h-100">
+                <CatalogRoomPreviewerView roomPreviewer={ roomPreviewer } height={ 140 } />
+                { product.uniqueLimitedItem &&
+                    <LimitedEditionCompletePlateView uniqueLimitedItemsLeft={ product.uniqueLimitedItemsLeft } uniqueLimitedSeriesSize={ product.uniqueLimitedSeriesSize } /> }
+            </div>
+            <div className="d-flex flex-column gap-2">
+                <div className="flex-grow-1 text-black text-truncate">{ GetOfferName(activeOffer) }</div>
+                { children }
+                <CatalogPurchaseView offer={ activeOffer } pageId={ pageParser.pageId } extra={ extra } disabled={ disabled } />
+            </div>
         </>
     );
 }
diff --git a/src/views/catalog/views/page/purchase/CatalogPurchaseView.scss b/src/views/catalog/views/page/purchase/CatalogPurchaseView.scss
index 4559e425..e4a2a26f 100644
--- a/src/views/catalog/views/page/purchase/CatalogPurchaseView.scss
+++ b/src/views/catalog/views/page/purchase/CatalogPurchaseView.scss
@@ -4,5 +4,3 @@
     width: 29px;
     padding: 3px 5px;
 }
-
-@import './purchase-button/CatalogPurchaseButtonView';
diff --git a/src/views/catalog/views/page/purchase/purchase-button/CatalogPurchaseButtonView.scss b/src/views/catalog/views/page/purchase/purchase-button/CatalogPurchaseButtonView.scss
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/views/catalog/views/page/search-result/CatalogLayoutSearchResultView.scss b/src/views/catalog/views/page/search-result/CatalogLayoutSearchResultView.scss
deleted file mode 100644
index ce60508f..00000000
--- a/src/views/catalog/views/page/search-result/CatalogLayoutSearchResultView.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import './offer/CatalogSearchResultOfferView';
-@import './offers/CatalogSearchResultOffersView';
diff --git a/src/views/catalog/views/page/search-result/offer/CatalogSearchResultOfferView.scss b/src/views/catalog/views/page/search-result/offer/CatalogSearchResultOfferView.scss
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/views/catalog/views/page/search-result/offers/CatalogSearchResultOffersView.scss b/src/views/catalog/views/page/search-result/offers/CatalogSearchResultOffersView.scss
deleted file mode 100644
index 28192aa4..00000000
--- a/src/views/catalog/views/page/search-result/offers/CatalogSearchResultOffersView.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.catalog-offers-container {
-    overflow-y: auto;
-}
diff --git a/src/views/catalog/views/search/CatalogSearchView.scss b/src/views/catalog/views/search/CatalogSearchView.scss
deleted file mode 100644
index e69de29b..00000000