[Feature] - 데모데이 피드백 반영(리버) #444
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| import { css } from "@emotion/react"; | ||
| import styled from "@emotion/styled"; | ||
|
|
||
| import { SPACING } from "@styles/tokens"; | ||
|
|
||
| export const Layout = styled.div` | ||
| display: flex; | ||
| flex-direction: column; | ||
| margin-top: ${SPACING.xxxl}; | ||
| min-height: calc(100vh - 16rem); | ||
| `; | ||
|
|
||
| export const searchResultTextStyle = css` | ||
| display: -webkit-box; | ||
| overflow: hidden; | ||
| width: 100%; | ||
| max-width: 100%; | ||
|
|
||
| line-height: 1.5; | ||
| white-space: normal; | ||
| word-break: break-word; | ||
| overflow-wrap: break-word; | ||
| text-overflow: ellipsis; | ||
| `; | ||
|
|
||
| export const SearchFallbackWrapper = styled.div` | ||
| flex: 1; | ||
| position: relative; | ||
| `; | ||
|
|
||
| export const MainPageTraveloguesList = styled.ul` | ||
| display: flex; | ||
| flex-direction: column; | ||
|
|
||
| gap: ${SPACING.m}; | ||
| `; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| import { css } from "@emotion/react"; | ||
|
|
||
| import type { SearchType } from "@type/domain/travelogue"; | ||
|
|
||
| import useInfiniteSearchTravelogues from "@queries/useInfiniteSearchTravelogues"; | ||
|
|
||
| import { SearchFallback, Text } from "@components/common"; | ||
| import TravelogueCard from "@components/pages/main/TravelogueCard/TravelogueCard"; | ||
| import TravelogueCardSkeleton from "@components/pages/main/TravelogueCard/skeleton/TravelogueCardSkeleton"; | ||
|
|
||
| import useIntersectionObserver from "@hooks/useIntersectionObserver"; | ||
|
|
||
| import { ERROR_MESSAGE_MAP } from "@constants/errorMessage"; | ||
|
|
||
| import * as S from "./TravelogueList.styled"; | ||
|
|
||
| const SKELETON_COUNT = 5; | ||
|
|
||
| interface TravelogueListProps { | ||
| keyword: string; | ||
| searchType: SearchType; | ||
| } | ||
|
|
||
| const TravelogueList = ({ keyword, searchType }: TravelogueListProps) => { | ||
| const { travelogues, status, fetchNextPage, isPaused, error } = useInfiniteSearchTravelogues( | ||
| keyword, | ||
| searchType, | ||
| ); | ||
| const { lastElementRef } = useIntersectionObserver(fetchNextPage); | ||
|
|
||
| if (travelogues.length === 0 && status === "success") { | ||
| return ( | ||
| <S.Layout> | ||
| {keyword && ( | ||
| <Text css={S.searchResultTextStyle} textType="title">{`"${keyword}" 검색 결과`}</Text> | ||
| )} | ||
| <S.SearchFallbackWrapper> | ||
| <SearchFallback title="휑" text="검색 결과가 없어요." /> | ||
| </S.SearchFallbackWrapper> | ||
| </S.Layout> | ||
| ); | ||
| } | ||
|
|
||
| if (status === "error") { | ||
| error && alert(error.message); | ||
|
|
||
| return <SearchFallback title="휑" text="검색 결과가 없어요." />; | ||
| } | ||
|
|
||
| if (isPaused) alert(ERROR_MESSAGE_MAP.network); | ||
|
|
||
| return ( | ||
| <S.Layout> | ||
| <S.MainPageTraveloguesList> | ||
| {keyword && ( | ||
| <Text css={S.searchResultTextStyle} textType="title">{`"${keyword}" 검색 결과`}</Text> | ||
| )} | ||
|
|
||
| {status === "pending" && ( | ||
| <S.MainPageTraveloguesList> | ||
| {Array.from({ length: SKELETON_COUNT }, (_, index) => ( | ||
| <TravelogueCardSkeleton key={index} /> | ||
| ))} | ||
| </S.MainPageTraveloguesList> | ||
| )} | ||
| {travelogues.map( | ||
| ({ id, title, thumbnail, authorProfileUrl, likeCount, tags, authorNickname }) => ( | ||
| <TravelogueCard | ||
| key={id} | ||
| travelogueOverview={{ | ||
| id, | ||
| title, | ||
| thumbnail, | ||
| authorProfileUrl, | ||
| likeCount, | ||
| tags, | ||
| authorNickname, | ||
| }} | ||
| /> | ||
| ), | ||
| )} | ||
| <div | ||
| ref={lastElementRef} | ||
| css={css` | ||
| height: 1px; | ||
| `} | ||
| /> | ||
| </S.MainPageTraveloguesList> | ||
| </S.Layout> | ||
| ); | ||
| }; | ||
|
|
||
| export default TravelogueList; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
이전 페이지가 마이페이지고 현재 페이지가 로그인 페이지라면 goBack을 통해 뒤로가기 버튼을 눌러도 마이 페이지로 가는 것이 아닌 루트 페이지로 이동하는 방식이군여 좋습니다 ! !