Skip to content
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.

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

➕ [WV-18] feat : main page에 gallery 추가 구현 #27

Merged
merged 14 commits into from
Dec 23, 2024
Merged
Show file tree
Hide file tree
Changes from 8 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
2 changes: 2 additions & 0 deletions app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import Image from "next/image";
import MainPoster from "@/assets/images/2024_post_bg_web.png";
import Schedule from "@/components/main/schedule";
import Video from "@/components/main/video";
import Gallery from "@/components/main/gallery";

export default function Main() {
return (
Expand All @@ -21,6 +22,7 @@ export default function Main() {
{/* video */}
<Video />
{/* gallery */}
<Gallery />
</>
);
}
Binary file added assets/images/gallery1.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/gallery10.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/gallery2.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/gallery3.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/gallery4.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/gallery5.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/gallery6.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/gallery7.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/gallery8.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/gallery9.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/player_banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/images/schedule_video.png
Binary file not shown.
Binary file added assets/images/store_banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 39 additions & 0 deletions components/main/gallery.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
"use client";
import Image from "next/image";
import MainGallery from "@/assets/images/main_title_gallery.png";
import StoreBanner from "@/assets/images/store_banner.png";
import PlayerBanner from "@/assets/images/player_banner.png";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

후후후후 제꺼 머지되었으니 index 파일 사용해주라주!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

추가했습니당

import Carousel from "../ui/custom-carousel";
import { CAROUSE_ITEMS } from "@/constants/main";

const Gallery = () => {
return (
<div className="w-[1200px] justify-self-center relative mb-[100px] justify-items-center">
<div className="relative h-[620px]">
<Image
src={MainGallery}
alt="main gallery"
width={0}
height={0}
sizes="100vw"
className="w-[700px] mx-auto absolute left-1/2 -translate-x-1/2 -z-10"
priority
/>
<div className="w-[1250px] mx-auto pt-[60px] overflow-hidden">
<Carousel images={CAROUSE_ITEMS} />
</div>
</div>
<div className="w-[1100px] mt-[40px] flex gap-5 justify-self-center">
<Image src={StoreBanner} alt="Store Banner" width={540} height={190} />
<Image
src={PlayerBanner}
alt="Player of the Month Banner"
width={540}
height={190}
/>
</div>
</div>
);
};

export default Gallery;
15 changes: 7 additions & 8 deletions components/main/schedule.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import { useState } from "react";
import Image from "next/image";
import MainSchedule from "@/assets/images/main_title_schedule.png";
import ScheduleVideo from "@/assets/images/schedule_video.png";
import KtwizLogo from "@/assets/images/logo_ktwiz.png";
import LgtwinsLogo from "@/assets/images/logo_lgtwins.png";
import TeamRanking from "@/assets/images/team_ranking.png";
Expand Down Expand Up @@ -35,7 +34,7 @@ const Schedule = () => {
<div className="flex justify-between gap-5 px-10 py-[50px]">
<div className="w-[605px] h-[222px] bg-SYSTEM-white text-SYSTEM-black items-center content-center">
{/* 상단 경기 일시 */}
<div className="mb-6 mx-5 pb-2 flex gap-11 border-b border-b-ELSE-DE items-center justify-center">
<div className="mb-8 mx-5 pb-2 flex gap-11 border-b border-b-ELSE-DE items-center justify-center">
<IconButton
icon={ChevronLeft}
circle
Expand Down Expand Up @@ -66,7 +65,7 @@ const Schedule = () => {
/>
<p>KT</p>
</div>
<div className="w-64 place-self-center justify-items-center space-y-3">
<div className="w-64 place-self-center justify-items-center space-y-6">
<div className="flex mt-3 gap-7 font-extrabold text-6xl">
{scheduleData.score}
<p className="text-ELSE-B7">:</p>
Expand Down Expand Up @@ -94,11 +93,11 @@ const Schedule = () => {
</div>
</div>
<div className="w-[394px] h-[222px] mr-5 bg-SYSTEM-white text-SYSTEM-black flex items-center justify-center">
<Image
src={ScheduleVideo}
alt="schdule video"
width={394}
height={222}
<iframe
src="https://tv.naver.com/embed/42663688"
width="394"
height="222"
allowFullScreen
/>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions components/main/video.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ const Video = () => {
};

return (
<div className="w-[1200px] justify-self-center relative mb-[100px] justify-items-center">
<div className="w-[1200px] justify-self-center relative mb-[120px] justify-items-center">
<div className="relative h-[300px]">
<Image
src={MainVideo}
alt="main schdule"
width={0}
height={0}
sizes="100vw"
className="w-[826px] mx-auto absolute left-1/2 -translate-x-1/2 -z-10"
className="w-[600px] mx-auto absolute left-1/2 -translate-x-1/2 -z-10"
priority
/>
<div className="w-[1100px] mx-auto pt-[160px]">
<div className="w-[1100px] mx-auto pt-[120px]">
<iframe
src={`https://tv.naver.com/embed/${mainVideoId}`}
width="1100"
Expand Down
262 changes: 0 additions & 262 deletions components/ui/carousel.tsx

This file was deleted.

Loading
Loading