Merge pull request #111 from planetscale/move-components

consistent directory structure

Author: thejessewinton

package.json

@@ -9,7 +9,7 @@
     "db:push": "prisma db push",
     "db:studio": "prisma studio",
     "dev": "next dev",
-    "generate:svg": "npx @svgr/cli --no-index --out-dir src/app/_svg -- src/svg",
+    "generate:svg": "npx @svgr/cli --no-index --out-dir src/app/components/svg -- src/svg",
     "postinstall": "prisma generate",
     "lint": "next lint",
     "start": "next start"

src/app/(auth)/sign-in/page.tsx

@@ -1,9 +1,9 @@
 import { type Metadata } from 'next'
 import { getProviders } from 'next-auth/react'
 import { redirect } from 'next/navigation'
-import Logo from '~/app/_svg/logo'
+import Logo from '~/components/svg/logo'
 import { getServerAuthSession } from '~/server/auth'
-import { SignInButtons } from './_components/sign-in-buttons'
+import { SignInButtons } from '~/components/sign-in-buttons'
 
 export const metadata: Metadata = {
   title: 'Sign In - Beam',

src/app/(default)/layout.tsx

@@ -1,6 +1,6 @@
 import { type ReactNode } from 'react'
-import { Header } from '../_components/header'
-import { Footer } from '../_components/footer'
+import { Header } from '~/components/header'
+import { Footer } from '~/components/footer'
 
 export default async function DefaultLayout({
   children,

src/app/(default)/new/page.tsx

@@ -1,5 +1,5 @@
 import { type Metadata } from 'next'
-import { PostForm } from './_components/post-form'
+import { PostForm } from '~/components/post-form'
 
 export const metadata = {
   title: 'New Post - Beam',

src/app/(default)/page.tsx

@@ -1,5 +1,5 @@
 import { api } from '~/trpc/server'
-import { PostFeed } from '../_components/post-feed'
+import { PostFeed } from '~/components/post-feed'
 
 const POSTS_PER_PAGE = 20
 

src/app/(default)/post/[id]/edit/page.tsx

@@ -1,7 +1,7 @@
 import { getServerAuthSession } from '~/server/auth'
 import { api } from '~/trpc/server'
 
-import { EditPostForm } from '../_components/edit-post-form'
+import { EditPostForm } from '~/components/edit-post-form'
 
 type ProfilePageParams = {
   params: {

src/app/(default)/post/[id]/page.tsx

@@ -1,10 +1,10 @@
-import { Avatar } from '~/app/_components/avatar'
+import { Avatar } from '~/components/avatar'
 
-import { Comment, AddCommentForm } from '~/app/_components/comment'
+import { Comment, AddCommentForm } from '~/components/comment'
 
 import { getServerAuthSession } from '~/server/auth'
 import { api } from '~/trpc/server'
-import { PostView } from '~/app/_components/post-view'
+import { PostView } from '~/components/post-view'
 
 type PostPageParams = {
   params: {

src/app/(default)/profile/[userId]/page.tsx

@@ -1,9 +1,9 @@
-import DotPattern from '~/app/_svg/dot-pattern'
+import DotPattern from '~/components/svg/dot-pattern'
 
 import { getServerAuthSession } from '~/server/auth'
 import { api } from '~/trpc/server'
-import { EditProfileAction } from './_components/edit-profile'
-import { PostFeed } from '~/app/_components/post-feed'
+import { EditProfileAction } from '~/components/edit-profile'
+import { PostFeed } from '~/components/post-feed'
 import { Suspense } from 'react'
 
 type ProfilePageParams = {

src/app/layout.tsx

@@ -5,13 +5,13 @@ import { cookies } from 'next/headers'
 
 import { TRPCReactProvider } from '~/trpc/react'
 import { classNames } from '~/utils/core'
-import { ThemeProvider } from '~/app/_providers/theme'
-import { Toaster } from '~/app/_providers/toaster'
+import { ThemeProvider } from '~/providers/theme'
+import { Toaster } from '~/providers/toaster'
 
-import { SearchDialog } from './_components/search-dialog'
-import { AlertDialog } from './_components/alert-dialog'
+import { SearchDialog } from '~/components/search-dialog'
+import { AlertDialog } from '~/components/alert-dialog'
 import { getServerAuthSession } from '~/server/auth'
-import { SessionProvider } from './_providers/auth'
+import { SessionProvider } from '~/providers/auth'
 
 const inter = localFont({
   variable: '--font-sans',

src/app/_components/actions.tsx src/components/actions.tsxsrc/app/_components/actions.tsx renamed to src/components/actions.tsx

@@ -3,8 +3,8 @@
 import { type Session } from 'next-auth'
 import { Button } from './button'
 import { ProfileMenu } from './profile-menu'
-import { useSearchStore } from '~/app/_hooks/use-search-store'
-import SearchIcon from '../_svg/search-icon'
+import { useSearchStore } from '~/hooks/use-search-store'
+import SearchIcon from '~/components/svg/search-icon'
 
 export const Actions = ({ session }: { session: Session | null }) => {
   const { toggleOpen } = useSearchStore()