feat(catalog): default upstream, toggle classico = Hippiehotel

Default catalog = rebuild upstream ultima release (CatalogClassicView).
Il toggle 'stile classico' mostra il catalogo Hippiehotel (CatalogModernView).

src/components/catalog/CatalogClassicView.tsx

@@ -1,9 +1,9 @@
 import { AddLinkEventTracker, ILinkEventTracker, RemoveLinkEventTracker } from '@nitrots/nitro-renderer';
-import { FC, useEffect } from 'react';
-import { FaCog, FaEdit, FaEye, FaEyeSlash, FaPlus, FaTrash } from 'react-icons/fa';
-import { CatalogType, GetConfigurationValue, LocalizeText } from '../../api';
-import { Column, Grid, NitroCardContentView, NitroCardHeaderView, NitroCardTabsItemView, NitroCardTabsView, NitroCardView } from '../../common';
-import { useCatalogActions, useCatalogData, useCatalogUiState, useHasPermission } from '../../hooks';
+import { FC, useEffect, useState } from 'react';
+import { FaBars, FaCog, FaEdit, FaEye, FaEyeSlash, FaPlus, FaTrash } from 'react-icons/fa';
+import { CatalogType, GetConfigurationValue, LocalizeShortNumber, LocalizeText } from '../../api';
+import { Column, Grid, LayoutCurrencyIcon, NitroCardContentView, NitroCardHeaderView, NitroCardTabsItemView, NitroCardTabsView, NitroCardView } from '../../common';
+import { useCatalogActions, useCatalogData, useCatalogUiState, useHasPermission, usePurse } from '../../hooks';
 import { CatalogAdminProvider, useCatalogAdmin } from './CatalogAdminContext';
 import { CatalogAdminOfferEditView } from './views/admin/CatalogAdminOfferEditView';
 import { CatalogAdminPageEditView } from './views/admin/CatalogAdminPageEditView';
@@ -31,6 +31,9 @@ const CatalogClassicViewInner: FC<{}> = () =>
     const loading = catalogAdmin?.loading ?? false;
 
     const isMod = useHasPermission('acc_catalogfurni');
+    const [ mobileMenuOpen, setMobileMenuOpen ] = useState(false);
+    const { purse = null } = usePurse();
+    const displayedCurrencies = GetConfigurationValue<number[]>('system.currency.types', []);
     const buildersClubHeaderStyle = (currentType === CatalogType.BUILDER)
         ? { borderColor: '#d79d2e', borderBottomColor: '#000', background: 'linear-gradient(180deg, #d89f2d 0%, #c68515 100%)' }
         : undefined;
@@ -121,6 +124,42 @@ const CatalogClassicViewInner: FC<{}> = () =>
             { isVisible &&
                 <NitroCardView classNames={ [ 'nitro-catalog-classic-window' ] } isResizable={ false } uniqueKey="catalog">
                     <NitroCardHeaderView className={ currentType === CatalogType.BUILDER ? 'builders-club-card-header' : '' } headerText={ LocalizeText('catalog.title') } onCloseClick={ () => setIsVisible(false) } style={ buildersClubHeaderStyle } />
+                    <div className="nitro-catalog-classic-mobile-header">
+                        { isMod &&
+                            <div className="nitro-catalog-classic-mobile-burger">
+                                <button className="nitro-catalog-classic-burger-btn" onClick={ () => setMobileMenuOpen(value => !value) }>
+                                    <FaBars />
+                                </button>
+                                { mobileMenuOpen &&
+                                    <div className="nitro-catalog-classic-burger-menu">
+                                        <button onClick={ () =>
+                                        {
+                                            setAdminMode(!adminMode); setMobileMenuOpen(false);
+                                        } }>
+                                            { adminMode ? 'Exit Admin' : 'Admin' }
+                                        </button>
+                                        { adminMode &&
+                                            <button disabled={ loading } onClick={ () =>
+                                            {
+                                                publishCatalog(); setMobileMenuOpen(false);
+                                            } }>
+                                                { loading ? '...' : 'Publish' }
+                                            </button> }
+                                    </div> }
+                            </div> }
+                        <div className="nitro-catalog-classic-mobile-currency">
+                            <div className="nitro-catalog-classic-coin">
+                                <span>{ LocalizeShortNumber(purse?.credits ?? 0) }</span>
+                                <LayoutCurrencyIcon type={ -1 } />
+                            </div>
+                            { displayedCurrencies.map(type => (
+                                <div key={ type } className="nitro-catalog-classic-coin">
+                                    <span>{ LocalizeShortNumber(purse?.activityPoints?.get(type) ?? 0) }</span>
+                                    <LayoutCurrencyIcon type={ type } />
+                                </div>
+                            )) }
+                        </div>
+                    </div>
                     { adminMode &&
                         <div className="nitro-catalog-classic-admin-banner flex items-center justify-between text-[10px] font-bold px-3 py-0.5 uppercase tracking-wider">
                             <span>Admin Mode</span>
@@ -148,7 +187,7 @@ const CatalogClassicViewInner: FC<{}> = () =>
                                 } }>
                                     <div className={ `flex items-center gap-1 ${ isHidden ? 'opacity-40' : '' }` }>
                                         <CatalogIconView icon={ child.iconId } />
