Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion backend/src/main/resources/application-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spring:
jpa:
database-platform: org.hibernate.dialect.PostgreSQLDialect
hibernate:
ddl-auto: create
ddl-auto: validate
show-sql: false
properties:
hibernate:
Expand Down
8 changes: 7 additions & 1 deletion frontend/src/app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,12 @@ body {
overflow-scrolling: touch;
}

pre {
font-family: 'Pretendard', sans-serif; /* 원하는 폰트 지정 */
line-height: 1; /* 직접 설정 */
white-space: pre-wrap; /* 줄바꿈 유지하면서 폭 맞추기 */
}

/* 하드웨어 가속 활성화 */
.transform-gpu {
transform: translateZ(0);
Expand Down Expand Up @@ -271,7 +277,7 @@ body {

.terms-table th,
.terms-table td {
@apply min-w-[130px] py-3 px-4 text-left border-b border-gray-200 ;
@apply min-w-[130px] py-3 px-4 text-left border-b border-gray-200;
}

.terms-table th {
Expand Down
10 changes: 5 additions & 5 deletions frontend/src/features/detail/ui/DescriptionTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@ export function DescriptionTab({
<div className="mt-4.5 flex flex-col gap-2">
<RegularText className="text-[15px] text-black">콘텐츠</RegularText>
{popupDetail.descriptions.map((description, index) => (
<pre
key={index}
className="text-sm text-black whitespace-pre-wrap"
style={{ lineHeight: '1' }}
>
<pre
key={index}
className="text-sm text-black whitespace-pre-wrap font-pretendard"
style={{ lineHeight: '1.5rem', padding: '0 1rem 0 0.5rem' }}
>
{description}
</pre>
))}
Expand Down
78 changes: 18 additions & 60 deletions frontend/src/features/map/ui/FilterGroupMapContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { getMapPopupListApi } from '@/entities/map/api';
import getPopupListApi from '@/entities/popup/api/getPopupListApi';
import BadgedPopupCard from '@/entities/popup/ui/BadgedPopupCard';
import { PopupItemType } from '@/entities/popup/types/PopupListItem';
import { MapPopupItem } from '@/entities/map/types/type';

export default function FilterGroupMapContainer() {
// 기본 위치 (서울숲 4번출구 앞)
Expand Down Expand Up @@ -105,35 +106,7 @@ export default function FilterGroupMapContainer() {
setSelectedPopupData(popupData.content[0]);
}
} catch (error) {
console.error('❌ 팝업 데이터 조회 실패, 목 데이터 사용:', error);

const mockPopupData = {
popupId: popupId,
popupName: `팝업 스토어 ${popupId}`,
location: {
addressName: '서울특별시 강남구 청담동',
region1depthName: '서울특별시',
region2depthName: '강남구',
region3depthName: '청담동',
latitude: 37.543401,
longitude: 127.04452,
},
rating: {
averageStar: 4.5,
reviewCount: 123,
},
period: '2025.01.01 ~ 2025.12.31',
dDay: 365,
popupImageUrl: '/images/popup-ex.png',
searchTags: {
type: '체험형',
category: ['패션'],
},
tag: 'DEFAULT' as const,
waitingCount: 3,
};

setSelectedPopupData(mockPopupData);
console.error('❌ 팝업 데이터 조회 실패', error);
}
};

Expand All @@ -142,40 +115,23 @@ export default function FilterGroupMapContainer() {
// 2. 로딩 완료 후 기본 위치(서울숲역 4번출구) 사용
// 3. 내위치찾기 버튼 클릭 시 현재 위치 추적 - 이때 권한설정 팝업

// 임시 목 데이터 (MSW 대신 사용)
const mockPopupList = {
popupList: [
{
id: 7,
latitude: 37.545681758279,
longitude: 127.04442401847,
},
{
id: 2,
latitude: 37.545470791421,
longitude: 127.04324359055,
},
],
};

console.log('isSearchFocused', isSearchFocused);

const { data: popupList, isLoading: isPopupListLoading } = useQuery({
queryKey: ['mapPopupList', popupType, category],
queryFn: async () => {
try {
const result = await getMapPopupListApi({
minLatitude: 37.541673,
maxLatitude: 37.545894,
minLongitude: 127.041309,
maxLongitude: 127.047804,
minLatitude: 33.12,
maxLatitude: 38.58,
minLongitude: 125.11,
maxLongitude: 131.86,
type: popupType.length > 0 ? popupType.join(',') : undefined,
category: category.length > 0 ? category.join(',') : undefined,
});
return result;

return { popupList: result };
} catch (error) {
console.error('❌ API 실패, 목 데이터 사용:', error);
return mockPopupList; // API 실패 시 목 데이터 반환
console.error('❌ API 실패', error);
return { popupList: [] };
}
},
});
Expand Down Expand Up @@ -293,18 +249,20 @@ export default function FilterGroupMapContainer() {
myLocationMarker={myLocationMarker}
>
{(() => {
const markerData =
popupList?.popupList || mockPopupList.popupList;

if (isPopupListLoading) {
if (
!popupList?.popupList ||
!Array.isArray(popupList.popupList)
) {
return null;
}

if (!markerData || markerData.length === 0) {
const markerData = popupList.popupList;

if (markerData.length === 0) {
return null;
}

return markerData.map(popup => {
return markerData.map((popup: MapPopupItem) => {
return (
<MapMarker
key={popup.id}
Expand Down
Loading