diff --git a/frontend/src/assets/images/index.ts b/frontend/src/assets/images/index.ts index 586e7b82b..632d6d2fb 100644 --- a/frontend/src/assets/images/index.ts +++ b/frontend/src/assets/images/index.ts @@ -1,5 +1,6 @@ -export { default as logoIcon } from './logo.png'; -export { default as newTemplateIcon } from './newTemplate.png'; +export { default as logoIcon } from './logo_24x24.png'; +export { default as newTemplateIcon } from './newTemplate_12x12.png'; export { default as pencilIcon } from './pencil.png'; export { default as searchIcon } from './search.png'; export { default as trashcanIcon } from './trashcan.png'; +export { default as userMenuIcon } from './userMenu_38x38.png'; diff --git a/frontend/src/assets/images/logo.png b/frontend/src/assets/images/logo.png deleted file mode 100644 index 60a611c84..000000000 Binary files a/frontend/src/assets/images/logo.png and /dev/null differ diff --git a/frontend/src/assets/images/logo_24x24.png b/frontend/src/assets/images/logo_24x24.png new file mode 100644 index 000000000..b7cedcb77 Binary files /dev/null and b/frontend/src/assets/images/logo_24x24.png differ diff --git a/frontend/src/assets/images/newTemplate.png b/frontend/src/assets/images/newTemplate.png deleted file mode 100644 index b0a86ab47..000000000 Binary files a/frontend/src/assets/images/newTemplate.png and /dev/null differ diff --git a/frontend/src/assets/images/newTemplate_12x12.png b/frontend/src/assets/images/newTemplate_12x12.png new file mode 100644 index 000000000..a4f597afe Binary files /dev/null and b/frontend/src/assets/images/newTemplate_12x12.png differ diff --git a/frontend/src/assets/images/userMenu_38x38.png b/frontend/src/assets/images/userMenu_38x38.png new file mode 100644 index 000000000..5caeec6e7 Binary files /dev/null and b/frontend/src/assets/images/userMenu_38x38.png differ diff --git a/frontend/src/components/Header/Header.style.ts b/frontend/src/components/Header/Header.style.ts new file mode 100644 index 000000000..40bdacb5e --- /dev/null +++ b/frontend/src/components/Header/Header.style.ts @@ -0,0 +1,64 @@ +import styled from '@emotion/styled'; + +import { theme } from '@/style/theme'; + +export const HeaderContainer = styled.nav` + position: fixed; + z-index: 1; + left: 0; + + display: flex; + justify-content: center; + + width: 100%; + + background: white; + border-bottom: 2px solid ${theme.color.light.secondary_200}; +`; + +export const HeaderContentContainer = styled.div` + display: flex; + gap: 3.75rem; + align-items: center; + + width: 80rem; + max-width: 80rem; + height: 4rem; + padding: 1.875rem; + + white-space: nowrap; +`; + +export const NavOptionButton = styled.button` + cursor: pointer; + background: none; +`; + +export const NewTemplateButton = styled.button` + cursor: pointer; + + display: flex; + gap: 0.5rem; + align-items: center; + justify-content: center; + + width: 7.5rem; + height: 2.375rem; + + background-color: white; + border: 2px solid ${theme.color.light.primary_800}; + border-radius: 8px; +`; + +export const UserMenuButton = styled.button` + cursor: pointer; + + width: 2.375rem; + height: 2.375rem; + + color: ${theme.color.light.primary_800}; + + object-fit: contain; + background-color: white; + border-radius: 50%; +`; diff --git a/frontend/src/components/Header/Header.tsx b/frontend/src/components/Header/Header.tsx index 793d5c2da..96e45eb0e 100644 --- a/frontend/src/components/Header/Header.tsx +++ b/frontend/src/components/Header/Header.tsx @@ -1,59 +1,62 @@ -import { useState } from 'react'; import { Link } from 'react-router-dom'; -import { logoIcon, newTemplateIcon, searchIcon } from '@/assets/images'; -import { Button, Flex, Heading, Input, Text } from '@/components'; -import * as S from './style'; - -const Header = () => { - const [searchValue, setSearchValue] = useState(''); - - const handleInputChange = (event: React.ChangeEvent) => { - setSearchValue(event.target.value); - }; - - return ( - - - - logo - CodeZap - - - - - - - - - +import { logoIcon, newTemplateIcon, userMenuIcon } from '@/assets/images'; +import { Flex, Heading, Text } from '@/components'; +import { theme } from '../../style/theme'; +import * as S from './Header.style'; + +const Header = () => ( + + + + + + + - - - - - - - - - - + + + + - - ); -}; + + +); + +const Logo = () => ( + + + 로고 버튼 + 코드잽 + + +); + +const NavOption = ({ route, name }: { route: string; name: string }) => ( + + + + {name} + + + +); + +const NewTemplateButton = () => ( + + + + + 새 템플릿 + + + +); + +const UserMenuButton = () => ( + + 사용자 메뉴 + +); export default Header; diff --git a/frontend/src/components/Header/style.ts b/frontend/src/components/Header/style.ts deleted file mode 100644 index 74a9d6f19..000000000 --- a/frontend/src/components/Header/style.ts +++ /dev/null @@ -1,17 +0,0 @@ -import styled from '@emotion/styled'; - -export const HeaderContainer = styled.nav` - position: fixed; - z-index: 1; - left: 0; - - display: flex; - gap: 10rem; - align-items: center; - - width: 100vw; - height: 6.4rem; - padding: 3rem; - - background: #393e46; -`;