-                                        <span className="truncate">{ child.localization }</span>
+                                        <span className="nitro-catalog-classic-tab-label truncate">{ child.localization }</span>
                                         { adminMode && isHidden && <FaEyeSlash className="text-[8px] text-danger ml-1" /> }
                                         { adminMode &&
                                             <div className="flex items-center gap-0.5 ml-1" onClick={ e => e.stopPropagation() }>
@@ -172,7 +211,7 @@ const CatalogClassicViewInner: FC<{}> = () =>
                             );
                         }) }
                         { isMod &&
-                            <NitroCardTabsItemView isActive={ adminMode } onClick={ () => setAdminMode(!adminMode) }>
+                            <NitroCardTabsItemView classNames={ [ 'nitro-catalog-classic-admin-tab' ] } isActive={ adminMode } onClick={ () => setAdminMode(!adminMode) }>
                                 <FaCog className={ `text-[10px] ${ adminMode ? 'animate-spin' : '' }` } style={ adminMode ? { animationDuration: '3s' } : {} } />
                             </NitroCardTabsItemView> }
                     </NitroCardTabsView>

src/components/catalog/CatalogView.tsx

@@ -8,20 +8,20 @@ export const CatalogView: FC<{}> = () =>
     const { catalogLocalizationVersion = 0 } = useCatalogData();
     const [ catalogClassicStyle ] = useCatalogClassicStyle();
 
-    // Modern (Hippiehotel style) is the default; the "stile classico" toggle in
-    // user settings (or the global catalog.classic.style flag) switches to the
-    // classic catalog. Both views are the Hippiehotel.nl Nitro-V3 originals.
+    // Default = upstream rebuilt catalog (CatalogClassicView, latest release theme).
+    // The "stile classico" toggle (or global catalog.classic.style flag) switches
+    // to the Hippiehotel.nl catalog (CatalogModernView, self-contained tailwind).
     if(catalogClassicStyle) return (
         <>
             <div className="hidden" data-catalog-localization-version={ catalogLocalizationVersion } />
-            <CatalogClassicView />
+            <CatalogModernView />
         </>
     );
 
     return (
         <>
             <div className="hidden" data-catalog-localization-version={ catalogLocalizationVersion } />
-            <CatalogModernView />
+            <CatalogClassicView />
         </>
     );
 };

src/components/catalog/views/page/layout/CatalogLayoutDefaultView.tsx

@@ -1,5 +1,5 @@
 import { FC } from 'react';
-import { FaEdit, FaPlus } from 'react-icons/fa';
+import { FaEdit, FaPlus, FaPowerOff, FaSyncAlt } from 'react-icons/fa';
 import { GetConfigurationValue, LocalizeText, ProductTypeEnum, SanitizeHtml } from '../../../../../api';
 import { Text } from '../../../../../common';
 import { useCatalogData } from '../../../../../hooks';
