From 2e0b97faa996d29279fb8d13cbe13ab4295f329a Mon Sep 17 00:00:00 2001 From: Aditya Anand M C Date: Tue, 28 Jan 2025 16:53:05 +0530 Subject: [PATCH] restructure --- apps/admin/src/main.tsx | 4 ++-- .../src/pages/{Pool/Pool.tsx => ManagePool/ManagePool.tsx} | 4 ++-- apps/admin/src/pages/ManagePool/index.ts | 1 + .../src/pages/{Pool => ManagePool}/tabs/TabApplication.tsx | 4 +--- .../src/pages/{Pool => ManagePool}/tabs/TabDistribute.tsx | 0 .../src/pages/{Pool => ManagePool}/tabs/TabRoundDate.tsx | 4 ++-- .../src/pages/{Pool => ManagePool}/tabs/TabRoundDetail.tsx | 0 apps/admin/src/pages/{Pool => ManagePool}/tabs/TabVoter.tsx | 0 .../pages/{Pool/PoolTabs.tsx => ManagePool/tabs/index.tsx} | 6 +++++- apps/admin/src/pages/Pool/index.ts | 1 - apps/admin/src/pages/Pool/tabs/index.ts | 5 ----- 11 files changed, 13 insertions(+), 16 deletions(-) rename apps/admin/src/pages/{Pool/Pool.tsx => ManagePool/ManagePool.tsx} (94%) create mode 100644 apps/admin/src/pages/ManagePool/index.ts rename apps/admin/src/pages/{Pool => ManagePool}/tabs/TabApplication.tsx (92%) rename apps/admin/src/pages/{Pool => ManagePool}/tabs/TabDistribute.tsx (100%) rename apps/admin/src/pages/{Pool => ManagePool}/tabs/TabRoundDate.tsx (94%) rename apps/admin/src/pages/{Pool => ManagePool}/tabs/TabRoundDetail.tsx (100%) rename apps/admin/src/pages/{Pool => ManagePool}/tabs/TabVoter.tsx (100%) rename apps/admin/src/pages/{Pool/PoolTabs.tsx => ManagePool/tabs/index.tsx} (86%) delete mode 100644 apps/admin/src/pages/Pool/index.ts delete mode 100644 apps/admin/src/pages/Pool/tabs/index.ts diff --git a/apps/admin/src/main.tsx b/apps/admin/src/main.tsx index e04236c..3b8b275 100644 --- a/apps/admin/src/main.tsx +++ b/apps/admin/src/main.tsx @@ -5,7 +5,7 @@ import { MainLayout } from "@/layouts/MainLayout"; import App from "./App"; import { CreateProgram } from "./pages/CreateProgram"; import { CreateRound } from "./pages/CreateRound"; -import { Pool } from "./pages/Pool"; +import { ManagePool } from "./pages/ManagePool"; import "./index.css"; // TODO: Add route protection when the user is not connected @@ -18,7 +18,7 @@ createRoot(document.getElementById("root")!).render( } /> } /> } /> - } /> + } /> diff --git a/apps/admin/src/pages/Pool/Pool.tsx b/apps/admin/src/pages/ManagePool/ManagePool.tsx similarity index 94% rename from apps/admin/src/pages/Pool/Pool.tsx rename to apps/admin/src/pages/ManagePool/ManagePool.tsx index 9bf8863..cc2864b 100644 --- a/apps/admin/src/pages/Pool/Pool.tsx +++ b/apps/admin/src/pages/ManagePool/ManagePool.tsx @@ -2,9 +2,9 @@ import { PoolSummary } from "gitcoin-ui/pool"; import { PoolType } from "gitcoin-ui/types"; -import { PoolTabs } from "./PoolTabs"; +import { PoolTabs } from "./tabs"; -export const Pool = () => { +export const ManagePool = () => { // Add mock data for testing const chainId = 1; // Ethereum mainnet const poolId = "pool-123"; diff --git a/apps/admin/src/pages/ManagePool/index.ts b/apps/admin/src/pages/ManagePool/index.ts new file mode 100644 index 0000000..f902a1f --- /dev/null +++ b/apps/admin/src/pages/ManagePool/index.ts @@ -0,0 +1 @@ +export * from "./ManagePool"; diff --git a/apps/admin/src/pages/Pool/tabs/TabApplication.tsx b/apps/admin/src/pages/ManagePool/tabs/TabApplication.tsx similarity index 92% rename from apps/admin/src/pages/Pool/tabs/TabApplication.tsx rename to apps/admin/src/pages/ManagePool/tabs/TabApplication.tsx index 2e9b7c8..38e3b79 100644 --- a/apps/admin/src/pages/Pool/tabs/TabApplication.tsx +++ b/apps/admin/src/pages/ManagePool/tabs/TabApplication.tsx @@ -6,9 +6,7 @@ import { usePerformEvaluation } from "@/hooks/checker/usePerformEvaluation"; import { usePerformOnChainReview } from "@/hooks/checker/usePerformOnChainReview"; export const TabApplication = () => { - // const { poolId, chainId } = useParams(); - - const { poolId, chainId } = { poolId: "635", chainId: "11155111" }; + const { poolId, chainId } = useParams(); const { address } = useAccount(); const { data: walletClient } = useWalletClient(); diff --git a/apps/admin/src/pages/Pool/tabs/TabDistribute.tsx b/apps/admin/src/pages/ManagePool/tabs/TabDistribute.tsx similarity index 100% rename from apps/admin/src/pages/Pool/tabs/TabDistribute.tsx rename to apps/admin/src/pages/ManagePool/tabs/TabDistribute.tsx diff --git a/apps/admin/src/pages/Pool/tabs/TabRoundDate.tsx b/apps/admin/src/pages/ManagePool/tabs/TabRoundDate.tsx similarity index 94% rename from apps/admin/src/pages/Pool/tabs/TabRoundDate.tsx rename to apps/admin/src/pages/ManagePool/tabs/TabRoundDate.tsx index 7d0e223..956f8fd 100644 --- a/apps/admin/src/pages/Pool/tabs/TabRoundDate.tsx +++ b/apps/admin/src/pages/ManagePool/tabs/TabRoundDate.tsx @@ -24,11 +24,11 @@ export const TabRoundDate = () => { roundDates: { applications: { start: "2025-01-01", - end: "2025-01-01", + end: "2025-02-01", }, round: { start: "2025-01-01", - end: "2025-01-01", + end: "2025-02-01", }, }, }, diff --git a/apps/admin/src/pages/Pool/tabs/TabRoundDetail.tsx b/apps/admin/src/pages/ManagePool/tabs/TabRoundDetail.tsx similarity index 100% rename from apps/admin/src/pages/Pool/tabs/TabRoundDetail.tsx rename to apps/admin/src/pages/ManagePool/tabs/TabRoundDetail.tsx diff --git a/apps/admin/src/pages/Pool/tabs/TabVoter.tsx b/apps/admin/src/pages/ManagePool/tabs/TabVoter.tsx similarity index 100% rename from apps/admin/src/pages/Pool/tabs/TabVoter.tsx rename to apps/admin/src/pages/ManagePool/tabs/TabVoter.tsx diff --git a/apps/admin/src/pages/Pool/PoolTabs.tsx b/apps/admin/src/pages/ManagePool/tabs/index.tsx similarity index 86% rename from apps/admin/src/pages/Pool/PoolTabs.tsx rename to apps/admin/src/pages/ManagePool/tabs/index.tsx index fdc2fa2..a4b69bf 100644 --- a/apps/admin/src/pages/Pool/PoolTabs.tsx +++ b/apps/admin/src/pages/ManagePool/tabs/index.tsx @@ -1,5 +1,9 @@ import { VerticalTabs, Icon } from "gitcoin-ui"; -import { TabApplication, TabDistribute, TabRoundDate, TabVoter, TabRoundDetail } from "./tabs"; +import { TabApplication } from "./TabApplication"; +import { TabDistribute } from "./TabDistribute"; +import { TabRoundDate } from "./TabRoundDate"; +import { TabRoundDetail } from "./TabRoundDetail"; +import { TabVoter } from "./TabVoter"; export const PoolTabs = () => { return ( diff --git a/apps/admin/src/pages/Pool/index.ts b/apps/admin/src/pages/Pool/index.ts deleted file mode 100644 index c4277a5..0000000 --- a/apps/admin/src/pages/Pool/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "./Pool"; diff --git a/apps/admin/src/pages/Pool/tabs/index.ts b/apps/admin/src/pages/Pool/tabs/index.ts deleted file mode 100644 index 196cb32..0000000 --- a/apps/admin/src/pages/Pool/tabs/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -export * from "./TabApplication"; -export * from "./TabDistribute"; -export * from "./TabRoundDate"; -export * from "./TabRoundDetail"; -export * from "./TabVoter";