Skip to content

Commit 1f04d52

Browse files
committed
Merge branch 'develop' of https://github.com/team-incube/Gwangju-talent-festival-Client into feat/vote
2 parents e7333b7 + 72d2010 commit 1f04d52

3 files changed

Lines changed: 48 additions & 5 deletions

File tree

public/images/본선_진출팀.png

269 KB
Loading

src/widgets/main/PreliminaryFourthSection/index.tsx

Lines changed: 47 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import { cn } from "@/shared/utils/cn";
33
import { SectionTitle } from "@/shared/ui/SectionTitle";
44
import ImageCarousel from "@/entities/home/ui/ImageCarousel";
5+
import Image from "next/image";
56

67
// const SLIDES_1 = [
78
// "/images/Preliminary/slide1_1.jpg",
@@ -46,18 +47,21 @@ const SLIDES_3 = [
4647
const YOUTUBE_PRELIMINARY_SAT = "https://www.youtube.com/embed/n1o5Q2AVs88";
4748
const YOUTUBE_PRELIMINARY_FRI = "https://www.youtube.com/embed/KbnIFWzWU2Y";
4849

50+
const TEAMS_IMAGE = "/images/본선_진출팀.png";
51+
4952
const PreliminaryFourthSection = () => {
5053
return (
5154
<section id="PreliminaryFourthSection" className={cn("flex flex-col items-center")}>
5255
<div className={cn("w-[70%] mobile:w-full")}>
5356
<SectionTitle
5457
title="2025 광탈페 예선 다시보기"
55-
description=""
5658
className={cn("mt-[66px] mobile:mt-[1.7rem] mb-[24px]")}
5759
/>
5860

5961
<h2
60-
className={cn("text-body2b mobile:text-body3b place-self-start mb-18 mobile:mb-0 mobile:ml-12")}
62+
className={cn(
63+
"text-body2b mobile:text-body3b place-self-start mb-18 mobile:mb-0 mobile:ml-12",
64+
)}
6165
>
6266
2025 광탈페 예선 참가팀 소개
6367
</h2>
@@ -97,7 +101,9 @@ const PreliminaryFourthSection = () => {
97101
2025. 7. 25(금) 光트로 예선1 다시보기
98102
</h2>
99103
<div className={cn("w-full mobile:w-full mobile:mt-16 mobile:px-16")}>
100-
<div className={cn("relative w-full aspect-[16/9] bg-black rounded-lg overflow-hidden")}>
104+
<div
105+
className={cn("relative w-full aspect-[16/9] bg-black rounded-lg overflow-hidden")}
106+
>
101107
<iframe
102108
src={YOUTUBE_PRELIMINARY_FRI}
103109
title="2025 광탈페 예선1 다시보기"
@@ -122,7 +128,9 @@ const PreliminaryFourthSection = () => {
122128
2025. 7. 26(토) 光트로 예선2 다시보기
123129
</h2>
124130
<div className={cn("w-full mobile:w-full mobile:mt-16 mobile:px-16")}>
125-
<div className={cn("relative w-full aspect-[16/9] bg-black rounded-lg overflow-hidden")}>
131+
<div
132+
className={cn("relative w-full aspect-[16/9] bg-black rounded-lg overflow-hidden")}
133+
>
126134
<iframe
127135
src={YOUTUBE_PRELIMINARY_SAT}
128136
title="2025 광탈페 예선2 다시보기"
@@ -136,6 +144,41 @@ const PreliminaryFourthSection = () => {
136144
</div>
137145
</div>
138146
</div>
147+
<div className={cn("w-[70%] mobile:w-full")}>
148+
<SectionTitle
149+
title="2025 광탈페 본선 진출팀"
150+
className={cn("mt-[66px] mobile:mt-[1.7rem] mb-28")}
151+
/>
152+
153+
<div
154+
className={cn(
155+
"flex w-full items-center gap-10 justify-between mobile:flex-col mobile:mb-[38px] mb-32",
156+
)}
157+
>
158+
<div className={cn("w-[50%] mobile:w-full mobile:mt-16 flex justify-center px-8")}>
159+
<Image src={TEAMS_IMAGE} alt="본선 진출팀" width={500} height={500} />
160+
</div>
161+
<div className={cn("w-[50%] mobile:w-full mobile:px-16")}>
162+
<div className="space-y-6">
163+
<h3 className="text-body2r mobile:text-caption2r font-bold text-gray-800 mb-4">
164+
감동과 열정의 예선경연을 거쳐 총 10개 팀이<br />
165+
선정되었습니다. 축하드립니다.
166+
</h3>
167+
<div className="space-y-4 text-body2r mobile:text-caption2r">
168+
<p>
169+
이제 2025. 9.27. 토요일<br />
170+
조선대학교 해오름관에서 대망의 본선무대가<br />
171+
펼쳐 집니다. 많은 관심과 응원 바랍니다.
172+
</p>
173+
<p className="text-body2r mobile:text-caption2r">
174+
상기 순서는 실제 본선 공연순서와 다르며<br />
175+
예선심사점수와 무관합니다.
176+
</p>
177+
</div>
178+
</div>
179+
</div>
180+
</div>
181+
</div>
139182
</section>
140183
);
141184
};

src/widgets/main/ReservationFifthSection/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const ReservationFifthSection = () => {
5757
</div>
5858

5959
<div className={cn("relative w-full text-center mt-[66px] mobile:mt-[2rem]")}>
60-
<SectionTitle title="본선 좌석예매" description="온∙오프라인 참여 홍보 및 신청 접수" />
60+
<SectionTitle title="본선 좌석예매" className="mb-28"/>
6161
<div
6262
className={cn(
6363
"flex flex-col gap-[40px] mb-[60px] bg-white rounded-[12px] py-[72px] px-[60px] text-center w-[376px] mobile:p-[24px] mobile:w-fit justify-self-center mx-auto mobile:mb-[15px] mobile:gap-[24px]",

0 commit comments

Comments
 (0)