Skip to content

[Bug] shop페이지 버그 발견 #198

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
bokeeeey merged 2 commits into from
Dec 12, 2024
Merged

[Bug] shop페이지 버그 발견 #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fdd27d
Bug: shop페이지 버그 수정을 위한 잠시 폐쇄
bokeeeey Dec 12, 2024
542bfc2
Bug: shop페이지 null 처리
bokeeeey Dec 12, 2024
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 .husky/commit-msg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
. "$(dirname -- "$0")/_/husky.sh"

message="$(cat $1)"
requiredPattern="^(Feat|Fix|Docs|Style|Refactor|Chore|Test|Design|Build|Merge|Setting|Deploy):.*$"
requiredPattern="^(Feat|Fix|Bug|Docs|Style|Refactor|Chore|Test|Design|Build|Merge|Setting|Deploy):.*$"
if ! [[ $message =~ $requiredPattern ]];
then
echo "=========================================================================="
Expand Down
32 changes: 18 additions & 14 deletions src/app/shop/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
import { ReactNode } from 'react';
// import { ReactNode } from 'react';

import Breadcrumb from '@/components/Breadcrumb/Breadcrumb';
// import Breadcrumb from '@/components/Breadcrumb/Breadcrumb';

interface ShopLayoutProps {
children: ReactNode;
}
// interface ShopLayoutProps {
// children: ReactNode;
// }

// export default function ShopLayout({ children }: ShopLayoutProps) {
// return (
// <section>
// <div>
// <Breadcrumb />
// {children}
// </div>
// </section>
// );
// }

export default function ShopLayout({ children }: ShopLayoutProps) {
return (
<section>
<div>
<Breadcrumb />
{children}
</div>
</section>
);
export default function ShopLayout() {
return null;
}
76 changes: 40 additions & 36 deletions src/app/shop/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,46 @@
import { getAllProductList } from '@/api/productAPI';
import Pagination from '@/components/Pagination/Pagination';
import type { ProductParams } from '@/types/productItemType';
import classNames from 'classnames/bind';
import CategoryMenu from './_components/Category/CategoryMenu';
import CategoryTitle from './_components/Category/CategoryTitle';
import ProductList from './_components/Product/ProductList';
import Sort from './_components/Sort/Sort';
import styles from './page.module.scss';
// import { getAllProductList } from '@/api/productAPI';
// import Pagination from '@/components/Pagination/Pagination';
// import type { ProductParams } from '@/types/productItemType';
// import classNames from 'classnames/bind';
// import CategoryMenu from './_components/Category/CategoryMenu';
// import CategoryTitle from './_components/Category/CategoryTitle';
// import ProductList from './_components/Product/ProductList';
// import Sort from './_components/Sort/Sort';
// import styles from './page.module.scss';

const cn = classNames.bind(styles);
// const cn = classNames.bind(styles);

interface ShopAllPageProps {
searchParams: { [key: string]: string | string[] | undefined };
}
// interface ShopAllPageProps {
// searchParams: { [key: string]: string | string[] | undefined };
// }

// export default async function ShopAllPage({ searchParams }: ShopAllPageProps) {
// const sortParam = Array.isArray(searchParams.sort) ? searchParams.sort[0] : searchParams.sort || 'createdAt_desc';
// const pageParam = Array.isArray(searchParams.page) ? searchParams.page[0] : searchParams.page || '0';

export default async function ShopAllPage({ searchParams }: ShopAllPageProps) {
const sortParam = Array.isArray(searchParams.sort) ? searchParams.sort[0] : searchParams.sort || 'createdAt_desc';
const pageParam = Array.isArray(searchParams.page) ? searchParams.page[0] : searchParams.page || '0';
// const getAllProductParams: ProductParams = {
// sort: sortParam as string,
// page: pageParam as string,
// size: '16',
// };

const getAllProductParams: ProductParams = {
sort: sortParam as string,
page: pageParam as string,
size: '16',
};
// const { data } = await getAllProductList(getAllProductParams);
// const { content, ...rest } = data;
// return (
// <>
// <div className={cn('title-wrap')}>
// <CategoryTitle totalCount={rest.totalElements}>전체상품</CategoryTitle>
// <Sort />
// </div>
// <CategoryMenu />
// <section className={cn('list-section')}>
// <ProductList content={content} size='lg' />
// <Pagination {...rest} searchParams={searchParams} />
// </section>
// </>
// );
// }

const { data } = await getAllProductList(getAllProductParams);
const { content, ...rest } = data;
return (
<>
<div className={cn('title-wrap')}>
<CategoryTitle totalCount={rest.totalElements}>전체상품</CategoryTitle>
<Sort />
</div>
<CategoryMenu />
<section className={cn('list-section')}>
<ProductList content={content} size='lg' />
<Pagination {...rest} searchParams={searchParams} />
</section>
</>
);
export default async function ShopAllPage() {
return null;
}
4 changes: 2 additions & 2 deletions src/components/Header/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { deleteCookie } from '@/utils/manageCookie';
import { useUser } from '@/hooks/useUser';
import { LogoIcon, UserIcon } from '@/public/index';
import type { CartAPIDataType } from '@/types/cartType';
import { CartButton, LoginButton, LogoutButton, NotificationButton, SearchButton, ShopButton } from './HeaderParts';
import { CartButton, LoginButton, LogoutButton, NotificationButton, SearchButton } from './HeaderParts';

import styles from './Header.module.scss';

Expand Down Expand Up @@ -103,7 +103,7 @@ export default function Header() {
>
커스텀 키보드 만들기
</Link>
<ShopButton />
{/* <ShopButton /> */}
<Link href={ROUTER.COMMUNITY} className={cn('button', { 'current-page': pathname === ROUTER.COMMUNITY })}>
커뮤니티
</Link>
Expand Down
Loading