From 7c889502f042d5a39865464fd254f79df7d2e424 Mon Sep 17 00:00:00 2001 From: Bill Date: Mon, 21 Feb 2022 13:39:07 -0500 Subject: [PATCH] More changes --- src/App.tsx | 2 +- src/{views => components}/main/MainView.tsx | 52 ++++++++++----------- src/components/purse/PurseView.scss | 1 - src/components/right-side/RightSideView.tsx | 2 +- src/views/Styles.scss | 1 - src/views/main/MainView.scss | 4 -- src/views/main/MainView.types.ts | 4 -- 7 files changed, 28 insertions(+), 38 deletions(-) rename src/{views => components}/main/MainView.tsx (64%) delete mode 100644 src/views/main/MainView.scss delete mode 100644 src/views/main/MainView.types.ts diff --git a/src/App.tsx b/src/App.tsx index 71a73ed3..856ba26c 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -2,12 +2,12 @@ import { ConfigurationEvent, HabboWebTools, LegacyExternalInterface, Nitro, Nitr import { FC, useCallback, useState } from 'react'; import { GetCommunication, GetConfiguration, GetNitroInstance } from './api'; import { LoadingView } from './components/loading/LoadingView'; +import { MainView } from './components/main/MainView'; import { useConfigurationEvent } from './hooks/events/core/configuration/configuration-event'; import { useLocalizationEvent } from './hooks/events/nitro/localization/localization-event'; import { dispatchMainEvent, useMainEvent } from './hooks/events/nitro/main-event'; import { useRoomEngineEvent } from './hooks/events/nitro/room/room-engine-event'; import { TransitionAnimation, TransitionAnimationTypes } from './layout'; -import { MainView } from './views/main/MainView'; export const App: FC<{}> = props => { diff --git a/src/views/main/MainView.tsx b/src/components/main/MainView.tsx similarity index 64% rename from src/views/main/MainView.tsx rename to src/components/main/MainView.tsx index b9829e84..50821cdc 100644 --- a/src/views/main/MainView.tsx +++ b/src/components/main/MainView.tsx @@ -1,33 +1,33 @@ import { HabboWebTools, RoomSessionEvent } from '@nitrots/nitro-renderer'; import { FC, useCallback, useEffect, useState } from 'react'; import { AddEventLinkTracker, GetCommunication, RemoveLinkEventTracker } from '../../api'; -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 { ChatHistoryView } from '../../components/chat-history/ChatHistoryView'; -import { GroupsView } from '../../components/groups/GroupsView'; -import { HelpView } from '../../components/help/HelpView'; -import { InventoryView } from '../../components/inventory/InventoryView'; -import { ModToolsView } from '../../components/mod-tools/ModToolsView'; -import { NavigatorView } from '../../components/navigator/NavigatorView'; -import { RightSideView } from '../../components/right-side/RightSideView'; -import { RoomHostView } from '../../components/room-host/RoomHostView'; -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 { Base } from '../../common'; import { useRoomSessionManagerEvent } from '../../hooks/events/nitro/session/room-session-manager-event'; import { TransitionAnimation, TransitionAnimationTypes } from '../../layout'; -import { CampaignView } from '../campaign/CampaignView'; -import { FloorplanEditorView } from '../floorplan-editor/FloorplanEditorView'; -import { FriendsView } from '../friends/FriendsView'; -import { HcCenterView } from '../hc-center/HcCenterView'; -import { HotelView } from '../hotel-view/HotelView'; -import { NitropediaView } from '../nitropedia/NitropediaView'; -import { MainViewProps } from './MainView.types'; +import { CampaignView } from '../../views/campaign/CampaignView'; +import { FloorplanEditorView } from '../../views/floorplan-editor/FloorplanEditorView'; +import { FriendsView } from '../../views/friends/FriendsView'; +import { HcCenterView } from '../../views/hc-center/HcCenterView'; +import { HotelView } from '../../views/hotel-view/HotelView'; +import { NitropediaView } from '../../views/nitropedia/NitropediaView'; +import { AchievementsView } from '../achievements/AchievementsView'; +import { AvatarEditorView } from '../avatar-editor/AvatarEditorView'; +import { CameraWidgetView } from '../camera/CameraWidgetView'; +import { CatalogView } from '../catalog/CatalogView'; +import { ChatHistoryView } from '../chat-history/ChatHistoryView'; +import { GroupsView } from '../groups/GroupsView'; +import { HelpView } from '../help/HelpView'; +import { InventoryView } from '../inventory/InventoryView'; +import { ModToolsView } from '../mod-tools/ModToolsView'; +import { NavigatorView } from '../navigator/NavigatorView'; +import { RightSideView } from '../right-side/RightSideView'; +import { RoomHostView } from '../room-host/RoomHostView'; +import { ToolbarView } from '../toolbar/ToolbarView'; +import { UserProfileView } from '../user-profile/UserProfileView'; +import { UserSettingsView } from '../user-settings/UserSettingsView'; +import { WiredView } from '../wired/WiredView'; -export const MainView: FC = props => +export const MainView: FC<{}> = props => { const [ isReady, setIsReady ] = useState(false); const [ landingViewVisible, setLandingViewVisible ] = useState(true); @@ -93,7 +93,7 @@ export const MainView: FC = props => }, [onLinkReceived]); return ( -
+ @@ -118,6 +118,6 @@ export const MainView: FC = props => -
+ ); } diff --git a/src/components/purse/PurseView.scss b/src/components/purse/PurseView.scss index 15add56a..2901eebb 100644 --- a/src/components/purse/PurseView.scss +++ b/src/components/purse/PurseView.scss @@ -2,7 +2,6 @@ background-color: rgba($dark, 0.95); font-size: $font-size-sm; pointer-events: all; - margin-bottom: 5px; box-shadow: inset 0px 5px lighten(rgba($dark, 0.6), 2.5), inset 0 -4px darken(rgba($dark, 0.6), 4); diff --git a/src/components/right-side/RightSideView.tsx b/src/components/right-side/RightSideView.tsx index 6de251de..51a1eae8 100644 --- a/src/components/right-side/RightSideView.tsx +++ b/src/components/right-side/RightSideView.tsx @@ -8,7 +8,7 @@ export const RightSideView: FC<{}> = props => { return (
- + diff --git a/src/views/Styles.scss b/src/views/Styles.scss index 05132c3d..52fbdfd8 100644 --- a/src/views/Styles.scss +++ b/src/views/Styles.scss @@ -1,7 +1,6 @@ @import "./shared/Shared"; @import "./friends/FriendsView"; @import "./hotel-view/HotelView"; -@import "./main/MainView"; @import "./notification-center/NotificationCenterView"; @import "./room/RoomView"; @import "./floorplan-editor/FloorplanEditorView"; diff --git a/src/views/main/MainView.scss b/src/views/main/MainView.scss deleted file mode 100644 index 3ff415d7..00000000 --- a/src/views/main/MainView.scss +++ /dev/null @@ -1,4 +0,0 @@ -.nitro-main { - width: 100%; - height: 100%; -} diff --git a/src/views/main/MainView.types.ts b/src/views/main/MainView.types.ts deleted file mode 100644 index e0fd1650..00000000 --- a/src/views/main/MainView.types.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface MainViewProps -{ - -}