From d0d9284ce46af120064a48811e3ded167c3a3db6 Mon Sep 17 00:00:00 2001 From: hyeopsang Date: Wed, 26 Feb 2025 14:16:29 +0900 Subject: [PATCH 1/7] =?UTF-8?q?feat:=20reply=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EB=B0=8F=20fetch=20API=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .husky/pre-commit | 4 +- apps/web/app/layout.tsx | 32 +--------- apps/web/app/page.tsx | 16 +---- apps/web/src/app/_providers/providers.tsx | 18 ++++++ apps/web/src/app/main/index.tsx | 10 ++++ apps/web/src/app/main/layouts/index.tsx | 27 +++++++++ .../src/feature/comment/types/comment-type.ts | 10 ++++ apps/web/src/feature/comment/ui/comment.tsx | 30 ++++++++++ apps/web/src/feature/comment/ui/index.ts | 1 + apps/web/src/feature/reply/api/reply-api.ts | 55 ++++++++++++++++++ .../web/src/feature/reply/types/reply-type.ts | 15 +++++ apps/web/src/feature/reply/ui/reply-list.tsx | 45 ++++++++++++++ apps/web/src/shared/api/fetch-wrapper.ts | 54 +++++++++++++++++ apps/web/src/shared/api/index.ts | 1 + apps/web/src/shared/assets/index.ts | 3 + apps/web/src/shared/assets/profile.png | Bin 0 -> 615 bytes apps/web/src/shared/favicon.ico | Bin 0 -> 25931 bytes apps/web/src/shared/ui/index.ts | 2 + apps/web/src/shared/ui/outline-button.tsx | 14 +++++ packages/ui/tailwind.config.ts | 1 + 20 files changed, 289 insertions(+), 49 deletions(-) create mode 100644 apps/web/src/app/_providers/providers.tsx create mode 100644 apps/web/src/app/main/index.tsx create mode 100644 apps/web/src/app/main/layouts/index.tsx create mode 100644 apps/web/src/feature/comment/types/comment-type.ts create mode 100644 apps/web/src/feature/comment/ui/comment.tsx create mode 100644 apps/web/src/feature/comment/ui/index.ts create mode 100644 apps/web/src/feature/reply/api/reply-api.ts create mode 100644 apps/web/src/feature/reply/types/reply-type.ts create mode 100644 apps/web/src/feature/reply/ui/reply-list.tsx create mode 100644 apps/web/src/shared/api/fetch-wrapper.ts create mode 100644 apps/web/src/shared/api/index.ts create mode 100644 apps/web/src/shared/assets/index.ts create mode 100644 apps/web/src/shared/assets/profile.png create mode 100644 apps/web/src/shared/favicon.ico create mode 100644 apps/web/src/shared/ui/index.ts create mode 100644 apps/web/src/shared/ui/outline-button.tsx diff --git a/.husky/pre-commit b/.husky/pre-commit index e9a388c..8823947 100644 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1,2 @@ -#!/usr/bin/env sh -. "$(dirname -- "$0")/_/husky.sh" -pnpm lint-staged \ No newline at end of file +pnpm lint-staged diff --git a/apps/web/app/layout.tsx b/apps/web/app/layout.tsx index 7e42423..44331d5 100644 --- a/apps/web/app/layout.tsx +++ b/apps/web/app/layout.tsx @@ -1,31 +1 @@ -import '@workspace/ui/globals.css'; - -import { Geist, Geist_Mono } from 'next/font/google'; - -import { Providers } from '@/components/providers'; - -const fontSans = Geist({ - subsets: ['latin'], - variable: '--font-sans', -}); - -const fontMono = Geist_Mono({ - subsets: ['latin'], - variable: '--font-mono', -}); - -export default function RootLayout({ - children, -}: Readonly<{ - children: React.ReactNode; -}>) { - return ( - - - {children} - - - ); -} +export { RootLayout as default } from '@/src/app/main/layouts'; diff --git a/apps/web/app/page.tsx b/apps/web/app/page.tsx index 58ee290..09e16c7 100644 --- a/apps/web/app/page.tsx +++ b/apps/web/app/page.tsx @@ -1,15 +1 @@ -export default function Page() { - return ( -
-
-

- Hello World -

