Skip to content

Refactor/289/에피상세 리팩토링 #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kss761036 merged 3 commits into from
Apr 8, 2025
Merged

Refactor/289/에피상세 리팩토링 #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d199a7c
🔨 Refactor: 에피그램 '본인' 대신 닉네임 노출
Apr 8, 2025
2f1e14a
💄 Design: (코드리뷰) 에피그램 줄바꿈 작성 그대로 노출
Apr 8, 2025
a126656
🔨 Refactor: 에피그램 작성단계에서 본인을 닉네임으로 변경
Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/app/(after-login)/epigrams/[id]/edit/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ export default function EditEpigramPage({ params }: EditEpigramPageProps) {
}}
isSubmitting={isPending}
onSubmit={handleUpdate}
myNickname={session?.user?.nickname || ''}
/>
</Inner>
);
Expand Down
21 changes: 16 additions & 5 deletions src/app/(after-login)/epigrams/_components/EpigramForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import { useState, useEffect } from 'react';
import { zodResolver } from '@hookform/resolvers/zod';
import { useSession } from 'next-auth/react';
import { useForm } from 'react-hook-form';
import { z } from 'zod';
import {
Expand All @@ -23,6 +24,7 @@ interface EpigramFormProps {
initValues?: Partial<CreateEpigramFormType>;
onSubmit: (data: CreateEpigramFormType) => void;
isSubmitting?: boolean;
myNickname?: string;
}

const singleTagSchema = z
Expand All @@ -39,6 +41,9 @@ export default function EpigramForm({
onSubmit,
isSubmitting = false,
}: EpigramFormProps) {
const { data: session } = useSession();
const myNickname = session?.user?.nickname || '';

const {
reset,
register,
Expand All @@ -51,14 +56,16 @@ export default function EpigramForm({
resolver: zodResolver(createEpigramFormSchema),
defaultValues: {
content: initValues?.content || '',
selectedAuthor: (initValues?.author && ['본인', '알 수 없음'].includes(initValues.author)
? initValues.author
: '직접 입력') as '직접 입력' | '본인' | '알 수 없음',
selectedAuthor:
initValues?.author === myNickname
? '본인'
: initValues?.author && ['본인', '알 수 없음'].includes(initValues.author)
? (initValues.author as '본인' | '알 수 없음')
: '직접 입력',
author:
initValues?.author && !['본인', '알 수 없음'].includes(initValues.author)
? initValues.author
: null,

referenceUrl: initValues?.referenceUrl ?? null,
referenceTitle: initValues?.referenceTitle ?? null,
tags: initValues?.tags || [],
Expand All @@ -77,7 +84,11 @@ export default function EpigramForm({

const handleFormSubmit = (data: CreateEpigramFormType) => {
const finalAuthor =
data.selectedAuthor === '직접 입력' ? data.author?.trim() || '' : data.selectedAuthor;
data.selectedAuthor === '본인'
? myNickname
: data.selectedAuthor === '직접 입력'
? data.author?.trim() || ''
: data.selectedAuthor;

const payload: CreateEpigramFormType = {
...data,
Expand Down
2 changes: 1 addition & 1 deletion src/app/(after-login)/epigrams/_components/detail/DetailContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ type DetailContent = Pick<EpigramDetail, 'content' | 'author'>;
export function DetailContent({ content, author }: DetailContent) {
return (
<>
<h2 className='font-iropke mb-4 text-2xl leading-relaxed break-keep md:mb-6 lg:mb-8 lg:text-3xl'>
<h2 className='font-iropke mb-4 text-2xl leading-relaxed break-keep whitespace-pre-wrap md:mb-6 lg:mb-8 lg:text-3xl'>
{content}
</h2>
<div className='mb-8 flex justify-end lg:mb-9'>
Expand Down
2 changes: 0 additions & 2 deletions src/app/(after-login)/mypage/_components/MyWritings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ export default function MyWritings() {
const comments = commentData?.pages.flatMap((page) => page.list) ?? [];
const CommentListCount = commentData?.pages?.[0]?.totalCount ?? 0;

console.log('comments', comments);
console.log('epigrams', epigrams);
return (
<Tabs>
<TabList>
Expand Down