diff --git a/src/components/index.scss b/src/components/index.scss index ac4f6da3..3fe69a2c 100644 --- a/src/components/index.scss +++ b/src/components/index.scss @@ -8,5 +8,6 @@ @import './mod-tools/ModToolsView'; @import './navigator/NavigatorView'; @import './toolbar/ToolbarView'; +@import './user-profile/UserProfileVew'; @import './user-settings/UserSettingsView'; @import './wired/WiredView'; diff --git a/src/views/user-profile/UserProfileVew.scss b/src/components/user-profile/UserProfileVew.scss similarity index 100% rename from src/views/user-profile/UserProfileVew.scss rename to src/components/user-profile/UserProfileVew.scss diff --git a/src/views/user-profile/UserProfileView.tsx b/src/components/user-profile/UserProfileView.tsx similarity index 100% rename from src/views/user-profile/UserProfileView.tsx rename to src/components/user-profile/UserProfileView.tsx diff --git a/src/views/user-profile/views/badges-container/BadgesContainerView.tsx b/src/components/user-profile/views/badges-container/BadgesContainerView.tsx similarity index 90% rename from src/views/user-profile/views/badges-container/BadgesContainerView.tsx rename to src/components/user-profile/views/badges-container/BadgesContainerView.tsx index 982058f8..6c950af6 100644 --- a/src/views/user-profile/views/badges-container/BadgesContainerView.tsx +++ b/src/components/user-profile/views/badges-container/BadgesContainerView.tsx @@ -1,6 +1,6 @@ import { FC } from 'react'; import { NitroCardGridItemView, NitroCardGridView } from '../../../../layout'; -import { BadgeImageView } from '../../../shared/badge-image/BadgeImageView'; +import { BadgeImageView } from '../../../../views/shared/badge-image/BadgeImageView'; import { BadgesContainerViewProps } from './BadgesContainerView.types'; export const BadgesContainerView: FC = props => diff --git a/src/views/user-profile/views/badges-container/BadgesContainerView.types.ts b/src/components/user-profile/views/badges-container/BadgesContainerView.types.ts similarity index 100% rename from src/views/user-profile/views/badges-container/BadgesContainerView.types.ts rename to src/components/user-profile/views/badges-container/BadgesContainerView.types.ts diff --git a/src/views/user-profile/views/friends-container/FriendsContainerView.tsx b/src/components/user-profile/views/friends-container/FriendsContainerView.tsx similarity index 100% rename from src/views/user-profile/views/friends-container/FriendsContainerView.tsx rename to src/components/user-profile/views/friends-container/FriendsContainerView.tsx diff --git a/src/views/user-profile/views/friends-container/FriendsContainerView.types.ts b/src/components/user-profile/views/friends-container/FriendsContainerView.types.ts similarity index 100% rename from src/views/user-profile/views/friends-container/FriendsContainerView.types.ts rename to src/components/user-profile/views/friends-container/FriendsContainerView.types.ts diff --git a/src/views/user-profile/views/groups-container/GroupsContainerView.scss b/src/components/user-profile/views/groups-container/GroupsContainerView.scss similarity index 100% rename from src/views/user-profile/views/groups-container/GroupsContainerView.scss rename to src/components/user-profile/views/groups-container/GroupsContainerView.scss diff --git a/src/views/user-profile/views/groups-container/GroupsContainerView.tsx b/src/components/user-profile/views/groups-container/GroupsContainerView.tsx similarity index 93% rename from src/views/user-profile/views/groups-container/GroupsContainerView.tsx rename to src/components/user-profile/views/groups-container/GroupsContainerView.tsx index d5afa3c9..6c11d09b 100644 --- a/src/views/user-profile/views/groups-container/GroupsContainerView.tsx +++ b/src/components/user-profile/views/groups-container/GroupsContainerView.tsx @@ -1,9 +1,9 @@ import { GroupFavoriteComposer, GroupInformationComposer, GroupInformationEvent, GroupInformationParser } from '@nitrots/nitro-renderer'; import classNames from 'classnames'; import { FC, useCallback, useEffect, useState } from 'react'; -import { GroupInformationView } from '../../../../components/groups/views/information/GroupInformationView'; import { CreateMessageHook, SendMessageHook } from '../../../../hooks'; -import { BadgeImageView } from '../../../shared/badge-image/BadgeImageView'; +import { BadgeImageView } from '../../../../views/shared/badge-image/BadgeImageView'; +import { GroupInformationView } from '../../../groups/views/information/GroupInformationView'; import { GroupsContainerViewProps } from './GroupsContainerView.types'; export const GroupsContainerView: FC = props => diff --git a/src/views/user-profile/views/groups-container/GroupsContainerView.types.ts b/src/components/user-profile/views/groups-container/GroupsContainerView.types.ts similarity index 100% rename from src/views/user-profile/views/groups-container/GroupsContainerView.types.ts rename to src/components/user-profile/views/groups-container/GroupsContainerView.types.ts diff --git a/src/views/user-profile/views/relationships-container/RelationshipsContainerView.scss b/src/components/user-profile/views/relationships-container/RelationshipsContainerView.scss similarity index 100% rename from src/views/user-profile/views/relationships-container/RelationshipsContainerView.scss rename to src/components/user-profile/views/relationships-container/RelationshipsContainerView.scss diff --git a/src/views/user-profile/views/relationships-container/RelationshipsContainerView.tsx b/src/components/user-profile/views/relationships-container/RelationshipsContainerView.tsx similarity index 97% rename from src/views/user-profile/views/relationships-container/RelationshipsContainerView.tsx rename to src/components/user-profile/views/relationships-container/RelationshipsContainerView.tsx index 4f1745cb..ec3c9e65 100644 --- a/src/views/user-profile/views/relationships-container/RelationshipsContainerView.tsx +++ b/src/components/user-profile/views/relationships-container/RelationshipsContainerView.tsx @@ -1,7 +1,7 @@ import { RelationshipStatusEnum, RelationshipStatusInfo } from '@nitrots/nitro-renderer'; import { FC, useCallback } from 'react'; import { GetUserProfile, LocalizeText } from '../../../../api'; -import { AvatarImageView } from '../../../shared/avatar-image/AvatarImageView'; +import { AvatarImageView } from '../../../../views/shared/avatar-image/AvatarImageView'; import { RelationshipsContainerViewProps } from './RelationshipsContainerView.types'; export const RelationshipsContainerView: FC = props => diff --git a/src/views/user-profile/views/relationships-container/RelationshipsContainerView.types.ts b/src/components/user-profile/views/relationships-container/RelationshipsContainerView.types.ts similarity index 100% rename from src/views/user-profile/views/relationships-container/RelationshipsContainerView.types.ts rename to src/components/user-profile/views/relationships-container/RelationshipsContainerView.types.ts diff --git a/src/views/user-profile/views/user-container/UserContainerView.tsx b/src/components/user-profile/views/user-container/UserContainerView.tsx similarity index 96% rename from src/views/user-profile/views/user-container/UserContainerView.tsx rename to src/components/user-profile/views/user-container/UserContainerView.tsx index cd48bb4c..f2714614 100644 --- a/src/views/user-profile/views/user-container/UserContainerView.tsx +++ b/src/components/user-profile/views/user-container/UserContainerView.tsx @@ -1,7 +1,7 @@ import { FriendlyTime } from '@nitrots/nitro-renderer'; import { FC, useCallback } from 'react'; import { GetSessionDataManager, LocalizeText } from '../../../../api'; -import { AvatarImageView } from '../../../shared/avatar-image/AvatarImageView'; +import { AvatarImageView } from '../../../../views/shared/avatar-image/AvatarImageView'; import { UserContainerViewProps } from './UserContainerView.types'; export const UserContainerView: FC = props => diff --git a/src/views/user-profile/views/user-container/UserContainerView.types.ts b/src/components/user-profile/views/user-container/UserContainerView.types.ts similarity index 100% rename from src/views/user-profile/views/user-container/UserContainerView.types.ts rename to src/components/user-profile/views/user-container/UserContainerView.types.ts diff --git a/src/views/Styles.scss b/src/views/Styles.scss index 1e013979..da73febb 100644 --- a/src/views/Styles.scss +++ b/src/views/Styles.scss @@ -8,7 +8,6 @@ @import "./right-side/RightSideView"; @import "./room/RoomView"; @import "./room-host/RoomHostView"; -@import "./user-profile/UserProfileVew"; @import "./chat-history/ChatHistoryView"; @import "./floorplan-editor/FloorplanEditorView"; @import "./nitropedia/NitropediaView"; diff --git a/src/views/main/MainView.tsx b/src/views/main/MainView.tsx index 1d978574..dff40edb 100644 --- a/src/views/main/MainView.tsx +++ b/src/views/main/MainView.tsx @@ -11,6 +11,7 @@ import { InventoryView } from '../../components/inventory/InventoryView'; import { ModToolsView } from '../../components/mod-tools/ModToolsView'; import { NavigatorView } from '../../components/navigator/NavigatorView'; import { ToolbarView } from '../../components/toolbar/ToolbarView'; +import { UserProfileView } from '../../components/user-profile/UserProfileView'; import { UserSettingsView } from '../../components/user-settings/UserSettingsView'; import { WiredView } from '../../components/wired/WiredView'; import { useRoomSessionManagerEvent } from '../../hooks/events/nitro/session/room-session-manager-event'; @@ -24,7 +25,6 @@ import { HotelView } from '../hotel-view/HotelView'; import { NitropediaView } from '../nitropedia/NitropediaView'; import { RightSideView } from '../right-side/RightSideView'; import { RoomHostView } from '../room-host/RoomHostView'; -import { UserProfileView } from '../user-profile/UserProfileView'; import { MainViewProps } from './MainView.types'; export const MainView: FC = props => diff --git a/src/views/room/widgets/infostand/views/user/InfoStandWidgetUserView.tsx b/src/views/room/widgets/infostand/views/user/InfoStandWidgetUserView.tsx index 2a3d5320..8012bbc2 100644 --- a/src/views/room/widgets/infostand/views/user/InfoStandWidgetUserView.tsx +++ b/src/views/room/widgets/infostand/views/user/InfoStandWidgetUserView.tsx @@ -5,12 +5,12 @@ import { FC, FocusEvent, KeyboardEvent, useCallback, useEffect, useState } from import { GetGroupInformation, LocalizeText, RoomWidgetChangeMottoMessage, RoomWidgetUpdateInfostandUserEvent } from '../../../../../../api'; import { Base } from '../../../../../../common/Base'; import { Flex } from '../../../../../../common/Flex'; +import { RelationshipsContainerView } from '../../../../../../components/user-profile/views/relationships-container/RelationshipsContainerView'; import { CreateMessageHook, SendMessageHook } from '../../../../../../hooks'; import { CreateEventDispatcherHook } from '../../../../../../hooks/events'; import { UserProfileIconView } from '../../../../../../layout'; import { AvatarImageView } from '../../../../../shared/avatar-image/AvatarImageView'; import { BadgeImageView } from '../../../../../shared/badge-image/BadgeImageView'; -import { RelationshipsContainerView } from '../../../../../user-profile/views/relationships-container/RelationshipsContainerView'; import { useRoomContext } from '../../../../context/RoomContext'; import { InfoStandWidgetUserViewProps } from './InfoStandWidgetUserView.types';