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

fix: 0살이면 1살 미만으로 뜨도록 수정, 리뷰 더보기 클릭이 안되는 문제 해결 #512

Merged
merged 4 commits into from
Oct 19, 2023
Merged

fix: 0살이면 1살 미만으로 뜨도록 수정, 리뷰 더보기 클릭이 안되는 문제 해결 #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
34dc8e1
fix/#511: 리뷰 목록 하단 margin 추가
HyeryongChoi Oct 19, 2023
f6e8ec0
feat/#511: 0살이면 1살 미만으로 뜨도록 수정
HyeryongChoi Oct 19, 2023
509552e
feat/#511: 상품상세 하단 margin 추가
HyeryongChoi Oct 19, 2023
b51b249
Merge branch 'develop' of https://github.com/woowacourse-teams/2023-z…
HyeryongChoi Oct 19, 2023
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
6 changes: 4 additions & 2 deletions frontend/src/components/Review/ReviewItem/ReviewItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import ReactedIcon from '@/assets/svg/reacted_icon.svg';
import UnReactedIcon from '@/assets/svg/un_reacted_icon.svg';
import StarRatingDisplay from '@/components/@common/StarRating/StarRatingDisplay/StartRatingDisplay';
import SuspendedImg from '@/components/@common/SuspendedImg/SuspendedImg';
import { getPetAge } from '@/components/PetProfile/PetItem';
import { COMMENT_VISIBLE_LINE_LIMIT, REACTIONS } from '@/constants/review';
import { useValidParams } from '@/hooks/@common/useValidParams';
import { useCheckAuth } from '@/hooks/auth';
Expand Down Expand Up @@ -79,7 +80,7 @@ const ReviewItem = (reviewItemProps: ReviewItemProps) => {
<InfoContainer>
<ReviewerName>{petName}</ReviewerName>
<InfoDetail>
{breedName} / {writtenAge}살
{breedName} / {getPetAge(writtenAge)}
</InfoDetail>
<InfoDetail>
{sizeName} / {writtenWeight}kg
Expand Down Expand Up @@ -280,8 +281,9 @@ const Comment = styled.p<StyledProps<{ isExpanded: boolean }>>`
${({ $isExpanded }) => {
if ($isExpanded) {
return css`
overflow: 'visible';
display: block;

word-break: break-word;
`;
}

Expand Down
2 changes: 2 additions & 0 deletions frontend/src/components/Review/ReviewListAndChart/ReviewList/ReviewList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ ReviewList.Skeleton = Skeleton;
export default ReviewList;

const Layout = styled.ul`
margin-bottom: 10rem;

& > li {
border-bottom: 1px solid ${({ theme }) => theme.color.grey200};
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/FoodDetail/FoodDetail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ const FoodDetail = () => {
export default FoodDetail;

const FoodDetailWrapper = styled.div`
padding: 4rem 0 12rem;
padding: 4rem 0 16rem;
`;

const FoodProfileContainer = styled.div`
Expand Down