Skip to content
Merged
Show file tree
Hide file tree
Changes from 52 commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
9db8a18
style: global, reset css 추가
seueooo Jul 13, 2025
fbf7ece
style: 반응형 대응을 위한 screen 토큰 추가
seueooo Jul 13, 2025
56cf427
feat: motion 패키지 설치
seueooo Jul 13, 2025
bc68535
style: 전역 레이아웃에 사용되는 sprinkle 컴포넌트 추가
seueooo Jul 13, 2025
c1db244
feat: 스토리북 docs 애드온 추가 및 sprinkle-container 스토리 추가
seueooo Jul 13, 2025
25df631
fix: story 에러 삭제
seueooo Jul 13, 2025
58df32d
chore: 파일명 컨벤션에 맞게 수정
seueooo Jul 13, 2025
df1e46e
chore: 필요없는 코드 삭제
seueooo Jul 13, 2025
906958b
feat: 수정된 디자인시스템 반영 및 토큰 추가, 토큰 단에서 폰트사이즈 반응형 적용
seueooo Jul 13, 2025
143f1d6
style: nav-home 데스크탑 뷰 퍼블리싱
seueooo Jul 13, 2025
0993bbf
style: 그라디언트 토큰 추가
seueooo Jul 13, 2025
7076abe
style: z-index 토큰 추가 및 index.ts에서 모든 토큰 export하도록 수정
seueooo Jul 13, 2025
69c04cc
style: nav-home 반응형 구현
seueooo Jul 13, 2025
538151b
style: 햄버거바 로테이션 애니메이션 추가 및 반응형 메뉴 구현
seueooo Jul 13, 2025
39757ad
style: token createGlobalTheme-> 일반 객체 형식으로 변경
seueooo Jul 13, 2025
1cd1088
feat: 페이지 라우터 연결, 탐색, 내캡슐, 설정페이지에 nav-home 추가
seueooo Jul 13, 2025
06fe5f9
chore: story 파일 ui로 구분 설정
seueooo Jul 13, 2025
7447cbf
refactor: 불필요한 코드 삭제
seueooo Jul 13, 2025
e5f5097
style: nav-home 메뉴 아이템 스타일 추가
seueooo Jul 13, 2025
67eb5b6
Merge branch 'develop' into feature/add-global-layout-home-nav/#61
seueooo Jul 13, 2025
11b638c
chore: svg type 추가
seueooo Jul 13, 2025
8a0aecb
chore: 임시 테스트 코드 추가
seueooo Jul 13, 2025
bee5d19
chore: token 객체 readonly 되도록 타입단언
seueooo Jul 13, 2025
c657a66
feat: useRouter 제거 후 link태그로 이동하도록 변경
seueooo Jul 13, 2025
129e16d
feat: 누락된 스타일 추가
seueooo Jul 13, 2025
35c4caa
fix: 충돌해결
seueooo Jul 14, 2025
aec1e29
chore: 패키지 업데이트 및 lock파일 추가
seueooo Jul 14, 2025
38f8697
chore: lock파일삭제
seueooo Jul 14, 2025
acb393e
style: 전역 레이아웃에 사용되는 sprinkle 컴포넌트 추가
seueooo Jul 13, 2025
1ee9131
feat: 스토리북 docs 애드온 추가 및 sprinkle-container 스토리 추가
seueooo Jul 13, 2025
e34ee43
fix: story 에러 삭제
seueooo Jul 13, 2025
f5e6c81
chore: 파일명 컨벤션에 맞게 수정
seueooo Jul 13, 2025
c879705
feat: 수정된 디자인시스템 반영 및 토큰 추가, 토큰 단에서 폰트사이즈 반응형 적용
seueooo Jul 13, 2025
d14646f
style: nav-home 데스크탑 뷰 퍼블리싱
seueooo Jul 13, 2025
cd1554a
style: 그라디언트 토큰 추가
seueooo Jul 13, 2025
4ab7b78
style: z-index 토큰 추가 및 index.ts에서 모든 토큰 export하도록 수정
seueooo Jul 13, 2025
2a1abf2
style: nav-home 반응형 구현
seueooo Jul 13, 2025
0309cb5
style: 햄버거바 로테이션 애니메이션 추가 및 반응형 메뉴 구현
seueooo Jul 13, 2025
385ca32
style: token createGlobalTheme-> 일반 객체 형식으로 변경
seueooo Jul 13, 2025
26716f2
chore: story 파일 ui로 구분 설정
seueooo Jul 13, 2025
c380eb0
fix: 충돌해결
seueooo Jul 14, 2025
46199b3
chore: 패키지 업데이트 및 lock파일 추가
seueooo Jul 14, 2025
faa1ce7
chore: lock파일삭제
seueooo Jul 14, 2025
1bd13bc
feat: lock파일 추가
seueooo Jul 14, 2025
d3e27bb
Merge branch 'develop' into feature/add-global-layout-home-nav/#61
seueooo Jul 14, 2025
db08802
fix: 불필요한 코드 삭제
seueooo Jul 14, 2025
9d16168
chore: nav-home을 사용하는 레이아웃 그룹핑
seueooo Jul 14, 2025
6248e98
chore: theme export 방식 변경 -> createTheme 이용하도록 수정
seueooo Jul 14, 2025
dd5c9d8
chore: screen 토큰은 개별적으로 export하도록 수정
seueooo Jul 14, 2025
b9c8649
refactor: 중복코드 제거
seueooo Jul 14, 2025
6ae5c23
feat: 햄버거메뉴 컴포넌트 분리
seueooo Jul 14, 2025
bc6eeb5
chore: 햄버거 스토리 추가
seueooo Jul 14, 2025
5002000
chore: text.ts에서 breakPoints import해서 사용하도록 수정
seueooo Jul 14, 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
2 changes: 1 addition & 1 deletion .coderabbit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ tone_instructions: |
보안, 성능, 유지보수성에 중점을 두고 리뷰해주세요.

