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

Dev-> Main 배포 #18

Merged
merged 56 commits into from
Dec 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
3f67b98
♻️ WV-11 refactor : font 및 favicon 폴더위치 변경
hayoung78 Dec 9, 2024
bce6269
📌 WV-11 setting : layout 구조 및 앱라우터 구조 설정
hayoung78 Dec 9, 2024
35661c5
📌 WV-11 setting : layout 구조 및 앱라우터 구조 설정
hayoung78 Dec 9, 2024
7c53795
Merge pull request #9 from KTwizviz/WV-11-test-page
hayoung78 Dec 9, 2024
a5a81e8
➕ [WV-12] feat : 배너 UI 구성 및 기능 연결 진행 중
Jinviz Dec 11, 2024
158b905
➕ feat : favicon 생성 및 metadata 초기설정
hayoung78 Dec 12, 2024
9a9f113
➕ [WV-12] feat : 진입한 메뉴에 따른 동적 렌더링 기능 구현
Jinviz Dec 13, 2024
1c56fba
➕ WV-15 feat : header ui 생성
hayoung78 Dec 13, 2024
3638721
🔧 [WV-12] fix : 명시적으로 타입 지정하여 에러 해결
Jinviz Dec 13, 2024
01557e9
➕ WV-15 feat : header ui 생성
hayoung78 Dec 13, 2024
c7fae85
✏️ [WV-12] rename : constant 폴더 constants로 변경
Jinviz Dec 13, 2024
1ee35f6
💄 [WV-12] design : 경로 @로 수정
Jinviz Dec 13, 2024
73fa0e8
💄 WV-13 design : 아이콘 및 이미지 추가
hee2323 Dec 13, 2024
d945434
➕ WV-13 feat : footer 추가
hee2323 Dec 13, 2024
1a27ae9
💄 WV-13 design : 메인 페이지 next 기본 내용 삭제
hee2323 Dec 13, 2024
a46ab7f
Merge pull request #11 from KTwizviz/WV-15-feat-header
hayoung78 Dec 13, 2024
db42b35
Merge pull request #10 from KTwizviz/WV-12-create-subbannermenu
Jinviz Dec 13, 2024
24eceb4
➕ WV-16 feat : 콘텐츠 영역 레이아웃 컴포넌트 구현
Jinviz Dec 13, 2024
04459d0
♻️ WV-15 refactor : 폴더구조 변경 및 menulayout 구조 수정
hayoung78 Dec 13, 2024
60abb6e
♻️ refactor : 레이아웃 컴포넌트 삭제 후 layout.tsx에 구현
Jinviz Dec 13, 2024
32fb10f
🔧 fix: text페이지 빌드 에러 해결
Jinviz Dec 13, 2024
bec0aca
Merge branch 'dev' of https://github.com/KTwizviz/wizviz into WV-15-f…
hayoung78 Dec 13, 2024
e249e34
Merge pull request #12 from KTwizviz/WV-16-contents-area
Jinviz Dec 13, 2024
3bb728e
♻️ WV-15 refactor : 폴더구조 수정
hayoung78 Dec 13, 2024
890c82a
Merge branch 'dev' of https://github.com/KTwizviz/wizviz into WV-15-f…
hayoung78 Dec 13, 2024
090133f
♻️ WV-15 refactor : type 수정
hayoung78 Dec 15, 2024
1a84d0f
♻️ WV-13 refactor : icon button 수정(shadcn UI button 사용X)
hee2323 Dec 15, 2024
34d451b
♻️ WV-15 refactor : header-menu 수정
hayoung78 Dec 15, 2024
5c43144
♻️ WV-13 refactor : icon button 이미지 or lucide icon 샤용할 수 있도록 수정
hee2323 Dec 15, 2024
62da878
♻️ WV-13 refactor : footer dialog 컨텐츠 내용이 적을 경우 고려하여 height 조정
hee2323 Dec 15, 2024
5fc402a
➕ WV-13 feat : footer에 icon buttom 및 select 사이트 연결 적용
hee2323 Dec 15, 2024
1bcb85f
➕ WV-13 feat : icon button test page에 추가
hee2323 Dec 15, 2024
1698875
♻️ WV-13 refactor : icon button 생성으로 필요없는 icon 삭제
hee2323 Dec 15, 2024
85986cf
Merge branch 'dev' of github.com:KTwizviz/wizviz into WV-13-create-fo…
hee2323 Dec 15, 2024
088843b
✏️ WV-12 rename : 폴더 이름 변경
Jinviz Dec 16, 2024
fc921b8
🔧 WV-12 fix : 이미지 경고문 해결
Jinviz Dec 16, 2024
1669354
🔧 WV-12 fix : 이미지 경고문 해결2
Jinviz Dec 16, 2024
538a2b0
♻️ refactor : site url 상수 파일로 이동, 상수 파일명 dialog -> footer로 변경
hee2323 Dec 16, 2024
8e8ee91
♻️ refactor : dialog 색상 시스템 컬러로 적용
hee2323 Dec 16, 2024
f5ac226
Merge pull request #13 from KTwizviz/WV-13-create-footer
hee2323 Dec 16, 2024
70ab2f0
Merge branch 'dev' of https://github.com/KTwizviz/wizviz into WV-12-c…
Jinviz Dec 16, 2024
551abe9
✏️ rename: 수정된 폴더명 적용용
Jinviz Dec 16, 2024
325c8ba
🔥 WV-15 remove : 불필요한 파일 삭제
hayoung78 Dec 16, 2024
4b4f310
Merge branch 'dev' of https://github.com/KTwizviz/wizviz into WV-15-f…
hayoung78 Dec 16, 2024
94911e6
🔧 [WV-12] fix : 빌드 에러 수정
Jinviz Dec 16, 2024
fa089c4
💄 WV-15 design : animation 적용
hayoung78 Dec 16, 2024
e03b48e
➕ WV-15 feat : header ui 생성
hayoung78 Dec 16, 2024
a6c77fb
🔥 WV-15 remove : 불필요한 파일 삭제
hayoung78 Dec 16, 2024
76795b1
Merge pull request #14 from KTwizviz/WV-12-create-subbannermenu
Jinviz Dec 16, 2024
194286b
💄 [WV-18] design : main 배너 이미지 추가
hee2323 Dec 16, 2024
7c280af
➕ [WV-18] feat : 메인페이지 배너, 스케줄 컴포넌트 추가
hee2323 Dec 16, 2024
3f60616
Merge branch 'dev' of github.com:KTwizviz/wizviz into WV-18-main-page
hee2323 Dec 16, 2024
4fced78
Merge pull request #16 from KTwizviz/WV-15-feat-header
hayoung78 Dec 16, 2024
41a43bb
Merge branch 'dev' of github.com:KTwizviz/wizviz into WV-18-main-page
hee2323 Dec 16, 2024
dc7fdf6
♻️ [WV-18] refactor : 임의로 색상 적용한 부분 디자인 시스템 색상 적용
hee2323 Dec 16, 2024
9e80426
Merge pull request #17 from KTwizviz/WV-18-main-page
hee2323 Dec 16, 2024
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
3 changes: 3 additions & 0 deletions app/(menu)/game/[...schedule]/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function page() {
return <div>page입니다</div>;
}
3 changes: 3 additions & 0 deletions app/(menu)/ktwiz/about/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function page() {
return <div>page입니다</div>;
}
3 changes: 3 additions & 0 deletions app/(menu)/ktwiz/bi/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function page() {
return <div>page입니다</div>;
}
3 changes: 3 additions & 0 deletions app/(menu)/ktwiz/policy/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function page() {
return <div>page입니다</div>;
}
3 changes: 3 additions & 0 deletions app/(menu)/ktwiz/sponsor/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function page() {
return <div>page입니다</div>;
}
3 changes: 3 additions & 0 deletions app/(menu)/ktwiz/wallpaper/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function page() {
return <div>page입니다</div>;
}
22 changes: 22 additions & 0 deletions app/(menu)/layout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import SubBannerMenu from "@/components/common/sub-menu-banner/SubMenuBanner";
import type { Metadata } from "next";

