More changes

This commit is contained in:
Bill 2022-02-21 13:39:07 -05:00
parent 38f6dc19a6
commit 7c889502f0
7 changed files with 28 additions and 38 deletions

View File

@ -2,12 +2,12 @@ import { ConfigurationEvent, HabboWebTools, LegacyExternalInterface, Nitro, Nitr
import { FC, useCallback, useState } from 'react'; import { FC, useCallback, useState } from 'react';
import { GetCommunication, GetConfiguration, GetNitroInstance } from './api'; import { GetCommunication, GetConfiguration, GetNitroInstance } from './api';
import { LoadingView } from './components/loading/LoadingView'; import { LoadingView } from './components/loading/LoadingView';
import { MainView } from './components/main/MainView';
import { useConfigurationEvent } from './hooks/events/core/configuration/configuration-event'; import { useConfigurationEvent } from './hooks/events/core/configuration/configuration-event';
import { useLocalizationEvent } from './hooks/events/nitro/localization/localization-event'; import { useLocalizationEvent } from './hooks/events/nitro/localization/localization-event';
import { dispatchMainEvent, useMainEvent } from './hooks/events/nitro/main-event'; import { dispatchMainEvent, useMainEvent } from './hooks/events/nitro/main-event';
import { useRoomEngineEvent } from './hooks/events/nitro/room/room-engine-event'; import { useRoomEngineEvent } from './hooks/events/nitro/room/room-engine-event';
import { TransitionAnimation, TransitionAnimationTypes } from './layout'; import { TransitionAnimation, TransitionAnimationTypes } from './layout';
import { MainView } from './views/main/MainView';
export const App: FC<{}> = props => export const App: FC<{}> = props =>
{ {

View File

@ -1,33 +1,33 @@
import { HabboWebTools, RoomSessionEvent } from '@nitrots/nitro-renderer'; import { HabboWebTools, RoomSessionEvent } from '@nitrots/nitro-renderer';
import { FC, useCallback, useEffect, useState } from 'react'; import { FC, useCallback, useEffect, useState } from 'react';
import { AddEventLinkTracker, GetCommunication, RemoveLinkEventTracker } from '../../api'; import { AddEventLinkTracker, GetCommunication, RemoveLinkEventTracker } from '../../api';
import { AchievementsView } from '../../components/achievements/AchievementsView'; import { Base } from '../../common';
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 { useRoomSessionManagerEvent } from '../../hooks/events/nitro/session/room-session-manager-event'; import { useRoomSessionManagerEvent } from '../../hooks/events/nitro/session/room-session-manager-event';
import { TransitionAnimation, TransitionAnimationTypes } from '../../layout'; import { TransitionAnimation, TransitionAnimationTypes } from '../../layout';
import { CampaignView } from '../campaign/CampaignView'; import { CampaignView } from '../../views/campaign/CampaignView';
import { FloorplanEditorView } from '../floorplan-editor/FloorplanEditorView'; import { FloorplanEditorView } from '../../views/floorplan-editor/FloorplanEditorView';
import { FriendsView } from '../friends/FriendsView'; import { FriendsView } from '../../views/friends/FriendsView';
import { HcCenterView } from '../hc-center/HcCenterView'; import { HcCenterView } from '../../views/hc-center/HcCenterView';
import { HotelView } from '../hotel-view/HotelView'; import { HotelView } from '../../views/hotel-view/HotelView';
import { NitropediaView } from '../nitropedia/NitropediaView'; import { NitropediaView } from '../../views/nitropedia/NitropediaView';
import { MainViewProps } from './MainView.types'; 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<MainViewProps> = props => export const MainView: FC<{}> = props =>
{ {
const [ isReady, setIsReady ] = useState(false); const [ isReady, setIsReady ] = useState(false);
const [ landingViewVisible, setLandingViewVisible ] = useState(true); const [ landingViewVisible, setLandingViewVisible ] = useState(true);
@ -93,7 +93,7 @@ export const MainView: FC<MainViewProps> = props =>
}, [onLinkReceived]); }, [onLinkReceived]);
return ( return (
<div className="nitro-main"> <Base fit>
<TransitionAnimation type={ TransitionAnimationTypes.FADE_IN } inProp={ landingViewVisible } timeout={ 300 }> <TransitionAnimation type={ TransitionAnimationTypes.FADE_IN } inProp={ landingViewVisible } timeout={ 300 }>
<HotelView /> <HotelView />
</TransitionAnimation> </TransitionAnimation>
@ -118,6 +118,6 @@ export const MainView: FC<MainViewProps> = props =>
<NitropediaView /> <NitropediaView />
<HcCenterView /> <HcCenterView />
<CampaignView /> <CampaignView />
</div> </Base>
); );
} }

View File

@ -2,7 +2,6 @@
background-color: rgba($dark, 0.95); background-color: rgba($dark, 0.95);
font-size: $font-size-sm; font-size: $font-size-sm;
pointer-events: all; pointer-events: all;
margin-bottom: 5px;
box-shadow: inset 0px 5px lighten(rgba($dark, 0.6), 2.5), box-shadow: inset 0px 5px lighten(rgba($dark, 0.6), 2.5),
inset 0 -4px darken(rgba($dark, 0.6), 4); inset 0 -4px darken(rgba($dark, 0.6), 4);

View File

@ -8,7 +8,7 @@ export const RightSideView: FC<{}> = props =>
{ {
return ( return (
<div className="nitro-right-side"> <div className="nitro-right-side">
<Column position="relative"> <Column position="relative" gap={ 1 }>
<PurseView /> <PurseView />
<GroupRoomInformationView /> <GroupRoomInformationView />
<NotificationCenterView /> <NotificationCenterView />

View File

@ -1,7 +1,6 @@
@import "./shared/Shared"; @import "./shared/Shared";
@import "./friends/FriendsView"; @import "./friends/FriendsView";
@import "./hotel-view/HotelView"; @import "./hotel-view/HotelView";
@import "./main/MainView";
@import "./notification-center/NotificationCenterView"; @import "./notification-center/NotificationCenterView";
@import "./room/RoomView"; @import "./room/RoomView";
@import "./floorplan-editor/FloorplanEditorView"; @import "./floorplan-editor/FloorplanEditorView";

View File

@ -1,4 +0,0 @@
.nitro-main {
width: 100%;
height: 100%;
}

View File

@ -1,4 +0,0 @@
export interface MainViewProps
{
}