Skip to content

Commit

Permalink
feat: 에러 핸들링 함수 구현 (#168)
Browse files Browse the repository at this point in the history
* feat: restClient 만든 후 clubFn에 적용

* feat: toast 띄우는 error 관리 hook 생성

* feat: alert hook 타입 지정

* chore: fix biome error

* chore: fix ts error

* feat: 동호회 상세 조회 적용

* chore: 파일 이름 변경

* chore: test
  • Loading branch information
Yejin0O0 authored Oct 28, 2024
1 parent 0804f33 commit f748ff5
Show file tree
Hide file tree
Showing 12 changed files with 619 additions and 87 deletions.
9 changes: 4 additions & 5 deletions app/(header)/club/[clubId]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import { usePathname } from "next/navigation";
function ClubIntroPage() {
const pathname = usePathname();
const clubId = Number(pathname.split("/")[2]);
const { data: clubData, isLoading, error } = useGetClubsById(clubId);

const { data: clubData, isLoading } = useGetClubsById(clubId);
const { mutate: postClubMembers } = usePostClubMembers(clubId);
const { data: isJoined } = useGetIsClubMember();
const { data: isLogin } = useGetLoginState();
Expand All @@ -24,10 +25,8 @@ function ClubIntroPage() {
);
}

if (error) {
return (
<div className="text-red-500">데이터를 불러오는 데 실패했습니다.</div>
);
if (!clubData) {
return <div>No data available</div>;
}

const handlePostClubMember = () => {
Expand Down
2 changes: 2 additions & 0 deletions app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import localFont from "next/font/local";
import "./globals.css";
import Header from "@/components/ui/Header";
import { Toaster } from "@/components/ui/toaster";
import { TanstackClientProvider } from "@/lib/TanstackClientProvider";
import { headers } from "next/headers";

Expand Down Expand Up @@ -34,6 +35,7 @@ export default function RootLayout({
{children}
</TanstackClientProvider>
</div>
<Toaster />
</body>
</html>
);
Expand Down
15 changes: 6 additions & 9 deletions app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,24 @@
import { ClubCard } from "@/components/clubs/ClubCard";
import Grid from "@/components/ui/Grid";
import { useGetClubs } from "@/lib/api/hooks/clubHook";
import type { components } from "@/schemas/schema";

export default function page() {
const { data, error, isLoading } = useGetClubs();
type ClubCardResponse = components["schemas"]["ClubCardResponse"];

export default function page() {
const { data, isLoading } = useGetClubs();
if (isLoading) {
return <div>Loading...</div>;
}

if (!data) {
// TODO: 에러 메시지
return <div>No data available</div>;
}

if (error) {
return <div>Error: {error.message}</div>;
return <div>데이터가 없습니다. </div>;
}

return (
<div className="my-10">
<Grid columns={3} placeItems="center" spacing="lg">
{data?.map((club) => (
{data.content?.map((club: ClubCardResponse) => (
<ClubCard key={club.club_id} {...club} />
))}
</Grid>
Expand Down
129 changes: 129 additions & 0 deletions components/ui/toast.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
"use client";

import * as ToastPrimitives from "@radix-ui/react-toast";
import { type VariantProps, cva } from "class-variance-authority";
import { X } from "lucide-react";
import * as React from "react";

import { cn } from "@/lib/utils";

const ToastProvider = ToastPrimitives.Provider;

const ToastViewport = React.forwardRef<
React.ElementRef<typeof ToastPrimitives.Viewport>,
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Viewport>
>(({ className, ...props }, ref) => (
<ToastPrimitives.Viewport
ref={ref}
className={cn(
"fixed top-0 z-[100] flex max-h-screen w-full flex-col-reverse p-4 sm:bottom-0 sm:right-0 sm:top-auto sm:flex-col md:max-w-[420px]",
className,
)}
{...props}
/>
));
ToastViewport.displayName = ToastPrimitives.Viewport.displayName;

const toastVariants = cva(
"group pointer-events-auto relative flex w-full items-center justify-between space-x-4 overflow-hidden rounded-md border p-6 pr-8 shadow-lg transition-all data-[swipe=cancel]:translate-x-0 data-[swipe=end]:translate-x-[var(--radix-toast-swipe-end-x)] data-[swipe=move]:translate-x-[var(--radix-toast-swipe-move-x)] data-[swipe=move]:transition-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[swipe=end]:animate-out data-[state=closed]:fade-out-80 data-[state=closed]:slide-out-to-right-full data-[state=open]:slide-in-from-top-full data-[state=open]:sm:slide-in-from-bottom-full",
{
variants: {
variant: {
default: "border bg-background text-foreground",
destructive:
"destructive group border-destructive bg-destructive text-destructive-foreground",
},
},
defaultVariants: {
variant: "default",
},
},
);

const Toast = React.forwardRef<
React.ElementRef<typeof ToastPrimitives.Root>,
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Root> &
VariantProps<typeof toastVariants>
>(({ className, variant, ...props }, ref) => {
return (
<ToastPrimitives.Root
ref={ref}
className={cn(toastVariants({ variant }), className)}
{...props}
/>
);
});
Toast.displayName = ToastPrimitives.Root.displayName;

const ToastAction = React.forwardRef<
React.ElementRef<typeof ToastPrimitives.Action>,
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Action>
>(({ className, ...props }, ref) => (
<ToastPrimitives.Action
ref={ref}
className={cn(
"inline-flex h-8 shrink-0 items-center justify-center rounded-md border bg-transparent px-3 text-sm font-medium ring-offset-background transition-colors hover:bg-secondary focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 group-[.destructive]:border-muted/40 group-[.destructive]:hover:border-destructive/30 group-[.destructive]:hover:bg-destructive group-[.destructive]:hover:text-destructive-foreground group-[.destructive]:focus:ring-destructive",
className,
)}
{...props}
/>
));
ToastAction.displayName = ToastPrimitives.Action.displayName;

const ToastClose = React.forwardRef<
React.ElementRef<typeof ToastPrimitives.Close>,
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Close>
>(({ className, ...props }, ref) => (
<ToastPrimitives.Close
ref={ref}
className={cn(
"absolute right-2 top-2 rounded-md p-1 text-foreground/50 opacity-0 transition-opacity hover:text-foreground focus:opacity-100 focus:outline-none focus:ring-2 group-hover:opacity-100 group-[.destructive]:text-red-300 group-[.destructive]:hover:text-red-50 group-[.destructive]:focus:ring-red-400 group-[.destructive]:focus:ring-offset-red-600",
className,
)}
toast-close=""
{...props}
>
<X className="h-4 w-4" />
</ToastPrimitives.Close>
));
ToastClose.displayName = ToastPrimitives.Close.displayName;

const ToastTitle = React.forwardRef<
React.ElementRef<typeof ToastPrimitives.Title>,
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Title>
>(({ className, ...props }, ref) => (
<ToastPrimitives.Title
ref={ref}
className={cn("text-sm font-semibold", className)}
{...props}
/>
));
ToastTitle.displayName = ToastPrimitives.Title.displayName;

const ToastDescription = React.forwardRef<
React.ElementRef<typeof ToastPrimitives.Description>,
React.ComponentPropsWithoutRef<typeof ToastPrimitives.Description>
>(({ className, ...props }, ref) => (
<ToastPrimitives.Description
ref={ref}
className={cn("text-sm opacity-90", className)}
{...props}
/>
));
ToastDescription.displayName = ToastPrimitives.Description.displayName;

type ToastProps = React.ComponentPropsWithoutRef<typeof Toast>;

type ToastActionElement = React.ReactElement<typeof ToastAction>;

export {
type ToastProps,
type ToastActionElement,
ToastProvider,
ToastViewport,
Toast,
ToastTitle,
ToastDescription,
ToastClose,
ToastAction,
};
31 changes: 31 additions & 0 deletions components/ui/toaster.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
"use client";

import {
Toast,
ToastClose,
ToastDescription,
ToastProvider,
ToastTitle,
ToastViewport,
} from "@/components/ui/toast";
import { useToast } from "@/hooks/use-toast";

export function Toaster() {
const { toasts } = useToast();

return (
<ToastProvider>
{toasts.map(({ id, title, description, action, ...props }) => (
<Toast key={id} {...props}>
<div className="grid gap-1">
{title && <ToastTitle>{title}</ToastTitle>}
{description && <ToastDescription>{description}</ToastDescription>}
</div>
{action}
<ToastClose />
</Toast>
))}
<ToastViewport />
</ToastProvider>
);
}
Loading

0 comments on commit f748ff5

Please sign in to comment.