Skip to content

Commit

Permalink
Merge pull request #234 from SOPT-all/fix/#226/qa-fourth
Browse files Browse the repository at this point in the history
[FIX] QA 4차 반영
  • Loading branch information
seong-hui authored Jan 24, 2025
2 parents 788cfdf + 7e0d3a7 commit b18405b
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 7 deletions.
4 changes: 4 additions & 0 deletions src/pages/templeDetailPage/blogReview/BlogReviewPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ const BlogReviewPage = () => {

const totalPages = data?.totalPages || 1;

useEffect(() => {
window.scrollTo(0, 0);
}, []);

useEffect(() => {
if (!isLoading && data) {
if (totalPages > 0 && currentPage > totalPages) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export const photoGrid = style({
gap: '1rem 1.1rem',
justifyContent: 'flex-start',
paddingBottom: '1rem',
paddingTop: '5.2rem',
});

export const photoItem = style({
Expand Down
14 changes: 9 additions & 5 deletions src/pages/wishList/WishListPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { useQueryClient } from '@tanstack/react-query';
import { useEffect, useState } from 'react';
import { useNavigate } from 'react-router-dom';

import container from './wishListPage.css';
import * as styles from './wishListPage.css';

const WishListPage = () => {
const [currentPage, setCurrentPage] = useState(1);
Expand Down Expand Up @@ -76,13 +76,17 @@ const WishListPage = () => {
}

return (
<div className={container}>
<PageName title="위시리스트" isLikeBtn={false} />
<div className={styles.container}>
<div className={styles.headerBox}>
<PageName title="위시리스트" isLikeBtn={false} />
</div>
{totalPages === 1 && wishlist.length === 0 ? (
<WishEmpty />
<div className={styles.emptyBox}>
<WishEmpty />
</div>
) : (
<>
<div>
<div className={styles.contentBox}>
<WishCardList
data={wishlist}
layout="vertical"
Expand Down
22 changes: 20 additions & 2 deletions src/pages/wishList/wishListPage.css.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,29 @@
import theme from '@styles/theme.css';
import { style } from '@vanilla-extract/css';

const container = style({
export const container = style({
minHeight: '100vh',
paddingBottom: '4.4rem',
display: 'grid',
gridTemplateRows: 'auto 1fr auto',
justifyItems: 'center',
});

export default container;
export const headerBox = style({
position: 'fixed',
top: 0,
paddingTop: '1.2rem',
width: '37.5rem',
display: 'flex',
justifyContent: 'center',
zIndex: 5,
backgroundColor: theme.COLORS.white,
});

export const contentBox = style({
paddingTop: '4.2rem',
});

export const emptyBox = style({
paddingTop: '7.2rem',
});

0 comments on commit b18405b

Please sign in to comment.