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

Jump to bottom

Hotfix: userStore에서 유저 데이터 참조, early return 문 삭제, 조건부 렌더링 적용 #237

Merged
merged 2 commits into from
Mar 29, 2024
Merged

Hotfix: userStore에서 유저 데이터 참조, early return 문 삭제, 조건부 렌더링 적용 #237

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e2bc4f
refactor: userStore에서 유저 데이터 참조, early return 문 삭제, 조건부 렌더링 적용
grapefruit13 Mar 29, 2024
e30852c
refactor: 유저id와 모집 유저 id 비교하는 조건문 수정
grapefruit13 Mar 29, 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
38 changes: 19 additions & 19 deletions src/components/postDetail/PostDetailContent/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,18 @@ import PostTitle from '@/components/postDetail/PostTitle';
import ReservationPanel from '@/components/postDetail/reservationPanel/ReservationPanel';
import ReviewList from '@/components/postDetail/ReviewList';
import { useDeviceType } from '@/hooks/useDeviceType';
import useUserStore from '@/stores/useUserStore';

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

const cx = classNames.bind(styles);

const nickname = '주인장';
const email = '[email protected]';

const PostDetailContent = ({ isLoggedIn }: PostPageProps) => {
const { userData } = useUserStore();
const nickname = userData?.nickname || '';
const email = userData?.email || '';
const userId = userData?.id;

const router = useRouter();
const { postId } = router.query;
const activityId = Number(postId);
Expand Down Expand Up @@ -62,17 +65,14 @@ const PostDetailContent = ({ isLoggedIn }: PostPageProps) => {
queryFn: getReviewList,
});

if (!postDetailData) return;

const {
title: unrefinedTitle,
subImages,
price,
bannerImageUrl,
category,
description: unrefinedDescription,
address,
} = postDetailData;
const postUserId = postDetailData?.userId || 0;
const unrefinedTitle = postDetailData?.title || '';
const subImages = postDetailData?.subImages || [];
const bannerImageUrl = postDetailData?.bannerImageUrl || '';
const category = postDetailData?.category || '';
const price = postDetailData?.price || 0;
const unrefinedDescription = postDetailData?.description || '';
const address = postDetailData?.address || '';

const isImageSlide = subImages?.length > 0;
const imageUrls = isImageSlide
Expand All @@ -87,8 +87,6 @@ const PostDetailContent = ({ isLoggedIn }: PostPageProps) => {
const { title, MaxCount } = splitTitleByDelimiter(unrefinedTitle);
const { description, discordLink } = splitDescByDelimiter(unrefinedDescription);

if (!reviewListData) return;

return (
<>
<section className={cx('main-banner')}>
Expand All @@ -98,7 +96,7 @@ const PostDetailContent = ({ isLoggedIn }: PostPageProps) => {
<div className={cx('container')}>
<section className={cx('section-top')}>
<PostTitle price={price} title={title} />
{isImageSlide ? (
{isImageSlide && imageUrls ? (
<ImageSlide imageList={imageUrls} />
) : (
<DefaultBanner url={bannerImageUrl} gameName={formatCategoryToGameNameEN(category)} />
Expand All @@ -112,9 +110,11 @@ const PostDetailContent = ({ isLoggedIn }: PostPageProps) => {
<PostDescription description={description} discordLink={discordLink} />
)}
{isOffline && <MapPreview address={address} />}
{isReservationAvailable && <ReviewList list={reviewListData} nickname={nickname} email={email} />}
{isReservationAvailable && reviewListData && (
<ReviewList list={reviewListData} nickname={nickname} email={email} />
)}
</section>
{isReservationAvailable && (
{postUserId !== userId && isReservationAvailable && (
<section>
{isReservationPanelOpen && (
<ReservationPanel
Expand Down