diff --git a/@/components/ui/accordion.tsx b/@/components/ui/accordion.tsx index 937620af2..7bf547d6c 100644 --- a/@/components/ui/accordion.tsx +++ b/@/components/ui/accordion.tsx @@ -1,8 +1,8 @@ "use client" -import * as React from "react" import * as AccordionPrimitive from "@radix-ui/react-accordion" import { ChevronDown } from "lucide-react" +import * as React from "react" import { cn } from "@/lib/utils" @@ -14,7 +14,7 @@ const AccordionItem = React.forwardRef< >(({ className, ...props }, ref) => ( )) @@ -52,9 +52,10 @@ const AccordionContent = React.forwardRef< )} {...props} > -
{children}
+
{children}
)) AccordionContent.displayName = AccordionPrimitive.Content.displayName -export { Accordion, AccordionItem, AccordionTrigger, AccordionContent } +export { Accordion, AccordionContent, AccordionItem, AccordionTrigger } + diff --git a/app/[page]/page.tsx b/app/[page]/page.tsx index 3dfde9f92..fad9caa78 100644 --- a/app/[page]/page.tsx +++ b/app/[page]/page.tsx @@ -1,6 +1,6 @@ import type { Metadata } from 'next'; -import Prose from 'components/prose'; +import Prose from 'components/ui/prose'; import { getPage } from 'lib/shopify'; import { notFound } from 'next/navigation'; diff --git a/app/layout.tsx b/app/layout.tsx index 6ca584df1..d6df5c584 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -34,7 +34,7 @@ export default async function RootLayout({ children }: { children: ReactNode }) return ( - +
{children}
diff --git a/app/page.tsx b/app/page.tsx index 1a60d5cb5..c056ad941 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -1,14 +1,11 @@ -import { Button } from '@/components/ui/button'; -import { Carousel } from 'components/carousel'; -import { GridTileImage } from 'components/grid/tile'; import Footer from 'components/layout/footer'; -import Link from 'next/link'; +import { Carousel } from 'components/ui/carousel'; import { Suspense } from 'react'; export const runtime = 'edge'; export const metadata = { - description: 'scape²: art for the wall & wardrobe.', + description: 'scape²: consciously created, art to wear, altering angles, by independent artist Sammii.', openGraph: { type: 'website' }, @@ -18,9 +15,13 @@ export default async function HomePage() { return ( <> - -
- + +
+ + + + + {/* - + */} +
- -