Merge pull request #9 from goodeats/dev

layout to ui

app/components/index.ts

@@ -1,5 +1,4 @@
 export * from './ui/index.ts'
-export * from './layout/index.ts'
 export * from './templates/index.ts'
 
 export * from './confetti.tsx'

app/components/ui/index.ts

@@ -1,2 +1,3 @@
-export * from './custom/index.ts'
 export * from './primitives/index.ts'
+export * from './layout/index.ts'
+export * from './custom/index.ts'

app/components/layout/content-actionbar.tsx → app/components/ui/layout/content-actionbar.tsx

@@ -1,7 +1,11 @@
 import { Link } from '@remix-run/react'
-import { Button, Icon, type IconName } from '#app/components/index.ts'
+import {
+	Button,
+	Icon,
+	type IconName,
+	floatingToolbarClassName,
+} from '#app/components/index.ts'
 import { DeleteNote } from '#app/routes/users+/$username_+/notes.$noteId.tsx'
-import { floatingToolbarClassName } from '../floating-toolbar.tsx'
 
 interface ContentActionbarProps {
 	timestamp?: string

app/components/layout/nav-search.tsx → app/components/ui/layout/nav-search.tsx

@@ -3,8 +3,8 @@ import { useMatches } from '@remix-run/react'
 import { cva, type VariantProps } from 'class-variance-authority'
 import * as React from 'react'
 
+import { SearchBar } from '#app/components/index.ts'
 import { cn } from '#app/utils/misc.tsx'
-import { SearchBar } from '../search-bar.tsx'
 
 const navSearchVariants = cva('nav', {
 	variants: {