diff --git a/src/views/groups/GroupView.scss b/src/components/groups/GroupView.scss similarity index 100% rename from src/views/groups/GroupView.scss rename to src/components/groups/GroupView.scss diff --git a/src/views/groups/GroupsMessageHandler.tsx b/src/components/groups/GroupsMessageHandler.tsx similarity index 100% rename from src/views/groups/GroupsMessageHandler.tsx rename to src/components/groups/GroupsMessageHandler.tsx diff --git a/src/views/groups/GroupsView.tsx b/src/components/groups/GroupsView.tsx similarity index 100% rename from src/views/groups/GroupsView.tsx rename to src/components/groups/GroupsView.tsx diff --git a/src/views/groups/common/GroupBadgePart.ts b/src/components/groups/common/GroupBadgePart.ts similarity index 100% rename from src/views/groups/common/GroupBadgePart.ts rename to src/components/groups/common/GroupBadgePart.ts diff --git a/src/views/groups/common/GroupMembershipType.ts b/src/components/groups/common/GroupMembershipType.ts similarity index 100% rename from src/views/groups/common/GroupMembershipType.ts rename to src/components/groups/common/GroupMembershipType.ts diff --git a/src/views/groups/common/GroupType.ts b/src/components/groups/common/GroupType.ts similarity index 100% rename from src/views/groups/common/GroupType.ts rename to src/components/groups/common/GroupType.ts diff --git a/src/views/groups/context/GroupsContext.tsx b/src/components/groups/context/GroupsContext.tsx similarity index 100% rename from src/views/groups/context/GroupsContext.tsx rename to src/components/groups/context/GroupsContext.tsx diff --git a/src/views/groups/context/GroupsContext.types.ts b/src/components/groups/context/GroupsContext.types.ts similarity index 98% rename from src/views/groups/context/GroupsContext.types.ts rename to src/components/groups/context/GroupsContext.types.ts index ac4fa922..ce95e62a 100644 --- a/src/views/groups/context/GroupsContext.types.ts +++ b/src/components/groups/context/GroupsContext.types.ts @@ -1,5 +1,5 @@ import { Dispatch, ProviderProps, Reducer } from 'react'; -import { GroupBadgePart } from './../common/GroupBadgePart'; +import { GroupBadgePart } from '../common/GroupBadgePart'; export interface IGroupsContext { diff --git a/src/views/groups/views/creator/GroupCreatorView.scss b/src/components/groups/views/creator/GroupCreatorView.scss similarity index 100% rename from src/views/groups/views/creator/GroupCreatorView.scss rename to src/components/groups/views/creator/GroupCreatorView.scss diff --git a/src/views/groups/views/creator/GroupCreatorView.tsx b/src/components/groups/views/creator/GroupCreatorView.tsx similarity index 100% rename from src/views/groups/views/creator/GroupCreatorView.tsx rename to src/components/groups/views/creator/GroupCreatorView.tsx diff --git a/src/views/groups/views/creator/GroupCreatorView.types.ts b/src/components/groups/views/creator/GroupCreatorView.types.ts similarity index 100% rename from src/views/groups/views/creator/GroupCreatorView.types.ts rename to src/components/groups/views/creator/GroupCreatorView.types.ts diff --git a/src/views/groups/views/creator/tab-confirmation/GroupCreatorTabConfirmationView.tsx b/src/components/groups/views/creator/tab-confirmation/GroupCreatorTabConfirmationView.tsx similarity index 96% rename from src/views/groups/views/creator/tab-confirmation/GroupCreatorTabConfirmationView.tsx rename to src/components/groups/views/creator/tab-confirmation/GroupCreatorTabConfirmationView.tsx index d0ef989f..351384e5 100644 --- a/src/views/groups/views/creator/tab-confirmation/GroupCreatorTabConfirmationView.tsx +++ b/src/components/groups/views/creator/tab-confirmation/GroupCreatorTabConfirmationView.tsx @@ -1,6 +1,6 @@ import { FC, useCallback } from 'react'; import { LocalizeText } from '../../../../../api'; -import { BadgeImageView } from '../../../../shared/badge-image/BadgeImageView'; +import { BadgeImageView } from '../../../../../views/shared/badge-image/BadgeImageView'; import { useGroupsContext } from '../../../context/GroupsContext'; export const GroupCreatorTabConfirmationView: FC<{}> = props => diff --git a/src/views/groups/views/information-standalone/GroupInformationStandaloneView.scss b/src/components/groups/views/information-standalone/GroupInformationStandaloneView.scss similarity index 100% rename from src/views/groups/views/information-standalone/GroupInformationStandaloneView.scss rename to src/components/groups/views/information-standalone/GroupInformationStandaloneView.scss diff --git a/src/views/groups/views/information-standalone/GroupInformationStandaloneView.tsx b/src/components/groups/views/information-standalone/GroupInformationStandaloneView.tsx similarity index 100% rename from src/views/groups/views/information-standalone/GroupInformationStandaloneView.tsx rename to src/components/groups/views/information-standalone/GroupInformationStandaloneView.tsx diff --git a/src/views/groups/views/information/GroupInformationView.scss b/src/components/groups/views/information/GroupInformationView.scss similarity index 100% rename from src/views/groups/views/information/GroupInformationView.scss rename to src/components/groups/views/information/GroupInformationView.scss diff --git a/src/views/groups/views/information/GroupInformationView.tsx b/src/components/groups/views/information/GroupInformationView.tsx similarity index 97% rename from src/views/groups/views/information/GroupInformationView.tsx rename to src/components/groups/views/information/GroupInformationView.tsx index 7f149698..58376380 100644 --- a/src/views/groups/views/information/GroupInformationView.tsx +++ b/src/components/groups/views/information/GroupInformationView.tsx @@ -4,9 +4,9 @@ import { CreateLinkEvent, GetSessionDataManager, LocalizeText, TryVisitRoom } fr import { GetGroupManager } from '../../../../api/groups/GetGroupManager'; import { GetGroupMembers } from '../../../../api/groups/GetGroupMembers'; import { TryJoinGroup } from '../../../../api/groups/TryJoinGroup'; -import { CatalogPageName } from '../../../../components/catalog/common/CatalogPageName'; import { SendMessageHook } from '../../../../hooks'; -import { BadgeImageView } from '../../../shared/badge-image/BadgeImageView'; +import { BadgeImageView } from '../../../../views/shared/badge-image/BadgeImageView'; +import { CatalogPageName } from '../../../catalog/common/CatalogPageName'; import { GroupMembershipType } from '../../common/GroupMembershipType'; import { GroupType } from '../../common/GroupType'; import { GroupInformationViewProps } from './GroupInformationView.types'; diff --git a/src/views/groups/views/information/GroupInformationView.types.ts b/src/components/groups/views/information/GroupInformationView.types.ts similarity index 100% rename from src/views/groups/views/information/GroupInformationView.types.ts rename to src/components/groups/views/information/GroupInformationView.types.ts diff --git a/src/views/groups/views/manager/GroupManagerView.scss b/src/components/groups/views/manager/GroupManagerView.scss similarity index 100% rename from src/views/groups/views/manager/GroupManagerView.scss rename to src/components/groups/views/manager/GroupManagerView.scss diff --git a/src/views/groups/views/manager/GroupManagerView.tsx b/src/components/groups/views/manager/GroupManagerView.tsx similarity index 100% rename from src/views/groups/views/manager/GroupManagerView.tsx rename to src/components/groups/views/manager/GroupManagerView.tsx diff --git a/src/views/groups/views/manager/tab-settings/GroupManagerTabSettingsView.tsx b/src/components/groups/views/manager/tab-settings/GroupManagerTabSettingsView.tsx similarity index 100% rename from src/views/groups/views/manager/tab-settings/GroupManagerTabSettingsView.tsx rename to src/components/groups/views/manager/tab-settings/GroupManagerTabSettingsView.tsx diff --git a/src/views/groups/views/members/GroupMembersView.scss b/src/components/groups/views/members/GroupMembersView.scss similarity index 100% rename from src/views/groups/views/members/GroupMembersView.scss rename to src/components/groups/views/members/GroupMembersView.scss diff --git a/src/views/groups/views/members/GroupMembersView.tsx b/src/components/groups/views/members/GroupMembersView.tsx similarity index 98% rename from src/views/groups/views/members/GroupMembersView.tsx rename to src/components/groups/views/members/GroupMembersView.tsx index 0ab607e9..342e7869 100644 --- a/src/views/groups/views/members/GroupMembersView.tsx +++ b/src/components/groups/views/members/GroupMembersView.tsx @@ -4,8 +4,8 @@ import { FC, KeyboardEvent, useCallback, useEffect, useState } from 'react'; import { GetSessionDataManager, GetUserProfile, LocalizeText } from '../../../../api'; import { CreateMessageHook, SendMessageHook } from '../../../../hooks'; import { NitroCardContentView, NitroCardHeaderView, NitroCardView } from '../../../../layout'; -import { AvatarImageView } from '../../../shared/avatar-image/AvatarImageView'; -import { BadgeImageView } from '../../../shared/badge-image/BadgeImageView'; +import { AvatarImageView } from '../../../../views/shared/avatar-image/AvatarImageView'; +import { BadgeImageView } from '../../../../views/shared/badge-image/BadgeImageView'; import { GroupMembersViewProps } from './GroupMembersView.types'; export const GroupMembersView: FC = props => diff --git a/src/views/groups/views/members/GroupMembersView.types.ts b/src/components/groups/views/members/GroupMembersView.types.ts similarity index 100% rename from src/views/groups/views/members/GroupMembersView.types.ts rename to src/components/groups/views/members/GroupMembersView.types.ts diff --git a/src/views/groups/views/room-information/GroupRoomInformationView.scss b/src/components/groups/views/room-information/GroupRoomInformationView.scss similarity index 100% rename from src/views/groups/views/room-information/GroupRoomInformationView.scss rename to src/components/groups/views/room-information/GroupRoomInformationView.scss diff --git a/src/views/groups/views/room-information/GroupRoomInformationView.tsx b/src/components/groups/views/room-information/GroupRoomInformationView.tsx similarity index 98% rename from src/views/groups/views/room-information/GroupRoomInformationView.tsx rename to src/components/groups/views/room-information/GroupRoomInformationView.tsx index edbf18b4..7763528e 100644 --- a/src/views/groups/views/room-information/GroupRoomInformationView.tsx +++ b/src/components/groups/views/room-information/GroupRoomInformationView.tsx @@ -3,7 +3,7 @@ import { FC, useCallback, useState } from 'react'; import { GetGroupInformation, GetSessionDataManager, LocalizeText } from '../../../../api'; import { GetGroupManager } from '../../../../api/groups/GetGroupManager'; import { CreateMessageHook, SendMessageHook } from '../../../../hooks'; -import { BadgeImageView } from '../../../shared/badge-image/BadgeImageView'; +import { BadgeImageView } from '../../../../views/shared/badge-image/BadgeImageView'; import { GroupMembershipType } from '../../common/GroupMembershipType'; import { GroupType } from '../../common/GroupType'; diff --git a/src/views/groups/views/shared-tabs/GroupSharedTabs.scss b/src/components/groups/views/shared-tabs/GroupSharedTabs.scss similarity index 100% rename from src/views/groups/views/shared-tabs/GroupSharedTabs.scss rename to src/components/groups/views/shared-tabs/GroupSharedTabs.scss diff --git a/src/views/groups/views/shared-tabs/tab-badge/GroupSharedTabBadgeView.scss b/src/components/groups/views/shared-tabs/tab-badge/GroupSharedTabBadgeView.scss similarity index 100% rename from src/views/groups/views/shared-tabs/tab-badge/GroupSharedTabBadgeView.scss rename to src/components/groups/views/shared-tabs/tab-badge/GroupSharedTabBadgeView.scss diff --git a/src/views/groups/views/shared-tabs/tab-badge/GroupSharedTabBadgeView.tsx b/src/components/groups/views/shared-tabs/tab-badge/GroupSharedTabBadgeView.tsx similarity index 98% rename from src/views/groups/views/shared-tabs/tab-badge/GroupSharedTabBadgeView.tsx rename to src/components/groups/views/shared-tabs/tab-badge/GroupSharedTabBadgeView.tsx index a29666fe..cca52530 100644 --- a/src/views/groups/views/shared-tabs/tab-badge/GroupSharedTabBadgeView.tsx +++ b/src/components/groups/views/shared-tabs/tab-badge/GroupSharedTabBadgeView.tsx @@ -1,6 +1,6 @@ import classNames from 'classnames'; import { FC, useCallback, useEffect, useState } from 'react'; -import { BadgeImageView } from '../../../../shared/badge-image/BadgeImageView'; +import { BadgeImageView } from '../../../../../views/shared/badge-image/BadgeImageView'; import { GroupBadgePart } from '../../../common/GroupBadgePart'; import { useGroupsContext } from '../../../context/GroupsContext'; import { GroupsActions } from '../../../context/GroupsContext.types'; diff --git a/src/views/groups/views/shared-tabs/tab-badge/GroupSharedTabBadgeView.types.ts b/src/components/groups/views/shared-tabs/tab-badge/GroupSharedTabBadgeView.types.ts similarity index 100% rename from src/views/groups/views/shared-tabs/tab-badge/GroupSharedTabBadgeView.types.ts rename to src/components/groups/views/shared-tabs/tab-badge/GroupSharedTabBadgeView.types.ts diff --git a/src/views/groups/views/shared-tabs/tab-colors/GroupSharedTabColorsView.scss b/src/components/groups/views/shared-tabs/tab-colors/GroupSharedTabColorsView.scss similarity index 100% rename from src/views/groups/views/shared-tabs/tab-colors/GroupSharedTabColorsView.scss rename to src/components/groups/views/shared-tabs/tab-colors/GroupSharedTabColorsView.scss diff --git a/src/views/groups/views/shared-tabs/tab-colors/GroupSharedTabColorsView.tsx b/src/components/groups/views/shared-tabs/tab-colors/GroupSharedTabColorsView.tsx similarity index 100% rename from src/views/groups/views/shared-tabs/tab-colors/GroupSharedTabColorsView.tsx rename to src/components/groups/views/shared-tabs/tab-colors/GroupSharedTabColorsView.tsx diff --git a/src/views/groups/views/shared-tabs/tab-identity/GroupSharedTabIdentityView.tsx b/src/components/groups/views/shared-tabs/tab-identity/GroupSharedTabIdentityView.tsx similarity index 100% rename from src/views/groups/views/shared-tabs/tab-identity/GroupSharedTabIdentityView.tsx rename to src/components/groups/views/shared-tabs/tab-identity/GroupSharedTabIdentityView.tsx diff --git a/src/views/groups/views/shared-tabs/tab-identity/GroupSharedTabIdentityView.types.ts b/src/components/groups/views/shared-tabs/tab-identity/GroupSharedTabIdentityView.types.ts similarity index 100% rename from src/views/groups/views/shared-tabs/tab-identity/GroupSharedTabIdentityView.types.ts rename to src/components/groups/views/shared-tabs/tab-identity/GroupSharedTabIdentityView.types.ts diff --git a/src/components/index.scss b/src/components/index.scss index 6217145b..730773fc 100644 --- a/src/components/index.scss +++ b/src/components/index.scss @@ -2,6 +2,7 @@ @import './avatar-editor/AvatarEditorView'; @import './camera/CameraWidgetView'; @import './catalog/CatalogView'; +@import './groups/GroupView'; @import './help/HelpView'; @import './inventory/InventoryView'; @import './navigator/NavigatorView'; diff --git a/src/views/Styles.scss b/src/views/Styles.scss index 44ba9bc0..dd4f6217 100644 --- a/src/views/Styles.scss +++ b/src/views/Styles.scss @@ -1,6 +1,5 @@ @import "./shared/Shared"; @import "./friends/FriendsView"; -@import "./groups/GroupView"; @import "./hotel-view/HotelView"; @import "./loading/LoadingView"; @import "./main/MainView"; diff --git a/src/views/main/MainView.tsx b/src/views/main/MainView.tsx index 4d3f93b0..ccf77590 100644 --- a/src/views/main/MainView.tsx +++ b/src/views/main/MainView.tsx @@ -5,6 +5,7 @@ import { AchievementsView } from '../../components/achievements/AchievementsView import { AvatarEditorView } from '../../components/avatar-editor/AvatarEditorView'; import { CameraWidgetView } from '../../components/camera/CameraWidgetView'; import { CatalogView } from '../../components/catalog/CatalogView'; +import { GroupsView } from '../../components/groups/GroupsView'; import { HelpView } from '../../components/help/HelpView'; import { InventoryView } from '../../components/inventory/InventoryView'; import { NavigatorView } from '../../components/navigator/NavigatorView'; @@ -17,7 +18,6 @@ import { CampaignView } from '../campaign/CampaignView'; import { ChatHistoryView } from '../chat-history/ChatHistoryView'; import { FloorplanEditorView } from '../floorplan-editor/FloorplanEditorView'; import { FriendsView } from '../friends/FriendsView'; -import { GroupsView } from '../groups/GroupsView'; import { HcCenterView } from '../hc-center/HcCenterView'; import { HotelView } from '../hotel-view/HotelView'; import { ModToolsView } from '../mod-tools/ModToolsView'; diff --git a/src/views/right-side/RightSideView.tsx b/src/views/right-side/RightSideView.tsx index c503a533..49b4ebca 100644 --- a/src/views/right-side/RightSideView.tsx +++ b/src/views/right-side/RightSideView.tsx @@ -1,5 +1,5 @@ import { FC } from 'react'; -import { GroupRoomInformationView } from '../groups/views/room-information/GroupRoomInformationView'; +import { GroupRoomInformationView } from '../../components/groups/views/room-information/GroupRoomInformationView'; import { NotificationCenterView } from '../notification-center/NotificationCenterView'; import { PurseView } from '../purse/PurseView'; import { RightSideProps } from './RightSideView.types'; diff --git a/src/views/user-profile/views/groups-container/GroupsContainerView.tsx b/src/views/user-profile/views/groups-container/GroupsContainerView.tsx index 92fdf691..d5afa3c9 100644 --- a/src/views/user-profile/views/groups-container/GroupsContainerView.tsx +++ b/src/views/user-profile/views/groups-container/GroupsContainerView.tsx @@ -1,8 +1,8 @@ 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 { GroupInformationView } from '../../../groups/views/information/GroupInformationView'; import { BadgeImageView } from '../../../shared/badge-image/BadgeImageView'; import { GroupsContainerViewProps } from './GroupsContainerView.types';