Merge pull request #23 from kihyeoon/dev

UX 개선 작업

package.json

@@ -11,10 +11,11 @@
     "build-storybook": "storybook build"
   },
   "dependencies": {
+    "@radix-ui/react-alert-dialog": "^1.1.1",
     "@radix-ui/react-avatar": "^1.0.4",
     "@radix-ui/react-checkbox": "^1.0.4",
     "@radix-ui/react-icons": "^1.3.0",
-    "@radix-ui/react-slot": "^1.0.2",
+    "@radix-ui/react-slot": "^1.1.0",
     "@radix-ui/react-toast": "^1.1.5",
     "@sanity/image-url": "^1.0.2",
     "@tanstack/react-query": "^5.37.1",

src/app/auth/signIn/page.tsx

@@ -29,7 +29,7 @@ export default async function SignInPage({
   const providers = (await getProviders()) ?? {};
 
   return (
-    <section className="mt-24 flex justify-center">
+    <section className="mt-24 flex flex-col justify-center gap-4">
       <SignIn providers={providers} callbackUrl={callbackUrl ?? "/"} />
     </section>
   );

src/app/layout.tsx

@@ -34,7 +34,7 @@ export default function RootLayout({
       >
         <Providers>
           <NavBar />
-          <main className="mx-auto flex w-full max-w-sm flex-1 flex-col items-center bg-neutral-100">
+          <main className="mx-auto flex w-full max-w-md flex-1 flex-col items-center bg-neutral-100">
             {children}
           </main>
           <Toaster />

src/app/recipe/[id]/loading.tsx

@@ -0,0 +1,9 @@
+import RecipeSkeleton from "@/features/recipe/components/detail/RecipeSkeleton";
+
+export default function Loading() {
+  return (
+    <div className="size-full px-4 py-4">
+      <RecipeSkeleton />
+    </div>
+  );
+}

src/components/ConfirmDialog.tsx

@@ -0,0 +1,51 @@
+import {
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+  AlertDialogTrigger,
+} from "@/components/ui/alert-dialog";
+
+interface Props {
+  trigger: React.ReactNode;
+  title: string;
+  description?: string;
+  handleAction?: () => void;
+  handleCancel?: () => void;
+  actionText?: string;
+  cancelText?: string;
+}
+
+export function ConfirmDialog({
+  trigger,
+  title,
+  description,
+  handleAction,
+  handleCancel = () => {},
+  actionText = "네",
+  cancelText = "아니요",
+}: Props) {
+  return (
+    <AlertDialog>
+      <AlertDialogTrigger asChild>{trigger}</AlertDialogTrigger>
+      <AlertDialogContent>
+        <AlertDialogHeader>
+          <AlertDialogTitle>{title}</AlertDialogTitle>
+          <AlertDialogDescription>{description}</AlertDialogDescription>
+        </AlertDialogHeader>
+        <AlertDialogFooter>
+          <AlertDialogCancel onClick={handleCancel}>
+            {cancelText}
+          </AlertDialogCancel>
+          <AlertDialogAction onClick={handleAction}>
+            {actionText}
+          </AlertDialogAction>
+        </AlertDialogFooter>
+      </AlertDialogContent>
+    </AlertDialog>
+  );
+}

src/components/NavBar.tsx

@@ -1,21 +1,34 @@
 "use client";
 
 import { signIn, signOut, useSession } from "next-auth/react";
+import { usePathname } from "next/navigation";
 
+import { ConfirmDialog } from "@/components/ConfirmDialog";
 import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
 import { Button } from "@/components/ui/button";
 
 export default function NavBar() {
   const { data: session } = useSession();
   const user = session?.user;
+  const pathname = usePathname();
+
+  if (pathname === "/auth/signIn") {
+    return null;
+  }
 
   return (
-    <nav className="z-20 mx-auto flex h-12 w-full max-w-sm items-center justify-end gap-1 bg-background px-4 pt-2">
+    <nav className="z-20 mx-auto flex h-12 w-full max-w-md items-center justify-end gap-1 bg-background px-4 pt-2">
       {user && (
-        <Avatar className="cursor-pointer" onClick={() => signOut()}>
-          <AvatarImage src={user.image} />
-          <AvatarFallback>{user.username}</AvatarFallback>
-        </Avatar>
+        <ConfirmDialog
+          trigger={
+            <Avatar className="cursor-pointer">
+              <AvatarImage src={user.image} />
+              <AvatarFallback>{user.username}</AvatarFallback>
+            </Avatar>
+          }
+          title="로그아웃 하시겠습니까?"
+          handleAction={() => signOut()}
+        />
       )}
       {!session && <Button onClick={() => signIn()}>로그인</Button>}
     </nav>

src/components/ui/alert-dialog.tsx

@@ -0,0 +1,141 @@
+"use client"
+
+import * as React from "react"
+import * as AlertDialogPrimitive from "@radix-ui/react-alert-dialog"
+
+import { cn } from "@/libs/utils"
+import { buttonVariants } from "@/components/ui/button"
+
+const AlertDialog = AlertDialogPrimitive.Root
+
+const AlertDialogTrigger = AlertDialogPrimitive.Trigger
+
+const AlertDialogPortal = AlertDialogPrimitive.Portal
+
+const AlertDialogOverlay = React.forwardRef<
+  React.ElementRef<typeof AlertDialogPrimitive.Overlay>,
+  React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Overlay>
+>(({ className, ...props }, ref) => (
+  <AlertDialogPrimitive.Overlay
+    className={cn(
+      "fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
+      className
+    )}
+    {...props}
+    ref={ref}
+  />
+))
+AlertDialogOverlay.displayName = AlertDialogPrimitive.Overlay.displayName
+
+const AlertDialogContent = React.forwardRef<
+  React.ElementRef<typeof AlertDialogPrimitive.Content>,
+  React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Content>
+>(({ className, ...props }, ref) => (
+  <AlertDialogPortal>
+    <AlertDialogOverlay />
+    <AlertDialogPrimitive.Content
+      ref={ref}
+      className={cn(
+        "fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg",
+        className
+      )}
+      {...props}
+    />
+  </AlertDialogPortal>
+))
+AlertDialogContent.displayName = AlertDialogPrimitive.Content.displayName
+
+const AlertDialogHeader = ({
+  className,
+  ...props
+}: React.HTMLAttributes<HTMLDivElement>) => (
+  <div
+    className={cn(
+      "flex flex-col space-y-2 text-center sm:text-left",
+      className
+    )}
+    {...props}
+  />
+)
+AlertDialogHeader.displayName = "AlertDialogHeader"
+
+const AlertDialogFooter = ({
+  className,
+  ...props
+}: React.HTMLAttributes<HTMLDivElement>) => (
+  <div
+    className={cn(
+      "flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2",
+      className
+    )}
+    {...props}
+  />
+)
+AlertDialogFooter.displayName = "AlertDialogFooter"
+
+const AlertDialogTitle = React.forwardRef<
+  React.ElementRef<typeof AlertDialogPrimitive.Title>,
+  React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Title>
+>(({ className, ...props }, ref) => (
+  <AlertDialogPrimitive.Title
+    ref={ref}
+    className={cn("text-lg font-semibold", className)}
+    {...props}
+  />
+))
+AlertDialogTitle.displayName = AlertDialogPrimitive.Title.displayName
+
+const AlertDialogDescription = React.forwardRef<
+  React.ElementRef<typeof AlertDialogPrimitive.Description>,
+  React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Description>
+>(({ className, ...props }, ref) => (
+  <AlertDialogPrimitive.Description
+    ref={ref}
+    className={cn("text-sm text-muted-foreground", className)}
+    {...props}
+  />
+))
+AlertDialogDescription.displayName =
+  AlertDialogPrimitive.Description.displayName
+
+const AlertDialogAction = React.forwardRef<
+  React.ElementRef<typeof AlertDialogPrimitive.Action>,
+  React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Action>
+>(({ className, ...props }, ref) => (
+  <AlertDialogPrimitive.Action
+    ref={ref}
+    className={cn(buttonVariants(), className)}
+    {...props}
+  />
+))
+AlertDialogAction.displayName = AlertDialogPrimitive.Action.displayName
+
+const AlertDialogCancel = React.forwardRef<
+  React.ElementRef<typeof AlertDialogPrimitive.Cancel>,
+  React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Cancel>
+>(({ className, ...props }, ref) => (
+  <AlertDialogPrimitive.Cancel
+    ref={ref}
+    className={cn(
+      buttonVariants({ variant: "outline" }),
+      "mt-2 sm:mt-0",
+      className
+    )}
+    {...props}
+  />
+))
+AlertDialogCancel.displayName = AlertDialogPrimitive.Cancel.displayName
+
+export {
+  AlertDialog,
+  AlertDialogPortal,
+  AlertDialogOverlay,
+  AlertDialogTrigger,
+  AlertDialogContent,
+  AlertDialogHeader,
+  AlertDialogFooter,
+  AlertDialogTitle,
+  AlertDialogDescription,
+  AlertDialogAction,
+  AlertDialogCancel,
+}

src/features/auth/components/SignIn.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { ClientSafeProvider, signIn } from "next-auth/react";
+import { type ClientSafeProvider, signIn } from "next-auth/react";
 
 import { Button } from "@/components/ui/button";
 
@@ -10,13 +10,37 @@ interface Props {
 }
 
 export default function SignIn({ providers, callbackUrl }: Props) {
+  const testAccount = {
+    email: "[email protected]",
+    password: "testpassword",
+  };
+
   return (
     <>
-      {Object.values(providers).map(({ name, id }) => (
-        <Button key={id} onClick={() => signIn(id, { callbackUrl })}>
-          {`${name}로 로그인하기`}
-        </Button>
-      ))}
+      {Object.values(providers).map(({ name, id }) => {
+        if (id !== "credentials") {
+          return (
+            <Button key={id} onClick={() => signIn(id, { callbackUrl })}>
+              {`${name}로 로그인하기`}
+            </Button>
+          );
+        } else {
+          return (
+            <Button
+              key={id}
+              onClick={() =>
+                signIn(id, {
+                  email: testAccount.email,
+                  password: testAccount.password,
+                  callbackUrl,
+                })
+              }
+            >
+              체험해보기
+            </Button>
+          );
+        }
+      })}
     </>
   );
 }

src/features/auth/services/auth.ts

@@ -1,4 +1,5 @@
 import NextAuth, { NextAuthOptions } from "next-auth";
+import CredentialsProvider from "next-auth/providers/credentials";
 import GoogleProvider from "next-auth/providers/google";
 
 import { addUser } from "@/features/auth/services/user";
@@ -9,6 +10,43 @@ export const authOptions: NextAuthOptions = {
       clientId: process.env.GOOGLE_CLIENT_ID || "",
       clientSecret: process.env.GOOGLE_CLIENT_SECRET || "",
     }),
+    CredentialsProvider({
+      name: "Credentials",
+      credentials: {
+        email: {
+          label: "Email",
+          type: "email",
+          placeholder: "[email protected]",
+        },
+        password: { label: "Password", type: "password" },
+      },
+      async authorize(credentials) {
+        const { email, password } = credentials || {};
+
+        const testAccounts = [
+          {
+            email: "[email protected]",
+            password: "testpassword",
+            name: "Test User",
+          },
+        ];
+
+        const user = testAccounts.find(
+          (account) => account.email === email && account.password === password,
+        );
+
+        if (user) {
+          return {
+            id: "test-id",
+            name: user.name,
+            email: user.email,
+            username: user.email.split("@")[0],
+          };
+        }
+
+        return null;
+      },
+    }),
   ],
   callbacks: {
     async signIn({ user: { id, name, image, email } }) {

src/features/recipe/components/detail/RecipeSkeleton.stories.ts

@@ -3,7 +3,7 @@ import type { Meta, StoryObj } from "@storybook/react";
 import RecipeSkeleton from "./RecipeSkeleton";
 
 const meta = {
-  title: "recipe/skeleton",
+  title: "recipe/skeleton/detail",
   component: RecipeSkeleton,
   parameters: {
     layout: "centered",

src/features/recipe/components/detail/RecipeSkeleton.tsx

@@ -3,6 +3,7 @@ import { Skeleton } from "@/components/ui/skeleton";
 export default function RecipeSkeleton() {
   return (
     <div className="flex flex-col gap-2">
+      <Skeleton className="h-52 w-full" />
       <Skeleton className="h-4 w-[50px]" />
       <Skeleton className="h-4 w-[70px]" />
       <Skeleton className="h-4 w-[60px]" />