export const metadata: Metadata = {
title: "Create Next App",
description: "Generated by create next app",
};

export default function MenuLayout({
children,
}: {
children: React.ReactNode;
}) {
return (
<>
<SubBannerMenu />
<div className="w-full flex justify-center">
<div className="w-[1100px] h-auto pt-10 pb-[100px]">{children}</div>
</div>
</>
);
}
3 changes: 3 additions & 0 deletions app/(menu)/media/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function page() {
return <div>page입니다</div>;
}
3 changes: 3 additions & 0 deletions app/(menu)/player/catcher/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function page() {
return <div>page입니다</div>;
}
3 changes: 3 additions & 0 deletions app/(menu)/player/cheer/cheering/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function page() {
return <div>page입니다</div>;
}
3 changes: 3 additions & 0 deletions app/(menu)/player/cheer/copyright/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function page() {
return <div>page입니다</div>;
}
3 changes: 3 additions & 0 deletions app/(menu)/player/cheer/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function page() {
return <div>page입니다</div>;
}
3 changes: 3 additions & 0 deletions app/(menu)/player/cheer/song/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function page() {
return <div>page입니다</div>;
}
3 changes: 3 additions & 0 deletions app/(menu)/player/coach/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function page() {
return <div>page입니다</div>;
}
3 changes: 3 additions & 0 deletions app/(menu)/player/pitcher/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function page() {
return <div>page입니다</div>;
}
3 changes: 3 additions & 0 deletions app/(menu)/wizpark/iksan/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function page() {
return <div>page입니다</div>;
}
3 changes: 3 additions & 0 deletions app/(menu)/wizpark/intro/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function page() {
return <div>page입니다</div>;
}
3 changes: 3 additions & 0 deletions app/(menu)/wizpark/location/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function page() {
return <div>page입니다</div>;
}
3 changes: 3 additions & 0 deletions app/(menu)/wizpark/parking/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default function page() {
return <div>page입니다</div>;
}
Binary file removed app/favicon.ico
Binary file not shown.
32 changes: 14 additions & 18 deletions app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
import type { Metadata } from "next";
import localFont from "next/font/local";

