diff --git a/src/assets/backgrounds/setting.png b/src/assets/backgrounds/setting.png new file mode 100644 index 0000000..89e78d6 Binary files /dev/null and b/src/assets/backgrounds/setting.png differ diff --git a/src/assets/icons/calendar.svg b/src/assets/icons/calendar.svg new file mode 100644 index 0000000..aa23069 --- /dev/null +++ b/src/assets/icons/calendar.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/src/assets/icons/info.svg b/src/assets/icons/info.svg new file mode 100644 index 0000000..05091e8 --- /dev/null +++ b/src/assets/icons/info.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/components/MyPage/BrandView.tsx b/src/components/MyPage/BrandView.tsx index c00d047..f6b7894 100644 --- a/src/components/MyPage/BrandView.tsx +++ b/src/components/MyPage/BrandView.tsx @@ -4,6 +4,8 @@ import styled from 'styled-components'; import { ReactComponent as AddIcon } from '@/assets/icons/add.svg'; import { ReactComponent as ArrowRight } from '@/assets/icons/arrowRight.svg'; +import { ReactComponent as CalendarIcon } from '@/assets/icons/calendar.svg'; +import { ReactComponent as InfoIcon } from '@/assets/icons/info.svg'; import { ReactComponent as BrandLogoImage } from '@/assets/logos/brandLogo.svg'; import Card from '@/components/MyPage/Card'; import DateCard from '@/components/MyPage/DateCard'; @@ -61,10 +63,18 @@ export const BrandView = () => { - - 브랜드 관리 - - + + + 브랜드 관리 + + + + + + + + + @@ -248,6 +258,14 @@ const BrandTextContainer = styled.div` gap: 12px; display: flex; `; +const BrandContainer = styled.div` + width: 100%; + height: 100%; + justify-content: flex-start; + align-items: center; + gap: 12px; + display: flex; +`; const BrandText = styled.div` text-align: center; color: ${({ theme }) => `${theme.color.gray800}`}; @@ -255,9 +273,6 @@ const BrandText = styled.div` word-wrap: break-word; `; const BrandMenuContainer = styled.div` - border-radius: 8px; - overflow: hidden; - border: 2px #efefef solid; justify-content: flex-start; align-items: center; display: flex; diff --git a/src/components/MyPage/SettingView.tsx b/src/components/MyPage/SettingView.tsx index d5dbb1f..a6f7176 100644 --- a/src/components/MyPage/SettingView.tsx +++ b/src/components/MyPage/SettingView.tsx @@ -1,12 +1,25 @@ import { styled } from 'styled-components'; +import backgroundImg from '@/assets/backgrounds/setting.png'; export const SettingView = () => { - return 설정어쩌구; + return ( + + + + ); }; const StyledContainer = styled.div` width: 100%; height: 100%; padding: 100px 24px 52px 24px; - background-color: aliceblue; +`; + +const ImageContainer = styled.div` + width: 100%; + height: 100%; + background-image: url(${backgroundImg}); + background-size: contain; + background-position: top; + background-repeat: no-repeat; `;