Merge branch 'dev' into @update/inventory

public/ui-config.json.example

@@ -1,8 +1,8 @@
 {
     "image.library.notifications.url": "${image.library.url}notifications/%image%.png",
     "achievements.images.url": "${image.library.url}Quests/%image%.png",
-    "camera.url": "https://camera.com",
+    "camera.url": "https://camera.url",
-    "thumbnails.url": "https://camera.com/thumbnail/%thumbnail%.png",
+    "thumbnails.url": "https://camera.url/thumbnail/%thumbnail%.png",
     "url.prefix": "https://website.com",
     "habbopages.url": "${url.prefix}/",
     "group.homepage.url": "${url.prefix}/groups/%groupid%/id",

src/api/catalog/ProductTypeEnum.ts

@@ -0,0 +1,11 @@
+export class ProductTypeEnum
+{
+    public static WALL: string = 'i';
+    public static FLOOR: string = 's';
+    public static EFFECT: string = 'e';
+    public static HABBO_CLUB: string = 'h';
+    public static BADGE: string = 'b';
+    public static GAME_TOKEN: string = 'GAME_TOKEN';
+    public static PET: string = 'p';
+    public static ROBOT: string = 'r';
+}

src/api/catalog/index.ts

@@ -0,0 +1 @@
+export * from './ProductTypeEnum';

src/api/index.ts

@@ -1,5 +1,6 @@
 export * from './achievements';
 export * from './campaign';
+export * from './catalog';
 export * from './common';
 export * from './core';
 export * from './friends';

src/api/nitro/room/widgets/handlers/FurniturePresentWidgetHandler.ts

@@ -1,7 +1,7 @@
 import { IFurnitureData, IGetImageListener, NitroEvent, NitroRenderTexture, PetFigureData, RoomObjectCategory, RoomObjectVariable, RoomSessionPresentEvent, RoomWidgetEnum, TextureUtils, Vector3d } from '@nitrots/nitro-renderer';
 import { GetSessionDataManager, IsOwnerOfFurniture } from '../../..';
 import { GetRoomEngine, LocalizeText } from '../../../..';
-import { ProductTypeEnum } from '../../../../../components/catalog/common/ProductTypeEnum';
+import { ProductTypeEnum } from '../../../../catalog';
 import { RoomWidgetUpdateEvent, RoomWidgetUpdatePresentDataEvent } from '../events';
 import { RoomWidgetFurniToWidgetMessage, RoomWidgetPresentOpenMessage } from '../messages';
 import { RoomWidgetMessage } from '../messages/RoomWidgetMessage';

src/api/nitro/session/GetFurnitureData.ts

@@ -1,6 +1,6 @@
 import { IFurnitureData } from '@nitrots/nitro-renderer';
 import { GetSessionDataManager } from '.';
-import { ProductTypeEnum } from '../../../components/catalog/common/ProductTypeEnum';
+import { ProductTypeEnum } from '../../catalog';
 
 export function GetFurnitureData(furniClassId: number, productType: string): IFurnitureData
 {

src/common/layout/LayoutFurniIconImageView.tsx

@@ -1,7 +1,6 @@
 import { FC } from 'react';
 import { LayoutImage, LayoutImageProps } from '.';
-import { GetRoomEngine } from '../../api';
+import { GetRoomEngine, ProductTypeEnum } from '../../api';
-import { ProductTypeEnum } from '../../components/catalog/common/ProductTypeEnum';
 
 interface LayoutFurniIconImageViewProps extends LayoutImageProps
 {

src/common/layout/LayoutFurniImageView.tsx

@@ -1,7 +1,6 @@
 import { IGetImageListener, ImageResult, TextureUtils, Vector3d } from '@nitrots/nitro-renderer';
 import { FC, useCallback, useEffect, useState } from 'react';
-import { GetRoomEngine } from '../../api';
+import { GetRoomEngine, ProductTypeEnum } from '../../api';
-import { ProductTypeEnum } from '../../components/catalog/common/ProductTypeEnum';
 import { Base } from '../Base';
 
 interface LayoutFurniImageViewProps

src/components/catalog/CatalogMessageHandler.tsx

@@ -1,7 +1,7 @@
 import { ApproveNameMessageEvent, CatalogPageMessageEvent, CatalogPagesListEvent, ClubGiftInfoEvent, GiftReceiverNotFoundEvent, GiftWrappingConfigurationEvent, HabboClubOffersMessageEvent, LimitedEditionSoldOutEvent, MarketplaceMakeOfferResult, NodeData, ProductOfferEvent, PurchaseErrorMessageEvent, PurchaseNotAllowedMessageEvent, PurchaseOKMessageEvent, SellablePetPalettesMessageEvent, UserSubscriptionEvent } from '@nitrots/nitro-renderer';
 import { GuildMembershipsMessageEvent } from '@nitrots/nitro-renderer/src/nitro/communication/messages/incoming/user/GuildMembershipsMessageEvent';
 import { FC, useCallback } from 'react';
-import { GetFurnitureData, GetProductDataForLocalization, LocalizeText, NotificationAlertType, NotificationUtilities } from '../../api';
+import { GetFurnitureData, GetProductDataForLocalization, LocalizeText, NotificationAlertType, NotificationUtilities, ProductTypeEnum } from '../../api';
 import { CatalogGiftReceiverNotFoundEvent, CatalogNameResultEvent, CatalogPurchasedEvent, CatalogPurchaseFailureEvent, CatalogPurchaseNotAllowedEvent, CatalogPurchaseSoldOutEvent } from '../../events';
 import { BatchUpdates, DispatchUiEvent, UseMessageEventHook } from '../../hooks';
 import { useCatalogContext } from './CatalogContext';
@@ -15,7 +15,6 @@ import { IPurchasableOffer } from './common/IPurchasableOffer';
 import { Offer } from './common/Offer';
 import { PageLocalization } from './common/PageLocalization';
 import { Product } from './common/Product';
-import { ProductTypeEnum } from './common/ProductTypeEnum';
 import { SubscriptionInfo } from './common/SubscriptionInfo';
 
 export const CatalogMessageHandler: FC<{}> = props =>

src/components/catalog/common/AttemptCatalogPlacement.ts

@@ -1,7 +1,6 @@
 import { CatalogPageMessageOfferData, RoomObjectCategory, RoomObjectPlacementSource } from '@nitrots/nitro-renderer';
-import { GetRoomEngine } from '../../../api';
+import { GetRoomEngine, ProductTypeEnum } from '../../../api';
 import { IsCatalogOfferDraggable } from './IsCatalogOfferDraggable';
-import { ProductTypeEnum } from './ProductTypeEnum';
 
 export const AttemptCatalogPlacement = (offer: CatalogPageMessageOfferData) =>
 {

src/components/catalog/common/IsCatalogOfferDraggable.ts

@@ -1,6 +1,5 @@
 import { CatalogPageMessageOfferData, RoomControllerLevel } from '@nitrots/nitro-renderer';
-import { GetRoomSession } from '../../../api';
+import { GetRoomSession, ProductTypeEnum } from '../../../api';
-import { ProductTypeEnum } from './ProductTypeEnum';
 
 export const IsCatalogOfferDraggable = (offer: CatalogPageMessageOfferData) =>
 {

src/components/catalog/common/Offer.ts

@@ -1,9 +1,8 @@
-import { GetFurnitureData, GetProductDataForLocalization, LocalizeText } from '../../../api';
+import { GetFurnitureData, GetProductDataForLocalization, LocalizeText, ProductTypeEnum } from '../../../api';
 import { ICatalogPage } from './ICatalogPage';
 import { IProduct } from './IProduct';
 import { IPurchasableOffer } from './IPurchasableOffer';
 import { Product } from './Product';
-import { ProductTypeEnum } from './ProductTypeEnum';
 
 export class Offer implements IPurchasableOffer
 {

src/components/catalog/common/Product.ts

@@ -1,9 +1,8 @@
 import { IFurnitureData, IObjectData, IProductData } from '@nitrots/nitro-renderer';
-import { GetConfiguration, GetRoomEngine, GetSessionDataManager } from '../../../api';
+import { GetConfiguration, GetRoomEngine, GetSessionDataManager, ProductTypeEnum } from '../../../api';
 import { GetPixelEffectIcon, GetSubscriptionProductIcon } from './CatalogUtilities';
 import { IProduct } from './IProduct';
 import { IPurchasableOffer } from './IPurchasableOffer';
-import { ProductTypeEnum } from './ProductTypeEnum';
 
 export class Product implements IProduct
 {

src/components/catalog/common/ProductTypeEnum.ts

@@ -1,11 +0,0 @@
-export class ProductTypeEnum
-{
-    public static WALL: string          = 'i';
-    public static FLOOR: string         = 's';
-    public static EFFECT: string        = 'e';
-    public static HABBO_CLUB: string    = 'h';
-    public static BADGE: string         = 'b';
-    public static GAME_TOKEN: string    = 'GAME_TOKEN';
-    public static PET: string           = 'p';
-    public static ROBOT: string         = 'r';
-}

src/components/catalog/views/gift/CatalogGiftView.tsx

@@ -2,12 +2,11 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { PurchaseFromCatalogAsGiftComposer } from '@nitrots/nitro-renderer';
 import classNames from 'classnames';
 import { FC, useCallback, useEffect, useMemo, useState } from 'react';
-import { GetSessionDataManager, LocalizeText, SendMessageComposer } from '../../../../api';
+import { GetSessionDataManager, LocalizeText, ProductTypeEnum, SendMessageComposer } from '../../../../api';
 import { Base, Button, ButtonGroup, Column, Flex, FormGroup, LayoutCurrencyIcon, LayoutFurniImageView, LayoutGiftTagView, NitroCardContentView, NitroCardHeaderView, NitroCardView, Text } from '../../../../common';
 import { CatalogEvent, CatalogInitGiftEvent, CatalogPurchasedEvent } from '../../../../events';
 import { BatchUpdates, UseUiEvent } from '../../../../hooks';
 import { useCatalogContext } from '../../CatalogContext';
-import { ProductTypeEnum } from '../../common/ProductTypeEnum';
 
 export const CatalogGiftView: FC<{}> = props =>
 {

src/components/catalog/views/page/common/CatalogGridOfferView.tsx

@@ -1,5 +1,6 @@
 import { FC, useMemo } from 'react';
-import { LayoutGridItem, LayoutGridItemProps } from '../../../../../common/layout/LayoutGridItem';
+import { ProductTypeEnum } from '../../../../../api';
+import { LayoutAvatarImageView, LayoutGridItem, LayoutGridItemProps } from '../../../../../common';
 import { IPurchasableOffer } from '../../../common/IPurchasableOffer';
 import { Offer } from '../../../common/Offer';
 
@@ -26,5 +27,10 @@ export const CatalogGridOfferView: FC<CatalogGridOfferViewProps> = props =>
 
     if(!product) return null;
 
-    return <LayoutGridItem itemImage={ iconUrl } itemCount={ ((offer.pricingModel === Offer.PRICING_MODEL_MULTI) ? product.productCount : 1) } itemUniqueSoldout={ (product.uniqueLimitedItemSeriesSize && !product.uniqueLimitedItemsLeft) } itemUniqueNumber={ product.uniqueLimitedItemSeriesSize } { ...rest } />;
+    return (
+        <LayoutGridItem itemImage={ iconUrl } itemCount={ ((offer.pricingModel === Offer.PRICING_MODEL_MULTI) ? product.productCount : 1) } itemUniqueSoldout={ (product.uniqueLimitedItemSeriesSize && !product.uniqueLimitedItemsLeft) } itemUniqueNumber={ product.uniqueLimitedItemSeriesSize } { ...rest }>
+            { (offer.product.productType === ProductTypeEnum.ROBOT) &&
+                <LayoutAvatarImageView figure={ offer.product.extraParam } headOnly={ true } direction={ 3 } /> }
+        </LayoutGridItem>
+    );
 }

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

@@ -1,9 +1,5 @@
 import { FC } from 'react';
-import { Base } from '../../../../../common/Base';
+import { Base, Column, Flex, Grid, Text } from '../../../../../common';
-import { Column } from '../../../../../common/Column';
-import { Flex } from '../../../../../common/Flex';
-import { Grid } from '../../../../../common/Grid';
-import { Text } from '../../../../../common/Text';
 import { useCatalogContext } from '../../../CatalogContext';
 import { CatalogAddOnBadgeWidgetView } from '../widgets/CatalogAddOnBadgeWidgetView';
 import { CatalogItemGridWidgetView } from '../widgets/CatalogItemGridWidgetView';

src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceItemView.tsx

@@ -1,11 +1,6 @@
 import { FC, useCallback, useMemo } from 'react';
-import { LocalizeText } from '../../../../../../api';
+import { LocalizeText, ProductTypeEnum } from '../../../../../../api';
-import { LayoutFurniIconImageView } from '../../../../../../common';
+import { Button, Column, LayoutFurniIconImageView, LayoutGridItem, Text } from '../../../../../../common';
-import { Button } from '../../../../../../common/Button';
-import { Column } from '../../../../../../common/Column';
-import { LayoutGridItem } from '../../../../../../common/layout/LayoutGridItem';
-import { Text } from '../../../../../../common/Text';
-import { ProductTypeEnum } from '../../../../common/ProductTypeEnum';
 import { MarketplaceOfferData } from './common/MarketplaceOfferData';
 import { MarketPlaceOfferState } from './common/MarketplaceOfferState';
 

src/components/catalog/views/page/layout/marketplace/MarketplacePostOfferView.tsx

@@ -1,11 +1,10 @@
 import { GetMarketplaceConfigurationMessageComposer, MakeOfferMessageComposer, MarketplaceConfigurationEvent } from '@nitrots/nitro-renderer';
 import { FC, useCallback, useEffect, useState } from 'react';
-import { FurnitureItem, LocalizeText, NotificationUtilities, SendMessageComposer } from '../../../../../../api';
+import { FurnitureItem, LocalizeText, NotificationUtilities, ProductTypeEnum, SendMessageComposer } from '../../../../../../api';
 import { Base, Button, Column, Grid, LayoutFurniImageView, NitroCardContentView, NitroCardHeaderView, NitroCardView, Text } from '../../../../../../common';
 import { CatalogPostMarketplaceOfferEvent } from '../../../../../../events';
 import { UseMessageEventHook, UseUiEvent } from '../../../../../../hooks';
 import { useCatalogContext } from '../../../../CatalogContext';
-import { ProductTypeEnum } from '../../../../common/ProductTypeEnum';
 
 export const MarketplacePostOfferView : FC<{}> = props =>
 {

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

@@ -1,8 +1,8 @@
 import { FC } from 'react';
-import { AutoGrid, AutoGridProps } from '../../../../../common/AutoGrid';
+import { ProductTypeEnum } from '../../../../../api';
+import { AutoGrid, AutoGridProps } from '../../../../../common';
 import { useCatalogContext } from '../../../CatalogContext';
 import { IPurchasableOffer } from '../../../common/IPurchasableOffer';
-import { ProductTypeEnum } from '../../../common/ProductTypeEnum';
 import { CatalogGridOfferView } from '../common/CatalogGridOfferView';
 
 interface CatalogItemGridWidgetViewProps extends AutoGridProps

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

@@ -1,13 +1,10 @@
 import { FC, useEffect, useState } from 'react';
-import { LocalizeText } from '../../../../../api';
+import { LocalizeText, ProductTypeEnum } from '../../../../../api';
-import { AutoGrid, AutoGridProps } from '../../../../../common/AutoGrid';
+import { AutoGrid, AutoGridProps, Button, ButtonGroup } from '../../../../../common';
-import { Button } from '../../../../../common/Button';
-import { ButtonGroup } from '../../../../../common/ButtonGroup';
 import { BatchUpdates } from '../../../../../hooks';
 import { useCatalogContext } from '../../../CatalogContext';
 import { IPurchasableOffer } from '../../../common/IPurchasableOffer';
 import { Offer } from '../../../common/Offer';
-import { ProductTypeEnum } from '../../../common/ProductTypeEnum';
 import { CatalogGridOfferView } from '../common/CatalogGridOfferView';
 
 interface CatalogSpacesWidgetViewProps extends AutoGridProps

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

@@ -1,11 +1,10 @@
 import { Vector3d } from '@nitrots/nitro-renderer';
 import { FC, useEffect } from 'react';
-import { GetAvatarRenderManager, GetSessionDataManager } from '../../../../../api';
+import { GetAvatarRenderManager, GetSessionDataManager, ProductTypeEnum } from '../../../../../api';
 import { AutoGrid, Column, LayoutGridItem, LayoutRoomPreviewerView } from '../../../../../common';
 import { useCatalogContext } from '../../../CatalogContext';
 import { FurniCategory } from '../../../common/FurniCategory';
 import { Offer } from '../../../common/Offer';
-import { ProductTypeEnum } from '../../../common/ProductTypeEnum';
 
 export const CatalogViewProductWidgetView: FC<{}> = props =>
 {

src/components/room/widgets/avatar-info/AvatarInfoWidgetAvatarView.tsx

@@ -1,6 +1,6 @@
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { RoomControllerLevel, RoomObjectCategory, RoomObjectVariable } from '@nitrots/nitro-renderer';
-import { FC, useEffect, useMemo, useState } from 'react';
+import { FC, useCallback, useEffect, useMemo, useState } from 'react';
 import { GetOwnRoomObject, GetUserProfile, LocalizeText, RoomWidgetMessage, RoomWidgetUpdateInfostandUserEvent, RoomWidgetUserActionMessage } from '../../../../api';
 import { Base, Flex } from '../../../../common';
 import { BatchUpdates } from '../../../../hooks';
@@ -61,7 +61,7 @@ export const AvatarInfoWidgetAvatarView: FC<AvatarInfoWidgetAvatarViewProps> = p
         return flag;
     }, []);
 
-    const processAction = (name: string) =>
+    const processAction = useCallback((name: string) =>
     {
         let messageType: string = null;
         let message: RoomWidgetMessage = null;
@@ -114,20 +114,16 @@ export const AvatarInfoWidgetAvatarView: FC<AvatarInfoWidgetAvatarViewProps> = p
                     hideMenu = false;
                     setMode(MODE_RELATIONSHIP);
                     break;
-                case 'respect':
+                case 'respect': {
-                    let newRespectsLeft = 0;
+                    let newRespectsLeft = (respectsLeft - 1);
                     
-                    setRespectsLeft(prevValue =>
+                    setRespectsLeft(newRespectsLeft);
-                    {
-                        newRespectsLeft = (prevValue - 1);
-
-                        return newRespectsLeft;
-                    });
 
                     messageType = RoomWidgetUserActionMessage.RESPECT_USER;
 
                     if(newRespectsLeft > 0) hideMenu = false;
                     break;
+                }
                 case 'ignore':
                     messageType = RoomWidgetUserActionMessage.IGNORE_USER;
                     break;
@@ -208,7 +204,7 @@ export const AvatarInfoWidgetAvatarView: FC<AvatarInfoWidgetAvatarViewProps> = p
         }
 
         if(hideMenu) close();
-    }
+    }, [ userData, respectsLeft, widgetHandler, close, ]);
 
     useEffect(() =>
     {

src/components/room/widgets/furniture/gift-opening/FurnitureGiftOpeningView.tsx

@@ -1,10 +1,9 @@
 import { RoomObjectCategory, RoomObjectOperationType } from '@nitrots/nitro-renderer';
 import { FC, useCallback, useMemo, useState } from 'react';
-import { CreateLinkEvent, GetRoomEngine, GetSessionDataManager, LocalizeText, RoomWidgetPresentOpenMessage, RoomWidgetUpdatePresentDataEvent, RoomWidgetUpdateRoomObjectEvent } from '../../../../../api';
+import { CreateLinkEvent, GetRoomEngine, GetSessionDataManager, LocalizeText, ProductTypeEnum, RoomWidgetPresentOpenMessage, RoomWidgetUpdatePresentDataEvent, RoomWidgetUpdateRoomObjectEvent } from '../../../../../api';
 import { Button, Column, Flex, LayoutGiftTagView, NitroCardContentView, NitroCardHeaderView, NitroCardView, Text } from '../../../../../common';
 import { BatchUpdates } from '../../../../../hooks';
 import { UseEventDispatcherHook } from '../../../../../hooks/events/UseEventDispatcherHook';
-import { ProductTypeEnum } from '../../../../catalog/common/ProductTypeEnum';
 import { useRoomContext } from '../../../RoomContext';
 
 const FLOOR: string = 'floor';