diff --git a/ark-indexer-marketplace-admin/src/app/(dashboard)/collections/search/[search]/components/SearchContracts.tsx b/ark-indexer-marketplace-admin/src/app/(dashboard)/collections/search/[search]/components/SearchContracts.tsx deleted file mode 100644 index 4fd18c28..00000000 --- a/ark-indexer-marketplace-admin/src/app/(dashboard)/collections/search/[search]/components/SearchContracts.tsx +++ /dev/null @@ -1,61 +0,0 @@ -"use client"; - -import Link from "next/link"; - -import { api } from "~/trpc/react"; - -export default function SearchContracts(props: { search: string }) { - const [contracts] = api.contract.searchContracts.useSuspenseQuery({ - contractName: props.search, - }); - - return ( -
- {contracts.map((contract) => ( -
- - {contract.contract_image ? ( -
- {contract.contract_name -
- ) : ( -
- )} - -
-
-

- {contract.contract_name} -

-

-
- {contract.is_spam && ( -
- SPAM -
- )} - - {contract.is_verified && ( -
- VERIFIED -
- )} -
-
-
- -
- ))} -
- ); -} diff --git a/ark-indexer-marketplace-admin/src/app/(dashboard)/collections/search/[search]/page.tsx b/ark-indexer-marketplace-admin/src/app/(dashboard)/collections/search/[search]/page.tsx index 0dc54b2f..aa2d7ab2 100644 --- a/ark-indexer-marketplace-admin/src/app/(dashboard)/collections/search/[search]/page.tsx +++ b/ark-indexer-marketplace-admin/src/app/(dashboard)/collections/search/[search]/page.tsx @@ -1,6 +1,7 @@ import { Suspense } from "react"; -import SearchContracts from "./components/SearchContracts"; +import SearchCollectionsLayout from "~/components/dashboard/SearchCollectionsLayout"; +import SearchContracts from "~/components/SearchContracts"; export default function CollectionSearch({ params, @@ -8,16 +9,10 @@ export default function CollectionSearch({ params: { search: string }; }) { return ( -
-
-

Search Results

-

- Explore the contracts that match your search query. -

-
+ -
+ ); } diff --git a/ark-indexer-marketplace-admin/src/app/(dashboard)/indexer/page.tsx b/ark-indexer-marketplace-admin/src/app/(dashboard)/indexer/page.tsx new file mode 100644 index 00000000..c36aad7a --- /dev/null +++ b/ark-indexer-marketplace-admin/src/app/(dashboard)/indexer/page.tsx @@ -0,0 +1,34 @@ +import { Suspense } from "react"; +import type { NextPage } from "next"; + +import BlocksOverview from "~/components/dashboard/BlockOverview"; +import BlocksOverviewSkeleton from "~/components/dashboard/BlockOverviewSkeleton"; +import CreateIndexerTaskForm from "~/components/dashboard/CreateIndexerTaskForm"; +import IndexerBlocksList from "~/components/dashboard/IndexerBlocksList"; +import IndexerTasksList from "~/components/dashboard/IndexerTasksList"; +import { TaskFormProvider } from "~/components/dashboard/TaskFormProvider"; + +const IndexerPage: NextPage = () => { + return ( + +
+
+ }> + + + + + + + + +
+
+ +
+
+ + ); +}; + +export default IndexerPage; diff --git a/ark-indexer-marketplace-admin/src/app/(dashboard)/layout.tsx b/ark-indexer-marketplace-admin/src/app/(dashboard)/layout.tsx index 030c0376..128c7b27 100644 --- a/ark-indexer-marketplace-admin/src/app/(dashboard)/layout.tsx +++ b/ark-indexer-marketplace-admin/src/app/(dashboard)/layout.tsx @@ -1,5 +1,6 @@ import { headers } from "next/headers"; +import CollectionSearch from "~/components/CollectionSearch"; import Header from "~/components/dashboard/Header"; import { NetworkProvider } from "~/components/dashboard/NetworkProvider"; import { ThemeProvider } from "~/components/ThemeProvider"; diff --git a/ark-indexer-marketplace-admin/src/app/(dashboard)/page.tsx b/ark-indexer-marketplace-admin/src/app/(dashboard)/page.tsx index 1bd9777f..4a4b929a 100644 --- a/ark-indexer-marketplace-admin/src/app/(dashboard)/page.tsx +++ b/ark-indexer-marketplace-admin/src/app/(dashboard)/page.tsx @@ -1,34 +1,34 @@ import { Suspense } from "react"; -import type { NextPage } from "next"; -import BlocksOverview from "~/components/dashboard/BlockOverview"; -import BlocksOverviewSkeleton from "~/components/dashboard/BlockOverviewSkeleton"; -import CreateIndexerTaskForm from "~/components/dashboard/CreateIndexerTaskForm"; -import IndexerBlocksList from "~/components/dashboard/IndexerBlocksList"; -import IndexerTasksList from "~/components/dashboard/IndexerTasksList"; -import { TaskFormProvider } from "~/components/dashboard/TaskFormProvider"; +import CollectionSearch from "~/components/CollectionSearch"; +import ContractGridItem from "~/components/dashboard/ContractGridItem"; +import { api } from "~/trpc/server"; +import SearchContracts from "../../components/SearchContracts"; + +export default async function DashboardPage({ + params, +}: { + params: { search: string }; +}) { + const contracts = await api.contract.getContracts.query(); -const DashboardPage: NextPage = () => { return ( - -
-
- }> - - - - - - - - -
-
- -
+
+
+

Contracts

+

+ Explore the contracts that match your search query. +

+ +
+
+ {contracts.map((contract) => ( + + ))}
- +
); -}; - -export default DashboardPage; +} diff --git a/ark-indexer-marketplace-admin/src/components/CollectionSearch.tsx b/ark-indexer-marketplace-admin/src/components/CollectionSearch.tsx index 0dc4d009..861d1e35 100644 --- a/ark-indexer-marketplace-admin/src/components/CollectionSearch.tsx +++ b/ark-indexer-marketplace-admin/src/components/CollectionSearch.tsx @@ -5,8 +5,8 @@ import { useRouter } from "next/navigation"; import { Input } from "./ui/input"; -export default function CollectionSearch() { - const [text, setText] = useState(""); +export default function CollectionSearch(props: { search?: string }) { + const [text, setText] = useState(props.search ?? ""); const router = useRouter(); return ( @@ -21,7 +21,7 @@ export default function CollectionSearch() { } }} type="search" - placeholder="Search collection..." + placeholder="Type collection name..." className="md:w-[100px] lg:w-[300px]" value={text} /> diff --git a/ark-indexer-marketplace-admin/src/components/SearchContracts.tsx b/ark-indexer-marketplace-admin/src/components/SearchContracts.tsx new file mode 100644 index 00000000..80ba443e --- /dev/null +++ b/ark-indexer-marketplace-admin/src/components/SearchContracts.tsx @@ -0,0 +1,18 @@ +"use client"; + +import ContractGridItem from "~/components/dashboard/ContractGridItem"; +import { api } from "~/trpc/react"; + +export default function SearchContracts(props: { search: string }) { + const [contracts] = api.contract.searchContracts.useSuspenseQuery({ + contractName: props.search, + }); + + return ( +
+ {contracts.map((contract) => ( + + ))} +
+ ); +} diff --git a/ark-indexer-marketplace-admin/src/components/dashboard/ContractGridItem.tsx b/ark-indexer-marketplace-admin/src/components/dashboard/ContractGridItem.tsx new file mode 100644 index 00000000..a6feffba --- /dev/null +++ b/ark-indexer-marketplace-admin/src/components/dashboard/ContractGridItem.tsx @@ -0,0 +1,56 @@ +import Link from "next/link"; + +import type { Contract } from "~/types"; + +interface ContractGridItemProps { + contract: Contract; +} + +export default function ContractGridItem(props: ContractGridItemProps) { + const { contract } = props; + return ( +
+ + {contract.contract_image ? ( +
+ {contract.contract_name +
+ ) : ( +
+ )} + +
+
+

+ {contract.contract_name} +

+

+
+ {contract.is_spam && ( +
+ SPAM +
+ )} + + {contract.is_verified && ( +
+ VERIFIED +
+ )} +
+
+
+ +
+ ); +} diff --git a/ark-indexer-marketplace-admin/src/components/dashboard/Header.tsx b/ark-indexer-marketplace-admin/src/components/dashboard/Header.tsx index ad50513f..bdc529db 100644 --- a/ark-indexer-marketplace-admin/src/components/dashboard/Header.tsx +++ b/ark-indexer-marketplace-admin/src/components/dashboard/Header.tsx @@ -33,7 +33,6 @@ export default function DashboardHeader({ user }: DashboardHeaderProps) {
- @@ -63,19 +62,6 @@ export default function DashboardHeader({ user }: DashboardHeaderProps) {
- - - - Dashboard - - - - - Metadata - - - -
Theme @@ -83,14 +69,6 @@ export default function DashboardHeader({ user }: DashboardHeaderProps) {
- - - - ArkProject.dev - - - - { diff --git a/ark-indexer-marketplace-admin/src/components/dashboard/NetworkSelector.tsx b/ark-indexer-marketplace-admin/src/components/dashboard/NetworkSelector.tsx index 1f6f7144..cbc66170 100644 --- a/ark-indexer-marketplace-admin/src/components/dashboard/NetworkSelector.tsx +++ b/ark-indexer-marketplace-admin/src/components/dashboard/NetworkSelector.tsx @@ -21,7 +21,7 @@ export default function NetworkSelector() { - Production Mainnet + Mainnet {/* Production Sepolia Staging Mainnet Staging Sepolia */} diff --git a/ark-indexer-marketplace-admin/src/components/dashboard/SearchCollectionsLayout.tsx b/ark-indexer-marketplace-admin/src/components/dashboard/SearchCollectionsLayout.tsx new file mode 100644 index 00000000..5daed324 --- /dev/null +++ b/ark-indexer-marketplace-admin/src/components/dashboard/SearchCollectionsLayout.tsx @@ -0,0 +1,22 @@ +import CollectionSearch from "~/components/CollectionSearch"; + +export default function SearchCollectionsLayout({ + children, + search, +}: { + search?: string; + children: React.ReactNode; +}) { + return ( +
+
+

Contracts

+

+ Explore the contracts that match your search query. +

+ +
+ {children} +
+ ); +} diff --git a/ark-indexer-marketplace-admin/src/lib/queries/contract.ts b/ark-indexer-marketplace-admin/src/lib/queries/contract.ts index 549f3737..416d93df 100644 --- a/ark-indexer-marketplace-admin/src/lib/queries/contract.ts +++ b/ark-indexer-marketplace-admin/src/lib/queries/contract.ts @@ -53,11 +53,22 @@ export async function fetchContract(contractAddress: string, chainId: string) { return res.rows.length > 0 ? res.rows[0] : undefined; } +export async function getDefaultContracts(chainId: string) { + const res = await pool.query( + `SELECT contract_address, chain_id, updated_timestamp, contract_type, contract_name, contract_symbol, contract_image, metadata_ok, is_spam, is_nsfw, deployed_timestamp, is_verified, save_images, is_refreshing + FROM contract + WHERE contract_type = 'ERC721' AND is_spam = false AND chain_id = $1 AND contract_name != '' ORDER BY contract_name ASC LIMIT 50`, + [chainId], + ); + + return res.rows; +} + export async function searchContracts(contractName: string, chainId: string) { const res = await pool.query( `SELECT contract_address, chain_id, updated_timestamp, contract_type, contract_name, contract_symbol, contract_image, metadata_ok, is_spam, is_nsfw, deployed_timestamp, is_verified, save_images, is_refreshing FROM contract - WHERE contract_type = 'ERC721' AND contract_name ILIKE $1 AND chain_id = $2 ORDER BY contract_image ASC LIMIT 50`, + WHERE contract_type = 'ERC721' AND contract_name ILIKE $1 AND chain_id = $2 ORDER BY contract_image ASC, contract_name ASC LIMIT 50`, ["%" + contractName + "%", chainId], ); diff --git a/ark-indexer-marketplace-admin/src/server/api/routers/contract.ts b/ark-indexer-marketplace-admin/src/server/api/routers/contract.ts index afeed94d..8dd169aa 100644 --- a/ark-indexer-marketplace-admin/src/server/api/routers/contract.ts +++ b/ark-indexer-marketplace-admin/src/server/api/routers/contract.ts @@ -5,6 +5,7 @@ import { spawnMetadataIndexerTask } from "~/lib/aws"; import { fetchContract, fetchRefreshingContracts, + getDefaultContracts, searchContracts, updateContract, updateIsRefreshingContract, @@ -25,6 +26,17 @@ export const contractRouter = createTRPCRouter({ await clearListedTokensCache(input.contractAddress); }), + getContracts: protectedProcedure.query(async () => { + try { + const contracts = await getDefaultContracts(MAINNET_CHAIN_ID); + + console.log("Contracts found:", JSON.stringify(contracts, null, 2)); + return contracts; + } catch (err) { + return []; + } + }), + searchContracts: protectedProcedure .input( z.object({