From 9df5b9ee7d2e04fd516c9dab2faec7d399387fe2 Mon Sep 17 00:00:00 2001 From: Daeeui Kim Date: Mon, 28 Aug 2023 22:47:08 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20sprite=20svg=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/svg/common/expand.svg | 3 --- src/assets/svg/common/fold.svg | 3 --- src/assets/svg/common/home.svg | 3 --- src/assets/svg/common/logo.svg | 6 ----- src/assets/svg/common/my-page.svg | 4 --- src/assets/svg/common/setting.svg | 4 --- src/assets/svg/common/sprite-svg.svg | 27 +++++++++++++++++++ src/assets/svg/common/write.svg | 3 --- .../common/BottomNavigation/index.tsx | 15 ++++++----- .../common/SideNavigation/index.tsx | 17 +++++------- src/components/common/SpriteSvg/index.tsx | 15 +++++++++++ src/pages/Home/components/Map/index.tsx | 1 - 12 files changed, 56 insertions(+), 45 deletions(-) delete mode 100644 src/assets/svg/common/expand.svg delete mode 100644 src/assets/svg/common/fold.svg delete mode 100644 src/assets/svg/common/home.svg delete mode 100644 src/assets/svg/common/logo.svg delete mode 100644 src/assets/svg/common/my-page.svg delete mode 100644 src/assets/svg/common/setting.svg create mode 100644 src/assets/svg/common/sprite-svg.svg delete mode 100644 src/assets/svg/common/write.svg create mode 100644 src/components/common/SpriteSvg/index.tsx diff --git a/src/assets/svg/common/expand.svg b/src/assets/svg/common/expand.svg deleted file mode 100644 index 897a5ff5..00000000 --- a/src/assets/svg/common/expand.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/svg/common/fold.svg b/src/assets/svg/common/fold.svg deleted file mode 100644 index 97bf7338..00000000 --- a/src/assets/svg/common/fold.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/svg/common/home.svg b/src/assets/svg/common/home.svg deleted file mode 100644 index 1e298368..00000000 --- a/src/assets/svg/common/home.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/assets/svg/common/logo.svg b/src/assets/svg/common/logo.svg deleted file mode 100644 index 0f9a7250..00000000 --- a/src/assets/svg/common/logo.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/assets/svg/common/my-page.svg b/src/assets/svg/common/my-page.svg deleted file mode 100644 index 7bf32308..00000000 --- a/src/assets/svg/common/my-page.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/svg/common/setting.svg b/src/assets/svg/common/setting.svg deleted file mode 100644 index ea7f7e4d..00000000 --- a/src/assets/svg/common/setting.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/assets/svg/common/sprite-svg.svg b/src/assets/svg/common/sprite-svg.svg new file mode 100644 index 00000000..3a599285 --- /dev/null +++ b/src/assets/svg/common/sprite-svg.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/svg/common/write.svg b/src/assets/svg/common/write.svg deleted file mode 100644 index 4e079dde..00000000 --- a/src/assets/svg/common/write.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/components/common/BottomNavigation/index.tsx b/src/components/common/BottomNavigation/index.tsx index 6b266025..6c17ab7c 100644 --- a/src/components/common/BottomNavigation/index.tsx +++ b/src/components/common/BottomNavigation/index.tsx @@ -1,10 +1,8 @@ -import { ReactComponent as HomeIcon } from 'assets/svg/common/home.svg'; -import { ReactComponent as WriteIcon } from 'assets/svg/common/write.svg'; -import { ReactComponent as MyPageIcon } from 'assets/svg/common/my-page.svg'; import { Link, useLocation } from 'react-router-dom'; import cn from 'utils/ts/classNames'; import { useAuth } from 'store/auth'; import styles from './BottomNavigation.module.scss'; +import SpriteSvg from '../SpriteSvg'; export default function BottomNavigation(): JSX.Element { const { pathname } = useLocation(); @@ -13,17 +11,17 @@ export default function BottomNavigation(): JSX.Element { const NAV_TABS = [ { pathname: '/', - icon: HomeIcon, + icon: 'home', text: '홈', }, { pathname: '/post', - icon: WriteIcon, + icon: 'write', text: '글쓰기', }, { pathname: auth ? '/profile' : '/login', - icon: MyPageIcon, + icon: 'my-page', text: '마이페이지', }, ]; @@ -40,7 +38,10 @@ export default function BottomNavigation(): JSX.Element { })} > - +
+ + +
{tab.text}
diff --git a/src/components/common/SideNavigation/index.tsx b/src/components/common/SideNavigation/index.tsx index bb15bd84..b69342eb 100644 --- a/src/components/common/SideNavigation/index.tsx +++ b/src/components/common/SideNavigation/index.tsx @@ -1,19 +1,14 @@ -import { ReactComponent as LogoIcon } from 'assets/svg/common/logo.svg'; -import { ReactComponent as SettingIcon } from 'assets/svg/common/setting.svg'; -import { ReactComponent as WriteIcon } from 'assets/svg/common/write.svg'; -import { ReactComponent as MyPageIcon } from 'assets/svg/common/my-page.svg'; import { ReactComponent as SearchIcon } from 'assets/svg/search/lens.svg'; import { ReactComponent as StoreFrontIcon } from 'assets/svg/home/storefront.svg'; import { ReactComponent as BookMarkIcon } from 'assets/svg/home/bookmark.svg'; import { ReactComponent as GroupIcon } from 'assets/svg/home/group.svg'; -import { ReactComponent as ExpandIcon } from 'assets/svg/common/expand.svg'; -import { ReactComponent as FoldIcon } from 'assets/svg/common/fold.svg'; import { useAuth, useClearAuth } from 'store/auth'; import cn from 'utils/ts/classNames'; import useBooleanState from 'utils/hooks/useBooleanState'; import { Link, useLocation } from 'react-router-dom'; import { useFilterFriend, useFilterNearby, useFilterScrap } from 'store/filter'; import styles from './SideNavigation.module.scss'; +import SpriteSvg from '../SpriteSvg'; export default function TopNavigation(): JSX.Element { const auth = useAuth(); @@ -33,7 +28,7 @@ export default function TopNavigation(): JSX.Element { const TABS = [ { name: '', - icon: , + icon: