diff --git a/apps/arkmarket/src/app/(authenticated)/layout.tsx b/apps/arkmarket/app/(authenticated)/layout.tsx similarity index 100% rename from apps/arkmarket/src/app/(authenticated)/layout.tsx rename to apps/arkmarket/app/(authenticated)/layout.tsx diff --git a/apps/arkmarket/src/app/(authenticated)/portfolio/components/Portfolio.tsx b/apps/arkmarket/app/(authenticated)/portfolio/components/Portfolio.tsx similarity index 100% rename from apps/arkmarket/src/app/(authenticated)/portfolio/components/Portfolio.tsx rename to apps/arkmarket/app/(authenticated)/portfolio/components/Portfolio.tsx diff --git a/apps/arkmarket/src/app/(authenticated)/portfolio/page.tsx b/apps/arkmarket/app/(authenticated)/portfolio/page.tsx similarity index 100% rename from apps/arkmarket/src/app/(authenticated)/portfolio/page.tsx rename to apps/arkmarket/app/(authenticated)/portfolio/page.tsx diff --git a/apps/arkmarket/src/app/(authenticated)/assets/[contract_address]/[token_id]/components/asset-infos.tsx b/apps/arkmarket/app/assets/[contract_address]/[token_id]/components/asset-infos.tsx similarity index 100% rename from apps/arkmarket/src/app/(authenticated)/assets/[contract_address]/[token_id]/components/asset-infos.tsx rename to apps/arkmarket/app/assets/[contract_address]/[token_id]/components/asset-infos.tsx diff --git a/apps/arkmarket/src/app/(authenticated)/assets/[contract_address]/[token_id]/components/asset.tsx b/apps/arkmarket/app/assets/[contract_address]/[token_id]/components/asset.tsx similarity index 100% rename from apps/arkmarket/src/app/(authenticated)/assets/[contract_address]/[token_id]/components/asset.tsx rename to apps/arkmarket/app/assets/[contract_address]/[token_id]/components/asset.tsx diff --git a/apps/arkmarket/src/app/(authenticated)/assets/[contract_address]/[token_id]/components/cancel-listing.tsx b/apps/arkmarket/app/assets/[contract_address]/[token_id]/components/cancel-listing.tsx similarity index 100% rename from apps/arkmarket/src/app/(authenticated)/assets/[contract_address]/[token_id]/components/cancel-listing.tsx rename to apps/arkmarket/app/assets/[contract_address]/[token_id]/components/cancel-listing.tsx diff --git a/apps/arkmarket/src/app/(authenticated)/assets/[contract_address]/[token_id]/components/create-listing.tsx b/apps/arkmarket/app/assets/[contract_address]/[token_id]/components/create-listing.tsx similarity index 100% rename from apps/arkmarket/src/app/(authenticated)/assets/[contract_address]/[token_id]/components/create-listing.tsx rename to apps/arkmarket/app/assets/[contract_address]/[token_id]/components/create-listing.tsx diff --git a/apps/arkmarket/src/app/(authenticated)/assets/[contract_address]/[token_id]/components/create-offer.tsx b/apps/arkmarket/app/assets/[contract_address]/[token_id]/components/create-offer.tsx similarity index 100% rename from apps/arkmarket/src/app/(authenticated)/assets/[contract_address]/[token_id]/components/create-offer.tsx rename to apps/arkmarket/app/assets/[contract_address]/[token_id]/components/create-offer.tsx diff --git a/apps/arkmarket/src/app/(authenticated)/assets/[contract_address]/[token_id]/components/fulfill-listing.tsx b/apps/arkmarket/app/assets/[contract_address]/[token_id]/components/fulfill-listing.tsx similarity index 100% rename from apps/arkmarket/src/app/(authenticated)/assets/[contract_address]/[token_id]/components/fulfill-listing.tsx rename to apps/arkmarket/app/assets/[contract_address]/[token_id]/components/fulfill-listing.tsx diff --git a/apps/arkmarket/src/app/(authenticated)/assets/[contract_address]/[token_id]/components/fulfill-offer.tsx b/apps/arkmarket/app/assets/[contract_address]/[token_id]/components/fulfill-offer.tsx similarity index 100% rename from apps/arkmarket/src/app/(authenticated)/assets/[contract_address]/[token_id]/components/fulfill-offer.tsx rename to apps/arkmarket/app/assets/[contract_address]/[token_id]/components/fulfill-offer.tsx diff --git a/apps/arkmarket/src/app/(authenticated)/assets/[contract_address]/[token_id]/components/token-activity.tsx b/apps/arkmarket/app/assets/[contract_address]/[token_id]/components/token-activity.tsx similarity index 100% rename from apps/arkmarket/src/app/(authenticated)/assets/[contract_address]/[token_id]/components/token-activity.tsx rename to apps/arkmarket/app/assets/[contract_address]/[token_id]/components/token-activity.tsx diff --git a/apps/arkmarket/src/app/(authenticated)/assets/[contract_address]/[token_id]/components/token-offers.tsx b/apps/arkmarket/app/assets/[contract_address]/[token_id]/components/token-offers.tsx similarity index 97% rename from apps/arkmarket/src/app/(authenticated)/assets/[contract_address]/[token_id]/components/token-offers.tsx rename to apps/arkmarket/app/assets/[contract_address]/[token_id]/components/token-offers.tsx index 89de644..621d4d2 100644 --- a/apps/arkmarket/src/app/(authenticated)/assets/[contract_address]/[token_id]/components/token-offers.tsx +++ b/apps/arkmarket/app/assets/[contract_address]/[token_id]/components/token-offers.tsx @@ -46,7 +46,7 @@ const TokenOffers: React.FC = ({ token }) => { const { address, account } = useAccount(); const isOwner = address && areAddressesEqual(token.owner, address); const { fulfillOffer } = useFulfillOffer(); - if (account === undefined) return null; + const isConnected = account !== undefined; return (
@@ -100,7 +100,7 @@ const TokenOffers: React.FC = ({ token }) => { {truncateString(offer.offer_maker, 8)} - {isOwner && ( + {isConnected && isOwner && ( + ) +}) +CarouselPrevious.displayName = "CarouselPrevious" + +const CarouselNext = React.forwardRef< + HTMLButtonElement, + React.ComponentProps +>(({ className, variant = "outline", size = "icon", ...props }, ref) => { + const { orientation, scrollNext, canScrollNext } = useCarousel() + + return ( + + ) +}) +CarouselNext.displayName = "CarouselNext" + +export { + type CarouselApi, + Carousel, + CarouselContent, + CarouselItem, + CarouselPrevious, + CarouselNext, +} diff --git a/packages/ui/src/components/ui/command.tsx b/packages/ui/src/components/command.tsx similarity index 100% rename from packages/ui/src/components/ui/command.tsx rename to packages/ui/src/components/command.tsx diff --git a/packages/ui/src/components/ui/dialog.tsx b/packages/ui/src/components/dialog.tsx similarity index 100% rename from packages/ui/src/components/ui/dialog.tsx rename to packages/ui/src/components/dialog.tsx diff --git a/packages/ui/src/components/ui/dropdown-menu.tsx b/packages/ui/src/components/dropdown-menu.tsx similarity index 100% rename from packages/ui/src/components/ui/dropdown-menu.tsx rename to packages/ui/src/components/dropdown-menu.tsx diff --git a/packages/ui/src/components/ui/form.tsx b/packages/ui/src/components/form.tsx similarity index 100% rename from packages/ui/src/components/ui/form.tsx rename to packages/ui/src/components/form.tsx diff --git a/packages/ui/src/components/ui/input.tsx b/packages/ui/src/components/input.tsx similarity index 100% rename from packages/ui/src/components/ui/input.tsx rename to packages/ui/src/components/input.tsx diff --git a/packages/ui/src/components/ui/label.tsx b/packages/ui/src/components/label.tsx similarity index 100% rename from packages/ui/src/components/ui/label.tsx rename to packages/ui/src/components/label.tsx diff --git a/packages/ui/src/components/ui/popover.tsx b/packages/ui/src/components/popover.tsx similarity index 100% rename from packages/ui/src/components/ui/popover.tsx rename to packages/ui/src/components/popover.tsx diff --git a/packages/ui/src/components/ui/scroll-area.tsx b/packages/ui/src/components/scroll-area.tsx similarity index 100% rename from packages/ui/src/components/ui/scroll-area.tsx rename to packages/ui/src/components/scroll-area.tsx diff --git a/packages/ui/src/components/ui/select.tsx b/packages/ui/src/components/select.tsx similarity index 100% rename from packages/ui/src/components/ui/select.tsx rename to packages/ui/src/components/select.tsx diff --git a/packages/ui/src/components/ui/separator.tsx b/packages/ui/src/components/separator.tsx similarity index 100% rename from packages/ui/src/components/ui/separator.tsx rename to packages/ui/src/components/separator.tsx diff --git a/packages/ui/src/components/ui/table.tsx b/packages/ui/src/components/table.tsx similarity index 100% rename from packages/ui/src/components/ui/table.tsx rename to packages/ui/src/components/table.tsx diff --git a/packages/ui/src/components/ui/theme.tsx b/packages/ui/src/components/theme.tsx similarity index 100% rename from packages/ui/src/components/ui/theme.tsx rename to packages/ui/src/components/theme.tsx diff --git a/packages/ui/src/components/ui/toast.tsx b/packages/ui/src/components/toast.tsx similarity index 100% rename from packages/ui/src/components/ui/toast.tsx rename to packages/ui/src/components/toast.tsx diff --git a/packages/ui/src/components/ui/tooltip.tsx b/packages/ui/src/components/tooltip.tsx similarity index 100% rename from packages/ui/src/components/ui/tooltip.tsx rename to packages/ui/src/components/tooltip.tsx diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8d912d2..161998f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -180,6 +180,9 @@ importers: cmdk: specifier: ^1.0.0 version: 1.0.0(@types/react@18.2.79)(react-dom@18.2.0)(react@18.2.0) + embla-carousel-react: + specifier: ^8.0.2 + version: 8.0.2(react@18.2.0) ethers: specifier: ^6.11.1 version: 6.11.1 @@ -3025,6 +3028,28 @@ packages: resolution: {integrity: sha512-lwKft2CLFztD+vEIpesrOtCrko/TFnEJlHFdRhazU7Y/jx5qc4cqsocfVrBg4So4gGe9lvxnbLIoev47WMpg+A==} dev: false + /embla-carousel-react@8.0.2(react@18.2.0): + resolution: {integrity: sha512-RHe1GKLulOW8EDN+cJgbFbVVfRXcaLT2/89dyVw3ONGgVpZjD19wB87I1LUZ1aCzOSrTccx0PFSQanK4OOfGPA==} + peerDependencies: + react: ^16.8.0 || ^17.0.1 || ^18.0.0 + dependencies: + embla-carousel: 8.0.2 + embla-carousel-reactive-utils: 8.0.2(embla-carousel@8.0.2) + react: 18.2.0 + dev: false + + /embla-carousel-reactive-utils@8.0.2(embla-carousel@8.0.2): + resolution: {integrity: sha512-nLZqDkQdO0hvOP49/dUwjkkepMnUXgIzhyRuDjwGqswpB4Ibnc5M+w7rSQQAM+uMj0cPaXnYOTlv8XD7I/zVNw==} + peerDependencies: + embla-carousel: 8.0.2 + dependencies: + embla-carousel: 8.0.2 + dev: false + + /embla-carousel@8.0.2: + resolution: {integrity: sha512-bogsDO8xosuh/l3PxIvA5AMl3+BnRVAse9sDW/60amzj4MbGS5re4WH5eVEXiuH8G1/3G7QUAX2QNr3Yx8z5rA==} + dev: false + /emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} diff --git a/tooling/tailwind/base.ts b/tooling/tailwind/base.ts index 15fd759..00bcad0 100644 --- a/tooling/tailwind/base.ts +++ b/tooling/tailwind/base.ts @@ -2,7 +2,7 @@ import type { Config } from "tailwindcss"; export default { darkMode: ["class"], - content: ["src/**/*.{ts,tsx}"], + content: ["**/*.{ts,tsx}"], theme: { extend: { colors: {