Skip to content

feat: 브랜드 목록 API 연결 #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
waldls merged 4 commits into from
Feb 5, 2026
Merged

feat: 브랜드 목록 API 연결 #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d29a8f1
feat: 브랜드 API 연결
Feb 4, 2026
90b6f88
feat: 브랜드 API 연결
Feb 4, 2026
3a49bc5
refactor: getBrands.ts에서 queryKey 상수 사용
Feb 4, 2026
86388d2
design: 기기명이 2줄, 3줄 넘어갈 경우, 기기 상세보기 스펙을 사진과 같은 라인으로 맞추기
Feb 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions src/apis/devices/getBrands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { axiosInstance } from '@/apis/axios/axios';
import type { GetBrandsResponse } from '@/types/devices';
import { useQuery } from '@tanstack/react-query';
import { queryKey } from '@/constants/queryKey';

export const getBrands = async (deviceType?: string): Promise<GetBrandsResponse> => {
const params = deviceType ? { deviceType } : {};
const { data } = await axiosInstance.get<GetBrandsResponse>('/api/brands', { params });
return data;
};

export const useGetBrands = (deviceType?: string) => {
return useQuery<GetBrandsResponse>({
queryKey: [queryKey.BRANDS, deviceType],
queryFn: () => getBrands(deviceType),
enabled: true,
});
};
3 changes: 2 additions & 1 deletion src/constants/queryKey.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ export const queryKey = {
TAGS: 'tags',
COMBOS: 'combos',
COMBO_DETAIL: 'combo',
LIFESTYLE_DEVICE: 'lifestyle_device'
LIFESTYLE_DEVICE: 'lifestyle_device',
BRANDS: 'brands'
} as const;
157 changes: 96 additions & 61 deletions src/pages/devices/DeviceSearchPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useState, useEffect, useRef } from 'react';
import { useState, useEffect, useRef, useMemo } from 'react';
import { useSearchParams, useNavigate } from 'react-router-dom';
import GNB from '@/components/Home/GNB';
import ProductCard from '@/components/ProductCard/ProductCard';
Expand All @@ -20,7 +20,6 @@ import {
DEVICE_CATEGORIES,
SORT_OPTIONS,
PRICE_OPTIONS,
BRAND_OPTIONS,
SCROLL_CONSTANTS,
} from '@/constants/devices';
import { MOCK_PRODUCTS } from '@/constants/mockData';
Expand All @@ -30,8 +29,25 @@ import { useGetCombos } from '@/apis/combo/getCombos';
import { useGetCombo } from '@/apis/combo/getComboId';
import { usePostComboDevice } from '@/apis/combo/postComboDevices';
import { useGetUserProfile } from '@/apis/mypage/getUserProfile';
import { useGetBrands } from '@/apis/devices/getBrands';
import { hasAuthTokens, hasCompletedOnboarding } from '@/utils/auth/authStorage';

// 카테고리 ID를 API deviceType으로 변환
const getCategoryDeviceType = (categoryId: number | null): string | undefined => {
if (!categoryId) return undefined;
const mapping: Record<number, string> = {
1: 'SMARTPHONE',
2: 'LAPTOP',
3: 'TABLET',
4: 'SMARTWATCH',
5: 'AUDIO',
6: 'KEYBOARD',
7: 'MOUSE',
8: 'CHARGER',
};
return mapping[categoryId];
};