reviews:
profile: 'assertive' # 리뷰 스타일: assertive(엄격), chill(관대)
profile: 'chill' # 리뷰 스타일: assertive(엄격), chill(관대)
request_changes_workflow: false
high_level_summary: true # PR 요약 생성
poem: false # 시(POEM) 생성 비활성화
Expand Down
2 changes: 1 addition & 1 deletion .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const config: StorybookConfig = {
"../shared/**/*.mdx",
"../shared/**/*.stories.@(js|jsx|mjs|ts|tsx)",
],
addons: ["@storybook/addon-onboarding"],
addons: ["@storybook/addon-onboarding", "@storybook/addon-docs"],
framework: {
name: "@storybook/nextjs",
options: {},
Expand Down
14 changes: 0 additions & 14 deletions .storybook/preview.ts

This file was deleted.

26 changes: 26 additions & 0 deletions .storybook/preview.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import type { Preview } from "@storybook/nextjs";
import { themeClass } from "../shared/styles/base/theme.css";

// Global styles import
import "@/shared/styles/base/global.css";
import "@/shared/styles/base/reset.css";

const preview: Preview = {
parameters: {
controls: {
matchers: {
color: /(background|color)$/i,
date: /Date$/i,
},
},
},
decorators: [
(Story) => (
<div className={themeClass}>
<Story />
</div>
),
],
};

export default preview;
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"editor.codeActionsOnSave": {
"source.organizeImports.biome": "explicit",
"source.fixAll.biome": "explicit"
"source.organizeImports.biome": "always",
"source.fixAll.biome": "always"
},
"editor.defaultFormatter": "biomejs.biome",
"editor.formatOnSave": true
Expand Down
9 changes: 9 additions & 0 deletions app/(main)/explore/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
const Explore = () => {
return (
<div>
<h1>explore</h1>
</div>
);
};

export default Explore;
16 changes: 16 additions & 0 deletions app/(main)/layout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import type { ReactNode } from "react";

import NavHome from "@/shared/ui/nav-home/nav-home";

export default function MainLayout({
children,
}: {
children: ReactNode;
}) {
return (
<div>
<NavHome />
{children}
</div>
);
}
9 changes: 9 additions & 0 deletions app/(main)/my/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
const My = () => {
return (
<div>
<h1>my</h1>
</div>
);
};

export default My;
9 changes: 9 additions & 0 deletions app/(main)/setting/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
const Setting = () => {
return (
<div>
<h1>setting</h1>
</div>
);
};

export default Setting;
12 changes: 0 additions & 12 deletions app/about/page.tsx

This file was deleted.

18 changes: 13 additions & 5 deletions app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,15 @@ import { pretendard } from "@/shared/styles/base/font";
import type { Metadata } from "next";
import type { ReactNode } from "react";

// TODO: 추후 수정
import "@/shared/styles/base/global.css";
import "@/shared/styles/base/reset.css";
import { globalLayout, rootStyle } from "@/shared/styles/base/global.css";
import { themeClass } from "@/shared/styles/base/theme.css";
import SprinkleContainer from "@/shared/ui/sprinkle-container/sprinkle-container";

// TODO: 추후 수정
export const metadata: Metadata = {
title: "Create Next App",
title: "Lettie",
description: "Generated by create next app",
};

Expand All @@ -16,9 +21,12 @@ export default function RootLayout({
children: ReactNode;
}>) {
return (
<html lang="ko" className={pretendard.className}>
<body>
<Providers>{children}</Providers>
<html lang="ko" className={`${pretendard.className} ${themeClass}`}>
<body className={rootStyle}>
<Providers>
<div className={globalLayout}>{children}</div>
</Providers>
<SprinkleContainer />
</body>
</html>
);
Expand Down
8 changes: 5 additions & 3 deletions app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import Link from "next/link";
import NavHome from "@/shared/ui/nav-home/nav-home";

const Home = () => {
return (
<div>
<h1>Home</h1>
<Link href="/about">About</Link>
<NavHome />
<main>
<h1>Home</h1>
</main>
</div>
);
};
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"@vanilla-extract/sprinkles": "^1.6.3",
"clsx": "^2.1.1",
"ky": "^1.8.1",
"motion": "^12.23.3",
"next": "15.3.5",
"next-plugin-svgr": "^1.1.12",
"pretendard": "^1.3.9",
Expand All @@ -34,6 +35,7 @@
"@commitlint/cli": "^19.8.1",
"@commitlint/config-conventional": "^19.8.1",
"@playwright/test": "^1.53.1",
"@storybook/addon-docs": "^9.0.16",
"@storybook/addon-onboarding": "^9.0.1",
"@storybook/nextjs": "^9.0.1",
"@types/node": "^22.0.0",
Expand All @@ -43,7 +45,7 @@
"@vanilla-extract/webpack-plugin": "^2.3.19",
"chromatic": "^12.0.0",
"lefthook": "^1.11.13",
"storybook": "^9.0.1",
"storybook": "^9.0.16",
"typescript": "^5"
}
}
Loading