diff --git a/apps/client/src/layout/Layout.tsx b/apps/client/src/layout/Layout.tsx index 055102fd..cc2ef7ba 100644 --- a/apps/client/src/layout/Layout.tsx +++ b/apps/client/src/layout/Layout.tsx @@ -1,15 +1,23 @@ import { Outlet, useLocation } from 'react-router-dom'; import { Sidebar } from '@shared/components/sidebar/Sidebar'; +import { ROUTES_CONFIG } from '@routes/routesConfig'; const Layout = () => { const location = useLocation(); - const isOnboarding = location.pathname.startsWith('/onboarding'); - const isLogin = location.pathname.startsWith('/login'); + + const isPolicyPage = + location.pathname === ROUTES_CONFIG.privacyPolicy.path || + location.pathname === ROUTES_CONFIG.termsOfService.path; + + const isSidebarHidden = + location.pathname.startsWith(ROUTES_CONFIG.onBoarding.path) || + location.pathname.startsWith(ROUTES_CONFIG.login.path) || + isPolicyPage; return ( <>
- {!isOnboarding && !isLogin && } + {!isSidebarHidden && }
diff --git a/apps/client/src/pages/login/Login.tsx b/apps/client/src/pages/login/Login.tsx index 1c15e771..128422ec 100644 --- a/apps/client/src/pages/login/Login.tsx +++ b/apps/client/src/pages/login/Login.tsx @@ -6,6 +6,7 @@ import { handleGoogleLogin } from '@shared/utils/handleGoogleLogin'; import { Link } from 'react-router-dom'; import Chippi from '@assets/chippi_extension_popup.svg'; import GoogleLogo from '/assets/onBoarding/icons/googleLogo.svg'; +import { ROUTES_CONFIG } from '@routes/routesConfig'; const Login = () => { return ( @@ -48,14 +49,14 @@ const Login = () => {

가입 시 pinback의{' '} 이용 약관 {' '} 및{' '} 개인정보처리방침 diff --git a/apps/client/src/pages/myBookmark/MyBookmark.tsx b/apps/client/src/pages/myBookmark/MyBookmark.tsx index 4eb4e558..c85bd055 100644 --- a/apps/client/src/pages/myBookmark/MyBookmark.tsx +++ b/apps/client/src/pages/myBookmark/MyBookmark.tsx @@ -18,6 +18,7 @@ import ArticlesLoadingBoundary from '@shared/components/articlesLoadingBoundary/ import ArticlesErrorBoundary from '@shared/components/articlesErrorBoundary/ArticlesErrorBoundary'; import { ErrorBoundary } from 'react-error-boundary'; import MyBookmarkContent from '@pages/myBookmark/components/myBookmarkContent/MyBookmarkContent'; +import Footer from './components/footer/Footer'; const MyBookmark = () => { const [activeBadge, setActiveBadge] = useState<'all' | 'notRead'>('all'); @@ -69,7 +70,7 @@ const MyBookmark = () => { id == null ? '' : (REMIND_MOCK_DATA.find((d) => d.id === id)?.title ?? ''); return ( -

+

나의 북마크

@@ -102,6 +103,7 @@ const MyBookmark = () => { /> +