Skip to content

Final #101

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
Joo-Nick merged 2 commits into from
Jun 3, 2025
Merged

Final #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
333b466
API 연결 수정 및 디자인 수정
Joo-Nick Jun 3, 2025
7f0e0a9
캐로셀 추가
Joo-Nick Jun 3, 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/api/home/apis.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ export const homeApi = {
status: item.status,
createdAt: item.createdAt,
preferredMatchDate: item.preferredMatchDate,
haveTicket: item.haveTicket,
}));
},

Expand Down
244 changes: 167 additions & 77 deletions src/pages/Home/components/NewMatchingList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
import { useState, useRef, useEffect } from "react";
import { Edit3, ChevronRight, CheckCircle2, X } from "lucide-react";
import {
Edit3,
ChevronRight,
CheckCircle2,
X,
ChevronLeft,
} from "lucide-react";
import { useNavigate } from "react-router-dom";
import { homeApi } from "../../../api/home/apis";
import { TeamId, getTeamInfo } from "../../../types/Type";

interface MatchingData {
haveTicket: any;
postIdx: number;
title: string;
stadiumIdx: number;
Expand All @@ -24,6 +32,9 @@ export default function NewMatchingList() {
const [isLoading, setIsLoading] = useState(true);
const [error, setError] = useState<string | null>(null);
const containerRef = useRef<HTMLDivElement>(null);
const navigate = useNavigate();
const [showLeftArrow, setShowLeftArrow] = useState(false);
const [showRightArrow, setShowRightArrow] = useState(false);

useEffect(() => {
const fetchMatchings = async () => {
Expand All @@ -36,6 +47,7 @@ export default function NewMatchingList() {
}));
setMatchings(convertedData);
setError(null);
setTimeout(checkScroll, 0);
} catch (err) {
setError("매칭 목록을 불러오는데 실패했습니다.");
console.error("Error fetching matchings:", err);
Expand Down Expand Up @@ -69,6 +81,53 @@ export default function NewMatchingList() {
}
};

const handleViewAll = () => {
navigate("/matching");
};

const handleMatchingClick = (postIdx: number) => {
navigate(`/matching/articles/${postIdx}`);
};

const checkScroll = () => {
if (containerRef.current) {
const { scrollLeft, scrollWidth, clientWidth } = containerRef.current;
const hasOverflow = scrollWidth > clientWidth;
setShowLeftArrow(scrollLeft > 0);
setShowRightArrow(
hasOverflow && scrollLeft < scrollWidth - clientWidth - 1,
);
}
};

const handleScroll = (direction: "left" | "right") => {
if (containerRef.current) {
const scrollAmount = 300; // 한 번에 스크롤할 픽셀 양
const newScrollLeft =
direction === "left"
? containerRef.current.scrollLeft - scrollAmount
: containerRef.current.scrollLeft + scrollAmount;

containerRef.current.scrollTo({
left: newScrollLeft,
behavior: "smooth",
});
}
};

useEffect(() => {
const container = containerRef.current;
if (container) {
container.addEventListener("scroll", checkScroll);
checkScroll(); // 초기 상태 체크
}
return () => {
if (container) {
container.removeEventListener("scroll", checkScroll);
}
};
}, []);

return (
<div className="flex w-252.5 flex-col md:w-180 xl:w-252.5">
<div className="mb-2 flex items-center justify-between">
Expand All @@ -78,90 +137,121 @@ export default function NewMatchingList() {
최신 직관 매칭 글
</h3>
</div>
<button className="t-button2 flex items-center gap-2.5 text-[var(--on-surface-grey1)]">
<button
onClick={handleViewAll}
className="t-button2 flex items-center gap-2.5 text-[var(--on-surface-grey1)] transition-colors hover:text-[#007bff]"
>
모두 보기
<ChevronRight size={24} className="text-[var(--on-surface-grey1)]" />
<ChevronRight
size={24}
className="text-[var(--on-surface-grey1)] group-hover:text-[#007bff]"
/>
</button>
</div>
<p className="t-body1 mb-4 text-[var(--on-surface-grey1)]">
최근에 추가된 직관 매칭 글을 확인해보세요!
</p>
{/* 최신 직관 매칭 글 목록 */}
<div
ref={containerRef}
className="flex w-252.5 cursor-grab gap-4 overflow-x-scroll select-none [-ms-overflow-style:'none'] [scrollbar-width:'none'] active:cursor-grabbing [&::-webkit-scrollbar]:hidden"
onMouseDown={handleMouseDown}
onMouseUp={handleMouseUp}
onMouseLeave={handleMouseUp}
onMouseMove={handleMouseMove}
>
{isLoading ? (
<div className="flex h-41 w-73 items-center justify-center">
<span className="t-body1 text-[var(--on-surface-grey2)]">
로딩 중...
</span>
</div>
) : error ? (
<div className="flex h-41 w-73 items-center justify-center">
<span className="t-body1 text-[var(--on-surface-grey2)]">
{error}
</span>
</div>
) : matchings.length === 0 ? (
<div className="flex h-41 w-73 items-center justify-center">
<span className="t-body1 text-[var(--on-surface-grey2)]">
매칭 목록이 없습니다.
</span>
</div>
) : (
matchings.map(matching => (
<div
key={matching.postIdx}
className="flex h-41 w-73 flex-shrink-0 flex-col justify-between rounded-xl bg-[var(--surface-1)] p-4"
>
<div className="mb-3 flex h-8 items-center justify-between">
<div className="t-caption text-[var(--on-surface-grey2)]">
{matching.userNickname}
<div className="relative">
{showLeftArrow && (
<button
onClick={() => handleScroll("left")}
className="absolute top-1/2 left-0 z-10 -translate-x-4 -translate-y-1/2 rounded-full bg-white p-2 shadow-md hover:bg-gray-50"
>
<ChevronLeft size={24} className="text-[var(--on-surface-grey1)]" />
</button>
)}
<div
ref={containerRef}
className="flex w-252.5 cursor-grab gap-4 overflow-x-scroll select-none [-ms-overflow-style:'none'] [scrollbar-width:'none'] active:cursor-grabbing [&::-webkit-scrollbar]:hidden"
onMouseDown={handleMouseDown}
onMouseUp={handleMouseUp}
onMouseLeave={handleMouseUp}
onMouseMove={handleMouseMove}
onScroll={checkScroll}
>
{isLoading ? (
<div className="flex h-41 w-73 items-center justify-center">
<span className="t-body1 text-[var(--on-surface-grey2)]">
로딩 중...
</span>
</div>
) : error ? (
<div className="flex h-41 w-73 items-center justify-center">
<span className="t-body1 text-[var(--on-surface-grey2)]">
{error}
</span>
</div>
) : matchings.length === 0 ? (
<div className="flex h-41 w-73 items-center justify-center">
<span className="t-body1 text-[var(--on-surface-grey2)]">
매칭 목록이 없습니다.
</span>
</div>
) : (
matchings.map(matching => (
<div
key={matching.postIdx}
onClick={() => handleMatchingClick(matching.postIdx)}
className="flex h-41 w-73 flex-shrink-0 cursor-pointer flex-col justify-between rounded-xl bg-[var(--surface-1)] p-4 transition-colors hover:bg-blue-100"
>
<div className="mb-3 flex h-8 items-center justify-between">
<div className="t-caption text-[var(--on-surface-grey2)]">
{matching.userNickname}
</div>
<img
src={`/images/${getTeamInfo(matching.userCheeringTeamId).logo}.png`}
alt={getTeamInfo(matching.userCheeringTeamId).name}
className="h-8 w-8 rounded-full border border-[var(--divider-dv2)] bg-white object-contain"
/>
</div>
<div className="flex h-8 items-center justify-between">
<span className="t-caption text-[var(--on-surface-default)]">
제목
</span>
<span className="t-caption text-[var(--on-surface-default)]">
{matching.title}
</span>
</div>
<div className="flex h-8 items-center justify-between">
<span className="t-caption text-[var(--on-surface-default)]">
선호 경기일
</span>
<span className="t-caption text-[var(--on-surface-default)]">
{matching.preferredMatchDate}
</span>
</div>
<div className="flex h-8 items-center justify-between">
<span className="t-caption text-[var(--on-surface-default)]">
티켓 보유여부
</span>
<span className="t-caption flex h-8 w-8 items-center justify-center rounded-lg bg-[var(--surface-3)] text-[var(--on-surface-default)]">
{matching.haveTicket ? (
<CheckCircle2
size={16}
className="text-[var(--on-surface-default)]"
/>
) : (
<X
size={16}
className="text-[var(--on-surface-default)]"
/>
)}
</span>
</div>
<img
src={`/images/${getTeamInfo(matching.userCheeringTeamId).logo}.png`}
alt={getTeamInfo(matching.userCheeringTeamId).name}
className="h-8 w-8 rounded-full border border-[var(--divider-dv2)] bg-white object-contain"
/>
</div>
<div className="flex h-8 items-center justify-between">
<span className="t-caption text-[var(--on-surface-default)]">
제목
</span>
<span className="t-caption text-[var(--on-surface-default)]">
{matching.title}
</span>
</div>
<div className="flex h-8 items-center justify-between">
<span className="t-caption text-[var(--on-surface-default)]">
선호 경기일
</span>
<span className="t-caption text-[var(--on-surface-default)]">
{matching.preferredMatchDate}
</span>
</div>
<div className="flex h-8 items-center justify-between">
<span className="t-caption text-[var(--on-surface-default)]">
티켓 보유여부
</span>
<span className="t-caption flex h-8 w-8 items-center justify-center rounded-lg bg-[var(--surface-3)] text-[var(--on-surface-default)]">
{matching.status === 1 ? (
<CheckCircle2
size={16}
className="text-[var(--on-surface-default)]"
/>
) : (
<X size={16} className="text-[var(--on-surface-default)]" />
)}
</span>
</div>
</div>
))
))
)}
</div>
{showRightArrow && (
<button
onClick={() => handleScroll("right")}
className="absolute top-1/2 right-0 z-10 translate-x-4 -translate-y-1/2 rounded-full bg-white p-2 shadow-md hover:bg-gray-50"
>
<ChevronRight
size={24}
className="text-[var(--on-surface-grey1)]"
/>
</button>
)}
</div>
</div>
Expand Down
Loading