From c6a9ba75a57e8b4483d920772cb8e0ee19ab3a9a Mon Sep 17 00:00:00 2001 From: durumi99 Date: Sun, 16 Mar 2025 23:03:08 +0900 Subject: [PATCH 001/208] 12313 --- .env | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.env b/.env index f82651ed..3966d150 100644 --- a/.env +++ b/.env @@ -1,2 +1,3 @@ -VITE_BASE_URL=https://api.humanzipyo.com +# VITE_BASE_URL=https://api.humanzipyo.com + VITE_GOOGLE_ANALYTICS=G-EZPQMV95QJ \ No newline at end of file From 055ddac982ff647fd095b3cf20f06dc49ec5f57d Mon Sep 17 00:00:00 2001 From: durumi99 Date: Sun, 16 Mar 2025 23:05:38 +0900 Subject: [PATCH 002/208] rollback --- .env | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.env b/.env index 3966d150..f82651ed 100644 --- a/.env +++ b/.env @@ -1,3 +1,2 @@ -# VITE_BASE_URL=https://api.humanzipyo.com - +VITE_BASE_URL=https://api.humanzipyo.com VITE_GOOGLE_ANALYTICS=G-EZPQMV95QJ \ No newline at end of file From 849d415a968be936b71fd4b332e4848abb6e2e5b Mon Sep 17 00:00:00 2001 From: durumi99 Date: Thu, 15 May 2025 02:09:11 +0900 Subject: [PATCH 003/208] =?UTF-8?q?#315=20[feat]=20=ED=95=98=EB=8B=A8=20?= =?UTF-8?q?=EB=84=A4=EB=B9=84=EA=B2=8C=EC=9D=B4=EC=85=98=EB=B0=94=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/bottomNav/favorites.svg | 3 ++ src/assets/bottomNav/home.svg | 3 ++ src/assets/bottomNav/myPage.svg | 3 ++ src/assets/bottomNav/shortView.svg | 3 ++ .../BottomNavigation.Style.ts | 22 +++++++++ .../BottomNavigation/BottomNavigation.tsx | 47 +++++++++++++++++++ src/layout/Mainlayout/Mainlayout.tsx | 2 + 7 files changed, 83 insertions(+) create mode 100644 src/assets/bottomNav/favorites.svg create mode 100644 src/assets/bottomNav/home.svg create mode 100644 src/assets/bottomNav/myPage.svg create mode 100644 src/assets/bottomNav/shortView.svg create mode 100644 src/layout/BottomNavigation/BottomNavigation.Style.ts create mode 100644 src/layout/BottomNavigation/BottomNavigation.tsx diff --git a/src/assets/bottomNav/favorites.svg b/src/assets/bottomNav/favorites.svg new file mode 100644 index 00000000..35c8bb5d --- /dev/null +++ b/src/assets/bottomNav/favorites.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/bottomNav/home.svg b/src/assets/bottomNav/home.svg new file mode 100644 index 00000000..fe8fb971 --- /dev/null +++ b/src/assets/bottomNav/home.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/bottomNav/myPage.svg b/src/assets/bottomNav/myPage.svg new file mode 100644 index 00000000..ce2400f1 --- /dev/null +++ b/src/assets/bottomNav/myPage.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/bottomNav/shortView.svg b/src/assets/bottomNav/shortView.svg new file mode 100644 index 00000000..eca9dbd2 --- /dev/null +++ b/src/assets/bottomNav/shortView.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/layout/BottomNavigation/BottomNavigation.Style.ts b/src/layout/BottomNavigation/BottomNavigation.Style.ts new file mode 100644 index 00000000..d4a107e8 --- /dev/null +++ b/src/layout/BottomNavigation/BottomNavigation.Style.ts @@ -0,0 +1,22 @@ +import styled from '@emotion/styled'; +import { theme } from '@styles/themes'; + +export const NavContainer = styled('nav')({ + position: 'fixed', + bottom: 0, + width: '100%', + height: '64px', + backgroundColor: theme.colors.primary50, + display: 'flex', + justifyContent: 'space-around', + alignItems: 'center', + zIndex: 1000, +}); + +export const NavItem = styled('div')({ + display: 'flex', + flexDirection: 'column', + alignItems: 'center', + fontSize: '12px', + color: '#333', +}); diff --git a/src/layout/BottomNavigation/BottomNavigation.tsx b/src/layout/BottomNavigation/BottomNavigation.tsx new file mode 100644 index 00000000..c7741e4a --- /dev/null +++ b/src/layout/BottomNavigation/BottomNavigation.tsx @@ -0,0 +1,47 @@ +import { useNavigate } from 'react-router-dom'; +import FavoritesSVG from '@assets/bottomNav/favorites.svg?react'; +import HomeSVG from '@assets/bottomNav/home.svg?react'; +import MyPageSVG from '@assets/bottomNav/myPage.svg?react'; +import ShortViewSVG from '@assets/bottomNav/shortView.svg?react'; +import { NavContainer, NavItem } from './BottomNavigation.Style'; + +const navItems = [ + { label: '홈', icon: }, + { label: '숏뷰', icon: }, + { label: '찜', icon: }, + { label: '마이', icon: }, +]; + +const BottomNavigation = () => { + const navigate = useNavigate(); + const handleClick = (index: number) => { + switch (index) { + case 0: + navigate('/'); + break; + case 1: + alert('숏뷰는 준비중입니다.'); + break; + case 2: + alert('관심종목은 준비중입니다.'); + break; + case 3: + alert('마이페이지는 준비중입니다.'); + break; + default: + break; + } + }; + + return ( + + {navItems.map((item, index) => ( + handleClick(index)}> + {item.icon} + + ))} + + ); +}; + +export default BottomNavigation; diff --git a/src/layout/Mainlayout/Mainlayout.tsx b/src/layout/Mainlayout/Mainlayout.tsx index ff6593a5..8df77e62 100644 --- a/src/layout/Mainlayout/Mainlayout.tsx +++ b/src/layout/Mainlayout/Mainlayout.tsx @@ -1,3 +1,4 @@ +import BottomNavigation from '@layout/BottomNavigation/BottomNavigation'; import Footer from '../Footer/Footer'; import Header from '../Header/Header'; import { LayoutProps } from './Mainlayout.Props'; @@ -8,6 +9,7 @@ const Mainlayout = ({ children }: LayoutProps) => {
{children} +