From 383a4782bcd3a24a054a23468a45b45f64271d47 Mon Sep 17 00:00:00 2001 From: wookki Date: Tue, 16 Jan 2024 18:00:27 +0900 Subject: [PATCH 1/3] =?UTF-8?q?assets:=20icon=20svg=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/icons/channel.svg | 5 ++--- public/assets/icons/favorite.svg | 4 ++-- public/assets/icons/filledFavorite.svg | 3 +++ public/assets/icons/filledHome.svg | 3 +++ public/assets/icons/home.svg | 5 ++--- public/assets/icons/location.svg | 3 +++ public/assets/icons/map.svg | 11 ----------- public/assets/icons/profile.svg | 5 ++--- 8 files changed, 17 insertions(+), 22 deletions(-) create mode 100644 public/assets/icons/filledFavorite.svg create mode 100644 public/assets/icons/filledHome.svg create mode 100644 public/assets/icons/location.svg delete mode 100644 public/assets/icons/map.svg diff --git a/public/assets/icons/channel.svg b/public/assets/icons/channel.svg index 39d109c6..71ae581d 100644 --- a/public/assets/icons/channel.svg +++ b/public/assets/icons/channel.svg @@ -1,4 +1,3 @@ - - - + + diff --git a/public/assets/icons/favorite.svg b/public/assets/icons/favorite.svg index f5b5cab7..3c4e8058 100644 --- a/public/assets/icons/favorite.svg +++ b/public/assets/icons/favorite.svg @@ -1,3 +1,3 @@ - - + + diff --git a/public/assets/icons/filledFavorite.svg b/public/assets/icons/filledFavorite.svg new file mode 100644 index 00000000..7637e9a6 --- /dev/null +++ b/public/assets/icons/filledFavorite.svg @@ -0,0 +1,3 @@ + + + diff --git a/public/assets/icons/filledHome.svg b/public/assets/icons/filledHome.svg new file mode 100644 index 00000000..920845b0 --- /dev/null +++ b/public/assets/icons/filledHome.svg @@ -0,0 +1,3 @@ + + + diff --git a/public/assets/icons/home.svg b/public/assets/icons/home.svg index 61609256..33bfa2c5 100644 --- a/public/assets/icons/home.svg +++ b/public/assets/icons/home.svg @@ -1,4 +1,3 @@ - - - + + diff --git a/public/assets/icons/location.svg b/public/assets/icons/location.svg new file mode 100644 index 00000000..f4a98532 --- /dev/null +++ b/public/assets/icons/location.svg @@ -0,0 +1,3 @@ + + + diff --git a/public/assets/icons/map.svg b/public/assets/icons/map.svg deleted file mode 100644 index ba01ae04..00000000 --- a/public/assets/icons/map.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/public/assets/icons/profile.svg b/public/assets/icons/profile.svg index 16f9b485..96b6259d 100644 --- a/public/assets/icons/profile.svg +++ b/public/assets/icons/profile.svg @@ -1,4 +1,3 @@ - - - + + From f9c9eccf41dd31e757ae31e878baea8bd065048e Mon Sep 17 00:00:00 2001 From: wookki Date: Tue, 16 Jan 2024 18:09:21 +0900 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20button-nav=20=EC=95=84=EC=9D=B4?= =?UTF-8?q?=EC=BD=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/shared/bottom-nav/BottomNav.module.scss | 1 + src/components/shared/bottom-nav/BottomNav.tsx | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/shared/bottom-nav/BottomNav.module.scss b/src/components/shared/bottom-nav/BottomNav.module.scss index 1828c956..e5068cd2 100644 --- a/src/components/shared/bottom-nav/BottomNav.module.scss +++ b/src/components/shared/bottom-nav/BottomNav.module.scss @@ -16,6 +16,7 @@ flex-direction: column; align-items: center; justify-content: space-between; + height: 42px; } } } diff --git a/src/components/shared/bottom-nav/BottomNav.tsx b/src/components/shared/bottom-nav/BottomNav.tsx index 3214f8b0..e22e7289 100644 --- a/src/components/shared/bottom-nav/BottomNav.tsx +++ b/src/components/shared/bottom-nav/BottomNav.tsx @@ -6,6 +6,8 @@ import { usePathname } from 'next/navigation'; import Channel from '@components/icons/Channel'; import Favorite from '@components/icons/Favorite'; +import FilledFavorite from '@components/icons/FilledFavorite'; +import FilledHome from '@components/icons/FilledHome'; import Home from '@components/icons/Home'; import Map from '@components/icons/Map'; import Profile from '@components/icons/Profile'; @@ -31,13 +33,13 @@ function BottomNav() {
  • - + {filteredPathName.startsWith('favorite') ? : } 즐겨찾기
  • - + {filteredPathName === '' ? : }
  • From f6dc404457acb85e58bef9c84e25e6831a60a3b1 Mon Sep 17 00:00:00 2001 From: wookki Date: Tue, 16 Jan 2024 18:09:43 +0900 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20icon=20=EC=BB=B4=ED=8F=AC=EB=84=8C?= =?UTF-8?q?=ED=8A=B8=20=EC=A0=9C=EC=9E=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/icons/Channel.tsx | 10 +++++----- src/components/icons/Favorite.tsx | 12 +++++------- src/components/icons/FilledFavorite.tsx | 15 +++++++++++++++ src/components/icons/FilledHome.tsx | 15 +++++++++++++++ src/components/icons/Home.tsx | 13 +++++-------- src/components/icons/Map.tsx | 18 ++++++------------ src/components/icons/Profile.tsx | 10 +++++----- 7 files changed, 56 insertions(+), 37 deletions(-) create mode 100644 src/components/icons/FilledFavorite.tsx create mode 100644 src/components/icons/FilledHome.tsx diff --git a/src/components/icons/Channel.tsx b/src/components/icons/Channel.tsx index 93523524..25669aa7 100644 --- a/src/components/icons/Channel.tsx +++ b/src/components/icons/Channel.tsx @@ -1,15 +1,15 @@ import { Colors, colors } from '@styles/colorPalette'; interface ChannelProps { - size?: number + width?: number + height?: number color?: Colors } -function Channel({ size = 24, color = 'black' }: ChannelProps) { +function Channel({ width = 19, height = 18, color = 'black' }: ChannelProps) { return ( - - - + + ); diff --git a/src/components/icons/Favorite.tsx b/src/components/icons/Favorite.tsx index 53750ec5..3589c7f9 100644 --- a/src/components/icons/Favorite.tsx +++ b/src/components/icons/Favorite.tsx @@ -1,14 +1,12 @@ -import { Colors, colors } from '@styles/colorPalette'; - interface FavoriteProps { - size?: number - color: Colors + width?: number + height?: number } -function Favorite({ size = 24, color = 'black' }: FavoriteProps) { +function Favorite({ width = 21, height = 19 }: FavoriteProps) { return ( - - + + ); diff --git a/src/components/icons/FilledFavorite.tsx b/src/components/icons/FilledFavorite.tsx new file mode 100644 index 00000000..ecad9ad3 --- /dev/null +++ b/src/components/icons/FilledFavorite.tsx @@ -0,0 +1,15 @@ +interface FilledFavoriteProps { + width?: number + height?: number +} + +function FilledFavorite({ width = 21, height = 19 }: FilledFavoriteProps) { + return ( + + + + + ); +} + +export default FilledFavorite; diff --git a/src/components/icons/FilledHome.tsx b/src/components/icons/FilledHome.tsx new file mode 100644 index 00000000..0db1c178 --- /dev/null +++ b/src/components/icons/FilledHome.tsx @@ -0,0 +1,15 @@ +interface HomeProps { + width?: number + height?: number +} + +function FilledHome({ width = 16, height = 20 }: HomeProps) { + return ( + + + + + ); +} + +export default FilledHome; diff --git a/src/components/icons/Home.tsx b/src/components/icons/Home.tsx index 8cab874b..543fc88b 100644 --- a/src/components/icons/Home.tsx +++ b/src/components/icons/Home.tsx @@ -1,15 +1,12 @@ -import { Colors, colors } from '@/styles/colorPalette'; - interface HomeProps { - size?: number - color: Colors + width?: number + height?: number } -function Home({ size = 24, color }: HomeProps) { +function Home({ width = 16, height = 20 }: HomeProps) { return ( - - - + + ); diff --git a/src/components/icons/Map.tsx b/src/components/icons/Map.tsx index 74389445..442997fb 100644 --- a/src/components/icons/Map.tsx +++ b/src/components/icons/Map.tsx @@ -1,23 +1,17 @@ import { Colors, colors } from '@styles/colorPalette'; interface MapProps { - size?: number + width?: number + height?: number color?: Colors } -function Map({ size = 24, color = 'black' }: MapProps) { +function Map({ width = 17, height = 20, color = 'black' }: MapProps) { return ( - - - - - - - - - - + + + ); } diff --git a/src/components/icons/Profile.tsx b/src/components/icons/Profile.tsx index c1d7cd8c..6ea76956 100644 --- a/src/components/icons/Profile.tsx +++ b/src/components/icons/Profile.tsx @@ -1,15 +1,15 @@ import { Colors, colors } from '@styles/colorPalette'; interface ProfileProps { - size?: number + width?: number + height?: number color?: Colors } -function Profile({ size = 24, color = 'black' }: ProfileProps) { +function Profile({ width = 17, height = 16, color = 'black' }: ProfileProps) { return ( - - - + + );