Skip to content

Commit

Permalink
[Fix]LikeLion-at-DGU#27 - 입장료 정보 없을 시 - 처리 오류 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
Chaem03 committed Oct 6, 2024
1 parent db87616 commit 237b590
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 30 deletions.
1 change: 0 additions & 1 deletion src/apis/booth.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ export const getBoothList = async (
const queryString = params.length > 0 ? `?${params.join("&")}` : "";
console.log("쿼리 문자열:", queryString);
const res = await instance.get(`/api/v1/booth/${queryString}`);
console.log("booth.js에서의 res 값", res);

return res;
} catch (err) {
Expand Down
2 changes: 1 addition & 1 deletion src/apis/boothDetail.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export const getBoothDetail = async (booth_id) => {
const res = await instance.get(`/api/v1/booth/detail/${booth_id}`);
return res;
} catch (err) {
console.log(err);
console.error(err);
throw err;
}
};
40 changes: 21 additions & 19 deletions src/components/about/Review/styled.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,26 @@ import styled from "styled-components";
export const MainWrapper = styled.div`
display: flex;
flex-direction: column;
flex-wrap: wrap;
flex-wrap: wrap;
align-items: center;
justify-content:center;
gap: 20px;
margin-top:30px;
justify-content: center;
gap: 20px;
margin-top: 30px;
`;

export const MentPlusLink = styled.div`
display:flex;
flex-direction:column;
gap:7px;
display: flex;
flex-direction: column;
gap: 7px;
margin-bottom: 15px;
align-items: center;
justify-content:center;
justify-content: center;
`;

export const MainMent = styled.div`
color: #000;
font-family: ${({ theme }) => theme.fonts.AppleSDGothicNeoUL00['font-family']};
font-family: ${({ theme }) =>
theme.fonts.AppleSDGothicNeoUL00["font-family"]};
font-size: 12px;
`;

Expand All @@ -30,25 +31,26 @@ export const LinkImg = styled.img`
`;

export const Link = styled.div`
display:flex;
flex-direction:row;
justify-content:center;
align-items:center;
gap:8px;
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
gap: 8px;
width: 114px;
height: 24px;
flex-shrink: 0;
border-radius: 20px;
background:#FFEADA;
background: #ffeada;
&:hover ${LinkImg} {
transform: rotate(-30deg);
}
`;

export const LinkMent = styled.div`
color: #ED6308;
font-family: ${({ theme }) => theme.fonts.AppleSDGothicNeoM00['font-family']};
color: #ed6308;
font-family: ${({ theme }) => theme.fonts.AppleSDGothicNeoM00["font-family"]};
font-size: 12px;
margin-top:3px;
`;
margin-top: 3px;
text-align: center;
`;
10 changes: 5 additions & 5 deletions src/components/common/BoothDetail/BoothDetail.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@ import { Detailtitle } from "../../../constant/StarDetail/data";
import { useBoothDetailData } from "../../../hook/useBoothDetail";

export const BoothDetail = ({ onClose, booth_id, boothInfo }) => {
console.log("boothInfo:", boothInfo);
const [currentIndex, setCurrentIndex] = useState(0);
const imgWrapperRef = useRef(null);
const { boothDetailData } = useBoothDetailData(booth_id);
console.log("boothDetail컴포넌트에서 :", boothDetailData);

if (!boothDetailData) {
return <div>Loading...</div>;
}
Expand Down Expand Up @@ -108,9 +107,10 @@ export const BoothDetail = ({ onClose, booth_id, boothInfo }) => {
0,
5
)} ~ ${boothDetailData.end_time.slice(0, 5)}`}
{index === 3 && boothDetailData.entrace_fee > 0
? boothDetailData.entrace_fee
: "-"}
{index === 3 &&
(boothDetailData.entrace_fee > 0
? boothDetailData.entrace_fee
: "-")}
{index === 4 && boothDetailData.menus}
{index === 5 && boothDetailData.insta_id}
</S.DetailContext>
Expand Down
2 changes: 0 additions & 2 deletions src/components/searchBar/SearchBar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,8 @@ export const SearchBar = ({ setFilteredData, setIsSearchExecuted }) => {
);

if (filteredData?.length > 0) {
console.log("검색 결과:", filteredData);
setFilteredData(filteredData);
} else {
console.log("검색 결과가 없습니다.");
setFilteredData([]); // 검색 결과가 없을 경우 빈 배열로 설정
}
};
Expand Down
2 changes: 0 additions & 2 deletions src/pages/booth/BoothPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,6 @@ export const BoothPage = () => {
)
);
marker.setZIndex(9999);
console.log(`Highlighted Marker ID ${boothId}: zIndex set to 9999`);
} else {
const booth = boothData.find((b) => b.id === boothId);
if (booth) {
Expand All @@ -313,7 +312,6 @@ export const BoothPage = () => {

// 기본 z-index 값 설정
marker.setZIndex(0);
console.log(`Reset Marker ID ${boothId}: zIndex set to 0`);
}
}
});
Expand Down

0 comments on commit 237b590

Please sign in to comment.