- {/* */} -
- Test -
-
-
- ); -} +export { HomePage as default } from '@/src/app/main'; diff --git a/apps/web/src/app/_providers/providers.tsx b/apps/web/src/app/_providers/providers.tsx new file mode 100644 index 0000000..bb5bcea --- /dev/null +++ b/apps/web/src/app/_providers/providers.tsx @@ -0,0 +1,18 @@ +'use client'; + +import { ThemeProvider as NextThemesProvider } from 'next-themes'; +import * as React from 'react'; + +export function Providers({ children }: { children: React.ReactNode }) { + return ( + + {children} + + ); +} diff --git a/apps/web/src/app/main/index.tsx b/apps/web/src/app/main/index.tsx new file mode 100644 index 0000000..8a7b92b --- /dev/null +++ b/apps/web/src/app/main/index.tsx @@ -0,0 +1,10 @@ +import { ReplyList } from '@/src/feature/reply/ui/reply-list'; +export function HomePage() { + return ( +
+
+ +
+
+ ); +} diff --git a/apps/web/src/app/main/layouts/index.tsx b/apps/web/src/app/main/layouts/index.tsx new file mode 100644 index 0000000..9dff1ab --- /dev/null +++ b/apps/web/src/app/main/layouts/index.tsx @@ -0,0 +1,27 @@ +import '@workspace/ui/globals.css'; + +import { Geist, Geist_Mono } from 'next/font/google'; + +import { Providers } from '@/src/app/_providers/providers'; + +const fontSans = Geist({ + subsets: ['latin'], + variable: '--font-sans', +}); + +const fontMono = Geist_Mono({ + subsets: ['latin'], + variable: '--font-mono', +}); + +export function RootLayout({ children }: { children: React.ReactNode }) { + return ( + + + {children} + + + ); +} diff --git a/apps/web/src/feature/comment/types/comment-type.ts b/apps/web/src/feature/comment/types/comment-type.ts new file mode 100644 index 0000000..0a26ceb --- /dev/null +++ b/apps/web/src/feature/comment/types/comment-type.ts @@ -0,0 +1,10 @@ +export interface CommentType { + id: string; + postId: string; + content: string; + author: string; + createdAt: string; + updatedAt: string; + parentCommentId: string; // default : true + ReplyCount: number; // default : true +} diff --git a/apps/web/src/feature/comment/ui/comment.tsx b/apps/web/src/feature/comment/ui/comment.tsx new file mode 100644 index 0000000..05bcf67 --- /dev/null +++ b/apps/web/src/feature/comment/ui/comment.tsx @@ -0,0 +1,30 @@ +import Image from 'next/image'; + +import { profile } from '@/src/shared/assets'; + +export function Comment({ + author, + content, +}: { + author: string; + content: string; +}) { + return ( +
+
+ profile +
+
+
+

{author}

+ almost 2 years ago +
+

{content}

+
+ {/* + */} +
+
+
+ ); +} diff --git a/apps/web/src/feature/comment/ui/index.ts b/apps/web/src/feature/comment/ui/index.ts new file mode 100644 index 0000000..24c349d --- /dev/null +++ b/apps/web/src/feature/comment/ui/index.ts @@ -0,0 +1 @@ +export { Comment } from '@/src/feature/comment/ui/comment'; diff --git a/apps/web/src/feature/reply/api/reply-api.ts b/apps/web/src/feature/reply/api/reply-api.ts new file mode 100644 index 0000000..77b96c6 --- /dev/null +++ b/apps/web/src/feature/reply/api/reply-api.ts @@ -0,0 +1,55 @@ +import { fetchWrapper } from '@/src/shared/api'; + +import { + CreateReplyDTO, + ReplyCursorPaginationResponse, + UpdateReplyDTO, +} from '../types/reply-type'; + +export const getReply = async ( + postId: string, + commentId: string, + cursor?: string, + limit?: number +): Promise => { + const queryParams = new URLSearchParams(); + if (cursor) queryParams.append('cursor', cursor); + if (limit) queryParams.append('limit', limit.toString()); + + return fetchWrapper.get( + `posts/${postId}/comments/${commentId}/replies?${queryParams.toString()}` + ); +}; + +export const createReply = async ( + postId: string, + commentId: string, + content: CreateReplyDTO +): Promise => { + return fetchWrapper.post( + `/posts/${postId}/comments/${commentId}/replies`, + JSON.stringify(content) + ); +}; + +export const deleteReply = async ( + postId: string, + commentId: string, + replyId: string +): Promise => { + return fetchWrapper.delete( + `/posts/${postId}/comments/${commentId}/replies/${replyId}` + ); +}; + +export const updateReply = async ( + postId: string, + commentId: string, + replyId: string, + content: UpdateReplyDTO +): Promise => { + return fetchWrapper.put( + `/posts/${postId}/comments/${commentId}/replies/${replyId}`, + JSON.stringify(content) + ); +}; diff --git a/apps/web/src/feature/reply/types/reply-type.ts b/apps/web/src/feature/reply/types/reply-type.ts new file mode 100644 index 0000000..5804bb4 --- /dev/null +++ b/apps/web/src/feature/reply/types/reply-type.ts @@ -0,0 +1,15 @@ +import { CommentType } from '@/src/feature/comment/types/comment-type'; + +export interface CreateReplyDTO { + content: string; + author: string; +} +export interface UpdateReplyDTO { + content: string; + author: string; +} +export interface ReplyCursorPaginationResponse { + data: CommentType[]; + nextCursor: string; // default : true + hasMore: boolean; +} diff --git a/apps/web/src/feature/reply/ui/reply-list.tsx b/apps/web/src/feature/reply/ui/reply-list.tsx new file mode 100644 index 0000000..e068c4d --- /dev/null +++ b/apps/web/src/feature/reply/ui/reply-list.tsx @@ -0,0 +1,45 @@ +'use client'; +import { useCallback, useEffect, useState } from 'react'; + +import type { CommentType } from '@/src/feature/comment/types/comment-type'; +import { Comment } from '@/src/feature/comment/ui/comment'; +import { getReply } from '@/src/feature/reply/api/reply-api'; +export function ReplyList() { + const [data, setData] = useState([]); + const [hasMore, setHasMore] = useState(true); + const [nextCursor, setNextCursor] = useState(undefined); + const [isLoading, setIsLoading] = useState(false); + + const fetchReplies = useCallback(async () => { + if (!hasMore || isLoading) return; + + setIsLoading(true); + try { + const response = await getReply( + '17358013402371', + '1738039148628', + nextCursor, + 10 + ); + console.log('Fetched Data:', response); + setData((prev) => [...prev, ...response.data]); + setHasMore(response.hasMore); + setNextCursor(response.nextCursor); + } catch (error) { + console.error('Error fetching replies:', error); + } finally { + setIsLoading(false); + } + }, [nextCursor, hasMore, isLoading]); + useEffect(() => { + fetchReplies(); + }, [fetchReplies]); + + return ( +
+ {data.map(({ id, author, content }) => ( + + ))} +
+ ); +} diff --git a/apps/web/src/shared/api/fetch-wrapper.ts b/apps/web/src/shared/api/fetch-wrapper.ts new file mode 100644 index 0000000..33d1180 --- /dev/null +++ b/apps/web/src/shared/api/fetch-wrapper.ts @@ -0,0 +1,54 @@ +export const fetchWrapper = { + get, + post, + put, + delete: _delete, +}; +const BASE_URL = 'http://localhost:4000/api'; +function get(url: string) { + const requestOptions = { + method: 'GET', + }; + return fetch(`${BASE_URL}/${url}`, requestOptions).then(handleResponse); +} + +async function post(url: string, body: []) { + const requestOptions = { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify(body), + }; + return fetch(`${BASE_URL}/${url}`, requestOptions).then(handleResponse); +} + +function put(url: string, body: []) { + const requestOptions = { + method: 'PUT', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify(body), + }; + return fetch(`${BASE_URL}/${url}`, requestOptions).then(handleResponse); +} + +// prefixed with underscored because delete is a reserved word in javascript +function _delete(url: string) { + const requestOptions = { + method: 'DELETE', + }; + return fetch(`${BASE_URL}/${url}`, requestOptions).then(handleResponse); +} + +function handleResponse(response: Response) { + return response.text().then((text) => { + try { + const data = text ? JSON.parse(text) : {}; + if (!response.ok) { + const error = (data && data.message) || response.statusText; + return Promise.reject(error); + } + return data; + } catch { + console.log('뭐가 문제야!!'); + } + }); +} diff --git a/apps/web/src/shared/api/index.ts b/apps/web/src/shared/api/index.ts new file mode 100644 index 0000000..f69bf4a --- /dev/null +++ b/apps/web/src/shared/api/index.ts @@ -0,0 +1 @@ +export { fetchWrapper } from '@/src/shared/api/fetch-wrapper'; diff --git a/apps/web/src/shared/assets/index.ts b/apps/web/src/shared/assets/index.ts new file mode 100644 index 0000000..7b59209 --- /dev/null +++ b/apps/web/src/shared/assets/index.ts @@ -0,0 +1,3 @@ +import profile from './profile.png'; + +export { profile }; diff --git a/apps/web/src/shared/assets/profile.png b/apps/web/src/shared/assets/profile.png new file mode 100644 index 0000000000000000000000000000000000000000..ce7a2f58137026d97bec73a93cdb4be69adcf4ce GIT binary patch literal 615 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!I14-?iy0UgcY`pa)tkqUfPz{9 zJ|V8|1wKF~F@SyDv}~X{-jX1{U0mj0ssD&oA2h&=IOasA-8@Sw{a_nVnxThXT`hTYBj$U_3e`sf2P>7~V8ww3E?zgg#+haxs+Tv(Niu%Q3)yfr?IX+5RITkZ+-f)lnpO5q5pa@a&XzLf+c6u54IZF_pV{ui%18qunnAZ*y#lyjaRR zzrOFnr3IEV@*XPp>vc|^`;zhA?#~$y;U@N+VZ}!fMLbrXA zPZuy*uzG)9bx}#ze=na6i=S8%e*yQyT$$9^dt&FTFT6e>Sl})f5xqBGZSUvohND`( z&p&SX6v5uFyVfS-WzpN0TdX2>9k}(}s_L=*?P&R5|39BTTR6*igQ?SxtFM07{`|M+ a-+u;|71?~tY9v4jh{4m<&t;ucLK6T`{P_z2 literal 0 HcmV?d00001 diff --git a/apps/web/src/shared/favicon.ico b/apps/web/src/shared/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..718d6fea4835ec2d246af9800eddb7ffb276240c GIT binary patch literal 25931 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 LrJugUA?W`A8`#=m literal 0 HcmV?d00001 diff --git a/apps/web/src/shared/ui/index.ts b/apps/web/src/shared/ui/index.ts new file mode 100644 index 0000000..e942d84 --- /dev/null +++ b/apps/web/src/shared/ui/index.ts @@ -0,0 +1,2 @@ +export { OutLineButton } from '@/src/shared/ui/outline-button'; +export { useInfiniteScroll } from '@/src/shared/ui/useInfiniteScroll'; diff --git a/apps/web/src/shared/ui/outline-button.tsx b/apps/web/src/shared/ui/outline-button.tsx new file mode 100644 index 0000000..7826369 --- /dev/null +++ b/apps/web/src/shared/ui/outline-button.tsx @@ -0,0 +1,14 @@ +import { Button } from '@workspace/ui/components/button'; +export function OutLineButton({ + text, + action, +}: { + text: string; + action: () => void; +}) { + return ( + + ); +} diff --git a/packages/ui/tailwind.config.ts b/packages/ui/tailwind.config.ts index 8096a01..e90262e 100644 --- a/packages/ui/tailwind.config.ts +++ b/packages/ui/tailwind.config.ts @@ -5,6 +5,7 @@ const config = { darkMode: ['class'], content: [ 'app/**/*.{ts,tsx}', + 'src/**/*.{ts,tsx}', 'components/**/*.{ts,tsx}', '../../packages/ui/src/components/**/*.{ts,tsx}', ], From 6f178b65fca9039bb94eb2253dc215009b2847f4 Mon Sep 17 00:00:00 2001 From: hyeopsang Date: Wed, 26 Feb 2025 14:42:49 +0900 Subject: [PATCH 2/7] =?UTF-8?q?feat:=20=EB=AC=B4=ED=95=9C=20=EC=8A=A4?= =?UTF-8?q?=ED=81=AC=EB=A1=A4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .husky/pre-commit | 2 ++ apps/web/src/feature/reply/ui/reply-list.tsx | 9 +++++- apps/web/src/shared/ui/useInfiniteScroll.tsx | 29 ++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 apps/web/src/shared/ui/useInfiniteScroll.tsx diff --git a/.husky/pre-commit b/.husky/pre-commit index 8823947..a5a29d9 100644 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,2 +1,4 @@ +#!/usr/bin/env sh +. "$(dirname -- "$0")/_/husky.sh" pnpm lint-staged diff --git a/apps/web/src/feature/reply/ui/reply-list.tsx b/apps/web/src/feature/reply/ui/reply-list.tsx index e068c4d..8d46879 100644 --- a/apps/web/src/feature/reply/ui/reply-list.tsx +++ b/apps/web/src/feature/reply/ui/reply-list.tsx @@ -4,6 +4,8 @@ import { useCallback, useEffect, useState } from 'react'; import type { CommentType } from '@/src/feature/comment/types/comment-type'; import { Comment } from '@/src/feature/comment/ui/comment'; import { getReply } from '@/src/feature/reply/api/reply-api'; +import { useInfiniteScroll } from '@/src/shared/ui/useInfiniteScroll'; + export function ReplyList() { const [data, setData] = useState([]); const [hasMore, setHasMore] = useState(true); @@ -31,15 +33,20 @@ export function ReplyList() { setIsLoading(false); } }, [nextCursor, hasMore, isLoading]); + useEffect(() => { fetchReplies(); - }, [fetchReplies]); + // eslint-disable-next-line react-hooks/exhaustive-deps + }, []); + + const { targetRef } = useInfiniteScroll(fetchReplies); return (
{data.map(({ id, author, content }) => ( ))} +
); } diff --git a/apps/web/src/shared/ui/useInfiniteScroll.tsx b/apps/web/src/shared/ui/useInfiniteScroll.tsx new file mode 100644 index 0000000..ebb223a --- /dev/null +++ b/apps/web/src/shared/ui/useInfiniteScroll.tsx @@ -0,0 +1,29 @@ +import { useEffect, useRef } from 'react'; + +export function useInfiniteScroll(fetchData: () => Promise) { + const targetRef = useRef(null); + + useEffect(() => { + if (!targetRef.current) return; + + const observer = new IntersectionObserver( + (entries) => { + if (entries[0]?.isIntersecting) { + fetchData(); + } + }, + { threshold: 1 } + ); + + const currentTarget = targetRef.current; + if (currentTarget) { + observer.observe(currentTarget); + } + + return () => { + observer.disconnect(); + }; + }, [fetchData]); + + return { targetRef }; +} From 9eac06f6a6586aa58a8aa6e42b367d231ccc858b Mon Sep 17 00:00:00 2001 From: hyeopsang Date: Thu, 27 Feb 2025 18:24:09 +0900 Subject: [PATCH 3/7] =?UTF-8?q?feat:=20=EB=8C=93=EA=B8=80=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web/src/app/main/index.tsx | 2 + apps/web/src/feature/reply/api/reply-add.ts | 20 +++++++++ apps/web/src/feature/reply/api/reply-api.ts | 4 +- apps/web/src/feature/reply/api/reply-fetch.ts | 38 +++++++++++++++++ apps/web/src/feature/reply/ui/reply-form.tsx | 33 +++++++++++++++ apps/web/src/feature/reply/ui/reply-list.tsx | 41 +------------------ apps/web/src/shared/api/fetch-wrapper.ts | 9 ++-- apps/web/src/shared/ui/outline-button.tsx | 14 ------- 8 files changed, 102 insertions(+), 59 deletions(-) create mode 100644 apps/web/src/feature/reply/api/reply-add.ts create mode 100644 apps/web/src/feature/reply/api/reply-fetch.ts create mode 100644 apps/web/src/feature/reply/ui/reply-form.tsx delete mode 100644 apps/web/src/shared/ui/outline-button.tsx diff --git a/apps/web/src/app/main/index.tsx b/apps/web/src/app/main/index.tsx index 8a7b92b..365851b 100644 --- a/apps/web/src/app/main/index.tsx +++ b/apps/web/src/app/main/index.tsx @@ -1,8 +1,10 @@ +import { ReplyForm } from '@/src/feature/reply/ui/reply-form'; import { ReplyList } from '@/src/feature/reply/ui/reply-list'; export function HomePage() { return (
+
diff --git a/apps/web/src/feature/reply/api/reply-add.ts b/apps/web/src/feature/reply/api/reply-add.ts new file mode 100644 index 0000000..c24f373 --- /dev/null +++ b/apps/web/src/feature/reply/api/reply-add.ts @@ -0,0 +1,20 @@ +'use server'; + +import { createReply } from '@/src/feature/reply/api/reply-api'; +type State = { + message?: string | null; +}; + +export async function replyAdd(prevState: State, queryData: FormData) { + // const postId = queryData.get("postId") as string; + // const commentId = queryData.get("commentId") as string; + const content = queryData.get('content') as string; + // const author = queryData.get("author") as string; + const author = 'guest'; + if (!content) { + return { message: '모든 빈 칸을 입력해주세요' }; + } + + await createReply('17358013402371', '1738039148628', { content, author }); + return { message: '댓글 작성 완료' }; +} diff --git a/apps/web/src/feature/reply/api/reply-api.ts b/apps/web/src/feature/reply/api/reply-api.ts index 77b96c6..03370ae 100644 --- a/apps/web/src/feature/reply/api/reply-api.ts +++ b/apps/web/src/feature/reply/api/reply-api.ts @@ -28,7 +28,7 @@ export const createReply = async ( ): Promise => { return fetchWrapper.post( `/posts/${postId}/comments/${commentId}/replies`, - JSON.stringify(content) + content ); }; @@ -50,6 +50,6 @@ export const updateReply = async ( ): Promise => { return fetchWrapper.put( `/posts/${postId}/comments/${commentId}/replies/${replyId}`, - JSON.stringify(content) + content ); }; diff --git a/apps/web/src/feature/reply/api/reply-fetch.ts b/apps/web/src/feature/reply/api/reply-fetch.ts new file mode 100644 index 0000000..4eac58f --- /dev/null +++ b/apps/web/src/feature/reply/api/reply-fetch.ts @@ -0,0 +1,38 @@ +'use clients'; +import { useCallback, useState } from 'react'; + +import type { CommentType } from '@/src/feature/comment/types/comment-type'; +import { getReply } from '@/src/feature/reply/api/reply-api'; +import { useInfiniteScroll } from '@/src/shared/ui/useInfiniteScroll'; + +export function useReplyFetch() { + const [data, setData] = useState([]); + const [hasMore, setHasMore] = useState(true); + const [nextCursor, setNextCursor] = useState(undefined); + const [isLoading, setIsLoading] = useState(false); + + const fetchReplies = useCallback(async () => { + if (!hasMore || isLoading) return; + + setIsLoading(true); + try { + const response = await getReply( + '17358013402371', + '1738039148628', + nextCursor, + 10 + ); + setData((prev) => [...prev, ...response.data]); + setHasMore(response.hasMore); + setNextCursor(response.nextCursor); + } catch (error) { + console.error('뭐가 문젠지 봐봐', error); + } finally { + setIsLoading(false); + } + }, [nextCursor, hasMore, isLoading]); + + const { targetRef } = useInfiniteScroll(fetchReplies); + + return { data, targetRef }; +} diff --git a/apps/web/src/feature/reply/ui/reply-form.tsx b/apps/web/src/feature/reply/ui/reply-form.tsx new file mode 100644 index 0000000..fc3407c --- /dev/null +++ b/apps/web/src/feature/reply/ui/reply-form.tsx @@ -0,0 +1,33 @@ +'use client'; +import { Button } from '@workspace/ui/components/button'; +import { useActionState } from 'react'; +import { startTransition } from 'react'; + +import { replyAdd } from '@/src/feature/reply/api/reply-add'; + +export function ReplyForm() { + const [state, dispatch] = useActionState(replyAdd, { message: '' }, '/'); + + const handleSubmit = (e: React.FormEvent) => { + e.preventDefault(); + const formData = new FormData(e.currentTarget); + + startTransition(() => { + dispatch(formData); + }); + }; + + return ( +
+