Skip to content

Commit 5413568

Browse files
authored
[Refector] 사이드 메뉴 정렬 및 로고 변경, 칼럼 D&D삭제
[fix, Refector] 사이드 메뉴 정렬 및 로고 변경, 칼럼상세 D&D삭제
2 parents ee5e935 + 4c0b2a4 commit 5413568

File tree

2 files changed

+35
-72
lines changed

2 files changed

+35
-72
lines changed
Lines changed: 7 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,4 @@
11
import { useEffect, useState, useRef } from "react";
2-
import {
3-
DndContext,
4-
closestCenter,
5-
PointerSensor,
6-
useSensor,
7-
useSensors,
8-
DragEndEvent,
9-
} from "@dnd-kit/core";
10-
import {
11-
SortableContext,
12-
verticalListSortingStrategy,
13-
arrayMove,
14-
} from "@dnd-kit/sortable";
152
import { CardType } from "@/types/task";
163
import { getCardsByColumn } from "@/api/card";
174
import SortableCard from "@/components/columnCard/SortableCard";
@@ -34,12 +21,6 @@ export const CardList = ({
3421
const [cards, setCards] = useState<CardType[]>([]);
3522
const observerRef = useRef<HTMLDivElement | null>(null);
3623

37-
const sensors = useSensors(
38-
useSensor(PointerSensor, {
39-
activationConstraint: { distance: 5 },
40-
})
41-
);
42-
4324
// 카드 목록 api 호출 (마감일 빠른 순 정렬)
4425
useEffect(() => {
4526
const fetchCards = async () => {
@@ -60,7 +41,7 @@ export const CardList = ({
6041
fetchCards();
6142
}, [columnId, initialTasks]);
6243

63-
// 스크롤 감지
44+
// 스크롤
6445
useEffect(() => {
6546
if (!scrollRoot?.current || !observerRef.current) return;
6647

@@ -82,36 +63,12 @@ export const CardList = ({
8263
};
8364
}, [scrollRoot]);
8465

85-
// 드래그 & 드롭
86-
const handleDragEnd = (event: DragEndEvent) => {
87-
const { active, over } = event;
88-
89-
if (!over || active.id === over.id) return;
90-
91-
const oldIndex = cards.findIndex((card) => card.id === active.id);
92-
const newIndex = cards.findIndex((card) => card.id === over.id);
93-
94-
const newOrder = arrayMove(cards, oldIndex, newIndex);
95-
setCards(newOrder);
96-
};
97-
9866
return (
99-
<DndContext
100-
sensors={sensors}
101-
collisionDetection={closestCenter}
102-
onDragEnd={handleDragEnd}
103-
>
104-
<SortableContext
105-
items={cards.map((card) => card.id)}
106-
strategy={verticalListSortingStrategy}
107-
>
108-
<div className="w-full grid grid-cols-1 gap-3">
109-
{cards.map((card) => (
110-
<SortableCard key={card.id} card={card} onClick={onCardClick} />
111-
))}
112-
<div ref={observerRef} className="h-[1px] bg-transparent" />
113-
</div>
114-
</SortableContext>
115-
</DndContext>
67+
<div className="w-full grid grid-cols-1 gap-3">
68+
{cards.map((card) => (
69+
<SortableCard key={card.id} card={card} onClick={onCardClick} />
70+
))}
71+
<div ref={observerRef} className="h-[1px] bg-transparent" />
72+
</div>
11673
);
11774
};

src/components/sideMenu/SideMenu.tsx

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -52,33 +52,39 @@ export default function SideMenu({
5252
<aside
5353
className={clsx(
5454
"z-20 flex flex-col h-screen overflow-y-auto lg:overflow-y-hidden overflow-x-hidden transition-all duration-200",
55-
"bg-white border-r border-[var(--color-gray3)] px-3 py-5",
55+
"bg-white border-r border-[var(--color-gray3)] py-5",
5656
isCollapsed
57-
? "w-[67px]"
58-
: "w-[67px] sm:w-[67px] md:w-[160px] lg:w-[300px]"
57+
? "w-[67px] items-center px-0"
58+
: "w-[67px] sm:w-[67px] md:w-[160px] lg:w-[300px] px-3"
5959
)}
6060
>
6161
{/* 로고 영역 */}
62-
<div className="flex flex-col items-center md:items-start mb-8 px-1">
62+
<div
63+
className={clsx(
64+
"flex flex-col mb-8",
65+
isCollapsed ? "items-center px-0" : "items-center md:items-start px-1"
66+
)}
67+
>
6368
<Link href="/mydashboard" className="mb-2">
64-
<Image
65-
src="/svgs/logo_taskify.svg"
66-
alt="Taskify Large Logo"
67-
width={109}
68-
height={34}
69-
className="hidden md:block"
70-
priority
71-
unoptimized
72-
/>
73-
<Image
74-
src="/svgs/logo.svg"
75-
alt="Taskify Small Logo"
76-
width={24}
77-
height={28}
78-
className="md:hidden"
79-
priority
80-
unoptimized
81-
/>
69+
{isCollapsed ? (
70+
<Image
71+
src="/svgs/logo.svg"
72+
alt="작은 로고"
73+
width={24}
74+
height={28}
75+
priority
76+
unoptimized
77+
/>
78+
) : (
79+
<Image
80+
src="/svgs/logo_taskify.svg"
81+
alt="Taskify 로고"
82+
width={109}
83+
height={34}
84+
priority
85+
unoptimized
86+
/>
87+
)}
8288
</Link>
8389

8490
{/* 접기/펼치기 버튼 (모바일에서는 숨김) */}

0 commit comments

Comments
 (0)