Skip to content
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

[ ViewProduct ] 상품보기 페이지 api 연결 #153

Merged
merged 10 commits into from
Jul 22, 2022
+557 −111
Merged

[ ViewProduct ] 상품보기 페이지 api 연결 #153

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
02990ec
[ feat ] 아이콘바 눌렀을 때 api 연결
say-young516 Jul 21, 2022
0f90ffb
[ feat ] swr 적용
say-young516 Jul 21, 2022
74623ad
[ feat ] 파라미터 넣어주기
say-young516 Jul 21, 2022
e02175a
[ feat ] 필터 요소 눌렀을 때 통신 가능
say-young516 Jul 21, 2022
9c635de
[ error ] ssr, swr
say-young516 Jul 22, 2022
6bf25ff
[ fix ] 필터 서버통신 일부 수정
Happhee Jul 22, 2022
25e6f3c
[ fix ] 쿼리 파라미터 변수명 변경
say-young516 Jul 22, 2022
c1de235
[ feat ] 카테고리 미선택시 필터링 완료
say-young516 Jul 22, 2022
2b31e46
[ feat ] 카테고리 선택시 필터링 완료
say-young516 Jul 22, 2022
1aeeffb
[ feat ] 검색했을 때 검색어 나옴
say-young516 Jul 22, 2022
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
Prev Previous commit
Next Next commit
[ feat ] 필터 요소 눌렀을 때 통신 가능
@say-young516
say-young516 committed Jul 21, 2022
commit e02175abb5186c56c87f8f8ba62c35d54567c103
8 changes: 4 additions & 4 deletions components/viewProduct/FilterDropdown.tsx
View file
Original file line number Diff line number Diff line change
@@ -84,7 +84,7 @@ export default function FilterDropdown(props: FilterDropdownProps) {
case 1:
newStr = '';
checkedItems[1].forEach(function (item, index) {
newStr += `${item},`;
newStr += `${item + 1}`;
});
newQuery = {
search: filterQuery.search,
@@ -100,7 +100,7 @@ export default function FilterDropdown(props: FilterDropdownProps) {
case 2:
newStr = '';
checkedItems[2].forEach(function (item, index) {
newStr += `${item},`;
newStr += `${item + 1}`;
});
newQuery = {
search: filterQuery.search,
@@ -116,7 +116,7 @@ export default function FilterDropdown(props: FilterDropdownProps) {
case 3:
newStr = '';
checkedItems[3].forEach(function (item, index) {
newStr += `${item},`;
newStr += `${item + 1}`;
});
newQuery = {
search: filterQuery.search,
@@ -132,7 +132,7 @@ export default function FilterDropdown(props: FilterDropdownProps) {
case 4:
newStr = '';
checkedItems[4].forEach(function (item, index) {
newStr += `${item},`;
newStr += `${item + 1}`;
});
newQuery = {
search: filterQuery.search,
68 changes: 34 additions & 34 deletions core/api/viewProduct.ts
View file
Original file line number Diff line number Diff line change
@@ -19,33 +19,13 @@ import { baseInstance } from '../axios';
// isError: error,
// };
// };
// export const useGetBannerViewProduct = (
// category: number,
// currentPage: number,
// viewProductData: string,
// ) => {
// const { data, error } = useSWR(
// [`${category}?page=${currentPage}&`, viewProductData],
// baseInstance.get,
// {
// errorRetryCount: 3,
// },
// );
// return {
// toyFilterList: data,
// isLoading: !error && !data,
// isError: error,
// };
// };
// export const getBannerViewProduct = (category: number, currentPage: number) => {
// return baseInstance.get(`/toy/list/${category}?page=${currentPage}`);
// };
// export const getViewProduct = (currentPage: number) => {
// return baseInstance.get(`/toy/list/?page=${currentPage}`);
// };
export const useGetViewProduct = (viewProductData: string) => {
export const useGetBannerViewProduct = (
category: number,
currentPage: number,
viewProductData: string,
) => {
const { data, error } = useSWR(
[`/toy/list/?`, viewProductData],
[`/toy/list/${category}?page=${currentPage}&`, viewProductData],
baseInstance.get,
{
errorRetryCount: 3,
@@ -57,12 +37,15 @@ export const useGetViewProduct = (viewProductData: string) => {
isError: error,
};
};
export const useGetBannerViewProduct = (
category: number,
viewProductData: string,
) => {
export const getBannerViewProduct = (category: number, currentPage: number) => {
return baseInstance.get(`/toy/list/${category}?page=${currentPage}`);
};
// export const getViewProduct = (currentPage: number) => {
// return baseInstance.get(`/toy/list/?page=${currentPage}`);
// };
export const useGetViewProduct = (viewProductData: string) => {
const { data, error } = useSWR(
[`/toy/list/${category}?&`, viewProductData],
[`/toy/list/`, viewProductData],
baseInstance.get,
{
errorRetryCount: 3,
@@ -74,9 +57,26 @@ export const useGetBannerViewProduct = (
isError: error,
};
};
export const getBannerViewProduct = (category: number) => {
return baseInstance.get(`/toy/list/${category}?`);
};
// export const useGetBannerViewProduct = (
// category: number,
// viewProductData: string,
// ) => {
// const { data, error } = useSWR(
// [`/toy/list/${category}?`, viewProductData],
// baseInstance.get,
// {
// errorRetryCount: 3,
// },
// );
// return {
// toyFilterList: data,
// isLoading: !error && !data,
// isError: error,
// };
// };
// export const getBannerViewProduct = (category: number) => {
// return baseInstance.get(`/toy/list/${category}?`);
// };
export const getViewProduct = () => {
return baseInstance.get(`/toy/list/`);
};
7 changes: 4 additions & 3 deletions pages/viewProduct.tsx
View file
Original file line number Diff line number Diff line change
@@ -62,6 +62,7 @@ export default function viewProduct({
Number(router.query.iconId) !== 0
? useGetBannerViewProduct(
Number(router.query.iconId),
0,
`search=${filterQuery.search}&type=${filterQuery.type}&month=${filterQuery.month}&price=${filterQuery.price}&playHow=${filterQuery.playHow}&store=${filterQuery.store}`,
)
: useGetViewProduct(
@@ -70,7 +71,7 @@ export default function viewProduct({

useEffect(() => {
if (result) {
const filterData = result.filter(
filterData = result.filter(
(_: any, idx: number) =>
(currentPage - 1) * 40 <= idx && idx < currentPage * 40,
);
@@ -86,7 +87,7 @@ export default function viewProduct({
// );
// setToyList(filterData);
// window.scrollTo(0, 0);
console.log('토이리스트', toyFilterList);
console.log('토이리스트', toyFilterList.data.data.result);
}
}, [toyFilterList]);
return (
@@ -205,7 +206,7 @@ const StEmptyView = styled.section`
// };
export const getServerSideProps: GetServerSideProps = async (context) => {
if (context.query.iconId && Number(context.query.iconId) !== 0) {
const res = await getBannerViewProduct(Number(context.query.iconId));
const res = await getBannerViewProduct(Number(context.query.iconId), 0);
return {
props: {
filterData: res.data.data.filterData,