diff --git a/src/views/Styles.scss b/src/views/Styles.scss index 060fc1e9..e78d377d 100644 --- a/src/views/Styles.scss +++ b/src/views/Styles.scss @@ -1,20 +1,14 @@ +@import './shared/Shared'; @import './auth/AuthView'; @import './avatar-editor/AvatarEditorView'; -@import './avatar-image/AvatarImage'; -@import './badge-image/BadgeImage'; @import './catalog/CatalogView'; -@import './catalog-icon/CatalogIconView'; -@import './currency-icon/CurrencyIcon'; @import './friend-list/FriendListView'; -@import './furni-image/FurniImageView'; @import './hotel-view/HotelView'; @import './inventory/InventoryView'; -@import './limited-edition/LimitedEdition'; @import './loading/LoadingView'; @import './main/MainView'; @import './navigator/NavigatorView'; @import './notification-center/NotificationCenterView'; -@import './pet-image/PetImage'; @import './purse/PurseView'; @import './right-side/RightSideView'; @import './room/RoomView'; diff --git a/src/views/catalog-icon/CatalogIconView.scss b/src/views/catalog/views/catalog-icon/CatalogIconView.scss similarity index 100% rename from src/views/catalog-icon/CatalogIconView.scss rename to src/views/catalog/views/catalog-icon/CatalogIconView.scss diff --git a/src/views/catalog-icon/CatalogIconView.tsx b/src/views/catalog/views/catalog-icon/CatalogIconView.tsx similarity index 87% rename from src/views/catalog-icon/CatalogIconView.tsx rename to src/views/catalog/views/catalog-icon/CatalogIconView.tsx index 6517f751..a587d91c 100644 --- a/src/views/catalog-icon/CatalogIconView.tsx +++ b/src/views/catalog/views/catalog-icon/CatalogIconView.tsx @@ -1,5 +1,5 @@ import { FC } from 'react'; -import { GetConfiguration } from '../../utils/GetConfiguration'; +import { GetConfiguration } from '../../../../utils/GetConfiguration'; import { CatalogIconViewProps } from './CatalogIconView.types'; export const CatalogIconView: FC = props => diff --git a/src/views/catalog-icon/CatalogIconView.types.ts b/src/views/catalog/views/catalog-icon/CatalogIconView.types.ts similarity index 100% rename from src/views/catalog-icon/CatalogIconView.types.ts rename to src/views/catalog/views/catalog-icon/CatalogIconView.types.ts diff --git a/src/views/catalog/views/navigation/item/CatalogNavigationItemView.tsx b/src/views/catalog/views/navigation/item/CatalogNavigationItemView.tsx index 6d38a6c2..d1cdea58 100644 --- a/src/views/catalog/views/navigation/item/CatalogNavigationItemView.tsx +++ b/src/views/catalog/views/navigation/item/CatalogNavigationItemView.tsx @@ -1,8 +1,8 @@ import { FC, useCallback, useEffect, useState } from 'react'; import { GetCatalogPageComposer } from '../../../../../api/catalog/GetCatalogPageComposer'; import { SendMessageHook } from '../../../../../hooks/messages/message-event'; -import { CatalogIconView } from '../../../../catalog-icon/CatalogIconView'; import { CatalogMode } from '../../../CatalogView.types'; +import { CatalogIconView } from '../../catalog-icon/CatalogIconView'; import { CatalogNavigationSetView } from '../set/CatalogNavigationSetView'; import { CatalogNavigationItemViewProps } from './CatalogNavigationItemView.types'; diff --git a/src/views/catalog/views/page/header/CatalogPageHeaderView.tsx b/src/views/catalog/views/page/header/CatalogPageHeaderView.tsx index e820357d..0afa99a1 100644 --- a/src/views/catalog/views/page/header/CatalogPageHeaderView.tsx +++ b/src/views/catalog/views/page/header/CatalogPageHeaderView.tsx @@ -1,6 +1,6 @@ import { FC } from 'react'; -import { CatalogIconView } from '../../../../catalog-icon/CatalogIconView'; import { useCatalogContext } from '../../../context/CatalogContext'; +import { CatalogIconView } from '../../catalog-icon/CatalogIconView'; import { CatalogPageHeaderViewProps } from './CatalogPageHeaderView.types'; export const CatalogPageHeaderView: FC = props => diff --git a/src/views/catalog/views/page/layout/default/CatalogLayoutDefaultView.tsx b/src/views/catalog/views/page/layout/default/CatalogLayoutDefaultView.tsx index 81276a80..47637afb 100644 --- a/src/views/catalog/views/page/layout/default/CatalogLayoutDefaultView.tsx +++ b/src/views/catalog/views/page/layout/default/CatalogLayoutDefaultView.tsx @@ -1,5 +1,5 @@ import { FC } from 'react'; -import { LimitedEditionCompletePlateView } from '../../../../../limited-edition/complete-plate/LimitedEditionCompletePlateView'; +import { LimitedEditionCompletePlateView } from '../../../../../shared/limited-edition/complete-plate/LimitedEditionCompletePlateView'; import { RoomPreviewerView } from '../../../../../room-previewer/RoomPreviewerView'; import { useCatalogContext } from '../../../../context/CatalogContext'; import { GetCatalogPageImage, GetCatalogPageText, GetOfferName } from '../../../../utils/CatalogUtilities'; @@ -21,7 +21,7 @@ export const CatalogLayoutDefaultView: FC = props { !product && -
+
diff --git a/src/views/catalog/views/page/layout/pets/CatalogLayoutPetView.tsx b/src/views/catalog/views/page/layout/pets/CatalogLayoutPetView.tsx index 88c8f61a..f2edc00b 100644 --- a/src/views/catalog/views/page/layout/pets/CatalogLayoutPetView.tsx +++ b/src/views/catalog/views/page/layout/pets/CatalogLayoutPetView.tsx @@ -3,8 +3,8 @@ 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 { PetImageView } from '../../../../../pet-image/PetImageView'; import { RoomPreviewerView } from '../../../../../room-previewer/RoomPreviewerView'; +import { PetImageView } from '../../../../../shared/pet-image/PetImageView'; import { useCatalogContext } from '../../../../context/CatalogContext'; import { CatalogActions } from '../../../../reducers/CatalogReducer'; import { GetCatalogPageImage, GetCatalogPageText, GetPetAvailableColors, GetPetIndexFromLocalization } from '../../../../utils/CatalogUtilities'; diff --git a/src/views/catalog/views/page/layout/pets/purchase/CatalogLayoutPetPurchaseView.tsx b/src/views/catalog/views/page/layout/pets/purchase/CatalogLayoutPetPurchaseView.tsx index 5ddb232c..e4282c68 100644 --- a/src/views/catalog/views/page/layout/pets/purchase/CatalogLayoutPetPurchaseView.tsx +++ b/src/views/catalog/views/page/layout/pets/purchase/CatalogLayoutPetPurchaseView.tsx @@ -4,7 +4,7 @@ import { CatalogEvent } from '../../../../../../../events'; import { useUiEvent } from '../../../../../../../hooks/events/ui/ui-event'; import { SendMessageHook } from '../../../../../../../hooks/messages/message-event'; import { LocalizeText } from '../../../../../../../utils/LocalizeText'; -import { CurrencyIcon } from '../../../../../../currency-icon/CurrencyIcon'; +import { CurrencyIcon } from '../../../../../../shared/currency-icon/CurrencyIcon'; import { CatalogPurchaseButtonView } from '../../../purchase/purchase-button/CatalogPurchaseButtonView'; import { CatalogPetNameApprovalView } from '../name-approval/CatalogPetNameApprovalView'; import { CatalogLayoutPetPurchaseViewProps } from './CatalogLayoutPetPurchaseView.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 8e997774..2b0dfe03 100644 --- a/src/views/catalog/views/page/layout/vip-buy/CatalogLayoutVipBuyView.tsx +++ b/src/views/catalog/views/page/layout/vip-buy/CatalogLayoutVipBuyView.tsx @@ -2,7 +2,7 @@ import { CatalogClubOfferData, CatalogRequestVipOffersComposer } from 'nitro-ren import { FC, useCallback, useEffect, useMemo } from 'react'; import { SendMessageHook } from '../../../../../../hooks/messages/message-event'; import { LocalizeText } from '../../../../../../utils/LocalizeText'; -import { CurrencyIcon } from '../../../../../currency-icon/CurrencyIcon'; +import { CurrencyIcon } from '../../../../../shared/currency-icon/CurrencyIcon'; import { useCatalogContext } from '../../../../context/CatalogContext'; import { GetCatalogPageImage } from '../../../../utils/CatalogUtilities'; import { CatalogLayoutVipBuyViewProps } from './CatalogLayoutVipBuyView.types'; diff --git a/src/views/catalog/views/page/product/CatalogProductView.tsx b/src/views/catalog/views/page/product/CatalogProductView.tsx index f48b33cf..f1477d4d 100644 --- a/src/views/catalog/views/page/product/CatalogProductView.tsx +++ b/src/views/catalog/views/page/product/CatalogProductView.tsx @@ -2,8 +2,8 @@ import { FurnitureType } from 'nitro-renderer'; import { FC, useMemo } from 'react'; import { GetRoomEngine, GetSessionDataManager } from '../../../../../api'; import { GetConfiguration } from '../../../../../utils/GetConfiguration'; -import { AvatarImageView } from '../../../../avatar-image/AvatarImageView'; -import { LimitedEditionStyledNumberView } from '../../../../limited-edition/styled-number/LimitedEditionStyledNumberView'; +import { AvatarImageView } from '../../../../shared/avatar-image/AvatarImageView'; +import { LimitedEditionStyledNumberView } from '../../../../shared/limited-edition/styled-number/LimitedEditionStyledNumberView'; import { ProductTypeEnum } from '../../../enums/ProductTypeEnum'; import { CatalogProductViewProps } from './CatalogProductView.types'; diff --git a/src/views/catalog/views/page/purchase/CatalogPurchaseView.tsx b/src/views/catalog/views/page/purchase/CatalogPurchaseView.tsx index 986e31e9..06b90343 100644 --- a/src/views/catalog/views/page/purchase/CatalogPurchaseView.tsx +++ b/src/views/catalog/views/page/purchase/CatalogPurchaseView.tsx @@ -1,6 +1,6 @@ import { FC, useEffect, useState } from 'react'; import { LocalizeText } from '../../../../../utils/LocalizeText'; -import { CurrencyIcon } from '../../../../currency-icon/CurrencyIcon'; +import { CurrencyIcon } from '../../../../shared/currency-icon/CurrencyIcon'; import { CatalogPurchaseViewProps } from './CatalogPurchaseView.types'; import { CatalogPurchaseButtonView } from './purchase-button/CatalogPurchaseButtonView'; diff --git a/src/views/catalog/views/page/search-result/CatalogLayoutSearchResultView.tsx b/src/views/catalog/views/page/search-result/CatalogLayoutSearchResultView.tsx index 2b5601c4..7fd00788 100644 --- a/src/views/catalog/views/page/search-result/CatalogLayoutSearchResultView.tsx +++ b/src/views/catalog/views/page/search-result/CatalogLayoutSearchResultView.tsx @@ -1,6 +1,6 @@ import { FC } from 'react'; -import { LimitedEditionCompletePlateView } from '../../../../limited-edition/complete-plate/LimitedEditionCompletePlateView'; import { RoomPreviewerView } from '../../../../room-previewer/RoomPreviewerView'; +import { LimitedEditionCompletePlateView } from '../../../../shared/limited-edition/complete-plate/LimitedEditionCompletePlateView'; import { useCatalogContext } from '../../../context/CatalogContext'; import { GetOfferName } from '../../../utils/CatalogUtilities'; import { CatalogPurchaseView } from '../purchase/CatalogPurchaseView'; diff --git a/src/views/friend-list/FriendListMessageHandler.tsx b/src/views/friend-list/FriendListMessageHandler.tsx index 68087f4f..e301778d 100644 --- a/src/views/friend-list/FriendListMessageHandler.tsx +++ b/src/views/friend-list/FriendListMessageHandler.tsx @@ -1,10 +1,10 @@ import { FriendListFragmentEvent, GetFriendRequestsComposer, MessengerInitEvent } from 'nitro-renderer'; import { FC, useCallback } from 'react'; import { CreateMessageHook, SendMessageHook } from '../../hooks/messages/message-event'; +import { MessengerSettings } from './common/MessengerSettings'; import { useFriendListContext } from './context/FriendListContext'; import { FriendListMessageHandlerProps } from './FriendListMessageHandler.types'; import { FriendListActions } from './reducers/FriendListReducer'; -import { MessengerSettings } from './utils/MessengerSettings'; export const FriendListMessageHandler: FC = props => { diff --git a/src/views/friend-list/utils/MessengerSettings.ts b/src/views/friend-list/common/MessengerSettings.ts similarity index 100% rename from src/views/friend-list/utils/MessengerSettings.ts rename to src/views/friend-list/common/MessengerSettings.ts diff --git a/src/views/friend-list/reducers/FriendListReducer.tsx b/src/views/friend-list/reducers/FriendListReducer.tsx index c9b7f612..8d4b7a23 100644 --- a/src/views/friend-list/reducers/FriendListReducer.tsx +++ b/src/views/friend-list/reducers/FriendListReducer.tsx @@ -1,7 +1,7 @@ import { FriendParser } from 'nitro-renderer'; import { Reducer } from 'react'; import { MessengerFriend } from '../common/MessengerFriend'; -import { MessengerSettings } from '../utils/MessengerSettings'; +import { MessengerSettings } from '../common/MessengerSettings'; export interface IFriendListState { diff --git a/src/views/inventory/views/badge/InventoryBadgeView.tsx b/src/views/inventory/views/badge/InventoryBadgeView.tsx index e44955b7..15601289 100644 --- a/src/views/inventory/views/badge/InventoryBadgeView.tsx +++ b/src/views/inventory/views/badge/InventoryBadgeView.tsx @@ -3,7 +3,7 @@ import { FC, useEffect } from 'react'; import { SendMessageHook } from '../../../../hooks/messages/message-event'; import { LocalizeBadgeName } from '../../../../utils/LocalizeBageName'; import { LocalizeText } from '../../../../utils/LocalizeText'; -import { BadgeImageView } from '../../../badge-image/BadgeImageView'; +import { BadgeImageView } from '../../../shared/badge-image/BadgeImageView'; import { useInventoryContext } from '../../context/InventoryContext'; import { InventoryBadgeActions } from '../../reducers/InventoryBadgeReducer'; import { InventoryActiveBadgeResultsView } from './active-results/InventoryActiveBadgeResultsView'; diff --git a/src/views/inventory/views/badge/item/InventoryBadgeItemView.tsx b/src/views/inventory/views/badge/item/InventoryBadgeItemView.tsx index 3209271a..1b9248b8 100644 --- a/src/views/inventory/views/badge/item/InventoryBadgeItemView.tsx +++ b/src/views/inventory/views/badge/item/InventoryBadgeItemView.tsx @@ -1,6 +1,6 @@ import { MouseEventType } from 'nitro-renderer'; import { FC, MouseEvent, useCallback } from 'react'; -import { BadgeImageView } from '../../../../badge-image/BadgeImageView'; +import { BadgeImageView } from '../../../../shared/badge-image/BadgeImageView'; import { useInventoryContext } from '../../../context/InventoryContext'; import { InventoryBadgeActions } from '../../../reducers/InventoryBadgeReducer'; import { InventoryBadgeItemViewProps } from './InventoryBadgeItemView.types'; diff --git a/src/views/inventory/views/bot/item/InventoryBotItemView.tsx b/src/views/inventory/views/bot/item/InventoryBotItemView.tsx index 408231f9..a7ac36a9 100644 --- a/src/views/inventory/views/bot/item/InventoryBotItemView.tsx +++ b/src/views/inventory/views/bot/item/InventoryBotItemView.tsx @@ -1,6 +1,6 @@ import { MouseEventType } from 'nitro-renderer'; import { FC, MouseEvent, useCallback, useState } from 'react'; -import { AvatarImageView } from '../../../../avatar-image/AvatarImageView'; +import { AvatarImageView } from '../../../../shared/avatar-image/AvatarImageView'; import { useInventoryContext } from '../../../context/InventoryContext'; import { InventoryBotActions } from '../../../reducers/InventoryBotReducer'; import { attemptBotPlacement } from '../../../utils/BotUtilities'; diff --git a/src/views/inventory/views/furniture/InventoryFurnitureView.tsx b/src/views/inventory/views/furniture/InventoryFurnitureView.tsx index 9cf4f4ac..ebb8ae60 100644 --- a/src/views/inventory/views/furniture/InventoryFurnitureView.tsx +++ b/src/views/inventory/views/furniture/InventoryFurnitureView.tsx @@ -3,8 +3,8 @@ import { FC, useEffect, useState } from 'react'; import { GetRoomEngine } from '../../../../api'; import { SendMessageHook } from '../../../../hooks/messages/message-event'; import { LocalizeText } from '../../../../utils/LocalizeText'; -import { LimitedEditionCompactPlateView } from '../../../limited-edition/compact-plate/LimitedEditionCompactPlateView'; import { RoomPreviewerView } from '../../../room-previewer/RoomPreviewerView'; +import { LimitedEditionCompactPlateView } from '../../../shared/limited-edition/compact-plate/LimitedEditionCompactPlateView'; import { useInventoryContext } from '../../context/InventoryContext'; import { InventoryFurnitureActions } from '../../reducers/InventoryFurnitureReducer'; import { FurniCategory } from '../../utils/FurniCategory'; diff --git a/src/views/inventory/views/furniture/item/InventoryFurnitureItemView.tsx b/src/views/inventory/views/furniture/item/InventoryFurnitureItemView.tsx index 250e604d..db969ff2 100644 --- a/src/views/inventory/views/furniture/item/InventoryFurnitureItemView.tsx +++ b/src/views/inventory/views/furniture/item/InventoryFurnitureItemView.tsx @@ -1,6 +1,6 @@ import { MouseEventType } from 'nitro-renderer'; import { FC, MouseEvent, useCallback, useState } from 'react'; -import { LimitedEditionStyledNumberView } from '../../../../limited-edition/styled-number/LimitedEditionStyledNumberView'; +import { LimitedEditionStyledNumberView } from '../../../../shared/limited-edition/styled-number/LimitedEditionStyledNumberView'; import { useInventoryContext } from '../../../context/InventoryContext'; import { InventoryFurnitureActions } from '../../../reducers/InventoryFurnitureReducer'; import { attemptItemPlacement } from '../../../utils/FurnitureUtilities'; diff --git a/src/views/inventory/views/pet/item/InventoryPetItemView.tsx b/src/views/inventory/views/pet/item/InventoryPetItemView.tsx index ddb79211..ab545789 100644 --- a/src/views/inventory/views/pet/item/InventoryPetItemView.tsx +++ b/src/views/inventory/views/pet/item/InventoryPetItemView.tsx @@ -1,6 +1,6 @@ import { MouseEventType } from 'nitro-renderer'; import { FC, MouseEvent, useCallback, useState } from 'react'; -import { PetImageView } from '../../../../pet-image/PetImageView'; +import { PetImageView } from '../../../../shared/pet-image/PetImageView'; import { useInventoryContext } from '../../../context/InventoryContext'; import { InventoryPetActions } from '../../../reducers/InventoryPetReducer'; import { attemptPetPlacement } from '../../../utils/PetUtilities'; diff --git a/src/views/purse/currency/CurrencyView.tsx b/src/views/purse/currency/CurrencyView.tsx index 4287794b..5e4e78fb 100644 --- a/src/views/purse/currency/CurrencyView.tsx +++ b/src/views/purse/currency/CurrencyView.tsx @@ -1,6 +1,6 @@ import { OverlayTrigger, Tooltip } from 'react-bootstrap'; import { LocalizeShortNumber } from '../../../utils/LocalizeShortNumber'; -import { CurrencyIcon } from '../../currency-icon/CurrencyIcon'; +import { CurrencyIcon } from '../../shared/currency-icon/CurrencyIcon'; import { CurrencyViewProps } from './CurrencyView.types'; export function CurrencyView(props: CurrencyViewProps): JSX.Element diff --git a/src/views/room/widgets/camera/views/checkout/CameraWidgetCheckoutView.tsx b/src/views/room/widgets/camera/views/checkout/CameraWidgetCheckoutView.tsx index c0ed5d00..948288e9 100644 --- a/src/views/room/widgets/camera/views/checkout/CameraWidgetCheckoutView.tsx +++ b/src/views/room/widgets/camera/views/checkout/CameraWidgetCheckoutView.tsx @@ -6,7 +6,7 @@ import { NitroCardContentView } from '../../../../../../layout/card/content/Nitr import { NitroCardView } from '../../../../../../layout/card/NitroCardView'; import { NitroCardSimpleHeaderView } from '../../../../../../layout/card/simple-header/NitroCardSimpleHeaderView'; import { LocalizeText } from '../../../../../../utils/LocalizeText'; -import { CurrencyIcon } from '../../../../../currency-icon/CurrencyIcon'; +import { CurrencyIcon } from '../../../../../shared/currency-icon/CurrencyIcon'; import { useCameraWidgetContext } from '../../context/CameraWidgetContext'; import { CameraWidgetCheckoutViewProps } from './CameraWidgetCheckoutView.types'; diff --git a/src/views/room/widgets/furniture/engraving-lock/FurnitureEngravingLockView.tsx b/src/views/room/widgets/furniture/engraving-lock/FurnitureEngravingLockView.tsx index df2662ed..b17752aa 100644 --- a/src/views/room/widgets/furniture/engraving-lock/FurnitureEngravingLockView.tsx +++ b/src/views/room/widgets/furniture/engraving-lock/FurnitureEngravingLockView.tsx @@ -10,7 +10,7 @@ import { NitroCardContentView } from '../../../../../layout/card/content/NitroCa import { NitroCardHeaderView } from '../../../../../layout/card/header/NitroCardHeaderView'; import { NitroCardView } from '../../../../../layout/card/NitroCardView'; import { LocalizeText } from '../../../../../utils/LocalizeText'; -import { AvatarImageView } from '../../../../avatar-image/AvatarImageView'; +import { AvatarImageView } from '../../../../shared/avatar-image/AvatarImageView'; import { useRoomContext } from '../../../context/RoomContext'; import { RoomWidgetRoomObjectUpdateEvent } from '../../../events'; import { FurnitureEngravingLockData } from './FurnitureEngravingLockData'; diff --git a/src/views/room/widgets/furniture/mannequin/FurnitureMannequinView.tsx b/src/views/room/widgets/furniture/mannequin/FurnitureMannequinView.tsx index 2ffb5e9f..b7ef3335 100644 --- a/src/views/room/widgets/furniture/mannequin/FurnitureMannequinView.tsx +++ b/src/views/room/widgets/furniture/mannequin/FurnitureMannequinView.tsx @@ -9,7 +9,7 @@ import { NitroCardContentView } from '../../../../../layout/card/content/NitroCa import { NitroCardView } from '../../../../../layout/card/NitroCardView'; import { NitroCardSimpleHeaderView } from '../../../../../layout/card/simple-header'; import { LocalizeText } from '../../../../../utils/LocalizeText'; -import { AvatarImageView } from '../../../../avatar-image/AvatarImageView'; +import { AvatarImageView } from '../../../../shared/avatar-image/AvatarImageView'; import { useRoomContext } from '../../../context/RoomContext'; import { RoomWidgetRoomObjectUpdateEvent } from '../../../events'; import { FurnitureMannequinData } from './FurnitureMannequinData'; diff --git a/src/views/room/widgets/infostand/views/bot/InfoStandWidgetBotView.tsx b/src/views/room/widgets/infostand/views/bot/InfoStandWidgetBotView.tsx index a2021565..0e683936 100644 --- a/src/views/room/widgets/infostand/views/bot/InfoStandWidgetBotView.tsx +++ b/src/views/room/widgets/infostand/views/bot/InfoStandWidgetBotView.tsx @@ -1,7 +1,7 @@ import { FC, useCallback } from 'react'; import { LocalizeText } from '../../../../../../utils/LocalizeText'; -import { AvatarImageView } from '../../../../../avatar-image/AvatarImageView'; -import { BadgeImageView } from '../../../../../badge-image/BadgeImageView'; +import { AvatarImageView } from '../../../../../shared/avatar-image/AvatarImageView'; +import { BadgeImageView } from '../../../../../shared/badge-image/BadgeImageView'; import { InfoStandWidgetBotViewProps } from './InfoStandWidgetBotView.types'; export const InfoStandWidgetBotView: FC = props => diff --git a/src/views/room/widgets/infostand/views/furni/InfoStandWidgetFurniView.tsx b/src/views/room/widgets/infostand/views/furni/InfoStandWidgetFurniView.tsx index 3afb383c..b2413aba 100644 --- a/src/views/room/widgets/infostand/views/furni/InfoStandWidgetFurniView.tsx +++ b/src/views/room/widgets/infostand/views/furni/InfoStandWidgetFurniView.tsx @@ -1,8 +1,8 @@ import { CrackableDataType, RoomControllerLevel, RoomWidgetEnumItemExtradataParameter, RoomWidgetFurniInfoUsagePolicyEnum, StringDataType } from 'nitro-renderer'; import { FC, useCallback, useEffect, useState } from 'react'; import { LocalizeText } from '../../../../../../utils/LocalizeText'; -import { BadgeImageView } from '../../../../../badge-image/BadgeImageView'; -import { LimitedEditionCompactPlateView } from '../../../../../limited-edition/compact-plate/LimitedEditionCompactPlateView'; +import { BadgeImageView } from '../../../../../shared/badge-image/BadgeImageView'; +import { LimitedEditionCompactPlateView } from '../../../../../shared/limited-edition/compact-plate/LimitedEditionCompactPlateView'; import { useRoomContext } from '../../../../context/RoomContext'; import { RoomWidgetFurniActionMessage } from '../../../../messages'; import { InfoStandWidgetFurniViewProps } from './InfoStandWidgetFurniView.types'; diff --git a/src/views/room/widgets/infostand/views/pet/InfoStandWidgetPetView.tsx b/src/views/room/widgets/infostand/views/pet/InfoStandWidgetPetView.tsx index f3417924..afb62410 100644 --- a/src/views/room/widgets/infostand/views/pet/InfoStandWidgetPetView.tsx +++ b/src/views/room/widgets/infostand/views/pet/InfoStandWidgetPetView.tsx @@ -1,6 +1,6 @@ import { FC } from 'react'; import { LocalizeText } from '../../../../../../utils/LocalizeText'; -import { PetImageView } from '../../../../../pet-image/PetImageView'; +import { PetImageView } from '../../../../../shared/pet-image/PetImageView'; import { InfoStandWidgetPetViewProps } from './InfoStandWidgetPetView.types'; export const InfoStandWidgetPetView: FC = props => diff --git a/src/views/room/widgets/infostand/views/rentable-bot/InfoStandWidgetRentableBotView.tsx b/src/views/room/widgets/infostand/views/rentable-bot/InfoStandWidgetRentableBotView.tsx index fab1eaaa..4b3230b7 100644 --- a/src/views/room/widgets/infostand/views/rentable-bot/InfoStandWidgetRentableBotView.tsx +++ b/src/views/room/widgets/infostand/views/rentable-bot/InfoStandWidgetRentableBotView.tsx @@ -2,8 +2,8 @@ import { BotRemoveComposer } from 'nitro-renderer'; import { FC, useCallback, useMemo } from 'react'; import { GetConnection } from '../../../../../../api'; import { LocalizeText } from '../../../../../../utils/LocalizeText'; -import { AvatarImageView } from '../../../../../avatar-image/AvatarImageView'; -import { BadgeImageView } from '../../../../../badge-image/BadgeImageView'; +import { AvatarImageView } from '../../../../../shared/avatar-image/AvatarImageView'; +import { BadgeImageView } from '../../../../../shared/badge-image/BadgeImageView'; import { BotSkillsEnum } from '../../../avatar-info/utils/BotSkillsEnum'; import { InfoStandWidgetRentableBotViewProps } from './InfoStandWidgetRentableBotView.types'; diff --git a/src/views/room/widgets/infostand/views/user/InfoStandWidgetUserView.tsx b/src/views/room/widgets/infostand/views/user/InfoStandWidgetUserView.tsx index 52c90be5..a85fafc3 100644 --- a/src/views/room/widgets/infostand/views/user/InfoStandWidgetUserView.tsx +++ b/src/views/room/widgets/infostand/views/user/InfoStandWidgetUserView.tsx @@ -2,8 +2,8 @@ import { RoomSessionUserBadgesEvent } from 'nitro-renderer'; import { FC, FocusEvent, KeyboardEvent, useCallback, useEffect, useState } from 'react'; import { CreateEventDispatcherHook } from '../../../../../../hooks/events'; import { LocalizeText } from '../../../../../../utils/LocalizeText'; -import { AvatarImageView } from '../../../../../avatar-image/AvatarImageView'; -import { BadgeImageView } from '../../../../../badge-image/BadgeImageView'; +import { AvatarImageView } from '../../../../../shared/avatar-image/AvatarImageView'; +import { BadgeImageView } from '../../../../../shared/badge-image/BadgeImageView'; import { useRoomContext } from '../../../../context/RoomContext'; import { RoomWidgetUpdateInfostandUserEvent } from '../../../../events/RoomWidgetUpdateInfostandUserEvent'; import { RoomWidgetChangeMottoMessage } from '../../../../messages'; diff --git a/src/views/shared/Shared.scss b/src/views/shared/Shared.scss new file mode 100644 index 00000000..89b99d57 --- /dev/null +++ b/src/views/shared/Shared.scss @@ -0,0 +1,6 @@ +@import './avatar-image/AvatarImage'; +@import './badge-image/BadgeImage'; +@import './currency-icon/CurrencyIcon.scss'; +@import './furni-image/FurniImageView'; +@import './limited-edition/LimitedEdition'; +@import './pet-image/PetImage'; diff --git a/src/views/avatar-image/AvatarImage.scss b/src/views/shared/avatar-image/AvatarImage.scss similarity index 100% rename from src/views/avatar-image/AvatarImage.scss rename to src/views/shared/avatar-image/AvatarImage.scss diff --git a/src/views/avatar-image/AvatarImageView.tsx b/src/views/shared/avatar-image/AvatarImageView.tsx similarity index 96% rename from src/views/avatar-image/AvatarImageView.tsx rename to src/views/shared/avatar-image/AvatarImageView.tsx index 80b7e8f1..9d3f6ea2 100644 --- a/src/views/avatar-image/AvatarImageView.tsx +++ b/src/views/shared/avatar-image/AvatarImageView.tsx @@ -1,6 +1,6 @@ import { AvatarScaleType, AvatarSetType } from 'nitro-renderer'; import { FC, useCallback, useEffect, useState } from 'react'; -import { GetAvatarRenderManager } from '../../api'; +import { GetAvatarRenderManager } from '../../../api'; import { AvatarImageViewProps } from './AvatarImageView.types'; export const AvatarImageView: FC = props => diff --git a/src/views/avatar-image/AvatarImageView.types.ts b/src/views/shared/avatar-image/AvatarImageView.types.ts similarity index 100% rename from src/views/avatar-image/AvatarImageView.types.ts rename to src/views/shared/avatar-image/AvatarImageView.types.ts diff --git a/src/views/badge-image/BadgeImage.scss b/src/views/shared/badge-image/BadgeImage.scss similarity index 100% rename from src/views/badge-image/BadgeImage.scss rename to src/views/shared/badge-image/BadgeImage.scss diff --git a/src/views/badge-image/BadgeImageView.tsx b/src/views/shared/badge-image/BadgeImageView.tsx similarity index 91% rename from src/views/badge-image/BadgeImageView.tsx rename to src/views/shared/badge-image/BadgeImageView.tsx index 37352b99..bf2d5e71 100644 --- a/src/views/badge-image/BadgeImageView.tsx +++ b/src/views/shared/badge-image/BadgeImageView.tsx @@ -1,5 +1,5 @@ import { FC } from 'react'; -import { GetConfiguration } from '../../utils/GetConfiguration'; +import { GetConfiguration } from '../../../utils/GetConfiguration'; import { BadgeImageViewProps } from './BadgeImageView.types'; export const BadgeImageView: FC = props => diff --git a/src/views/badge-image/BadgeImageView.types.ts b/src/views/shared/badge-image/BadgeImageView.types.ts similarity index 100% rename from src/views/badge-image/BadgeImageView.types.ts rename to src/views/shared/badge-image/BadgeImageView.types.ts diff --git a/src/views/currency-icon/CurrencyIcon.scss b/src/views/shared/currency-icon/CurrencyIcon.scss similarity index 100% rename from src/views/currency-icon/CurrencyIcon.scss rename to src/views/shared/currency-icon/CurrencyIcon.scss diff --git a/src/views/currency-icon/CurrencyIcon.tsx b/src/views/shared/currency-icon/CurrencyIcon.tsx similarity index 86% rename from src/views/currency-icon/CurrencyIcon.tsx rename to src/views/shared/currency-icon/CurrencyIcon.tsx index 14f78e76..b2624104 100644 --- a/src/views/currency-icon/CurrencyIcon.tsx +++ b/src/views/shared/currency-icon/CurrencyIcon.tsx @@ -1,5 +1,5 @@ import { FC } from 'react'; -import { GetConfiguration } from '../../utils/GetConfiguration'; +import { GetConfiguration } from '../../../utils/GetConfiguration'; import { CurrencyIconProps } from './CurrencyIcon.types'; export const CurrencyIcon: FC = props => diff --git a/src/views/currency-icon/CurrencyIcon.types.ts b/src/views/shared/currency-icon/CurrencyIcon.types.ts similarity index 100% rename from src/views/currency-icon/CurrencyIcon.types.ts rename to src/views/shared/currency-icon/CurrencyIcon.types.ts diff --git a/src/views/furni-image/FurniImageView.scss b/src/views/shared/furni-image/FurniImageView.scss similarity index 100% rename from src/views/furni-image/FurniImageView.scss rename to src/views/shared/furni-image/FurniImageView.scss diff --git a/src/views/furni-image/FurniImageView.tsx b/src/views/shared/furni-image/FurniImageView.tsx similarity index 94% rename from src/views/furni-image/FurniImageView.tsx rename to src/views/shared/furni-image/FurniImageView.tsx index e4c9bdd6..706c5da4 100644 --- a/src/views/furni-image/FurniImageView.tsx +++ b/src/views/shared/furni-image/FurniImageView.tsx @@ -1,8 +1,8 @@ import { IGetImageListener, ImageResult, TextureUtils, Vector3d } from 'nitro-renderer'; import { RenderTexture } from 'pixi.js'; import { FC, useCallback, useEffect, useState } from 'react'; -import { GetRoomEngine } from '../../api'; -import { ProductTypeEnum } from '../catalog/enums/ProductTypeEnum'; +import { GetRoomEngine } from '../../../api'; +import { ProductTypeEnum } from '../../catalog/enums/ProductTypeEnum'; import { FurniImageViewProps } from './FurniImageView.types'; export const FurniImageView: FC = props => diff --git a/src/views/furni-image/FurniImageView.types.ts b/src/views/shared/furni-image/FurniImageView.types.ts similarity index 100% rename from src/views/furni-image/FurniImageView.types.ts rename to src/views/shared/furni-image/FurniImageView.types.ts diff --git a/src/views/limited-edition/LimitedEdition.scss b/src/views/shared/limited-edition/LimitedEdition.scss similarity index 59% rename from src/views/limited-edition/LimitedEdition.scss rename to src/views/shared/limited-edition/LimitedEdition.scss index c3095bbb..c0cfadab 100644 --- a/src/views/limited-edition/LimitedEdition.scss +++ b/src/views/shared/limited-edition/LimitedEdition.scss @@ -1,16 +1,16 @@ .unique-item { - background: url("../../assets/images/unique/grid-bg.png") center no-repeat, rgba(0, 0, 0, 0.1); + background: url("../../../assets/images/unique/grid-bg.png") center no-repeat, rgba(0, 0, 0, 0.1); &:before { position: absolute; content: ' '; width: 100%; height: 100%; - background: url("../../assets/images/unique/grid-bg-glass.png") center no-repeat; + background: url("../../../assets/images/unique/grid-bg-glass.png") center no-repeat; } &.sold-out:before { - background: url("../../assets/images/unique/grid-bg-sold-out.png") center no-repeat, url("../../assets/images/unique/grid-bg-glass.png") center no-repeat; + background: url("../../../assets/images/unique/grid-bg-sold-out.png") center no-repeat, url("../../../assets/images/unique/grid-bg-glass.png") center no-repeat; } .unique-item-counter { @@ -21,14 +21,14 @@ bottom: 1px; width: 100%; height: 9px; - background: url("../../assets/images/unique/grid-count-bg.png") center no-repeat; + background: url("../../../assets/images/unique/grid-count-bg.png") center no-repeat; } } .unique-sold-out-blocker { width: 364px; height: 30px; - background: url("../../assets/images/unique/catalog-info-sold-out.png"); + background: url("../../../assets/images/unique/catalog-info-sold-out.png"); div { float: right; diff --git a/src/views/limited-edition/compact-plate/LimitedEditionCompactPlateView.scss b/src/views/shared/limited-edition/compact-plate/LimitedEditionCompactPlateView.scss similarity index 78% rename from src/views/limited-edition/compact-plate/LimitedEditionCompactPlateView.scss rename to src/views/shared/limited-edition/compact-plate/LimitedEditionCompactPlateView.scss index f4190dc7..f9e5f792 100644 --- a/src/views/limited-edition/compact-plate/LimitedEditionCompactPlateView.scss +++ b/src/views/shared/limited-edition/compact-plate/LimitedEditionCompactPlateView.scss @@ -6,7 +6,7 @@ right: 16px; width: 34px; height: 37px; - background: url("../../../assets/images/unique/inventory-info-amount-bg.png"); + background: url("../../../../assets/images/unique/inventory-info-amount-bg.png"); div { display: flex; diff --git a/src/views/limited-edition/compact-plate/LimitedEditionCompactPlateView.tsx b/src/views/shared/limited-edition/compact-plate/LimitedEditionCompactPlateView.tsx similarity index 100% rename from src/views/limited-edition/compact-plate/LimitedEditionCompactPlateView.tsx rename to src/views/shared/limited-edition/compact-plate/LimitedEditionCompactPlateView.tsx diff --git a/src/views/limited-edition/compact-plate/LimitedEditionCompactPlateView.types.ts b/src/views/shared/limited-edition/compact-plate/LimitedEditionCompactPlateView.types.ts similarity index 100% rename from src/views/limited-edition/compact-plate/LimitedEditionCompactPlateView.types.ts rename to src/views/shared/limited-edition/compact-plate/LimitedEditionCompactPlateView.types.ts diff --git a/src/views/limited-edition/complete-plate/LimitedEditionCompletePlateView.scss b/src/views/shared/limited-edition/complete-plate/LimitedEditionCompletePlateView.scss similarity index 79% rename from src/views/limited-edition/complete-plate/LimitedEditionCompletePlateView.scss rename to src/views/shared/limited-edition/complete-plate/LimitedEditionCompletePlateView.scss index f77718a5..ba46a182 100644 --- a/src/views/limited-edition/complete-plate/LimitedEditionCompletePlateView.scss +++ b/src/views/shared/limited-edition/complete-plate/LimitedEditionCompletePlateView.scss @@ -3,7 +3,7 @@ left: 10px; width: 170px; height: 29px; - background: url("../../../assets/images/unique/catalog-info-amount-bg.png"); + background: url("../../../../assets/images/unique/catalog-info-amount-bg.png"); div { position: relative; diff --git a/src/views/limited-edition/complete-plate/LimitedEditionCompletePlateView.tsx b/src/views/shared/limited-edition/complete-plate/LimitedEditionCompletePlateView.tsx similarity index 93% rename from src/views/limited-edition/complete-plate/LimitedEditionCompletePlateView.tsx rename to src/views/shared/limited-edition/complete-plate/LimitedEditionCompletePlateView.tsx index bd1049f6..cfc1d0c7 100644 --- a/src/views/limited-edition/complete-plate/LimitedEditionCompletePlateView.tsx +++ b/src/views/shared/limited-edition/complete-plate/LimitedEditionCompletePlateView.tsx @@ -1,5 +1,5 @@ import { FC } from 'react'; -import { LocalizeText } from '../../../utils/LocalizeText'; +import { LocalizeText } from '../../../../utils/LocalizeText'; import { LimitedEditionStyledNumberView } from '../styled-number/LimitedEditionStyledNumberView'; import { LimitedEditionCompletePlateViewProps } from './LimitedEditionCompletePlateView.types'; diff --git a/src/views/limited-edition/complete-plate/LimitedEditionCompletePlateView.types.ts b/src/views/shared/limited-edition/complete-plate/LimitedEditionCompletePlateView.types.ts similarity index 100% rename from src/views/limited-edition/complete-plate/LimitedEditionCompletePlateView.types.ts rename to src/views/shared/limited-edition/complete-plate/LimitedEditionCompletePlateView.types.ts diff --git a/src/views/limited-edition/styled-number/LimitedEditionStyledNumberView.scss b/src/views/shared/limited-edition/styled-number/LimitedEditionStyledNumberView.scss similarity index 92% rename from src/views/limited-edition/styled-number/LimitedEditionStyledNumberView.scss rename to src/views/shared/limited-edition/styled-number/LimitedEditionStyledNumberView.scss index 9d2a8414..a5e36263 100644 --- a/src/views/limited-edition/styled-number/LimitedEditionStyledNumberView.scss +++ b/src/views/shared/limited-edition/styled-number/LimitedEditionStyledNumberView.scss @@ -3,7 +3,7 @@ outline: 0; height: 5px; margin-right: 1px; - background-image: url('../../../assets/images/unique/numbers.png'); + background-image: url('../../../../assets/images/unique/numbers.png'); background-repeat: no-repeat; &:last-child { diff --git a/src/views/limited-edition/styled-number/LimitedEditionStyledNumberView.tsx b/src/views/shared/limited-edition/styled-number/LimitedEditionStyledNumberView.tsx similarity index 100% rename from src/views/limited-edition/styled-number/LimitedEditionStyledNumberView.tsx rename to src/views/shared/limited-edition/styled-number/LimitedEditionStyledNumberView.tsx diff --git a/src/views/limited-edition/styled-number/LimitedEditionStyledNumberView.types.ts b/src/views/shared/limited-edition/styled-number/LimitedEditionStyledNumberView.types.ts similarity index 100% rename from src/views/limited-edition/styled-number/LimitedEditionStyledNumberView.types.ts rename to src/views/shared/limited-edition/styled-number/LimitedEditionStyledNumberView.types.ts diff --git a/src/views/pet-image/PetImage.scss b/src/views/shared/pet-image/PetImage.scss similarity index 100% rename from src/views/pet-image/PetImage.scss rename to src/views/shared/pet-image/PetImage.scss diff --git a/src/views/pet-image/PetImageView.tsx b/src/views/shared/pet-image/PetImageView.tsx similarity index 97% rename from src/views/pet-image/PetImageView.tsx rename to src/views/shared/pet-image/PetImageView.tsx index 948a1b8e..4f3f61bd 100644 --- a/src/views/pet-image/PetImageView.tsx +++ b/src/views/shared/pet-image/PetImageView.tsx @@ -1,6 +1,6 @@ import { PetFigureData, TextureUtils, Vector3d } from 'nitro-renderer'; import { FC, useCallback, useEffect, useState } from 'react'; -import { GetRoomEngine } from '../../api'; +import { GetRoomEngine } from '../../../api'; import { PetImageViewProps } from './PetImageView.types'; export const PetImageView: FC = props => diff --git a/src/views/pet-image/PetImageView.types.ts b/src/views/shared/pet-image/PetImageView.types.ts similarity index 100% rename from src/views/pet-image/PetImageView.types.ts rename to src/views/shared/pet-image/PetImageView.types.ts diff --git a/src/views/toolbar/ToolbarView.tsx b/src/views/toolbar/ToolbarView.tsx index 4b643ad0..2c742baf 100644 --- a/src/views/toolbar/ToolbarView.tsx +++ b/src/views/toolbar/ToolbarView.tsx @@ -6,7 +6,7 @@ import { dispatchUiEvent } from '../../hooks/events/ui/ui-event'; import { CreateMessageHook } from '../../hooks/messages/message-event'; import { TransitionAnimation } from '../../layout/transitions/TransitionAnimation'; import { TransitionAnimationTypes } from '../../layout/transitions/TransitionAnimation.types'; -import { AvatarImageView } from '../avatar-image/AvatarImageView'; +import { AvatarImageView } from '../shared/avatar-image/AvatarImageView'; import { ToolbarMeView } from './me/ToolbarMeView'; import { ToolbarViewItems, ToolbarViewProps } from './ToolbarView.types';