reorg

MananTank · MananTank · commit 9bfe509898a3 · 2025-06-10T16:44:08.000+05:30
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/cards.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/cards.tsx
@@ -33,7 +33,7 @@ export function Cards(props: {
       <CardLink
         title="Create Coin"
         description="Launch your own ERC-20 coin"
-        href={`/team/${props.teamSlug}/${props.projectSlug}/assets/create`}
+        href={`/team/${props.teamSlug}/${props.projectSlug}/assets/create/token`}
         icon={CoinsIcon}
         trackingLabel="create-token"
       />
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/_common/step-card.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/_common/step-card.tsx
@@ -1,7 +1,7 @@
 import { Button } from "@/components/ui/button";
 import { useTrack } from "hooks/analytics/useTrack";
 import { ArrowLeftIcon, ArrowRightIcon } from "lucide-react";
-import { getStepCardTrackingData } from "../tracking";
+import { getStepCardTrackingData } from "../token/_common/tracking";
 
 export function StepCard(props: {
   title: string;
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/_common/form.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/_common/form.ts
@@ -1,7 +1,7 @@
 import type { UseFormReturn } from "react-hook-form";
 import * as z from "zod";
-import { socialUrlsSchema } from "../_common/schema";
-import type { NFTMetadataWithPrice } from "./upload-nfts/batch-upload/process-files";
+import { socialUrlsSchema } from "../../_common/schema";
+import type { NFTMetadataWithPrice } from "../upload-nfts/batch-upload/process-files";
 
 export const nftCollectionInfoFormSchema = z.object({
   // info fieldset
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/_common/tracking.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/_common/tracking.ts
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/collection-info/nft-collection-info-fieldset.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/collection-info/nft-collection-info-fieldset.tsx
@@ -8,9 +8,9 @@ import { Textarea } from "@/components/ui/textarea";
 import { ClientOnly } from "components/ClientOnly/ClientOnly";
 import { FileInput } from "components/shared/FileInput";
 import type { ThirdwebClient } from "thirdweb";
-import { SocialUrlsFieldset } from "../_common/SocialUrls";
-import { StepCard } from "../_common/step-card";
-import type { NFTCollectionInfoForm } from "./form";
+import { SocialUrlsFieldset } from "../../_common/SocialUrls";
+import { StepCard } from "../../_common/step-card";
+import type { NFTCollectionInfoForm } from "../_common/form";
 
 export function NFTCollectionInfoFieldset(props: {
   client: ThirdwebClient;
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/create-nft-page-ui.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/create-nft-page-ui.tsx
@@ -12,9 +12,9 @@ import {
   type CreateNFTFunctions,
   type NFTCollectionInfoFormValues,
   nftCollectionInfoFormSchema,
-} from "./form";
-import { LaunchNFT } from "./launch-nft";
-import { NFTCollectionInfoFieldset } from "./nft-collection-info-fieldset";
+} from "./_common/form";
+import { NFTCollectionInfoFieldset } from "./collection-info/nft-collection-info-fieldset";
+import { LaunchNFT } from "./launch/launch-nft";
 import type {} from "./upload-nfts/batch-upload/process-files";
 import { type NFTData, UploadNFTsFieldset } from "./upload-nfts/upload-nfts";
 
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/create-nft-page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/create-nft-page.tsx
@@ -24,12 +24,15 @@ import { useActiveAccount } from "thirdweb/react";
 import { maxUint256 } from "thirdweb/utils";
 import { parseError } from "utils/errorParser";
 import { useAddContractToProject } from "../../../hooks/project-contracts";
-import { CreateNFTPageUI } from "./create-nft-page-ui";
-import type { CreateNFTFormValues, NFTCollectionInfoFormValues } from "./form";
+import type {
+  CreateNFTFormValues,
+  NFTCollectionInfoFormValues,
+} from "./_common/form";
 import {
   getNFTDeploymentTrackingData,
   getNFTStepTrackingData,
-} from "./tracking";
+} from "./_common/tracking";
+import { CreateNFTPageUI } from "./create-nft-page-ui";
 import type { NFTMetadataWithPrice } from "./upload-nfts/batch-upload/process-files";
 
 export function CreateNFTPage(props: {
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/launch/launch-nft.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/launch/launch-nft.tsx
@@ -24,11 +24,11 @@ import { useMemo, useRef, useState } from "react";
 import { type ThirdwebClient, defineChain } from "thirdweb";
 import { TokenProvider, TokenSymbol, useActiveWallet } from "thirdweb/react";
 import { parseError } from "utils/errorParser";
-import { ChainOverview } from "../_common/chain-overview";
-import { FilePreview } from "../_common/file-preview";
-import { StepCard } from "../_common/step-card";
-import type { CreateNFTFormValues, CreateNFTFunctions } from "./form";
-import { getNFTLaunchTrackingData } from "./tracking";
+import { ChainOverview } from "../../_common/chain-overview";
+import { FilePreview } from "../../_common/file-preview";
+import { StepCard } from "../../_common/step-card";
+import type { CreateNFTFormValues, CreateNFTFunctions } from "../_common/form";
+import { getNFTLaunchTrackingData } from "../_common/tracking";
 
 const stepIds = {
   "deploy-contract": "deploy-contract",
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/page.tsx
@@ -25,7 +25,7 @@ export default async function Page(props: {
 
   if (!authToken || !accountAddress) {
     loginRedirect(
-      `/team/${params.team_slug}/${params.project_slug}/assets/create`,
+      `/team/${params.team_slug}/${params.project_slug}/assets/create/nft`,
     );
   }
 
@@ -45,7 +45,7 @@ export default async function Page(props: {
   return (
     <div className="flex grow flex-col">
       <CreateAssetPageHeader
-        title="Create NFT"
+        title="Create NFT Collection"
         description="Launch an NFT collection for your project"
         teamSlug={params.team_slug}
         projectSlug={params.project_slug}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/schema.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/schema.ts
@@ -37,18 +37,9 @@ export const nftWithPriceSchema = z.object({
   background_color: z
     .string()
     .optional()
-    .refine(
-      (val) => {
-        if (!val) {
-          return true;
-        }
-        return val.startsWith("#") && val.length === 7;
-      },
-      {
-        message:
-          "Background color must be a six-character hexadecimal with a pre-pended #",
-      },
-    ),
+    .refine((val) => !val || /^#[0-9A-Fa-f]{6}$/.test(val), {
+      message: "Must be a valid hex color (e.g., #FF0000)",
+    }),
   price_amount: priceAmountSchema,
   price_currency: z.string().refine((value) => {
     if (!value) {
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/single-upload/single-upload-nft.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/nft/upload-nfts/single-upload/single-upload-nft.tsx
@@ -199,9 +199,6 @@ export function SingleUploadNFT(props: {
 
         {/* Advanced Settings */}
         <div className="border-t border-dashed px-4 py-6 md:px-6">
-          <h3 className="mb-4 font-medium text-muted-foreground text-sm">
-            Advanced Settings
-          </h3>
           <div className="space-y-4">
             <FormField
               control={form.control}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/_common/form.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/_common/form.ts
@@ -1,6 +1,6 @@
 import type { UseFormReturn } from "react-hook-form";
 import * as z from "zod";
-import { addressSchema, socialUrlsSchema } from "./_common/schema";
+import { addressSchema, socialUrlsSchema } from "../../_common/schema";
 
 export const tokenInfoFormSchema = z.object({
   // info fieldset
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/_common/tracking.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/_common/tracking.ts
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/create-token-page-impl.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/create-token-page-impl.tsx
@@ -28,13 +28,13 @@ import {
 import { useActiveAccount } from "thirdweb/react";
 import { parseError } from "utils/errorParser";
 import { pollWithTimeout } from "utils/pollWithTimeout";
-import { useAddContractToProject } from "../../hooks/project-contracts";
-import { CreateTokenAssetPageUI } from "./create-token-page.client";
-import type { CreateAssetFormValues } from "./form";
+import { useAddContractToProject } from "../../../hooks/project-contracts";
+import type { CreateAssetFormValues } from "./_common/form";
 import {
   getTokenDeploymentTrackingData,
   getTokenStepTrackingData,
-} from "./tracking";
+} from "./_common/tracking";
+import { CreateTokenAssetPageUI } from "./create-token-page.client";
 
 export function CreateTokenAssetPage(props: {
   accountAddress: string;
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/create-token-page.client.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/create-token-page.client.tsx
@@ -8,16 +8,16 @@ import {
   type ThirdwebClient,
   getAddress,
 } from "thirdweb";
-import { TokenDistributionFieldset } from "./distribution/token-distribution";
 import {
   type CreateAssetFormValues,
   type TokenDistributionFormValues,
   type TokenInfoFormValues,
   tokenDistributionFormSchema,
   tokenInfoFormSchema,
-} from "./form";
+} from "./_common/form";
+import { TokenDistributionFieldset } from "./distribution/token-distribution";
 import { LaunchTokenStatus } from "./launch/launch-token";
-import { TokenInfoFieldset } from "./token-info-fieldset";
+import { TokenInfoFieldset } from "./token-info/token-info-fieldset";
 
 export type CreateTokenFunctions = {
   deployContract: (values: CreateAssetFormValues) => Promise<{
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/create-token-page.stories.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/create-token-page.stories.tsx
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/distribution/token-airdrop.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/distribution/token-airdrop.tsx
@@ -37,8 +37,8 @@ import {
 } from "lucide-react";
 import { useState } from "react";
 import type { ThirdwebClient } from "thirdweb";
-import { DownloadFileButton } from "../_common/download-file-button";
-import type { TokenDistributionForm } from "../form";
+import { DownloadFileButton } from "../../_common/download-file-button";
+import type { TokenDistributionForm } from "../_common/form";
 
 type AirdropAddressInput = {
   address: string;
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/distribution/token-distribution.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/distribution/token-distribution.tsx
@@ -8,11 +8,11 @@ import {
 import { Form } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
 import type { ThirdwebClient } from "thirdweb";
-import { StepCard } from "../_common/step-card";
+import { StepCard } from "../../_common/step-card";
 import type {
   TokenDistributionForm,
   TokenDistributionFormValues,
-} from "../form";
+} from "../_common/form";
 import { TokenAirdropSection } from "./token-airdrop";
 import { TokenSaleSection } from "./token-sale";
 
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/distribution/token-sale.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/distribution/token-sale.tsx
@@ -6,7 +6,7 @@ import { DynamicHeight } from "@/components/ui/DynamicHeight";
 import { DecimalInput } from "@/components/ui/decimal-input";
 import { Switch } from "@/components/ui/switch";
 import type { ThirdwebClient } from "thirdweb";
-import type { TokenDistributionForm } from "../form";
+import type { TokenDistributionForm } from "../_common/form";
 
 export function TokenSaleSection(props: {
   form: TokenDistributionForm;
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/launch/launch-token.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/launch/launch-token.tsx
@@ -22,14 +22,14 @@ import Link from "next/link";
 import { useState } from "react";
 import type { ThirdwebClient } from "thirdweb";
 import { useActiveWallet } from "thirdweb/react";
-import { parseError } from "../../../../../../../../../utils/errorParser";
-import { ChainOverview } from "../_common/chain-overview";
-import { FilePreview } from "../_common/file-preview";
-import { StepCard } from "../_common/step-card";
+import { parseError } from "utils/errorParser";
+import { ChainOverview } from "../../_common/chain-overview";
+import { FilePreview } from "../../_common/file-preview";
+import { StepCard } from "../../_common/step-card";
+import type { CreateAssetFormValues } from "../_common/form";
+import { getTokenLaunchTrackingData } from "../_common/tracking";
 import type { CreateTokenFunctions } from "../create-token-page.client";
 import { TokenDistributionBarChart } from "../distribution/token-distribution";
-import type { CreateAssetFormValues } from "../form";
-import { getTokenLaunchTrackingData } from "../tracking";
 
 const stepIds = {
   "deploy-contract": "deploy-contract",
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/page.tsx
@@ -5,9 +5,9 @@ import { redirect } from "next/navigation";
 import {
   getAuthToken,
   getAuthTokenWalletAddress,
-} from "../../../../../../api/lib/getAuthToken";
-import { loginRedirect } from "../../../../../../login/loginRedirect";
-import { CreateAssetPageHeader } from "./_common/PageHeader";
+} from "../../../../../../../api/lib/getAuthToken";
+import { loginRedirect } from "../../../../../../../login/loginRedirect";
+import { CreateAssetPageHeader } from "../_common/PageHeader";
 import { CreateTokenAssetPage } from "./create-token-page-impl";
 
 export default async function Page(props: {
@@ -24,7 +24,7 @@ export default async function Page(props: {
 
   if (!authToken || !accountAddress) {
     loginRedirect(
-      `/team/${params.team_slug}/${params.project_slug}/assets/create`,
+      `/team/${params.team_slug}/${params.project_slug}/assets/create/token`,
     );
   }
 
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/token-info/token-info-fieldset.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/assets/create/token/token-info/token-info-fieldset.tsx
@@ -8,9 +8,9 @@ import { Textarea } from "@/components/ui/textarea";
 import { ClientOnly } from "components/ClientOnly/ClientOnly";
 import { FileInput } from "components/shared/FileInput";
 import type { ThirdwebClient } from "thirdweb";
-import { SocialUrlsFieldset } from "./_common/SocialUrls";
-import { StepCard } from "./_common/step-card";
-import type { TokenInfoForm } from "./form";
+import { SocialUrlsFieldset } from "../../_common/SocialUrls";
+import { StepCard } from "../../_common/step-card";
+import type { TokenInfoForm } from "../_common/form";
 
 export function TokenInfoFieldset(props: {
   client: ThirdwebClient;
