diff --git a/frontend/.storybook/preview.ts b/frontend/.storybook/preview.ts index a9a9b4fb..767db400 100644 --- a/frontend/.storybook/preview.ts +++ b/frontend/.storybook/preview.ts @@ -1,15 +1,5 @@ import type { Preview } from '@storybook/react'; import '../src/index.css'; -// 우선은 폰트 다 포함시켰는데, 나중에 사용할 것들만 따로 뺴자. -import '@fontsource/pretendard/100.css'; -import '@fontsource/pretendard/200.css'; -import '@fontsource/pretendard/300.css'; -import '@fontsource/pretendard/400.css'; -import '@fontsource/pretendard/500.css'; -import '@fontsource/pretendard/600.css'; -import '@fontsource/pretendard/700.css'; -import '@fontsource/pretendard/800.css'; -import '@fontsource/pretendard/900.css'; const preview: Preview = { parameters: { diff --git a/frontend/package.json b/frontend/package.json index d5fe6de4..268c3601 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -19,7 +19,6 @@ "build-storybook": "storybook build" }, "dependencies": { - "@fontsource/pretendard": "^5.1.0", "axios": "^1.7.7", "lz-string": "^1.5.0", "react": "^18.3.1", diff --git a/frontend/src/App.css b/frontend/src/App.css index 12c5704e..77787acb 100644 --- a/frontend/src/App.css +++ b/frontend/src/App.css @@ -1,6 +1,6 @@ #root { touch-action: pan-y; - font-family: Pretendard, 'Pretendard Variable', sans-serif; + font-family: Pretendard, 'Pretendard Variable', sans-serif !important; } .logo { @@ -40,10 +40,10 @@ } .disable-drag { - -webkit-user-select:none; - -moz-user-select:none; - -ms-user-select:none; - user-select:none + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } .overlay { diff --git a/frontend/src/component/content/Content.tsx b/frontend/src/component/content/Content.tsx index 5483e14c..030c696f 100644 --- a/frontend/src/component/content/Content.tsx +++ b/frontend/src/component/content/Content.tsx @@ -4,6 +4,7 @@ import { getChannelInfo } from '@/api/channel.api'; import { useContext } from 'react'; import { ChannelContext } from '@/context/ChannelContext'; import { Dropdown } from '../common/dropdown/Dropdown'; +import { FooterContext } from '../layout/footer/LayoutFooterProvider'; interface IContentProps { title: string; @@ -35,6 +36,7 @@ interface IContentProps { */ export const Content = (props: IContentProps) => { + const { resetFooterContext } = useContext(FooterContext); const formattedDate = new Date(props.time).toLocaleDateString('ko-KR', { year: 'numeric', month: '2-digit', @@ -61,9 +63,15 @@ export const Content = (props: IContentProps) => { const goToChannelInfoPage = () => { if (channelInfo?.id) { navigate(`/channelInfo/${channelInfo.id}`); + resetFooterContext(); } }; + const goToHostViewPage = () => { + navigate(props.link); + resetFooterContext(); + }; + const handleUpdate = () => { getUpdateChannelInfo(); goToChannelInfoPage(); @@ -71,21 +79,18 @@ export const Content = (props: IContentProps) => { return (
-