const DeviceSearchPage = () => {
const [searchParams, setSearchParams] = useSearchParams();
const selectedProductId = searchParams.get('productId');
Expand Down Expand Up @@ -69,11 +85,28 @@ const DeviceSearchPage = () => {

const productGridRef = useRef<HTMLDivElement>(null);

// 브랜드 API 조회 - 선택된 카테고리에 따라 deviceType 전달
const { data: brandsData } = useGetBrands(getCategoryDeviceType(selectedCategory));

// API 데이터를 FilterOption 형식으로 변환
const brandOptions = useMemo(() => {
if (!brandsData?.result) return [];
return brandsData.result.map(brand => ({
value: brand.brandId.toString(),
label: brand.brandName,
}));
}, [brandsData]);

// 페이지 마운트 시 상단으로 스크롤
useEffect(() => {
window.scrollTo(0, 0);
}, []);

// 카테고리 변경 시 선택된 브랜드 초기화
useEffect(() => {
setSelectedBrand(null);
}, [selectedCategory]);

/* 선택된 제품 찾기 */
const selectedProduct = selectedProductId
? MOCK_PRODUCTS.find(p => p.id === Number(selectedProductId))
Expand Down Expand Up @@ -329,7 +362,7 @@ const DeviceSearchPage = () => {
<div className="ml-20">
<FilterDropdown
label="브랜드"
options={BRAND_OPTIONS}
options={brandOptions}
selectedValue={selectedBrand}
onSelect={(value) => setSelectedBrand(value as string | null)}
/>
Expand Down Expand Up @@ -416,77 +449,79 @@ const DeviceSearchPage = () => {
onClick={(e) => e.stopPropagation()}
>
{/* Content */}
<div className="flex items-start justify-between gap-56">
{/* Left Section */}
<div className="w-400 flex flex-col gap-20">
{/* Name & Price + Image */}
<div className="flex flex-col gap-20">
{/* Name & Price */}
<div className="flex flex-col gap-12">
<p className="font-heading-1 text-blue-600">{selectedProduct.name}</p>
<div className="flex items-center gap-8 font-heading-2 text-black">
<p>₩</p>
<p>{selectedProduct.price.toLocaleString()}</p>
<div className="flex flex-col gap-20">
{/* Row 1: Name & Price */}
<div className="w-400">
{/* Name & Price */}
<div className="flex flex-col gap-12">
<p className="font-heading-1 text-blue-600">{selectedProduct.name}</p>
<div className="flex items-center gap-8 font-heading-2 text-black">
<p>₩</p>
<p>{selectedProduct.price.toLocaleString()}</p>
</div>
</div>
</div>

{/* Row 2: Image + Specs */}
<div className="flex items-start gap-56">
{/* Image */}
<div className="w-400 h-400 bg-gray-200 relative">
</div>

{/* Right Section - Specs */}
<div className="w-303 flex flex-col gap-40">
{/* Product Info Table */}
<div className="flex flex-col gap-20 pl-16">
<div className="flex items-center gap-24">
<p className="font-body-2-r text-gray-400 w-80 flex-shrink-0">모델명</p>
<p className="font-body-2-r text-black line-clamp-1">{selectedProduct.name}</p>
</div>
<div className="flex items-center gap-24">
<p className="font-body-2-r text-gray-400 w-80">카테고리</p>
<p className="font-body-2-r text-black">{selectedProduct.category}</p>
</div>
<div className="flex items-center gap-24">
<p className="font-body-2-r text-gray-400 w-80">브랜드</p>
<p className="font-body-2-r text-black">Apple</p>
</div>
<div className="flex items-center gap-24">
<p className="font-body-2-r text-gray-400 w-80">색상</p>
<p className="font-body-2-r text-black">내추럴 티타늄</p>
</div>
<div className="flex items-center gap-24">
<p className="font-body-2-r text-gray-400 w-80">가격</p>
<div className="flex items-center gap-4 font-body-2-r text-black">
<p>{selectedProduct.price.toLocaleString()}</p>
<p>원</p>
</div>
</div>
<div className="flex items-center gap-24">
<p className="font-body-2-r text-gray-400 w-80">충전방식</p>
<p className="font-body-2-r text-black">USB-C</p>
</div>
<div className="flex items-center gap-24">
<p className="font-body-2-r text-gray-400 w-80">출시일</p>
<p className="font-body-2-r text-black">2023년 9월</p>
</div>
</div>

{/* Image */}
<div className="w-400 h-400 bg-gray-200 relative">
{/* Hashtags */}
<div className="flex items-center gap-16">
<ProductLife label="office" />
<ProductLife label="portability" />
</div>
</div>
</div>

{/* Button */}
{/* Row 3: Button */}
<div className="w-400">
<PrimaryButton
text={addToCombinationConfig.text}
onClick={addToCombinationConfig.handler}
disabled={isProfileLoading}
className="w-full bg-blue-500 hover:bg-blue-400 transition-colors"
/>
</div>

{/* Right Section */}
<div className="w-303 flex flex-col gap-40 pt-118">
{/* Product Info Table */}
<div className="flex flex-col gap-20 pl-16">
<div className="flex items-center gap-24">
<p className="font-body-2-r text-gray-400 w-80">모델명</p>
<p className="font-body-2-r text-black">{selectedProduct.name}</p>
</div>
<div className="flex items-center gap-24">
<p className="font-body-2-r text-gray-400 w-80">카테고리</p>
<p className="font-body-2-r text-black">{selectedProduct.category}</p>
</div>
<div className="flex items-center gap-24">
<p className="font-body-2-r text-gray-400 w-80">브랜드</p>
<p className="font-body-2-r text-black">Apple</p>
</div>
<div className="flex items-center gap-24">
<p className="font-body-2-r text-gray-400 w-80">색상</p>
<p className="font-body-2-r text-black">내추럴 티타늄</p>
</div>
<div className="flex items-center gap-24">
<p className="font-body-2-r text-gray-400 w-80">가격</p>
<div className="flex items-center gap-4 font-body-2-r text-black">
<p>{selectedProduct.price.toLocaleString()}</p>
<p>원</p>
</div>
</div>
<div className="flex items-center gap-24">
<p className="font-body-2-r text-gray-400 w-80">충전방식</p>
<p className="font-body-2-r text-black">USB-C</p>
</div>
<div className="flex items-center gap-24">
<p className="font-body-2-r text-gray-400 w-80">출시일</p>
<p className="font-body-2-r text-black">2023년 9월</p>
</div>
</div>

{/* Hashtags */}
<div className="flex items-center gap-16">
<ProductLife label="office" />
<ProductLife label="portability" />
</div>
</div>
</div>
</div>
</div>
Expand Down
11 changes: 11 additions & 0 deletions src/types/devices.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@ import { type CombinationName, type CombinationStatus } from '@/constants/combin
export type AuthStatus = 'logout' | 'login';
export type ModalView = 'device' | 'combination' | 'combinationDetail';

export interface Brand {
brandId: number;
brandName: string;
}

export interface GetBrandsResponse {
code: string;
message: string;
result: Brand[];
}

export type CombinationTagType = {
name: CombinationName;
status: CombinationStatus;
Expand Down