-
Notifications
You must be signed in to change notification settings - Fork 0
Feat: global layout 설정 및 nav-home 구현 #66
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
Merged
Merged
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 fbf7ece
style: 반응형 대응을 위한 screen 토큰 추가
seueooo 56cf427
feat: motion 패키지 설치
seueooo bc68535
style: 전역 레이아웃에 사용되는 sprinkle 컴포넌트 추가
seueooo c1db244
feat: 스토리북 docs 애드온 추가 및 sprinkle-container 스토리 추가
seueooo 25df631
fix: story 에러 삭제
seueooo 58df32d
chore: 파일명 컨벤션에 맞게 수정
seueooo df1e46e
chore: 필요없는 코드 삭제
seueooo 906958b
feat: 수정된 디자인시스템 반영 및 토큰 추가, 토큰 단에서 폰트사이즈 반응형 적용
seueooo 143f1d6
style: nav-home 데스크탑 뷰 퍼블리싱
seueooo 0993bbf
style: 그라디언트 토큰 추가
seueooo 7076abe
style: z-index 토큰 추가 및 index.ts에서 모든 토큰 export하도록 수정
seueooo 69c04cc
style: nav-home 반응형 구현
seueooo 538151b
style: 햄버거바 로테이션 애니메이션 추가 및 반응형 메뉴 구현
seueooo 39757ad
style: token createGlobalTheme-> 일반 객체 형식으로 변경
seueooo 1cd1088
feat: 페이지 라우터 연결, 탐색, 내캡슐, 설정페이지에 nav-home 추가
seueooo 06fe5f9
chore: story 파일 ui로 구분 설정
seueooo 7447cbf
refactor: 불필요한 코드 삭제
seueooo e5f5097
style: nav-home 메뉴 아이템 스타일 추가
seueooo 67eb5b6
Merge branch 'develop' into feature/add-global-layout-home-nav/#61
seueooo 11b638c
chore: svg type 추가
seueooo 8a0aecb
chore: 임시 테스트 코드 추가
seueooo bee5d19
chore: token 객체 readonly 되도록 타입단언
seueooo c657a66
feat: useRouter 제거 후 link태그로 이동하도록 변경
seueooo 129e16d
feat: 누락된 스타일 추가
seueooo 35c4caa
fix: 충돌해결
seueooo aec1e29
chore: 패키지 업데이트 및 lock파일 추가
seueooo 38f8697
chore: lock파일삭제
seueooo acb393e
style: 전역 레이아웃에 사용되는 sprinkle 컴포넌트 추가
seueooo 1ee9131
feat: 스토리북 docs 애드온 추가 및 sprinkle-container 스토리 추가
seueooo e34ee43
fix: story 에러 삭제
seueooo f5e6c81
chore: 파일명 컨벤션에 맞게 수정
seueooo c879705
feat: 수정된 디자인시스템 반영 및 토큰 추가, 토큰 단에서 폰트사이즈 반응형 적용
seueooo d14646f
style: nav-home 데스크탑 뷰 퍼블리싱
seueooo cd1554a
style: 그라디언트 토큰 추가
seueooo 4ab7b78
style: z-index 토큰 추가 및 index.ts에서 모든 토큰 export하도록 수정
seueooo 2a1abf2
style: nav-home 반응형 구현
seueooo 0309cb5
style: 햄버거바 로테이션 애니메이션 추가 및 반응형 메뉴 구현
seueooo 385ca32
style: token createGlobalTheme-> 일반 객체 형식으로 변경
seueooo 26716f2
chore: story 파일 ui로 구분 설정
seueooo c380eb0
fix: 충돌해결
seueooo 46199b3
chore: 패키지 업데이트 및 lock파일 추가
seueooo faa1ce7
chore: lock파일삭제
seueooo 1bd13bc
feat: lock파일 추가
seueooo d3e27bb
Merge branch 'develop' into feature/add-global-layout-home-nav/#61
seueooo db08802
fix: 불필요한 코드 삭제
seueooo 9d16168
chore: nav-home을 사용하는 레이아웃 그룹핑
seueooo 6248e98
chore: theme export 방식 변경 -> createTheme 이용하도록 수정
seueooo dd5c9d8
chore: screen 토큰은 개별적으로 export하도록 수정
seueooo b9c8649
refactor: 중복코드 제거
seueooo 6ae5c23
feat: 햄버거메뉴 컴포넌트 분리
seueooo bc6eeb5
chore: 햄버거 스토리 추가
seueooo 5002000
chore: text.ts에서 breakPoints import해서 사용하도록 수정
seueooo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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> | ||
| ); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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; |
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.