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.

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

deploy #644

Merged
merged 8 commits into from
Nov 29, 2024
3 changes: 3 additions & 0 deletions src/api/books/useGetBooksInfoSearchUrl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export const useGetBooksInfoSearchUrl = () => {
});
const [query, page, sort, category] =
useParseUrlQueryString(searchUrlQueryKeys);
const [isFetched, setIsFetched] = useState(false);

const { request } = useApi("get", "books/info/search", {
query,
Expand Down Expand Up @@ -59,6 +60,7 @@ export const useGetBooksInfoSearchUrl = () => {
);
const { totalPages } = response.data.meta;
const categoryIndex = categories.findIndex(i => i.name === category);
setIsFetched(true);
setSearchResult({
bookList: book,
categoryList: categories,
Expand All @@ -73,5 +75,6 @@ export const useGetBooksInfoSearchUrl = () => {

return {
...searchResult,
isFetched,
};
};
12 changes: 11 additions & 1 deletion src/asset/css/reset.css
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ a {
color: #2e363e;
text-decoration: none;
}

body {
font-family: "Noto Sans KR", sans-serif;
font-stretch: normal;
Expand All @@ -147,6 +146,17 @@ body {
white-space: nowrap;
}

button {
color: #2d2d2d;
-webkit-appearance: none;
appearance: none;
}

select {
-webkit-appearance: none;
appearance: none;
color: #2d2d2d;
}
/* styleguide CSS */

.color-81 {
Expand Down
18 changes: 14 additions & 4 deletions src/component/book/BookDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import Like from "~/component/book/like/Like";
import TagWrapper from "~/component/book/tag/TagWrapper";
import "~/asset/css/BookDetail.css";
import { Book } from "~/type";
import { Helmet } from "react-helmet-async";
import HelmetComponent from "../utils/HelmetComponent";

const callsignToNumbers = (callSign: string) =>
Expand All @@ -29,10 +28,17 @@ const compareCallsign = (a: Book, b: Book) => {
const BookDetail = () => {
const id = useParams().id || "";
const myRef = useRef<HTMLDivElement>(null);
const recentScrollPosition = useRef(0);
const location = useLocation();
useEffect(() => myRef.current?.scrollIntoView(), []);
const { bookDetailInfo } = useGetBooksInfoId({ id });

useEffect(() => {
recentScrollPosition.current = window.scrollY;
myRef.current?.scrollIntoView();
return () => {
window.scrollTo(0, recentScrollPosition.current);
};
}, [myRef.current]);
const { bookDetailInfo } = useGetBooksInfoId({ id });

if (!bookDetailInfo) {
return (
Expand All @@ -59,7 +65,11 @@ const BookDetail = () => {

return (
<main>
<HelmetComponent title={bookDetailInfo.title} description={ `집현전의 소중한 자산 "${bookDetailInfo.title}" 입니다.`} img={bookDetailInfo.image} />
<HelmetComponent
title={bookDetailInfo.title}
description={`집현전의 소중한 자산 "${bookDetailInfo.title}" 입니다.`}
img={bookDetailInfo.image}
/>
<Banner
img="bookdetail"
titleKo="도서 상세 및 예약"
Expand Down
3 changes: 2 additions & 1 deletion src/component/search/Search.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import SearchSection from "./SearchSection";

const Search = () => {
const myRef = useRef<HTMLDivElement>(null);
const { bookList, categoryList, lastPage, categoryIndex } =
const { bookList, categoryList, lastPage, categoryIndex, isFetched } =
useGetBooksInfoSearchUrl();
const [urlSearchParams, setUrlSearchParams] = useSearchParams();
const [query, page, sort] = useParseUrlQueryString(searchUrlQueryKeys);
Expand Down Expand Up @@ -63,6 +63,7 @@ const Search = () => {
setPage={setPage}
myRef={myRef}
/>
{!isFetched ? <div className="loader" /> : null}
<section className="wish-book-wraper">
<WishBook />
</section>
Expand Down
6 changes: 5 additions & 1 deletion src/component/utils/HeaderMobile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ const HeaderMobile = () => {
<Image src={Logo} alt="logo" />
</Link>
<nav className="header-mobile__gnb__wrapper">
<Link className="header-mobile__search" to={{ pathname: `/search` }}>
<Link
className="header-mobile__search"
to={{ pathname: `/search` }}
onClick={() => window.scrollTo(0, 0)}
>
<Image src={SearchBook} alt="search" />
</Link>
<button
Expand Down