diff --git a/src/App.scss b/src/App.scss index e888fa9e..a8a41ed8 100644 --- a/src/App.scss +++ b/src/App.scss @@ -96,4 +96,3 @@ $nitro-calendar-height: 400px; @import './common'; @import './components'; -@import "./views/Styles"; diff --git a/src/views/hotel-view/HotelView.scss b/src/components/hotel-view/HotelView.scss similarity index 100% rename from src/views/hotel-view/HotelView.scss rename to src/components/hotel-view/HotelView.scss diff --git a/src/views/hotel-view/HotelView.tsx b/src/components/hotel-view/HotelView.tsx similarity index 100% rename from src/views/hotel-view/HotelView.tsx rename to src/components/hotel-view/HotelView.tsx diff --git a/src/views/hotel-view/views/widget-slot/WidgetSlotView.tsx b/src/components/hotel-view/views/widget-slot/WidgetSlotView.tsx similarity index 100% rename from src/views/hotel-view/views/widget-slot/WidgetSlotView.tsx rename to src/components/hotel-view/views/widget-slot/WidgetSlotView.tsx diff --git a/src/views/hotel-view/views/widget-slot/WidgetSlotView.types.ts b/src/components/hotel-view/views/widget-slot/WidgetSlotView.types.ts similarity index 100% rename from src/views/hotel-view/views/widget-slot/WidgetSlotView.types.ts rename to src/components/hotel-view/views/widget-slot/WidgetSlotView.types.ts diff --git a/src/views/hotel-view/views/widgets/GetWidgetLayout.tsx b/src/components/hotel-view/views/widgets/GetWidgetLayout.tsx similarity index 100% rename from src/views/hotel-view/views/widgets/GetWidgetLayout.tsx rename to src/components/hotel-view/views/widgets/GetWidgetLayout.tsx diff --git a/src/views/hotel-view/views/widgets/GetWidgetLayout.types.ts b/src/components/hotel-view/views/widgets/GetWidgetLayout.types.ts similarity index 100% rename from src/views/hotel-view/views/widgets/GetWidgetLayout.types.ts rename to src/components/hotel-view/views/widgets/GetWidgetLayout.types.ts diff --git a/src/views/hotel-view/views/widgets/HotelViewWidgets.scss b/src/components/hotel-view/views/widgets/HotelViewWidgets.scss similarity index 100% rename from src/views/hotel-view/views/widgets/HotelViewWidgets.scss rename to src/components/hotel-view/views/widgets/HotelViewWidgets.scss diff --git a/src/views/hotel-view/views/widgets/bonus-rare/BonusRareWidgetView.scss b/src/components/hotel-view/views/widgets/bonus-rare/BonusRareWidgetView.scss similarity index 100% rename from src/views/hotel-view/views/widgets/bonus-rare/BonusRareWidgetView.scss rename to src/components/hotel-view/views/widgets/bonus-rare/BonusRareWidgetView.scss diff --git a/src/views/hotel-view/views/widgets/bonus-rare/BonusRareWidgetView.tsx b/src/components/hotel-view/views/widgets/bonus-rare/BonusRareWidgetView.tsx similarity index 100% rename from src/views/hotel-view/views/widgets/bonus-rare/BonusRareWidgetView.tsx rename to src/components/hotel-view/views/widgets/bonus-rare/BonusRareWidgetView.tsx diff --git a/src/views/hotel-view/views/widgets/bonus-rare/BonusRareWidgetView.types.ts b/src/components/hotel-view/views/widgets/bonus-rare/BonusRareWidgetView.types.ts similarity index 100% rename from src/views/hotel-view/views/widgets/bonus-rare/BonusRareWidgetView.types.ts rename to src/components/hotel-view/views/widgets/bonus-rare/BonusRareWidgetView.types.ts diff --git a/src/views/hotel-view/views/widgets/hall-of-fame-item/HallOfFameItemView.tsx b/src/components/hotel-view/views/widgets/hall-of-fame-item/HallOfFameItemView.tsx similarity index 100% rename from src/views/hotel-view/views/widgets/hall-of-fame-item/HallOfFameItemView.tsx rename to src/components/hotel-view/views/widgets/hall-of-fame-item/HallOfFameItemView.tsx diff --git a/src/views/hotel-view/views/widgets/hall-of-fame-item/HallOfFameItemView.types.ts b/src/components/hotel-view/views/widgets/hall-of-fame-item/HallOfFameItemView.types.ts similarity index 100% rename from src/views/hotel-view/views/widgets/hall-of-fame-item/HallOfFameItemView.types.ts rename to src/components/hotel-view/views/widgets/hall-of-fame-item/HallOfFameItemView.types.ts diff --git a/src/views/hotel-view/views/widgets/hall-of-fame/HallOfFameWidgetView.scss b/src/components/hotel-view/views/widgets/hall-of-fame/HallOfFameWidgetView.scss similarity index 100% rename from src/views/hotel-view/views/widgets/hall-of-fame/HallOfFameWidgetView.scss rename to src/components/hotel-view/views/widgets/hall-of-fame/HallOfFameWidgetView.scss diff --git a/src/views/hotel-view/views/widgets/hall-of-fame/HallOfFameWidgetView.tsx b/src/components/hotel-view/views/widgets/hall-of-fame/HallOfFameWidgetView.tsx similarity index 100% rename from src/views/hotel-view/views/widgets/hall-of-fame/HallOfFameWidgetView.tsx rename to src/components/hotel-view/views/widgets/hall-of-fame/HallOfFameWidgetView.tsx diff --git a/src/views/hotel-view/views/widgets/hall-of-fame/HallOfFameWidgetView.types.ts b/src/components/hotel-view/views/widgets/hall-of-fame/HallOfFameWidgetView.types.ts similarity index 100% rename from src/views/hotel-view/views/widgets/hall-of-fame/HallOfFameWidgetView.types.ts rename to src/components/hotel-view/views/widgets/hall-of-fame/HallOfFameWidgetView.types.ts diff --git a/src/views/hotel-view/views/widgets/promo-article/PromoArticleWidgetView.scss b/src/components/hotel-view/views/widgets/promo-article/PromoArticleWidgetView.scss similarity index 100% rename from src/views/hotel-view/views/widgets/promo-article/PromoArticleWidgetView.scss rename to src/components/hotel-view/views/widgets/promo-article/PromoArticleWidgetView.scss diff --git a/src/views/hotel-view/views/widgets/promo-article/PromoArticleWidgetView.tsx b/src/components/hotel-view/views/widgets/promo-article/PromoArticleWidgetView.tsx similarity index 100% rename from src/views/hotel-view/views/widgets/promo-article/PromoArticleWidgetView.tsx rename to src/components/hotel-view/views/widgets/promo-article/PromoArticleWidgetView.tsx diff --git a/src/views/hotel-view/views/widgets/promo-article/PromoArticleWidgetView.types.ts b/src/components/hotel-view/views/widgets/promo-article/PromoArticleWidgetView.types.ts similarity index 100% rename from src/views/hotel-view/views/widgets/promo-article/PromoArticleWidgetView.types.ts rename to src/components/hotel-view/views/widgets/promo-article/PromoArticleWidgetView.types.ts diff --git a/src/views/hotel-view/views/widgets/widget-container/WidgetContainerView.scss b/src/components/hotel-view/views/widgets/widget-container/WidgetContainerView.scss similarity index 100% rename from src/views/hotel-view/views/widgets/widget-container/WidgetContainerView.scss rename to src/components/hotel-view/views/widgets/widget-container/WidgetContainerView.scss diff --git a/src/views/hotel-view/views/widgets/widget-container/WidgetContainerView.tsx b/src/components/hotel-view/views/widgets/widget-container/WidgetContainerView.tsx similarity index 100% rename from src/views/hotel-view/views/widgets/widget-container/WidgetContainerView.tsx rename to src/components/hotel-view/views/widgets/widget-container/WidgetContainerView.tsx diff --git a/src/views/hotel-view/views/widgets/widget-container/WidgetContainerView.types.ts b/src/components/hotel-view/views/widgets/widget-container/WidgetContainerView.types.ts similarity index 100% rename from src/views/hotel-view/views/widgets/widget-container/WidgetContainerView.types.ts rename to src/components/hotel-view/views/widgets/widget-container/WidgetContainerView.types.ts diff --git a/src/components/index.scss b/src/components/index.scss index c00839bd..5cea1b3b 100644 --- a/src/components/index.scss +++ b/src/components/index.scss @@ -10,6 +10,7 @@ @import './guide-tool/GuideToolView'; @import './hc-center/HcCenterView'; @import './help/HelpView'; +@import './hotel-view/HotelView'; @import './inventory/InventoryView'; @import './loading/LoadingView'; @import './mod-tools/ModToolsView'; diff --git a/src/components/main/MainView.tsx b/src/components/main/MainView.tsx index 45d382e3..d87f677d 100644 --- a/src/components/main/MainView.tsx +++ b/src/components/main/MainView.tsx @@ -3,7 +3,6 @@ import { FC, useCallback, useEffect, useState } from 'react'; import { AddEventLinkTracker, GetCommunication, RemoveLinkEventTracker } from '../../api'; import { Base, TransitionAnimation, TransitionAnimationTypes } from '../../common'; import { UseRoomSessionManagerEvent } from '../../hooks'; -import { HotelView } from '../../views/hotel-view/HotelView'; import { AchievementsView } from '../achievements/AchievementsView'; import { AvatarEditorView } from '../avatar-editor/AvatarEditorView'; import { CameraWidgetView } from '../camera/CameraWidgetView'; @@ -16,6 +15,7 @@ import { GroupsView } from '../groups/GroupsView'; import { GuideToolView } from '../guide-tool/GuideToolView'; import { HcCenterView } from '../hc-center/HcCenterView'; import { HelpView } from '../help/HelpView'; +import { HotelView } from '../hotel-view/HotelView'; import { InventoryView } from '../inventory/InventoryView'; import { ModToolsView } from '../mod-tools/ModToolsView'; import { NavigatorView } from '../navigator/NavigatorView'; diff --git a/src/views/Styles.scss b/src/views/Styles.scss deleted file mode 100644 index 0f26fa35..00000000 --- a/src/views/Styles.scss +++ /dev/null @@ -1 +0,0 @@ -@import "./hotel-view/HotelView";