From 353b387fbfaf16f02fc5932006e6724837b715c1 Mon Sep 17 00:00:00 2001 From: TerryM Date: Wed, 20 May 2026 11:33:43 +0800 Subject: [PATCH] refactor: organize pages into folders --- README.md | 4 ++-- docs/workflow.md | 4 ++-- src/App.tsx | 10 +++++----- src/AppAdminOnly.tsx | 10 +++++----- src/adminRouteTree.tsx | 10 +++++----- src/pages/{AboutPage.tsx => About/index.tsx} | 2 +- src/pages/{Browse.tsx => Browse/index.tsx} | 10 +++++----- .../{CategoryPage.tsx => Category/index.tsx} | 10 +++++----- .../{FavoritesPage.tsx => Favorites/index.tsx} | 8 ++++---- src/pages/{Home.tsx => Home/index.tsx} | 16 ++++++++-------- .../index.tsx} | 12 ++++++------ src/pages/{SearchPage.tsx => Search/index.tsx} | 10 +++++----- src/pages/{WalletPage.tsx => Wallet/index.tsx} | 6 +++--- .../{AdminDashboard.tsx => Dashboard/index.tsx} | 6 +++--- .../admin/{AdminLogin.tsx => Login/index.tsx} | 10 +++++----- .../index.tsx} | 12 ++++++------ .../{AdminResources.tsx => Resources/index.tsx} | 12 ++++++------ .../index.tsx} | 6 +++--- 18 files changed, 79 insertions(+), 79 deletions(-) rename src/pages/{AboutPage.tsx => About/index.tsx} (89%) rename src/pages/{Browse.tsx => Browse/index.tsx} (96%) rename src/pages/{CategoryPage.tsx => Category/index.tsx} (95%) rename src/pages/{FavoritesPage.tsx => Favorites/index.tsx} (84%) rename src/pages/{Home.tsx => Home/index.tsx} (93%) rename src/pages/{ResourceDetail.tsx => ResourceDetail/index.tsx} (96%) rename src/pages/{SearchPage.tsx => Search/index.tsx} (96%) rename src/pages/{WalletPage.tsx => Wallet/index.tsx} (89%) rename src/pages/admin/{AdminDashboard.tsx => Dashboard/index.tsx} (94%) rename src/pages/admin/{AdminLogin.tsx => Login/index.tsx} (88%) rename src/pages/admin/{AdminResourceForm.tsx => ResourceForm/index.tsx} (97%) rename src/pages/admin/{AdminResources.tsx => Resources/index.tsx} (94%) rename src/pages/admin/{AdminSearchLogs.tsx => SearchLogs/index.tsx} (91%) diff --git a/README.md b/README.md index 58209c4..4b4d882 100644 --- a/README.md +++ b/README.md @@ -72,8 +72,8 @@ src/ adminRouteTree.tsx # admin routes components/ # reusable public components layouts/ # public/admin layout shells - pages/ # public pages - pages/admin/ # admin pages + pages/ # public pages; one folder per page, e.g. Home/index.tsx + pages/admin/ # admin pages; one folder per page, e.g. Resources/index.tsx utils/ # formatting/display helpers ``` diff --git a/docs/workflow.md b/docs/workflow.md index 518639c..95181a4 100644 --- a/docs/workflow.md +++ b/docs/workflow.md @@ -27,8 +27,8 @@ git pull --ff-only origin main Use the existing structure: -- Public pages: `src/pages/` -- Admin pages: `src/pages/admin/` +- Public pages: `src/pages//index.tsx` +- Admin pages: `src/pages/admin//index.tsx` - Shared components: `src/components/` - API helpers/types: `src/api.ts` - Translations/copy: `src/i18n.tsx` diff --git a/src/App.tsx b/src/App.tsx index 07f3bce..f178152 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -4,17 +4,17 @@ import { I18nProvider } from "./i18n"; import { PublicLayout } from "./layouts/PublicLayout"; import { Home } from "./pages/Home"; import { Browse } from "./pages/Browse"; -import { CategoryPage } from "./pages/CategoryPage"; -import { SearchPage } from "./pages/SearchPage"; -import { FavoritesPage } from "./pages/FavoritesPage"; +import { CategoryPage } from "./pages/Category"; +import { SearchPage } from "./pages/Search"; +import { FavoritesPage } from "./pages/Favorites"; import { ResourceDetail } from "./pages/ResourceDetail"; -import { AboutPage } from "./pages/AboutPage"; +import { AboutPage } from "./pages/About"; import { adminUiPrefix } from "./adminPaths"; import { AdminRouteTree } from "./adminRouteTree"; import { AdminRouterModeProvider } from "./adminRouterMode"; const WalletPage = lazy(() => - import("./pages/WalletPage").then((module) => ({ + import("./pages/Wallet").then((module) => ({ default: module.WalletPage, })), ); diff --git a/src/AppAdminOnly.tsx b/src/AppAdminOnly.tsx index 10e013c..f319cd3 100644 --- a/src/AppAdminOnly.tsx +++ b/src/AppAdminOnly.tsx @@ -3,11 +3,11 @@ import { I18nProvider } from "./i18n"; import { adminUiPrefix } from "./adminPaths"; import { AdminRouterModeProvider } from "./adminRouterMode"; import { AdminLayout } from "./layouts/AdminLayout"; -import { AdminLogin } from "./pages/admin/AdminLogin"; -import { AdminDashboard } from "./pages/admin/AdminDashboard"; -import { AdminResources } from "./pages/admin/AdminResources"; -import { AdminResourceForm } from "./pages/admin/AdminResourceForm"; -import { AdminSearchLogs } from "./pages/admin/AdminSearchLogs"; +import { AdminLogin } from "./pages/admin/Login"; +import { AdminDashboard } from "./pages/admin/Dashboard"; +import { AdminResources } from "./pages/admin/Resources"; +import { AdminResourceForm } from "./pages/admin/ResourceForm"; +import { AdminSearchLogs } from "./pages/admin/SearchLogs"; function NotFound() { return ( diff --git a/src/adminRouteTree.tsx b/src/adminRouteTree.tsx index ec88f60..2e56071 100644 --- a/src/adminRouteTree.tsx +++ b/src/adminRouteTree.tsx @@ -1,11 +1,11 @@ import { Route } from "react-router-dom"; import { adminUiPrefix } from "./adminPaths"; import { AdminLayout } from "./layouts/AdminLayout"; -import { AdminLogin } from "./pages/admin/AdminLogin"; -import { AdminDashboard } from "./pages/admin/AdminDashboard"; -import { AdminResources } from "./pages/admin/AdminResources"; -import { AdminResourceForm } from "./pages/admin/AdminResourceForm"; -import { AdminSearchLogs } from "./pages/admin/AdminSearchLogs"; +import { AdminLogin } from "./pages/admin/Login"; +import { AdminDashboard } from "./pages/admin/Dashboard"; +import { AdminResources } from "./pages/admin/Resources"; +import { AdminResourceForm } from "./pages/admin/ResourceForm"; +import { AdminSearchLogs } from "./pages/admin/SearchLogs"; /** Shared between full `App` (when admin enabled) and `AppAdminOnly`. */ export function AdminRouteTree() { diff --git a/src/pages/AboutPage.tsx b/src/pages/About/index.tsx similarity index 89% rename from src/pages/AboutPage.tsx rename to src/pages/About/index.tsx index e78c483..f2a9cc3 100644 --- a/src/pages/AboutPage.tsx +++ b/src/pages/About/index.tsx @@ -1,4 +1,4 @@ -import { useI18n } from "../i18n"; +import { useI18n } from "../../i18n"; export function AboutPage() { const { t } = useI18n(); diff --git a/src/pages/Browse.tsx b/src/pages/Browse/index.tsx similarity index 96% rename from src/pages/Browse.tsx rename to src/pages/Browse/index.tsx index 066d4f6..eda46c2 100644 --- a/src/pages/Browse.tsx +++ b/src/pages/Browse/index.tsx @@ -1,10 +1,10 @@ import { useEffect, useMemo, useState } from "react"; import { useSearchParams } from "react-router-dom"; -import { getJSON, itemsOrEmpty, type Resource } from "../api"; -import { ResourceCard } from "../components/ResourceCard"; -import { ResourceListFooter } from "../components/ResourceListFooter"; -import { useI18n } from "../i18n"; -import { typeFilterLabel } from "../resourceTypeLabels"; +import { getJSON, itemsOrEmpty, type Resource } from "../../api"; +import { ResourceCard } from "../../components/ResourceCard"; +import { ResourceListFooter } from "../../components/ResourceListFooter"; +import { useI18n } from "../../i18n"; +import { typeFilterLabel } from "../../resourceTypeLabels"; const types = [ "all", diff --git a/src/pages/CategoryPage.tsx b/src/pages/Category/index.tsx similarity index 95% rename from src/pages/CategoryPage.tsx rename to src/pages/Category/index.tsx index 1c4478d..e4a893e 100644 --- a/src/pages/CategoryPage.tsx +++ b/src/pages/Category/index.tsx @@ -1,10 +1,10 @@ import { useEffect, useMemo, useState } from "react"; import { useParams, useSearchParams } from "react-router-dom"; -import { getJSON, itemsOrEmpty, type Category, type Resource } from "../api"; -import { ResourceCard } from "../components/ResourceCard"; -import { ResourceListFooter } from "../components/ResourceListFooter"; -import { useI18n } from "../i18n"; -import { typeFilterLabel } from "../resourceTypeLabels"; +import { getJSON, itemsOrEmpty, type Category, type Resource } from "../../api"; +import { ResourceCard } from "../../components/ResourceCard"; +import { ResourceListFooter } from "../../components/ResourceListFooter"; +import { useI18n } from "../../i18n"; +import { typeFilterLabel } from "../../resourceTypeLabels"; const TYPE_FILTERS = [ "all", diff --git a/src/pages/FavoritesPage.tsx b/src/pages/Favorites/index.tsx similarity index 84% rename from src/pages/FavoritesPage.tsx rename to src/pages/Favorites/index.tsx index 91d9b5c..7a316df 100644 --- a/src/pages/FavoritesPage.tsx +++ b/src/pages/Favorites/index.tsx @@ -1,8 +1,8 @@ import { useEffect, useState } from "react"; -import { getJSON, type Resource } from "../api"; -import { ResourceCard } from "../components/ResourceCard"; -import { readFavorites } from "../favorites"; -import { useI18n } from "../i18n"; +import { getJSON, type Resource } from "../../api"; +import { ResourceCard } from "../../components/ResourceCard"; +import { readFavorites } from "../../favorites"; +import { useI18n } from "../../i18n"; export function FavoritesPage() { const { t, lang } = useI18n(); diff --git a/src/pages/Home.tsx b/src/pages/Home/index.tsx similarity index 93% rename from src/pages/Home.tsx rename to src/pages/Home/index.tsx index 2b3dbfb..cacad39 100644 --- a/src/pages/Home.tsx +++ b/src/pages/Home/index.tsx @@ -1,17 +1,17 @@ import { ChevronRight } from "lucide-react"; import { Link } from "react-router-dom"; import { useEffect, useRef, useState } from "react"; -import { getJSON, itemsOrEmpty, type Category, type Resource } from "../api"; -import { CategoryIcon } from "../components/CategoryIcon"; -import { FigmaBanner } from "../components/FigmaBanner"; +import { getJSON, itemsOrEmpty, type Category, type Resource } from "../../api"; +import { CategoryIcon } from "../../components/CategoryIcon"; +import { FigmaBanner } from "../../components/FigmaBanner"; import { ComingSoonLatestUpdateRow, LatestUpdateRow, -} from "../components/LatestUpdateRow"; -import { RecommendedCard } from "../components/RecommendedCard"; -import { SectionHeader } from "../components/SectionHeader"; -import { useI18n } from "../i18n"; -import { categoryCardLines } from "../utils/categoryDisplay"; +} from "../../components/LatestUpdateRow"; +import { RecommendedCard } from "../../components/RecommendedCard"; +import { SectionHeader } from "../../components/SectionHeader"; +import { useI18n } from "../../i18n"; +import { categoryCardLines } from "../../utils/categoryDisplay"; export function Home() { const { t, lang } = useI18n(); diff --git a/src/pages/ResourceDetail.tsx b/src/pages/ResourceDetail/index.tsx similarity index 96% rename from src/pages/ResourceDetail.tsx rename to src/pages/ResourceDetail/index.tsx index 729859c..9dd6af3 100644 --- a/src/pages/ResourceDetail.tsx +++ b/src/pages/ResourceDetail/index.tsx @@ -8,15 +8,15 @@ import { postJSON, postFavoriteDelta, type Resource, -} from "../api"; +} from "../../api"; import { resourceLanguageLabel, resourceTypeLabel, -} from "../resourceTypeLabels"; -import { ResourceCard } from "../components/ResourceCard"; -import { isFavorite, toggleFavorite } from "../favorites"; -import { useI18n } from "../i18n"; -import { isLikelyVideoPath } from "../video"; +} from "../../resourceTypeLabels"; +import { ResourceCard } from "../../components/ResourceCard"; +import { isFavorite, toggleFavorite } from "../../favorites"; +import { useI18n } from "../../i18n"; +import { isLikelyVideoPath } from "../../video"; export function ResourceDetail() { const { id } = useParams(); diff --git a/src/pages/SearchPage.tsx b/src/pages/Search/index.tsx similarity index 96% rename from src/pages/SearchPage.tsx rename to src/pages/Search/index.tsx index 8c629c2..9bc18e7 100644 --- a/src/pages/SearchPage.tsx +++ b/src/pages/Search/index.tsx @@ -1,10 +1,10 @@ import { useEffect, useMemo, useState } from "react"; import { useSearchParams } from "react-router-dom"; -import { getJSON, itemsOrEmpty, postJSON, type Resource } from "../api"; -import { ResourceCard } from "../components/ResourceCard"; -import { ResourceListFooter } from "../components/ResourceListFooter"; -import { useI18n } from "../i18n"; -import { typeFilterLabel } from "../resourceTypeLabels"; +import { getJSON, itemsOrEmpty, postJSON, type Resource } from "../../api"; +import { ResourceCard } from "../../components/ResourceCard"; +import { ResourceListFooter } from "../../components/ResourceListFooter"; +import { useI18n } from "../../i18n"; +import { typeFilterLabel } from "../../resourceTypeLabels"; const types = [ "all", diff --git a/src/pages/WalletPage.tsx b/src/pages/Wallet/index.tsx similarity index 89% rename from src/pages/WalletPage.tsx rename to src/pages/Wallet/index.tsx index 200a8e4..cb75c41 100644 --- a/src/pages/WalletPage.tsx +++ b/src/pages/Wallet/index.tsx @@ -1,9 +1,9 @@ import { RainbowKitProvider, darkTheme } from "@rainbow-me/rainbowkit"; import { WagmiProvider } from "wagmi"; import "@rainbow-me/rainbowkit/styles.css"; -import { WalletLoginControls } from "../components/WalletLoginControls"; -import { useI18n } from "../i18n"; -import { wagmiConfig } from "../wagmiConfig"; +import { WalletLoginControls } from "../../components/WalletLoginControls"; +import { useI18n } from "../../i18n"; +import { wagmiConfig } from "../../wagmiConfig"; export function WalletPage() { const { t } = useI18n(); diff --git a/src/pages/admin/AdminDashboard.tsx b/src/pages/admin/Dashboard/index.tsx similarity index 94% rename from src/pages/admin/AdminDashboard.tsx rename to src/pages/admin/Dashboard/index.tsx index cf40261..223e769 100644 --- a/src/pages/admin/AdminDashboard.tsx +++ b/src/pages/admin/Dashboard/index.tsx @@ -1,7 +1,7 @@ import { useEffect, useState } from "react"; -import { getJSONAuth } from "../../api"; -import { getToken } from "../../admin/token"; -import { useAdminT } from "../../admin/useAdminT"; +import { getJSONAuth } from "../../../api"; +import { getToken } from "../../../admin/token"; +import { useAdminT } from "../../../admin/useAdminT"; type Dash = { totalResources: number; diff --git a/src/pages/admin/AdminLogin.tsx b/src/pages/admin/Login/index.tsx similarity index 88% rename from src/pages/admin/AdminLogin.tsx rename to src/pages/admin/Login/index.tsx index f8f1ebb..501226b 100644 --- a/src/pages/admin/AdminLogin.tsx +++ b/src/pages/admin/Login/index.tsx @@ -1,10 +1,10 @@ import { useState } from "react"; import { useNavigate } from "react-router-dom"; -import { postJSON } from "../../api"; -import { setToken } from "../../admin/token"; -import { useAdminT } from "../../admin/useAdminT"; -import { useAdminRouterMode } from "../../adminRouterMode"; -import { adminUiPrefix } from "../../adminPaths"; +import { postJSON } from "../../../api"; +import { setToken } from "../../../admin/token"; +import { useAdminT } from "../../../admin/useAdminT"; +import { useAdminRouterMode } from "../../../adminRouterMode"; +import { adminUiPrefix } from "../../../adminPaths"; export function AdminLogin() { const t = useAdminT(); diff --git a/src/pages/admin/AdminResourceForm.tsx b/src/pages/admin/ResourceForm/index.tsx similarity index 97% rename from src/pages/admin/AdminResourceForm.tsx rename to src/pages/admin/ResourceForm/index.tsx index f74925e..27b27d4 100644 --- a/src/pages/admin/AdminResourceForm.tsx +++ b/src/pages/admin/ResourceForm/index.tsx @@ -7,12 +7,12 @@ import { putJSON, uploadFile, type Category, -} from "../../api"; -import { getToken } from "../../admin/token"; -import { useAdminT } from "../../admin/useAdminT"; -import { resourceTypeDisplay } from "../../resourceTypeLabels"; -import { adminUiPrefix } from "../../adminPaths"; -import { useAdminRouterMode } from "../../adminRouterMode"; +} from "../../../api"; +import { getToken } from "../../../admin/token"; +import { useAdminT } from "../../../admin/useAdminT"; +import { resourceTypeDisplay } from "../../../resourceTypeLabels"; +import { adminUiPrefix } from "../../../adminPaths"; +import { useAdminRouterMode } from "../../../adminRouterMode"; const types = [ "image", diff --git a/src/pages/admin/AdminResources.tsx b/src/pages/admin/Resources/index.tsx similarity index 94% rename from src/pages/admin/AdminResources.tsx rename to src/pages/admin/Resources/index.tsx index d50e189..afff498 100644 --- a/src/pages/admin/AdminResources.tsx +++ b/src/pages/admin/Resources/index.tsx @@ -6,12 +6,12 @@ import { itemsOrEmpty, type AdminResource, type Category, -} from "../../api"; -import { getToken } from "../../admin/token"; -import { resourceTypeDisplay } from "../../resourceTypeLabels"; -import { useAdminT } from "../../admin/useAdminT"; -import { adminUiPrefix } from "../../adminPaths"; -import { useAdminRouterMode } from "../../adminRouterMode"; +} from "../../../api"; +import { getToken } from "../../../admin/token"; +import { resourceTypeDisplay } from "../../../resourceTypeLabels"; +import { useAdminT } from "../../../admin/useAdminT"; +import { adminUiPrefix } from "../../../adminPaths"; +import { useAdminRouterMode } from "../../../adminRouterMode"; function statusLabel(t: (k: string) => string, s: string) { if (s === "published") return t("published"); diff --git a/src/pages/admin/AdminSearchLogs.tsx b/src/pages/admin/SearchLogs/index.tsx similarity index 91% rename from src/pages/admin/AdminSearchLogs.tsx rename to src/pages/admin/SearchLogs/index.tsx index 6868091..905293b 100644 --- a/src/pages/admin/AdminSearchLogs.tsx +++ b/src/pages/admin/SearchLogs/index.tsx @@ -1,7 +1,7 @@ import { useEffect, useState } from "react"; -import { getJSONAuth } from "../../api"; -import { getToken } from "../../admin/token"; -import { useAdminT } from "../../admin/useAdminT"; +import { getJSONAuth } from "../../../api"; +import { getToken } from "../../../admin/token"; +import { useAdminT } from "../../../admin/useAdminT"; type Row = { id: number; query: string; createdAt: string };