const geistSans = localFont({
src: "./fonts/GeistVF.woff",
variable: "--font-geist-sans",
weight: "100 900",
});
const geistMono = localFont({
src: "./fonts/GeistMonoVF.woff",
variable: "--font-geist-mono",
weight: "100 900",
});
import "../css/index.css";
import Header from "@/components/layout/header";
import Footer from "@/components/layout/footer";

export const metadata: Metadata = {
title: "Create Next App",
description: "Generated by create next app",
title: "Kt wiz_wizviz",
description: "한국 야구의 10번째 심장 kt wiz 야구단 공식 홈페이지",
icons: {
icon: "/logo_ktwiz_kr.svg",
},
};

export default function RootLayout({
Expand All @@ -24,10 +18,12 @@ export default function RootLayout({
}>) {
return (
<html lang="en">
<body
className={`${geistSans.variable} ${geistMono.variable} antialiased`}
>
{children}
<body>
<div className="flex flex-col min-h-screen">
<Header />
<main className="flex-1">{children}</main>
<Footer />
</div>
</body>
</html>
);
Expand Down
111 changes: 17 additions & 94 deletions app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,101 +1,24 @@
import Image from "next/image";
import MainPoster from "@/assets/images/2024_post_bg_web.png";
import Schedule from "@/components/main/schedule";

export default function Home() {
export default function Main() {
return (
<div className="grid grid-rows-[20px_1fr_20px] items-center justify-items-center min-h-screen p-8 pb-20 gap-16 sm:p-20 font-[family-name:var(--font-geist-sans)]">
<main className="flex flex-col gap-8 row-start-2 items-center sm:items-start">
<>
{/* main banner */}
<div className="relative">
<Image
className="dark:invert"
src="https://nextjs.org/icons/next.svg"
alt="Next.js logo"
width={180}
height={38}
priority
src={MainPoster}
alt="main poster"
width={0}
height={0}
className="w-full mb-24"
/>
<ol className="list-inside list-decimal text-sm text-center sm:text-left font-[family-name:var(--font-geist-mono)]">
<li className="mb-2">
Get started by editing{" "}
<code className="bg-black/[.05] dark:bg-white/[.06] px-1 py-0.5 rounded font-semibold">
app/page.tsx
</code>
.
</li>
<li>Save and see your changes instantly.</li>
</ol>

<div className="flex gap-4 items-center flex-col sm:flex-row">
<a
className="rounded-full border border-solid border-transparent transition-colors flex items-center justify-center bg-foreground text-background gap-2 hover:bg-[#383838] dark:hover:bg-[#ccc] text-sm sm:text-base h-10 sm:h-12 px-4 sm:px-5"
href="https://vercel.com/new?utm_source=create-next-app&utm_medium=appdir-template-tw&utm_campaign=create-next-app"
target="_blank"
rel="noopener noreferrer"
>
<Image
className="dark:invert"
src="https://nextjs.org/icons/vercel.svg"
alt="Vercel logomark"
width={20}
height={20}
/>
Deploy now
</a>
<a
className="rounded-full border border-solid border-black/[.08] dark:border-white/[.145] transition-colors flex items-center justify-center hover:bg-[#f2f2f2] dark:hover:bg-[#1a1a1a] hover:border-transparent text-sm sm:text-base h-10 sm:h-12 px-4 sm:px-5 sm:min-w-44"
href="https://nextjs.org/docs?utm_source=create-next-app&utm_medium=appdir-template-tw&utm_campaign=create-next-app"
target="_blank"
rel="noopener noreferrer"
>
Read our docs
</a>
</div>
</main>
<footer className="row-start-3 flex gap-6 flex-wrap items-center justify-center">
<a
className="flex items-center gap-2 hover:underline hover:underline-offset-4"
href="https://nextjs.org/learn?utm_source=create-next-app&utm_medium=appdir-template-tw&utm_campaign=create-next-app"
target="_blank"
rel="noopener noreferrer"
>
<Image
aria-hidden
src="https://nextjs.org/icons/file.svg"
alt="File icon"
width={16}
height={16}
/>
Learn
</a>
<a
className="flex items-center gap-2 hover:underline hover:underline-offset-4"
href="https://vercel.com/templates?framework=next.js&utm_source=create-next-app&utm_medium=appdir-template-tw&utm_campaign=create-next-app"
target="_blank"
rel="noopener noreferrer"
>
<Image
aria-hidden
src="https://nextjs.org/icons/window.svg"
alt="Window icon"
width={16}
height={16}
/>
Examples
</a>
<a
className="flex items-center gap-2 hover:underline hover:underline-offset-4"
href="https://nextjs.org?utm_source=create-next-app&utm_medium=appdir-template-tw&utm_campaign=create-next-app"
target="_blank"
rel="noopener noreferrer"
>
<Image
aria-hidden
src="https://nextjs.org/icons/globe.svg"
alt="Globe icon"
width={16}
height={16}
/>
Go to nextjs.org →
</a>
</footer>
</div>
</div>
{/* schedule */}
<Schedule />
{/* video */}
{/* gallery */}
</>
);
}
60 changes: 60 additions & 0 deletions app/test-page/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
"use client";

import IconButton from "@/components/ui/icon-button";
import { ChevronLeft, ChevronRight } from "lucide-react";
import instagram from "@/assets/icons/icon_instagram.png";

const page = () => {
const handleClick = () => {
console.log("button click!");
};
return (
<div className="p-4">
<div className="text-lg font-bold">📌 test button</div>
<div className="mt-2 flex gap-2">
<IconButton
icon={instagram}
iconSize={18}
border
onClick={() => handleClick}
/>
<IconButton
icon={instagram}
iconSize={18}
text="insta"
border
onClick={() => handleClick}
/>
<IconButton
icon={ChevronLeft}
border
circle
className="text-ELSE-DE bg-ELSE-7374"
onClick={() => handleClick}
/>
<IconButton
icon={ChevronRight}
border
circle
className="text-ELSE-DE bg-ELSE-7374"
onClick={() => handleClick}
/>
<IconButton
icon={ChevronLeft}
border
circle
className="text-ELSE-7374"
onClick={() => handleClick}
/>
<IconButton
icon={ChevronRight}
border
circle
className="text-ELSE-7374"
onClick={() => handleClick}
/>
</div>
</div>
);
};
export default page;
Binary file added assets/images/2024_post_bg_web.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 added assets/images/image_defeat.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 added assets/images/image_draw.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 added assets/images/image_win.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading