diff --git a/src/pages/HomePage.tsx b/src/pages/HomePage.tsx index 9aedd57f..1c42633e 100644 --- a/src/pages/HomePage.tsx +++ b/src/pages/HomePage.tsx @@ -11,6 +11,7 @@ import { useAuth } from "@/hooks/auth/useAuth"; import { useDebounce } from "@/hooks/useDebounce"; import { useRandomTranslation } from "@/hooks/useRandomTranslation"; import { useSearchQuery } from "@/hooks/useSearchQuery"; +import DiscoverContent from "@/pages/discover/discoverContent"; import { HomeLayout } from "@/pages/layouts/HomeLayout"; import { BookmarksPart } from "@/pages/parts/home/BookmarksPart"; import { HeroPart } from "@/pages/parts/home/HeroPart"; @@ -18,7 +19,6 @@ import { WatchingPart } from "@/pages/parts/home/WatchingPart"; import { SearchListPart } from "@/pages/parts/search/SearchListPart"; import { SearchLoadingPart } from "@/pages/parts/search/SearchLoadingPart"; import { usePreferencesStore } from "@/stores/preferences"; -import DiscoverContent from "@/utils/discoverContent"; import { Button } from "./About"; import { PopupModal } from "./parts/home/PopupModal"; diff --git a/src/pages/Discover.tsx b/src/pages/discover/Discover.tsx similarity index 93% rename from src/pages/Discover.tsx rename to src/pages/discover/Discover.tsx index 61a5c660..ac00897c 100644 --- a/src/pages/Discover.tsx +++ b/src/pages/discover/Discover.tsx @@ -3,10 +3,10 @@ import { Helmet } from "react-helmet-async"; import { useTranslation } from "react-i18next"; import { Loading } from "@/components/layout/Loading"; -import DiscoverContent from "@/utils/discoverContent"; +import DiscoverContent from "@/pages/discover/discoverContent"; -import { SubPageLayout } from "./layouts/SubPageLayout"; -import { PageTitle } from "./parts/util/PageTitle"; +import { SubPageLayout } from "../layouts/SubPageLayout"; +import { PageTitle } from "../parts/util/PageTitle"; export function Discover() { const { t } = useTranslation(); diff --git a/src/utils/discover.ts b/src/pages/discover/common.ts similarity index 100% rename from src/utils/discover.ts rename to src/pages/discover/common.ts diff --git a/src/utils/discoverContent.tsx b/src/pages/discover/discoverContent.tsx similarity index 99% rename from src/utils/discoverContent.tsx rename to src/pages/discover/discoverContent.tsx index a133afa5..fa673bdd 100644 --- a/src/utils/discoverContent.tsx +++ b/src/pages/discover/discoverContent.tsx @@ -6,7 +6,6 @@ import { get } from "@/backend/metadata/tmdb"; import { Divider } from "@/components/utils/Divider"; import { Flare } from "@/components/utils/Flare"; import { useIsMobile } from "@/hooks/useIsMobile"; -import { conf } from "@/setup/config"; import { Category, Genre, @@ -15,9 +14,10 @@ import { TVShow, categories, tvCategories, -} from "@/utils/discover"; +} from "@/pages/discover/common"; +import { conf } from "@/setup/config"; -import { Icon, Icons } from "../components/Icon"; +import { Icon, Icons } from "../../components/Icon"; const editorPicks = [ { id: 9342, type: "movie" }, // The Mask of Zorro diff --git a/src/setup/App.tsx b/src/setup/App.tsx index ec1e8083..77a199f5 100644 --- a/src/setup/App.tsx +++ b/src/setup/App.tsx @@ -15,7 +15,7 @@ import { useOnlineListener } from "@/hooks/usePing"; import { AboutPage } from "@/pages/About"; import { AdminPage } from "@/pages/admin/AdminPage"; import VideoTesterView from "@/pages/developer/VideoTesterView"; -import { Discover } from "@/pages/Discover"; +import { Discover } from "@/pages/discover/Discover"; import { DmcaPage, shouldHaveDmcaPage } from "@/pages/Dmca"; import MaintenancePage from "@/pages/errors/MaintenancePage"; import { NotFoundPage } from "@/pages/errors/NotFoundPage"; diff --git a/src/utils/setup/App.tsx b/src/utils/setup/App.tsx index 55e95357..98184cb3 100644 --- a/src/utils/setup/App.tsx +++ b/src/utils/setup/App.tsx @@ -15,7 +15,7 @@ import { useOnlineListener } from "@/hooks/usePing"; import { AboutPage } from "@/pages/About"; import { AdminPage } from "@/pages/admin/AdminPage"; import VideoTesterView from "@/pages/developer/VideoTesterView"; -import { Discover } from "@/pages/Discover"; +import { Discover } from "@/pages/discover/Discover"; import { DmcaPage, shouldHaveDmcaPage } from "@/pages/Dmca"; import MaintenancePage from "@/pages/errors/MaintenancePage"; import { NotFoundPage } from "@/pages/errors/NotFoundPage";