Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions src/app/dashboard/[id]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -147,17 +147,19 @@ export default function DashboardID() {
<>
<div className="h-screen select-none">
<div
className="flex min-h-screen mobile:flex-col tablet:flex-col"
className="BG-gray flex min-h-screen mobile:flex-col tablet:flex-col"
onTouchStart={handleTouchStart}
onTouchMove={handleTouchMove}
onTouchEnd={handleTouchEnd}
>
{columns?.map((column) => (
<Column key={column.id} column={column} dashboardId={dashboardId} />
))}{' '}
<div className="BG-gray Border-column p-20 mobile:h-full mobile:w-308 mobile:border-t-2 tablet:h-full tablet:w-584 tablet:border-t-2">
{/* <div className="BG-gray Border-column p-20 mobile:h-full mobile:w-308 mobile:border-t-2 tablet:h-full tablet:w-584 tablet:border-t-2"> */}
<div className="BG-gray Border-column p-20 pt-84 mobile:size-full mobile:border-t-2 mobile:pt-20 tablet:size-full tablet:border-t-2 tablet:pt-20">
<button
className="BG-white Border-btn m flex justify-center gap-12 whitespace-nowrap rounded-8 px-85 pb-20 pt-24 text-18 font-bold mobile:flex mobile:w-full mobile:justify-center mobile:px-50 mobile:py-20 mobile:text-16 tablet:flex tablet:w-full tablet:items-center"
// className="BG-white Border-btn m flex justify-center gap-12 whitespace-nowrap rounded-8 px-85 pb-20 pt-24 text-18 font-bold mobile:flex mobile:w-full mobile:justify-center mobile:px-50 mobile:py-20 mobile:text-16 tablet:flex tablet:w-full tablet:items-center"
className="BG-white Border-btn m flex justify-center gap-12 whitespace-nowrap rounded-8 px-85 pb-20 pt-24 text-18 font-bold mobile:flex mobile:size-full mobile:justify-center mobile:px-50 mobile:py-20 mobile:text-16 tablet:flex tablet:w-full tablet:items-center"
onClick={handleCreateColumn}
>
<span>์ƒˆ๋กœ์šด ์ปฌ๋Ÿผ ์ถ”๊ฐ€ํ•˜๊ธฐ</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,13 @@ export default function ModifyCardForm({
})

// React Hook Form ๊ณผ tags ๊ฐ’ ์—ฐ๊ฒฐ
// ๐Ÿ’ฅ ํŠธ๋Ÿฌ๋ธ”์ŠˆํŒ…: ํƒœ๊ทธ์ˆ˜์ •ํ•ด๋„ isDirty๊ฐ€ ์žกํžˆ์ง€ ์•Š์•„์„œ, shouldDirty๋ฅผ ์ถ”๊ฐ€ํ•˜์—ฌ ํ•ด๊ฒฐ(๋ฐฐ์—ด ์ฃผ์†Œ๋Š” ๊ทธ๋Œ€๋กœ๋‹ˆ๊นŒ..)
useEffect(() => {
setValue('tags', tags, { shouldDirty: true })
}, [tags, tags.length, setValue])
// useEffect(() => {
// {shouldDirty: true }
// }, [preview])

// ์ƒํƒœ(์ปฌ๋Ÿผ) ์„ ํƒ ์‹œ / assignee ์„ ํƒ ์‹œ ๋“œ๋กญ๋‹ค์šด ๋‹ซ๊ธฐ
useEffect(() => {
Expand All @@ -99,7 +103,7 @@ export default function ModifyCardForm({
{ columnId, file },
{
onSuccess: ({ imageUrl }) => {
setValue('imageUrl', imageUrl)
setValue('imageUrl', imageUrl, { shouldDirty: true })
setPreview(imageUrl)
},
},
Expand Down
2 changes: 1 addition & 1 deletion src/app/features/dashboard_Id/Card/cardModal/Comment.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export default function Comment({ comment }: { comment: CommentType }) {
content={comment.content}
/>
) : (
<p className="text-14">{comment.content}</p>
<p className="whitespace-pre-line text-14">{comment.content}</p>
)}
{!modifyComment && (
<div className="Text-gray-light active:Text-btn flex gap-14 text-12 font-normal underline underline-offset-2 mobile:gap-8 tablet:gap-12">
Expand Down
6 changes: 4 additions & 2 deletions src/app/features/dashboard_Id/Column/Column.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export default function Column({

if (isLoading)
return (
<div className="BG-gray Border-column w-354 shrink-0 p-20 pt-103 mobile:w-308 tablet:w-584">
<div className="BG-gray Border-column flex w-354 shrink-0 flex-col gap-16 p-20 pt-104 mobile:h-190 mobile:w-full tablet:h-190 tablet:w-full">
<div className="BG-white size-full"></div>
</div>
) // ์Šค์ผˆ๋ ˆํ†ค ์ ์šฉ???โญ๏ธ
Expand Down Expand Up @@ -87,7 +87,9 @@ export default function Column({
}}
data-column-id={id}
className={cn(
'BG-gray Border-column flex w-354 shrink-0 flex-col gap-16 p-20 mobile:w-308 tablet:w-584',
// 'BG-gray Border-column flex w-354 shrink-0 flex-col gap-16 p-20 mobile:w-308 tablet:w-584',
'BG-gray Border-column flex w-354 shrink-0 flex-col gap-16 p-20 mobile:w-full tablet:w-full',

{
'BG-drag-hovered': isDraggingover,
},
Expand Down
Loading