@@ -17,13 +17,12 @@ import { CatalogLayoutProps } from './CatalogLayout.types';
 export const CatalogLayoutDefaultView: FC<CatalogLayoutProps> = props =>
 {
     const { page = null } = props;
-    const { currentOffer = null, currentPage = null } = useCatalogData();
+    const { currentOffer = null, currentPage = null, roomPreviewer = null } = useCatalogData();
     const catalogAdmin = useCatalogAdmin();
     const adminMode = catalogAdmin?.adminMode ?? false;
 
     return (
         <div className="nitro-catalog-classic-default-layout flex flex-col h-full gap-2">
-            { /* Admin: quick actions */ }
             { adminMode && !catalogAdmin.editingPageData &&
                 <div className="flex gap-2 nitro-catalog-classic-default-admin">
                     <button
@@ -42,23 +41,24 @@ export const CatalogLayoutDefaultView: FC<CatalogLayoutProps> = props =>
                         <FaPlus className="text-[10px]" /> { LocalizeText('catalog.admin.offer.new') }
                     </button>
                 </div> }
-
-            { /* Product detail card */ }
             { currentOffer &&
-                <div className="nitro-catalog-classic-offer-panel flex gap-0 overflow-hidden">
-                    { /* Preview area */ }
+                <div className="nitro-catalog-classic-offer-panel flex gap-0 shrink-0">
                     <div className="nitro-catalog-classic-offer-preview relative flex items-center justify-center">
                         { (currentOffer.product.productType !== ProductTypeEnum.BADGE) &&
                             <>
+                                <button className="nitro-catalog-classic-preview-btn nitro-catalog-classic-preview-rotate" onClick={ () => roomPreviewer?.changeRoomObjectDirection() }>
+                                    <FaSyncAlt /> Rotate
+                                </button>
+                                <button className="nitro-catalog-classic-preview-btn nitro-catalog-classic-preview-state" onClick={ () => roomPreviewer?.changeRoomObjectState() }>
+                                    <FaPowerOff /> Toggle State
+                                </button>
                                 <CatalogViewProductWidgetView />
                                 <CatalogAddOnBadgeWidgetView className="bg-muted rounded bottom-1 right-1 absolute" />
                             </> }
                         { (currentOffer.product.productType === ProductTypeEnum.BADGE) &&
                             <CatalogAddOnBadgeWidgetView className="scale-2" /> }
                     </div>
-                    { /* Product info + purchase */ }
                     <div className="nitro-catalog-classic-offer-info flex flex-col flex-1 min-w-0 gap-2">
-                        { /* Title row */ }
                         <div>
                             <div className="flex items-start justify-between gap-2">
                                 <Text className="text-[13px]! font-bold text-dark leading-tight">{ currentOffer.localizationName }</Text>
@@ -77,19 +77,16 @@ export const CatalogLayoutDefaultView: FC<CatalogLayoutProps> = props =>
                                 </div> }
                             <CatalogLimitedItemWidgetView />
                         </div>
-                        { /* Price */ }
                         <CatalogTotalPriceWidget />
-                        { /* Spinner */ }
                         <CatalogSpinnerWidgetView />
-                        { /* Actions */ }
-                        <div className="flex gap-1.5 mt-auto">
+                        <div className="nitro-catalog-classic-offer-actions flex gap-1.5">
                             <CatalogPurchaseWidgetView />
                         </div>
                     </div>
                 </div> }
 
             { !currentOffer &&
-                <div className="nitro-catalog-classic-welcome flex items-center gap-3">
+                <div className="nitro-catalog-classic-welcome flex items-center gap-3 shrink-0">
                     { !!page.localization.getImage(1) &&
                         <img className="w-[70px] h-[70px] object-contain rounded shrink-0" src={ page.localization.getImage(1) } /> }
                     <Text className="text-[11px]! text-muted" dangerouslySetInnerHTML={ { __html: SanitizeHtml(page.localization.getText(0)) } } />

src/components/catalog/views/page/layout/CatalogLayoutTrophiesView.tsx

@@ -58,9 +58,11 @@ export const CatalogLayoutTrophiesView: FC<CatalogLayoutProps> = props =>
                     </button>
                 </div> }
 
-            { /* Selected trophy card */ }
+            { /* Selected trophy card. shrink-0 + no overflow-hidden so the
+                 Buy button stays inside the panel even when the grid below
+                 holds many trophies. */ }
             { currentOffer
-                ? <div className="flex gap-0 bg-white rounded border-2 border-warning/40 overflow-hidden" style={ { boxShadow: '0 0 8px rgba(255,193,7,0.15)' } }>
+                ? <div className="flex gap-0 bg-white rounded border-2 border-warning/40 shrink-0" style={ { boxShadow: '0 0 8px rgba(255,193,7,0.15)' } }>
                     { /* Preview */ }
                     <div className="w-[120px] min-w-[120px] relative flex items-center justify-center border-r-2 border-warning/30" style={ { background: 'linear-gradient(180deg, #fff9e6 0%, #fff3cc 100%)' } }>
                         { (currentOffer.product.productType !== ProductTypeEnum.BADGE)
@@ -90,7 +92,7 @@ export const CatalogLayoutTrophiesView: FC<CatalogLayoutProps> = props =>
                         <CatalogTotalPriceWidget />
                         { !canPurchase &&
                             <span className="text-[9px] text-warning italic">{ LocalizeText('catalog.trophies.write.hint') }</span> }
-                        <div className="flex gap-1.5 mt-auto">
+                        <div className="flex gap-1.5">
                             <CatalogPurchaseWidgetView />
                         </div>
                     </div>

src/components/catalog/views/page/widgets/CatalogPurchaseWidgetView.tsx

@@ -240,7 +240,7 @@ export const CatalogPurchaseWidgetView: FC<CatalogPurchaseWidgetViewProps> = pro
                 return <Button variant="danger">{ LocalizeText('generic.failed') + ' - ' + LocalizeText('catalog.alert.limited_edition_sold_out.title') }</Button>;
             case CatalogPurchaseState.NONE:
             default:
-                return <Button disabled={ (purchaseOptions.extraParamRequired && (!purchaseOptions.extraData || !purchaseOptions.extraData.length)) } onClick={ event => setPurchaseState(CatalogPurchaseState.CONFIRM) }>{ LocalizeText('catalog.purchase_confirmation.' + (currentOffer.isRentOffer ? 'rent' : 'buy')) }</Button>;
+                return <Button variant="success" disabled={ (purchaseOptions.extraParamRequired && (!purchaseOptions.extraData || !purchaseOptions.extraData.length)) } onClick={ event => setPurchaseState(CatalogPurchaseState.CONFIRM) }>{ LocalizeText('catalog.purchase_confirmation.' + (currentOffer.isRentOffer ? 'rent' : 'buy')) }</Button>;
         }
     };
 

src/components/catalog/views/page/widgets/CatalogViewProductWidgetView.tsx

@@ -19,6 +19,8 @@ export const CatalogViewProductWidgetView: FC<{}> = props =>
         if(!product) return;
 
         roomPreviewer.reset(false);
+        roomPreviewer.updateObjectRoom('default', 'default', 'default');
+        roomPreviewer.updateRoomWallsAndFloorVisibility(true, true);
 
         switch(product.productType)
         {
@@ -68,6 +70,8 @@ export const CatalogViewProductWidgetView: FC<{}> = props =>
             case ProductTypeEnum.WALL: {
                 if(!product.furnitureData) return;
 
+                roomPreviewer.updateRoomWallsAndFloorVisibility(true, true);
+
                 switch(product.furnitureData.specialType)
                 {
                     case FurniCategory.FLOOR: