Skip to content

Commit

Permalink
feat: 로고 이미지 추가
Browse files Browse the repository at this point in the history
홈, 로그인 페이지
  • Loading branch information
a-honey committed Feb 16, 2024
1 parent c5aae83 commit 8a46311
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 9 deletions.
12 changes: 12 additions & 0 deletions src/assets/logos/text_logo_l.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions src/assets/logos/text_logo_m.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 8 additions & 6 deletions src/components/organisms/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const Header: React.FC<{

return (
<div
className={`flex justify-center items-center fixed top-0 w-screen max-w-[480px] py-[12px] px-[20px] z-[1000] ${background}`}
className={`flex ${headerLeft ? 'justify-between' : 'justify-center'} items-center fixed top-0 w-screen max-w-[480px] py-[12px] px-[20px] z-[1000] ${background}`}
>
{headerLeft ?? (
<button
Expand All @@ -45,11 +45,13 @@ const Header: React.FC<{
/>
</button>
)}
<div className="flex justify-center text-center w-full">
<p className="heading3-bold text-gray8 pt-1">
{typeof headerTitle === 'string' ? headerTitle : ''}
</p>
</div>
{!headerLeft && (
<div className="flex justify-center text-center w-full">
<p className="heading3-bold text-gray8 pt-1">
{typeof headerTitle === 'string' ? headerTitle : ''}
</p>
</div>
)}
{headerRight ?? <div className="w-7" />}
</div>
);
Expand Down
3 changes: 2 additions & 1 deletion src/pages/home/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { type NextPage } from 'next';
import MyFridgeImg from '@/assets/images/img_home_my.svg';
import LogoTextImg from '@/assets/logos/text_logo_m.svg';
import FriendsFridgeImg from '@/assets/images/img_home_friend.svg';
import { GreenArrowButton } from '@/components/atoms';
import { NearExpirationWarnBox, SvgAndTextBox } from '@/components/molecules';
Expand All @@ -14,7 +15,7 @@ const Home: NextPage = () => {
<div className="pt-[52px]">
<Header
headerTitle={''}
headerLeft={<div className="w-[100px] h-3 bg-point2" />}
headerLeft={<LogoTextImg />}
headerRight={
<div>
<AlarmIcon />
Expand Down
Loading

0 comments on commit 8a46311

Please sign in to comment.