From 3e478694c66bda4653c48fd27e8ebf03de18854e Mon Sep 17 00:00:00 2001 From: Bill Date: Wed, 23 Jun 2021 00:03:56 -0400 Subject: [PATCH] More restructuring --- src/views/catalog/CatalogMessageHandler.tsx | 4 ++-- src/views/catalog/{utils => common}/CatalogPetPalette.ts | 0 src/views/catalog/{utils => common}/CatalogUtilities.ts | 0 src/views/catalog/{enums => common}/FurniCategory.ts | 0 src/views/catalog/{utils => common}/IPurse.ts | 0 src/views/catalog/{enums => common}/ProductTypeEnum.ts | 0 src/views/catalog/{utils => common}/Purse.ts | 0 src/views/catalog/{utils => common}/SubscriptionInfo.ts | 0 src/views/catalog/reducers/CatalogReducer.tsx | 6 +++--- src/views/catalog/views/page/CatalogPageView.tsx | 4 ++-- .../page/layout/default/CatalogLayoutDefaultView.tsx | 4 ++-- .../CatalogLayoutGuildCustomFurniView.tsx | 4 ++-- .../layout/guild-forum/CatalogLayoutGuildForumView.tsx | 2 +- .../layout/info-loyalty/CatalogLayoutInfoLoyaltyView.tsx | 2 +- .../views/page/layout/pets/CatalogLayoutPetView.tsx | 4 ++-- .../views/page/layout/pets2/CatalogLayoutPets2View.tsx | 2 +- .../views/page/layout/pets3/CatalogLayoutPets3View.tsx | 2 +- .../single-bundle/CatalogLayoutSingleBundleView.tsx | 2 +- .../page/layout/spaces-new/CatalogLayoutSpacesView.tsx | 6 +++--- .../page/layout/trophies/CatalogLayoutTrophiesView.tsx | 4 ++-- .../views/page/layout/vip-buy/CatalogLayoutVipBuyView.tsx | 2 +- .../catalog/views/page/product/CatalogProductView.tsx | 2 +- .../purchase-button/CatalogPurchaseButtonView.tsx | 2 +- .../page/search-result/CatalogLayoutSearchResultView.tsx | 4 ++-- src/views/catalog/views/search/CatalogSearchView.tsx | 2 +- src/views/inventory/InventoryMessageHandler.tsx | 4 ++-- src/views/inventory/InventoryView.tsx | 2 +- src/views/inventory/{utils => common}/BotItem.ts | 0 src/views/inventory/{utils => common}/BotUtilities.ts | 0 src/views/inventory/{utils => common}/FurniCategory.ts | 0 src/views/inventory/{utils => common}/FurnitureItem.ts | 0 .../inventory/{utils => common}/FurnitureUtilities.ts | 0 src/views/inventory/{utils => common}/GroupItem.ts | 0 src/views/inventory/{utils => common}/IFurnitureItem.ts | 0 .../inventory/{utils => common}/InventoryUtilities.ts | 0 src/views/inventory/{utils => common}/PetItem.ts | 0 src/views/inventory/{utils => common}/PetUtilities.ts | 0 src/views/inventory/reducers/InventoryBotReducer.tsx | 4 ++-- .../inventory/reducers/InventoryFurnitureReducer.tsx | 6 +++--- src/views/inventory/reducers/InventoryPetReducer.tsx | 4 ++-- src/views/inventory/views/bot/InventoryBotView.tsx | 4 ++-- .../inventory/views/bot/item/InventoryBotItemView.tsx | 2 +- .../views/bot/item/InventoryBotItemView.types.ts | 2 +- .../views/bot/results/InventoryBotResultsView.types.ts | 2 +- .../inventory/views/furniture/InventoryFurnitureView.tsx | 8 ++++---- .../views/furniture/item/InventoryFurnitureItemView.tsx | 2 +- .../furniture/item/InventoryFurnitureItemView.types.ts | 2 +- .../results/InventoryFurnitureResultsView.types.ts | 2 +- .../search/InventoryFurnitureSearchView.types.ts | 2 +- src/views/inventory/views/pet/InventoryPetView.tsx | 4 ++-- .../inventory/views/pet/item/InventoryPetItemView.tsx | 2 +- .../views/pet/item/InventoryPetItemView.types.ts | 2 +- .../views/pet/results/InventoryPetResultsView.types.ts | 2 +- src/views/purse/PurseMessageHandler.tsx | 2 +- src/views/purse/PurseView.tsx | 2 +- src/views/purse/{utils => common}/Currency.ts | 0 src/views/purse/{utils => common}/CurrencyHelper.ts | 0 src/views/purse/currency/CurrencyView.types.ts | 2 +- src/views/purse/reducers/PurseReducer.tsx | 2 +- src/views/shared/furni-image/FurniImageView.tsx | 2 +- .../{ => shared}/room-previewer/RoomPreviewerView.scss | 0 .../{ => shared}/room-previewer/RoomPreviewerView.tsx | 0 .../room-previewer/RoomPreviewerView.types.ts | 0 63 files changed, 62 insertions(+), 62 deletions(-) rename src/views/catalog/{utils => common}/CatalogPetPalette.ts (100%) rename src/views/catalog/{utils => common}/CatalogUtilities.ts (100%) rename src/views/catalog/{enums => common}/FurniCategory.ts (100%) rename src/views/catalog/{utils => common}/IPurse.ts (100%) rename src/views/catalog/{enums => common}/ProductTypeEnum.ts (100%) rename src/views/catalog/{utils => common}/Purse.ts (100%) rename src/views/catalog/{utils => common}/SubscriptionInfo.ts (100%) rename src/views/inventory/{utils => common}/BotItem.ts (100%) rename src/views/inventory/{utils => common}/BotUtilities.ts (100%) rename src/views/inventory/{utils => common}/FurniCategory.ts (100%) rename src/views/inventory/{utils => common}/FurnitureItem.ts (100%) rename src/views/inventory/{utils => common}/FurnitureUtilities.ts (100%) rename src/views/inventory/{utils => common}/GroupItem.ts (100%) rename src/views/inventory/{utils => common}/IFurnitureItem.ts (100%) rename src/views/inventory/{utils => common}/InventoryUtilities.ts (100%) rename src/views/inventory/{utils => common}/PetItem.ts (100%) rename src/views/inventory/{utils => common}/PetUtilities.ts (100%) rename src/views/purse/{utils => common}/Currency.ts (100%) rename src/views/purse/{utils => common}/CurrencyHelper.ts (100%) rename src/views/{ => shared}/room-previewer/RoomPreviewerView.scss (100%) rename src/views/{ => shared}/room-previewer/RoomPreviewerView.tsx (100%) rename src/views/{ => shared}/room-previewer/RoomPreviewerView.types.ts (100%) diff --git a/src/views/catalog/CatalogMessageHandler.tsx b/src/views/catalog/CatalogMessageHandler.tsx index 509a256c..54b73d18 100644 --- a/src/views/catalog/CatalogMessageHandler.tsx +++ b/src/views/catalog/CatalogMessageHandler.tsx @@ -6,10 +6,10 @@ import { CatalogPurchaseSoldOutEvent } from '../../events/catalog/CatalogPurchas import { dispatchUiEvent } from '../../hooks/events/ui/ui-event'; import { CreateMessageHook } from '../../hooks/messages/message-event'; import { CatalogMessageHandlerProps } from './CatalogMessageHandler.types'; +import { CatalogPetPalette } from './common/CatalogPetPalette'; +import { SubscriptionInfo } from './common/SubscriptionInfo'; import { useCatalogContext } from './context/CatalogContext'; import { CatalogActions } from './reducers/CatalogReducer'; -import { CatalogPetPalette } from './utils/CatalogPetPalette'; -import { SubscriptionInfo } from './utils/SubscriptionInfo'; export const CatalogMessageHandler: FC = props => { diff --git a/src/views/catalog/utils/CatalogPetPalette.ts b/src/views/catalog/common/CatalogPetPalette.ts similarity index 100% rename from src/views/catalog/utils/CatalogPetPalette.ts rename to src/views/catalog/common/CatalogPetPalette.ts diff --git a/src/views/catalog/utils/CatalogUtilities.ts b/src/views/catalog/common/CatalogUtilities.ts similarity index 100% rename from src/views/catalog/utils/CatalogUtilities.ts rename to src/views/catalog/common/CatalogUtilities.ts diff --git a/src/views/catalog/enums/FurniCategory.ts b/src/views/catalog/common/FurniCategory.ts similarity index 100% rename from src/views/catalog/enums/FurniCategory.ts rename to src/views/catalog/common/FurniCategory.ts diff --git a/src/views/catalog/utils/IPurse.ts b/src/views/catalog/common/IPurse.ts similarity index 100% rename from src/views/catalog/utils/IPurse.ts rename to src/views/catalog/common/IPurse.ts diff --git a/src/views/catalog/enums/ProductTypeEnum.ts b/src/views/catalog/common/ProductTypeEnum.ts similarity index 100% rename from src/views/catalog/enums/ProductTypeEnum.ts rename to src/views/catalog/common/ProductTypeEnum.ts diff --git a/src/views/catalog/utils/Purse.ts b/src/views/catalog/common/Purse.ts similarity index 100% rename from src/views/catalog/utils/Purse.ts rename to src/views/catalog/common/Purse.ts diff --git a/src/views/catalog/utils/SubscriptionInfo.ts b/src/views/catalog/common/SubscriptionInfo.ts similarity index 100% rename from src/views/catalog/utils/SubscriptionInfo.ts rename to src/views/catalog/common/SubscriptionInfo.ts diff --git a/src/views/catalog/reducers/CatalogReducer.tsx b/src/views/catalog/reducers/CatalogReducer.tsx index b0cd9ee3..6d68951a 100644 --- a/src/views/catalog/reducers/CatalogReducer.tsx +++ b/src/views/catalog/reducers/CatalogReducer.tsx @@ -1,8 +1,8 @@ import { CatalogClubOfferData, CatalogGroupData, CatalogPageOfferData, ICatalogPageData, ICatalogPageParser } from 'nitro-renderer'; import { Reducer } from 'react'; -import { CatalogPetPalette } from '../utils/CatalogPetPalette'; -import { ICatalogOffers, ICatalogSearchResult, SetOffersToNodes } from '../utils/CatalogUtilities'; -import { SubscriptionInfo } from '../utils/SubscriptionInfo'; +import { CatalogPetPalette } from '../common/CatalogPetPalette'; +import { ICatalogOffers, ICatalogSearchResult, SetOffersToNodes } from '../common/CatalogUtilities'; +import { SubscriptionInfo } from '../common/SubscriptionInfo'; export interface ICatalogState { diff --git a/src/views/catalog/views/page/CatalogPageView.tsx b/src/views/catalog/views/page/CatalogPageView.tsx index 9194e2e5..3b127509 100644 --- a/src/views/catalog/views/page/CatalogPageView.tsx +++ b/src/views/catalog/views/page/CatalogPageView.tsx @@ -1,9 +1,9 @@ import { Vector3d } from 'nitro-renderer'; import { FC, useEffect } from 'react'; import { GetAvatarRenderManager, GetFurnitureDataForProductOffer, GetSessionDataManager } from '../../../../api'; +import { FurniCategory } from '../../common/FurniCategory'; +import { ProductTypeEnum } from '../../common/ProductTypeEnum'; import { useCatalogContext } from '../../context/CatalogContext'; -import { FurniCategory } from '../../enums/FurniCategory'; -import { ProductTypeEnum } from '../../enums/ProductTypeEnum'; import { CatalogPageViewProps } from './CatalogPageView.types'; import { GetCatalogLayout } from './layout/GetCatalogLayout'; import { CatalogLayoutSearchResultView } from './search-result/CatalogLayoutSearchResultView'; diff --git a/src/views/catalog/views/page/layout/default/CatalogLayoutDefaultView.tsx b/src/views/catalog/views/page/layout/default/CatalogLayoutDefaultView.tsx index 47637afb..076a0ee2 100644 --- a/src/views/catalog/views/page/layout/default/CatalogLayoutDefaultView.tsx +++ b/src/views/catalog/views/page/layout/default/CatalogLayoutDefaultView.tsx @@ -1,8 +1,8 @@ import { FC } from 'react'; import { LimitedEditionCompletePlateView } from '../../../../../shared/limited-edition/complete-plate/LimitedEditionCompletePlateView'; -import { RoomPreviewerView } from '../../../../../room-previewer/RoomPreviewerView'; +import { RoomPreviewerView } from '../../../../../shared/room-previewer/RoomPreviewerView'; +import { GetCatalogPageImage, GetCatalogPageText, GetOfferName } from '../../../../common/CatalogUtilities'; import { useCatalogContext } from '../../../../context/CatalogContext'; -import { GetCatalogPageImage, GetCatalogPageText, GetOfferName } from '../../../../utils/CatalogUtilities'; import { CatalogPageOffersView } from '../../offers/CatalogPageOffersView'; import { CatalogPurchaseView } from '../../purchase/CatalogPurchaseView'; import { CatalogLayoutDefaultViewProps } from './CatalogLayoutDefaultView.types'; diff --git a/src/views/catalog/views/page/layout/guild-custom-furni/CatalogLayoutGuildCustomFurniView.tsx b/src/views/catalog/views/page/layout/guild-custom-furni/CatalogLayoutGuildCustomFurniView.tsx index 7f5ef58c..0057dfa0 100644 --- a/src/views/catalog/views/page/layout/guild-custom-furni/CatalogLayoutGuildCustomFurniView.tsx +++ b/src/views/catalog/views/page/layout/guild-custom-furni/CatalogLayoutGuildCustomFurniView.tsx @@ -2,9 +2,9 @@ import { CatalogGroupsComposer } from 'nitro-renderer'; import { FC, useEffect } from 'react'; import { SendMessageHook } from '../../../../../../hooks/messages'; import { LocalizeText } from '../../../../../../utils/LocalizeText'; -import { RoomPreviewerView } from '../../../../../room-previewer/RoomPreviewerView'; +import { RoomPreviewerView } from '../../../../../shared/room-previewer/RoomPreviewerView'; +import { GetOfferName } from '../../../../common/CatalogUtilities'; import { useCatalogContext } from '../../../../context/CatalogContext'; -import { GetOfferName } from '../../../../utils/CatalogUtilities'; import { CatalogPageOffersView } from '../../offers/CatalogPageOffersView'; import { CatalogPurchaseView } from '../../purchase/CatalogPurchaseView'; import { CatalogLayoutGuildCustomFurniViewProps } from './CatalogLayoutGuildCustomFurniView.types'; diff --git a/src/views/catalog/views/page/layout/guild-forum/CatalogLayoutGuildForumView.tsx b/src/views/catalog/views/page/layout/guild-forum/CatalogLayoutGuildForumView.tsx index 6160d1a5..c3cb9687 100644 --- a/src/views/catalog/views/page/layout/guild-forum/CatalogLayoutGuildForumView.tsx +++ b/src/views/catalog/views/page/layout/guild-forum/CatalogLayoutGuildForumView.tsx @@ -2,9 +2,9 @@ import { CatalogGroupsComposer } from 'nitro-renderer'; import { FC, useEffect } from 'react'; import { SendMessageHook } from '../../../../../../hooks/messages'; import { LocalizeText } from '../../../../../../utils/LocalizeText'; +import { GetCatalogPageText } from '../../../../common/CatalogUtilities'; import { useCatalogContext } from '../../../../context/CatalogContext'; import { CatalogActions } from '../../../../reducers/CatalogReducer'; -import { GetCatalogPageText } from '../../../../utils/CatalogUtilities'; import { CatalogLayoutGuildForumViewProps } from './CatalogLayoutGuildForumView.types'; export const CatalogLayouGuildForumView: FC = props => diff --git a/src/views/catalog/views/page/layout/info-loyalty/CatalogLayoutInfoLoyaltyView.tsx b/src/views/catalog/views/page/layout/info-loyalty/CatalogLayoutInfoLoyaltyView.tsx index bbca55b2..eb976b8f 100644 --- a/src/views/catalog/views/page/layout/info-loyalty/CatalogLayoutInfoLoyaltyView.tsx +++ b/src/views/catalog/views/page/layout/info-loyalty/CatalogLayoutInfoLoyaltyView.tsx @@ -1,5 +1,5 @@ import { FC } from 'react'; -import { GetCatalogPageText } from '../../../../utils/CatalogUtilities'; +import { GetCatalogPageText } from '../../../../common/CatalogUtilities'; import { CatalogLayoutInfoLoyaltyViewProps } from './CatalogLayoutInfoLoyaltyView.types'; export const CatalogLayoutInfoLoyaltyView: FC = props => diff --git a/src/views/catalog/views/page/layout/pets/CatalogLayoutPetView.tsx b/src/views/catalog/views/page/layout/pets/CatalogLayoutPetView.tsx index f2edc00b..0651cca6 100644 --- a/src/views/catalog/views/page/layout/pets/CatalogLayoutPetView.tsx +++ b/src/views/catalog/views/page/layout/pets/CatalogLayoutPetView.tsx @@ -3,11 +3,11 @@ import { FC, useEffect, useMemo, useState } from 'react'; import { GetProductDataForLocalization } from '../../../../../../api/nitro/session/GetProductDataForLocalization'; import { SendMessageHook } from '../../../../../../hooks/messages/message-event'; import { LocalizeText } from '../../../../../../utils/LocalizeText'; -import { RoomPreviewerView } from '../../../../../room-previewer/RoomPreviewerView'; import { PetImageView } from '../../../../../shared/pet-image/PetImageView'; +import { RoomPreviewerView } from '../../../../../shared/room-previewer/RoomPreviewerView'; +import { GetCatalogPageImage, GetCatalogPageText, GetPetAvailableColors, GetPetIndexFromLocalization } from '../../../../common/CatalogUtilities'; import { useCatalogContext } from '../../../../context/CatalogContext'; import { CatalogActions } from '../../../../reducers/CatalogReducer'; -import { GetCatalogPageImage, GetCatalogPageText, GetPetAvailableColors, GetPetIndexFromLocalization } from '../../../../utils/CatalogUtilities'; import { CatalogLayoutPetViewProps } from './CatalogLayoutPetView.types'; import { CatalogLayoutPetPurchaseView } from './purchase/CatalogLayoutPetPurchaseView'; diff --git a/src/views/catalog/views/page/layout/pets2/CatalogLayoutPets2View.tsx b/src/views/catalog/views/page/layout/pets2/CatalogLayoutPets2View.tsx index c2d0a31a..8255ac44 100644 --- a/src/views/catalog/views/page/layout/pets2/CatalogLayoutPets2View.tsx +++ b/src/views/catalog/views/page/layout/pets2/CatalogLayoutPets2View.tsx @@ -1,5 +1,5 @@ import { FC } from 'react'; -import { GetCatalogPageImage, GetCatalogPageText } from '../../../../utils/CatalogUtilities'; +import { GetCatalogPageImage, GetCatalogPageText } from '../../../../common/CatalogUtilities'; import { CatalogLayoutPets2ViewProps } from './CatalogLayoutPets2View.types'; export const CatalogLayoutPets2View: FC = props => diff --git a/src/views/catalog/views/page/layout/pets3/CatalogLayoutPets3View.tsx b/src/views/catalog/views/page/layout/pets3/CatalogLayoutPets3View.tsx index ddcf3ef1..d15ec172 100644 --- a/src/views/catalog/views/page/layout/pets3/CatalogLayoutPets3View.tsx +++ b/src/views/catalog/views/page/layout/pets3/CatalogLayoutPets3View.tsx @@ -1,5 +1,5 @@ import { FC } from 'react'; -import { GetCatalogPageImage, GetCatalogPageText } from '../../../../utils/CatalogUtilities'; +import { GetCatalogPageImage, GetCatalogPageText } from '../../../../common/CatalogUtilities'; import { CatalogLayoutPets3ViewProps } from './CatalogLayoutPets3View.types'; export const CatalogLayoutPets3View: FC = props => diff --git a/src/views/catalog/views/page/layout/single-bundle/CatalogLayoutSingleBundleView.tsx b/src/views/catalog/views/page/layout/single-bundle/CatalogLayoutSingleBundleView.tsx index d1c47be1..c85baeae 100644 --- a/src/views/catalog/views/page/layout/single-bundle/CatalogLayoutSingleBundleView.tsx +++ b/src/views/catalog/views/page/layout/single-bundle/CatalogLayoutSingleBundleView.tsx @@ -1,6 +1,6 @@ import { FC } from 'react'; +import { GetCatalogPageImage, GetCatalogPageText } from '../../../../common/CatalogUtilities'; import { useCatalogContext } from '../../../../context/CatalogContext'; -import { GetCatalogPageImage, GetCatalogPageText } from '../../../../utils/CatalogUtilities'; import { CatalogProductView } from '../../product/CatalogProductView'; import { CatalogPurchaseView } from '../../purchase/CatalogPurchaseView'; import { CatalogLayoutSingleBundleViewProps } from './CatalogLayoutSingleBundleView.types'; diff --git a/src/views/catalog/views/page/layout/spaces-new/CatalogLayoutSpacesView.tsx b/src/views/catalog/views/page/layout/spaces-new/CatalogLayoutSpacesView.tsx index b4baaffc..5b56f6a3 100644 --- a/src/views/catalog/views/page/layout/spaces-new/CatalogLayoutSpacesView.tsx +++ b/src/views/catalog/views/page/layout/spaces-new/CatalogLayoutSpacesView.tsx @@ -2,10 +2,10 @@ import { CatalogPageOfferData, IFurnitureData } from 'nitro-renderer'; import { FC, useEffect, useState } from 'react'; import { GetSessionDataManager } from '../../../../../../api'; import { LocalizeText } from '../../../../../../utils/LocalizeText'; -import { RoomPreviewerView } from '../../../../../room-previewer/RoomPreviewerView'; +import { RoomPreviewerView } from '../../../../../shared/room-previewer/RoomPreviewerView'; +import { GetCatalogPageImage, GetCatalogPageText, GetOfferName } from '../../../../common/CatalogUtilities'; +import { ProductTypeEnum } from '../../../../common/ProductTypeEnum'; import { useCatalogContext } from '../../../../context/CatalogContext'; -import { ProductTypeEnum } from '../../../../enums/ProductTypeEnum'; -import { GetCatalogPageImage, GetCatalogPageText, GetOfferName } from '../../../../utils/CatalogUtilities'; import { CatalogPageOffersView } from '../../offers/CatalogPageOffersView'; import { CatalogPurchaseView } from '../../purchase/CatalogPurchaseView'; import { CatalogLayoutSpacesViewProps } from './CatalogLayoutSpacesView.types'; diff --git a/src/views/catalog/views/page/layout/trophies/CatalogLayoutTrophiesView.tsx b/src/views/catalog/views/page/layout/trophies/CatalogLayoutTrophiesView.tsx index a1b3acad..fb68497c 100644 --- a/src/views/catalog/views/page/layout/trophies/CatalogLayoutTrophiesView.tsx +++ b/src/views/catalog/views/page/layout/trophies/CatalogLayoutTrophiesView.tsx @@ -1,7 +1,7 @@ import { FC, useState } from 'react'; -import { RoomPreviewerView } from '../../../../../room-previewer/RoomPreviewerView'; +import { RoomPreviewerView } from '../../../../../shared/room-previewer/RoomPreviewerView'; +import { GetOfferName } from '../../../../common/CatalogUtilities'; import { useCatalogContext } from '../../../../context/CatalogContext'; -import { GetOfferName } from '../../../../utils/CatalogUtilities'; import { CatalogPageOffersView } from '../../offers/CatalogPageOffersView'; import { CatalogPurchaseView } from '../../purchase/CatalogPurchaseView'; import { CatalogLayoutTrophiesViewProps } from './CatalogLayoutTrophiesView.types'; diff --git a/src/views/catalog/views/page/layout/vip-buy/CatalogLayoutVipBuyView.tsx b/src/views/catalog/views/page/layout/vip-buy/CatalogLayoutVipBuyView.tsx index 2b0dfe03..554e1c58 100644 --- a/src/views/catalog/views/page/layout/vip-buy/CatalogLayoutVipBuyView.tsx +++ b/src/views/catalog/views/page/layout/vip-buy/CatalogLayoutVipBuyView.tsx @@ -3,8 +3,8 @@ import { FC, useCallback, useEffect, useMemo } from 'react'; import { SendMessageHook } from '../../../../../../hooks/messages/message-event'; import { LocalizeText } from '../../../../../../utils/LocalizeText'; import { CurrencyIcon } from '../../../../../shared/currency-icon/CurrencyIcon'; +import { GetCatalogPageImage } from '../../../../common/CatalogUtilities'; import { useCatalogContext } from '../../../../context/CatalogContext'; -import { GetCatalogPageImage } from '../../../../utils/CatalogUtilities'; import { CatalogLayoutVipBuyViewProps } from './CatalogLayoutVipBuyView.types'; export const CatalogLayoutVipBuyView: FC = props => diff --git a/src/views/catalog/views/page/product/CatalogProductView.tsx b/src/views/catalog/views/page/product/CatalogProductView.tsx index f1477d4d..729d7e20 100644 --- a/src/views/catalog/views/page/product/CatalogProductView.tsx +++ b/src/views/catalog/views/page/product/CatalogProductView.tsx @@ -4,7 +4,7 @@ import { GetRoomEngine, GetSessionDataManager } from '../../../../../api'; import { GetConfiguration } from '../../../../../utils/GetConfiguration'; import { AvatarImageView } from '../../../../shared/avatar-image/AvatarImageView'; import { LimitedEditionStyledNumberView } from '../../../../shared/limited-edition/styled-number/LimitedEditionStyledNumberView'; -import { ProductTypeEnum } from '../../../enums/ProductTypeEnum'; +import { ProductTypeEnum } from '../../../common/ProductTypeEnum'; import { CatalogProductViewProps } from './CatalogProductView.types'; export const CatalogProductView: FC = props => diff --git a/src/views/catalog/views/page/purchase/purchase-button/CatalogPurchaseButtonView.tsx b/src/views/catalog/views/page/purchase/purchase-button/CatalogPurchaseButtonView.tsx index 25598d34..2ae147b9 100644 --- a/src/views/catalog/views/page/purchase/purchase-button/CatalogPurchaseButtonView.tsx +++ b/src/views/catalog/views/page/purchase/purchase-button/CatalogPurchaseButtonView.tsx @@ -5,7 +5,7 @@ import { useUiEvent } from '../../../../../../hooks/events/ui/ui-event'; import { SendMessageHook } from '../../../../../../hooks/messages/message-event'; import { LoadingSpinnerView } from '../../../../../../layout'; import { LocalizeText } from '../../../../../../utils/LocalizeText'; -import { GetCurrencyAmount } from '../../../../../purse/utils/CurrencyHelper'; +import { GetCurrencyAmount } from '../../../../../purse/common/CurrencyHelper'; import { CatalogPurchaseButtonViewProps, CatalogPurchaseState } from './CatalogPurchaseButtonView.types'; export const CatalogPurchaseButtonView: FC = props => diff --git a/src/views/catalog/views/page/search-result/CatalogLayoutSearchResultView.tsx b/src/views/catalog/views/page/search-result/CatalogLayoutSearchResultView.tsx index 7fd00788..d5e147f2 100644 --- a/src/views/catalog/views/page/search-result/CatalogLayoutSearchResultView.tsx +++ b/src/views/catalog/views/page/search-result/CatalogLayoutSearchResultView.tsx @@ -1,8 +1,8 @@ import { FC } from 'react'; -import { RoomPreviewerView } from '../../../../room-previewer/RoomPreviewerView'; import { LimitedEditionCompletePlateView } from '../../../../shared/limited-edition/complete-plate/LimitedEditionCompletePlateView'; +import { RoomPreviewerView } from '../../../../shared/room-previewer/RoomPreviewerView'; +import { GetOfferName } from '../../../common/CatalogUtilities'; import { useCatalogContext } from '../../../context/CatalogContext'; -import { GetOfferName } from '../../../utils/CatalogUtilities'; import { CatalogPurchaseView } from '../purchase/CatalogPurchaseView'; import { CatalogLayoutSearchResultViewProps } from './CatalogLayoutSearchResultView.types'; import { CatalogSearchResultOffersView } from './offers/CatalogSearchResultOffersView'; diff --git a/src/views/catalog/views/search/CatalogSearchView.tsx b/src/views/catalog/views/search/CatalogSearchView.tsx index bcd44a40..ff97d251 100644 --- a/src/views/catalog/views/search/CatalogSearchView.tsx +++ b/src/views/catalog/views/search/CatalogSearchView.tsx @@ -2,9 +2,9 @@ import { ICatalogPageData, IFurnitureData } from 'nitro-renderer'; import { FC, useCallback, useEffect, useState } from 'react'; import { GetSessionDataManager } from '../../../../api'; import { LocalizeText } from '../../../../utils/LocalizeText'; +import { GetOfferNodes } from '../../common/CatalogUtilities'; import { useCatalogContext } from '../../context/CatalogContext'; import { CatalogActions } from '../../reducers/CatalogReducer'; -import { GetOfferNodes } from '../../utils/CatalogUtilities'; import { CatalogSearchViewProps } from './CatalogSearchView.types'; export const CatalogSearchView: FC = props => diff --git a/src/views/inventory/InventoryMessageHandler.tsx b/src/views/inventory/InventoryMessageHandler.tsx index 4098fc25..af4e8eba 100644 --- a/src/views/inventory/InventoryMessageHandler.tsx +++ b/src/views/inventory/InventoryMessageHandler.tsx @@ -1,14 +1,14 @@ import { BadgesEvent, BotAddedToInventoryEvent, BotInventoryMessageEvent, BotRemovedFromInventoryEvent, FurnitureListAddOrUpdateEvent, FurnitureListEvent, FurnitureListInvalidateEvent, FurnitureListItemParser, FurnitureListRemovedEvent, FurniturePostItPlacedEvent, PetAddedToInventoryEvent, PetData, PetInventoryEvent, PetRemovedFromInventory } from 'nitro-renderer'; import { FC, useCallback } from 'react'; import { CreateMessageHook } from '../../hooks/messages/message-event'; +import { mergeFurniFragments } from './common/FurnitureUtilities'; +import { mergePetFragments } from './common/PetUtilities'; import { useInventoryContext } from './context/InventoryContext'; import { InventoryMessageHandlerProps } from './InventoryMessageHandler.types'; import { InventoryBadgeActions } from './reducers/InventoryBadgeReducer'; import { InventoryBotActions } from './reducers/InventoryBotReducer'; import { InventoryFurnitureActions } from './reducers/InventoryFurnitureReducer'; import { InventoryPetActions } from './reducers/InventoryPetReducer'; -import { mergeFurniFragments } from './utils/FurnitureUtilities'; -import { mergePetFragments } from './utils/PetUtilities'; let furniMsgFragments: Map[] = null; let petMsgFragments: Map[] = null; diff --git a/src/views/inventory/InventoryView.tsx b/src/views/inventory/InventoryView.tsx index 5d6d1b22..a1ba407e 100644 --- a/src/views/inventory/InventoryView.tsx +++ b/src/views/inventory/InventoryView.tsx @@ -7,6 +7,7 @@ import { useRoomSessionManagerEvent } from '../../hooks/events/nitro/session/roo import { useUiEvent } from '../../hooks/events/ui/ui-event'; import { NitroCardContentView, NitroCardHeaderView, NitroCardTabsItemView, NitroCardTabsView, NitroCardView } from '../../layout'; import { LocalizeText } from '../../utils/LocalizeText'; +import { isObjectMoverRequested, setObjectMoverRequested } from './common/InventoryUtilities'; import { InventoryContextProvider } from './context/InventoryContext'; import { InventoryMessageHandler } from './InventoryMessageHandler'; import { InventoryTabs, InventoryViewProps } from './InventoryView.types'; @@ -14,7 +15,6 @@ import { initialInventoryBadge, InventoryBadgeReducer } from './reducers/Invento import { initialInventoryBot, InventoryBotReducer } from './reducers/InventoryBotReducer'; import { initialInventoryFurniture, InventoryFurnitureReducer } from './reducers/InventoryFurnitureReducer'; import { initialInventoryPet, InventoryPetReducer } from './reducers/InventoryPetReducer'; -import { isObjectMoverRequested, setObjectMoverRequested } from './utils/InventoryUtilities'; import { InventoryBadgeView } from './views/badge/InventoryBadgeView'; import { InventoryBotView } from './views/bot/InventoryBotView'; import { InventoryFurnitureView } from './views/furniture/InventoryFurnitureView'; diff --git a/src/views/inventory/utils/BotItem.ts b/src/views/inventory/common/BotItem.ts similarity index 100% rename from src/views/inventory/utils/BotItem.ts rename to src/views/inventory/common/BotItem.ts diff --git a/src/views/inventory/utils/BotUtilities.ts b/src/views/inventory/common/BotUtilities.ts similarity index 100% rename from src/views/inventory/utils/BotUtilities.ts rename to src/views/inventory/common/BotUtilities.ts diff --git a/src/views/inventory/utils/FurniCategory.ts b/src/views/inventory/common/FurniCategory.ts similarity index 100% rename from src/views/inventory/utils/FurniCategory.ts rename to src/views/inventory/common/FurniCategory.ts diff --git a/src/views/inventory/utils/FurnitureItem.ts b/src/views/inventory/common/FurnitureItem.ts similarity index 100% rename from src/views/inventory/utils/FurnitureItem.ts rename to src/views/inventory/common/FurnitureItem.ts diff --git a/src/views/inventory/utils/FurnitureUtilities.ts b/src/views/inventory/common/FurnitureUtilities.ts similarity index 100% rename from src/views/inventory/utils/FurnitureUtilities.ts rename to src/views/inventory/common/FurnitureUtilities.ts diff --git a/src/views/inventory/utils/GroupItem.ts b/src/views/inventory/common/GroupItem.ts similarity index 100% rename from src/views/inventory/utils/GroupItem.ts rename to src/views/inventory/common/GroupItem.ts diff --git a/src/views/inventory/utils/IFurnitureItem.ts b/src/views/inventory/common/IFurnitureItem.ts similarity index 100% rename from src/views/inventory/utils/IFurnitureItem.ts rename to src/views/inventory/common/IFurnitureItem.ts diff --git a/src/views/inventory/utils/InventoryUtilities.ts b/src/views/inventory/common/InventoryUtilities.ts similarity index 100% rename from src/views/inventory/utils/InventoryUtilities.ts rename to src/views/inventory/common/InventoryUtilities.ts diff --git a/src/views/inventory/utils/PetItem.ts b/src/views/inventory/common/PetItem.ts similarity index 100% rename from src/views/inventory/utils/PetItem.ts rename to src/views/inventory/common/PetItem.ts diff --git a/src/views/inventory/utils/PetUtilities.ts b/src/views/inventory/common/PetUtilities.ts similarity index 100% rename from src/views/inventory/utils/PetUtilities.ts rename to src/views/inventory/common/PetUtilities.ts diff --git a/src/views/inventory/reducers/InventoryBotReducer.tsx b/src/views/inventory/reducers/InventoryBotReducer.tsx index 44e5a839..3b8cf142 100644 --- a/src/views/inventory/reducers/InventoryBotReducer.tsx +++ b/src/views/inventory/reducers/InventoryBotReducer.tsx @@ -1,7 +1,7 @@ import { BotData } from 'nitro-renderer'; import { Reducer } from 'react'; -import { BotItem } from '../utils/BotItem'; -import { addSingleBotItem, processBotFragment, removeBotItemById } from '../utils/BotUtilities'; +import { BotItem } from '../common/BotItem'; +import { addSingleBotItem, processBotFragment, removeBotItemById } from '../common/BotUtilities'; export interface IInventoryBotState { diff --git a/src/views/inventory/reducers/InventoryFurnitureReducer.tsx b/src/views/inventory/reducers/InventoryFurnitureReducer.tsx index b44d250d..865b9207 100644 --- a/src/views/inventory/reducers/InventoryFurnitureReducer.tsx +++ b/src/views/inventory/reducers/InventoryFurnitureReducer.tsx @@ -1,8 +1,8 @@ import { FurnitureListItemParser } from 'nitro-renderer'; import { Reducer } from 'react'; -import { FurnitureItem } from '../utils/FurnitureItem'; -import { addFurnitureItem, processFurniFragment, removeFurniItemById } from '../utils/FurnitureUtilities'; -import { GroupItem } from '../utils/GroupItem'; +import { FurnitureItem } from '../common/FurnitureItem'; +import { addFurnitureItem, processFurniFragment, removeFurniItemById } from '../common/FurnitureUtilities'; +import { GroupItem } from '../common/GroupItem'; export interface IInventoryFurnitureState { diff --git a/src/views/inventory/reducers/InventoryPetReducer.tsx b/src/views/inventory/reducers/InventoryPetReducer.tsx index 7f6e1e7c..445270b3 100644 --- a/src/views/inventory/reducers/InventoryPetReducer.tsx +++ b/src/views/inventory/reducers/InventoryPetReducer.tsx @@ -1,7 +1,7 @@ import { PetData } from 'nitro-renderer'; import { Reducer } from 'react'; -import { PetItem } from '../utils/PetItem'; -import { addSinglePetItem, processPetFragment, removePetItemById } from '../utils/PetUtilities'; +import { PetItem } from '../common/PetItem'; +import { addSinglePetItem, processPetFragment, removePetItemById } from '../common/PetUtilities'; export interface IInventoryPetState { diff --git a/src/views/inventory/views/bot/InventoryBotView.tsx b/src/views/inventory/views/bot/InventoryBotView.tsx index 0dbf85e4..f28e7458 100644 --- a/src/views/inventory/views/bot/InventoryBotView.tsx +++ b/src/views/inventory/views/bot/InventoryBotView.tsx @@ -3,10 +3,10 @@ import { FC, useEffect } from 'react'; import { GetRoomEngine } from '../../../../api'; import { SendMessageHook } from '../../../../hooks/messages/message-event'; import { LocalizeText } from '../../../../utils/LocalizeText'; -import { RoomPreviewerView } from '../../../room-previewer/RoomPreviewerView'; +import { RoomPreviewerView } from '../../../shared/room-previewer/RoomPreviewerView'; +import { attemptBotPlacement } from '../../common/BotUtilities'; import { useInventoryContext } from '../../context/InventoryContext'; import { InventoryBotActions } from '../../reducers/InventoryBotReducer'; -import { attemptBotPlacement } from '../../utils/BotUtilities'; import { InventoryBotViewProps } from './InventoryBotView.types'; import { InventoryBotResultsView } from './results/InventoryBotResultsView'; diff --git a/src/views/inventory/views/bot/item/InventoryBotItemView.tsx b/src/views/inventory/views/bot/item/InventoryBotItemView.tsx index a7ac36a9..a08151cf 100644 --- a/src/views/inventory/views/bot/item/InventoryBotItemView.tsx +++ b/src/views/inventory/views/bot/item/InventoryBotItemView.tsx @@ -1,9 +1,9 @@ import { MouseEventType } from 'nitro-renderer'; import { FC, MouseEvent, useCallback, useState } from 'react'; import { AvatarImageView } from '../../../../shared/avatar-image/AvatarImageView'; +import { attemptBotPlacement } from '../../../common/BotUtilities'; import { useInventoryContext } from '../../../context/InventoryContext'; import { InventoryBotActions } from '../../../reducers/InventoryBotReducer'; -import { attemptBotPlacement } from '../../../utils/BotUtilities'; import { InventoryBotItemViewProps } from './InventoryBotItemView.types'; export const InventoryBotItemView: FC = props => diff --git a/src/views/inventory/views/bot/item/InventoryBotItemView.types.ts b/src/views/inventory/views/bot/item/InventoryBotItemView.types.ts index 8d80c9b4..2c897fc6 100644 --- a/src/views/inventory/views/bot/item/InventoryBotItemView.types.ts +++ b/src/views/inventory/views/bot/item/InventoryBotItemView.types.ts @@ -1,4 +1,4 @@ -import { BotItem } from '../../../utils/BotItem'; +import { BotItem } from '../../../common/BotItem'; export interface InventoryBotItemViewProps { diff --git a/src/views/inventory/views/bot/results/InventoryBotResultsView.types.ts b/src/views/inventory/views/bot/results/InventoryBotResultsView.types.ts index bca525c7..68836836 100644 --- a/src/views/inventory/views/bot/results/InventoryBotResultsView.types.ts +++ b/src/views/inventory/views/bot/results/InventoryBotResultsView.types.ts @@ -1,4 +1,4 @@ -import { BotItem } from '../../../utils/BotItem'; +import { BotItem } from '../../../common/BotItem'; export interface InventoryBotResultsViewProps { diff --git a/src/views/inventory/views/furniture/InventoryFurnitureView.tsx b/src/views/inventory/views/furniture/InventoryFurnitureView.tsx index ebb8ae60..644af8a1 100644 --- a/src/views/inventory/views/furniture/InventoryFurnitureView.tsx +++ b/src/views/inventory/views/furniture/InventoryFurnitureView.tsx @@ -3,13 +3,13 @@ import { FC, useEffect, useState } from 'react'; import { GetRoomEngine } from '../../../../api'; import { SendMessageHook } from '../../../../hooks/messages/message-event'; import { LocalizeText } from '../../../../utils/LocalizeText'; -import { RoomPreviewerView } from '../../../room-previewer/RoomPreviewerView'; import { LimitedEditionCompactPlateView } from '../../../shared/limited-edition/compact-plate/LimitedEditionCompactPlateView'; +import { RoomPreviewerView } from '../../../shared/room-previewer/RoomPreviewerView'; +import { FurniCategory } from '../../common/FurniCategory'; +import { attemptItemPlacement } from '../../common/FurnitureUtilities'; +import { GroupItem } from '../../common/GroupItem'; import { useInventoryContext } from '../../context/InventoryContext'; import { InventoryFurnitureActions } from '../../reducers/InventoryFurnitureReducer'; -import { FurniCategory } from '../../utils/FurniCategory'; -import { attemptItemPlacement } from '../../utils/FurnitureUtilities'; -import { GroupItem } from '../../utils/GroupItem'; import { InventoryFurnitureViewProps } from './InventoryFurnitureView.types'; import { InventoryFurnitureResultsView } from './results/InventoryFurnitureResultsView'; import { InventoryFurnitureSearchView } from './search/InventoryFurnitureSearchView'; diff --git a/src/views/inventory/views/furniture/item/InventoryFurnitureItemView.tsx b/src/views/inventory/views/furniture/item/InventoryFurnitureItemView.tsx index db969ff2..97d174c6 100644 --- a/src/views/inventory/views/furniture/item/InventoryFurnitureItemView.tsx +++ b/src/views/inventory/views/furniture/item/InventoryFurnitureItemView.tsx @@ -1,9 +1,9 @@ import { MouseEventType } from 'nitro-renderer'; import { FC, MouseEvent, useCallback, useState } from 'react'; import { LimitedEditionStyledNumberView } from '../../../../shared/limited-edition/styled-number/LimitedEditionStyledNumberView'; +import { attemptItemPlacement } from '../../../common/FurnitureUtilities'; import { useInventoryContext } from '../../../context/InventoryContext'; import { InventoryFurnitureActions } from '../../../reducers/InventoryFurnitureReducer'; -import { attemptItemPlacement } from '../../../utils/FurnitureUtilities'; import { InventoryFurnitureItemViewProps } from './InventoryFurnitureItemView.types'; export const InventoryFurnitureItemView: FC = props => diff --git a/src/views/inventory/views/furniture/item/InventoryFurnitureItemView.types.ts b/src/views/inventory/views/furniture/item/InventoryFurnitureItemView.types.ts index 2e960f23..4d85f6f6 100644 --- a/src/views/inventory/views/furniture/item/InventoryFurnitureItemView.types.ts +++ b/src/views/inventory/views/furniture/item/InventoryFurnitureItemView.types.ts @@ -1,4 +1,4 @@ -import { GroupItem } from '../../../utils/GroupItem'; +import { GroupItem } from '../../../common/GroupItem'; export interface InventoryFurnitureItemViewProps { diff --git a/src/views/inventory/views/furniture/results/InventoryFurnitureResultsView.types.ts b/src/views/inventory/views/furniture/results/InventoryFurnitureResultsView.types.ts index 4461e531..a0bc56bd 100644 --- a/src/views/inventory/views/furniture/results/InventoryFurnitureResultsView.types.ts +++ b/src/views/inventory/views/furniture/results/InventoryFurnitureResultsView.types.ts @@ -1,4 +1,4 @@ -import { GroupItem } from '../../../utils/GroupItem'; +import { GroupItem } from '../../../common/GroupItem'; export interface InventoryFurnitureResultsViewProps { diff --git a/src/views/inventory/views/furniture/search/InventoryFurnitureSearchView.types.ts b/src/views/inventory/views/furniture/search/InventoryFurnitureSearchView.types.ts index 6d0672aa..74916884 100644 --- a/src/views/inventory/views/furniture/search/InventoryFurnitureSearchView.types.ts +++ b/src/views/inventory/views/furniture/search/InventoryFurnitureSearchView.types.ts @@ -1,5 +1,5 @@ import { Dispatch, SetStateAction } from 'react'; -import { GroupItem } from '../../../utils/GroupItem'; +import { GroupItem } from '../../../common/GroupItem'; export interface InventoryFurnitureSearchViewProps { diff --git a/src/views/inventory/views/pet/InventoryPetView.tsx b/src/views/inventory/views/pet/InventoryPetView.tsx index 7e6f849e..df943500 100644 --- a/src/views/inventory/views/pet/InventoryPetView.tsx +++ b/src/views/inventory/views/pet/InventoryPetView.tsx @@ -3,10 +3,10 @@ import { FC, useEffect } from 'react'; import { GetRoomEngine } from '../../../../api'; import { SendMessageHook } from '../../../../hooks/messages/message-event'; import { LocalizeText } from '../../../../utils/LocalizeText'; -import { RoomPreviewerView } from '../../../room-previewer/RoomPreviewerView'; +import { RoomPreviewerView } from '../../../shared/room-previewer/RoomPreviewerView'; +import { attemptPetPlacement } from '../../common/PetUtilities'; import { useInventoryContext } from '../../context/InventoryContext'; import { InventoryPetActions } from '../../reducers/InventoryPetReducer'; -import { attemptPetPlacement } from '../../utils/PetUtilities'; import { InventoryPetViewProps } from './InventoryPetView.types'; import { InventoryPetResultsView } from './results/InventoryPetResultsView'; diff --git a/src/views/inventory/views/pet/item/InventoryPetItemView.tsx b/src/views/inventory/views/pet/item/InventoryPetItemView.tsx index ab545789..cd99c6bc 100644 --- a/src/views/inventory/views/pet/item/InventoryPetItemView.tsx +++ b/src/views/inventory/views/pet/item/InventoryPetItemView.tsx @@ -1,9 +1,9 @@ import { MouseEventType } from 'nitro-renderer'; import { FC, MouseEvent, useCallback, useState } from 'react'; import { PetImageView } from '../../../../shared/pet-image/PetImageView'; +import { attemptPetPlacement } from '../../../common/PetUtilities'; import { useInventoryContext } from '../../../context/InventoryContext'; import { InventoryPetActions } from '../../../reducers/InventoryPetReducer'; -import { attemptPetPlacement } from '../../../utils/PetUtilities'; import { InventoryPetItemViewProps } from './InventoryPetItemView.types'; export const InventoryPetItemView: FC = props => diff --git a/src/views/inventory/views/pet/item/InventoryPetItemView.types.ts b/src/views/inventory/views/pet/item/InventoryPetItemView.types.ts index 7e1d2e3b..c42bcc63 100644 --- a/src/views/inventory/views/pet/item/InventoryPetItemView.types.ts +++ b/src/views/inventory/views/pet/item/InventoryPetItemView.types.ts @@ -1,4 +1,4 @@ -import { PetItem } from '../../../utils/PetItem'; +import { PetItem } from '../../../common/PetItem'; export interface InventoryPetItemViewProps { diff --git a/src/views/inventory/views/pet/results/InventoryPetResultsView.types.ts b/src/views/inventory/views/pet/results/InventoryPetResultsView.types.ts index a2eb62ef..75035b3d 100644 --- a/src/views/inventory/views/pet/results/InventoryPetResultsView.types.ts +++ b/src/views/inventory/views/pet/results/InventoryPetResultsView.types.ts @@ -1,4 +1,4 @@ -import { PetItem } from '../../../utils/PetItem'; +import { PetItem } from '../../../common/PetItem'; export interface InventoryPetResultsViewProps { diff --git a/src/views/purse/PurseMessageHandler.tsx b/src/views/purse/PurseMessageHandler.tsx index 1e141bfe..17c5ba4f 100644 --- a/src/views/purse/PurseMessageHandler.tsx +++ b/src/views/purse/PurseMessageHandler.tsx @@ -1,10 +1,10 @@ import { UserCreditsEvent, UserCurrencyEvent, UserCurrencyUpdateEvent } from 'nitro-renderer'; import { FC, useCallback } from 'react'; import { CreateMessageHook } from '../../hooks/messages/message-event'; +import { Currency } from './common/Currency'; import { usePurseContext } from './context/PurseContext'; import { PurseMessageHandlerProps } from './PurseMessageHandler.types'; import { PurseActions } from './reducers/PurseReducer'; -import { Currency } from './utils/Currency'; export const PurseMessageHandler: FC = props => { diff --git a/src/views/purse/PurseView.tsx b/src/views/purse/PurseView.tsx index b768454f..b78c046e 100644 --- a/src/views/purse/PurseView.tsx +++ b/src/views/purse/PurseView.tsx @@ -4,12 +4,12 @@ import { NotificationCenterEvent } from '../../events'; import { dispatchUiEvent } from '../../hooks/events'; import { SendMessageHook } from '../../hooks/messages/message-event'; import { GetConfiguration } from '../../utils/GetConfiguration'; +import { SetLastCurrencies } from './common/CurrencyHelper'; import { PurseContextProvider } from './context/PurseContext'; import { CurrencyView } from './currency/CurrencyView'; import { PurseMessageHandler } from './PurseMessageHandler'; import { PurseViewProps } from './PurseView.types'; import { initialPurse, PurseReducer } from './reducers/PurseReducer'; -import { SetLastCurrencies } from './utils/CurrencyHelper'; export const PurseView: FC = props => { diff --git a/src/views/purse/utils/Currency.ts b/src/views/purse/common/Currency.ts similarity index 100% rename from src/views/purse/utils/Currency.ts rename to src/views/purse/common/Currency.ts diff --git a/src/views/purse/utils/CurrencyHelper.ts b/src/views/purse/common/CurrencyHelper.ts similarity index 100% rename from src/views/purse/utils/CurrencyHelper.ts rename to src/views/purse/common/CurrencyHelper.ts diff --git a/src/views/purse/currency/CurrencyView.types.ts b/src/views/purse/currency/CurrencyView.types.ts index 6e276237..aa58250d 100644 --- a/src/views/purse/currency/CurrencyView.types.ts +++ b/src/views/purse/currency/CurrencyView.types.ts @@ -1,4 +1,4 @@ -import { Currency } from '../utils/Currency'; +import { Currency } from '../common/Currency'; export interface CurrencyViewProps { diff --git a/src/views/purse/reducers/PurseReducer.tsx b/src/views/purse/reducers/PurseReducer.tsx index e0243a13..1a84005f 100644 --- a/src/views/purse/reducers/PurseReducer.tsx +++ b/src/views/purse/reducers/PurseReducer.tsx @@ -1,5 +1,5 @@ import { Reducer } from 'react'; -import { Currency } from '../utils/Currency'; +import { Currency } from '../common/Currency'; export interface IPurseState { diff --git a/src/views/shared/furni-image/FurniImageView.tsx b/src/views/shared/furni-image/FurniImageView.tsx index 706c5da4..bc85db31 100644 --- a/src/views/shared/furni-image/FurniImageView.tsx +++ b/src/views/shared/furni-image/FurniImageView.tsx @@ -2,7 +2,7 @@ import { IGetImageListener, ImageResult, TextureUtils, Vector3d } from 'nitro-re import { RenderTexture } from 'pixi.js'; import { FC, useCallback, useEffect, useState } from 'react'; import { GetRoomEngine } from '../../../api'; -import { ProductTypeEnum } from '../../catalog/enums/ProductTypeEnum'; +import { ProductTypeEnum } from '../../catalog/common/ProductTypeEnum'; import { FurniImageViewProps } from './FurniImageView.types'; export const FurniImageView: FC = props => diff --git a/src/views/room-previewer/RoomPreviewerView.scss b/src/views/shared/room-previewer/RoomPreviewerView.scss similarity index 100% rename from src/views/room-previewer/RoomPreviewerView.scss rename to src/views/shared/room-previewer/RoomPreviewerView.scss diff --git a/src/views/room-previewer/RoomPreviewerView.tsx b/src/views/shared/room-previewer/RoomPreviewerView.tsx similarity index 100% rename from src/views/room-previewer/RoomPreviewerView.tsx rename to src/views/shared/room-previewer/RoomPreviewerView.tsx diff --git a/src/views/room-previewer/RoomPreviewerView.types.ts b/src/views/shared/room-previewer/RoomPreviewerView.types.ts similarity index 100% rename from src/views/room-previewer/RoomPreviewerView.types.ts rename to src/views/shared/room-previewer/RoomPreviewerView.types.ts