-
Notifications
You must be signed in to change notification settings - Fork 2
Feat[#THKV-119] : NavProfile 리디자인 적용 및 Header 구현 #114
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 all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
804dfcc
fix: arrowNext 아이콘 변경
grapefruit13 1ed1e5f
fix: arrowNext stroke로 변경
grapefruit13 f9ed559
fix: typography 컨플릭트 해결
grapefruit13 186144f
feat: NavProfile 리디자인 적용
grapefruit13 9aebc49
style: NavProvile w-238px 적용
grapefruit13 03ab2cc
style: header-logo png 추가
grapefruit13 eb71a6a
feat: Header 컴포넌트 구현
grapefruit13 582c986
feat: RootLayout에 Header 적용
grapefruit13 ddc3791
feat: useMounted 훅 구현
grapefruit13 14c02fc
feat: Header - useMounted 훅 적용
grapefruit13 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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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,25 @@ | ||
| 'use client'; | ||
|
|
||
| import Image from 'next/image'; | ||
| import NavProfile from '@/components/common/NavProfile'; | ||
| import { useMounted } from '@/hooks/useMounted'; | ||
| import { useUserStore } from '@/stores/useUserStore'; | ||
|
|
||
| const Header = () => { | ||
| const isMounted = useMounted(); | ||
| const username = useUserStore((state) => state.username); | ||
|
|
||
| return ( | ||
| <header className='fixed top-0 z-10 flex w-full flex-row items-center justify-between border border-b-gray-100 bg-white-100 px-6 py-4'> | ||
| <Image | ||
| src='/imgs/header-logo.png' | ||
| width={66} | ||
| height={48} | ||
| alt='header logo' | ||
| /> | ||
| <NavProfile name={isMounted ? username : ''} /> | ||
| </header> | ||
| ); | ||
| }; | ||
|
|
||
| export default Header; |
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
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,11 @@ | ||
| import { useEffect, useState } from 'react'; | ||
|
|
||
| export const useMounted = () => { | ||
| const [isMounted, setIsMounted] = useState(false); | ||
|
|
||
| useEffect(() => { | ||
| setIsMounted(true); | ||
| }, []); | ||
|
|
||
| return isMounted; | ||
| }; |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
오늘 작업하면서 이부분처럼 customTypography 선언한 부분 변경해두겠습니다