diff --git a/src/components/common/Filter/Filter.tsx b/src/components/common/Filter/Filter.tsx index f425006..e6a6775 100644 --- a/src/components/common/Filter/Filter.tsx +++ b/src/components/common/Filter/Filter.tsx @@ -1,9 +1,10 @@ import { Badge } from '@/components/ui/badge'; -import { DualSlider } from '@/components/ui/dual-slider'; import { Label } from '@/components/ui/label'; import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group'; import useFilterStore, { WineType } from '@/stores/filterStore'; +import DualSlider from '../slider/DualSlider'; + const Filter = () => { const { type, setType, minPrice, maxPrice, setPriceRange, rating, setRating } = useFilterStore(); @@ -13,8 +14,8 @@ const Filter = () => { return (
- WINE TYPES -
+ WINE TYPES +
{/* todo: 공통 뱃지로 변경 필요 */} {wineTypeOptions.map((option, index) => ( { ))}
-
- PRICE - {/* todo: 공통 레인지 슬라이더로 변경 필요 */} - +
+ PRICE +
- RATING + RATING {/* todo: 공통 라디오, 라벨 컴포넌트로 변경 필요 */}
{/* 전체인 경우 rating값을 아예 안보내는 것 같아 임의로 all로 설정 */} - +
-
+
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index 729edac..68ccced 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -1,27 +1,36 @@ import '@/styles/globals.css'; +import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; import clsx from 'clsx'; +import Head from 'next/head'; import { useRouter } from 'next/router'; import Gnb from '@/components/common/Gnb'; import type { AppProps } from 'next/app'; +const queryClient = new QueryClient(); + export default function App({ Component, pageProps }: AppProps) { const { pathname } = useRouter(); - const pagesWithoutGnb = ['/login', '/signup', '/_error']; + const pagesWithoutGnb = ['/login', '/signup', '/signin', '/_error']; const hideHeader = pagesWithoutGnb.includes(pathname); return ( <> - {!hideHeader && } -
- -
+ + WINE + + + {!hideHeader && } +
+ +
+ ); } diff --git a/src/pages/_document.tsx b/src/pages/_document.tsx index 7cb1e80..740ca42 100644 --- a/src/pages/_document.tsx +++ b/src/pages/_document.tsx @@ -5,6 +5,15 @@ export default function Document() { + + + + + + {/* todo: 배포 후 이미지, url 변경 필요 */} + + +