From b5a202a3579e43e8f374cb964e929235c55a0cb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B3=A0=EA=B0=80=ED=98=95?= <101045330+aazkgh@users.noreply.github.com> Date: Thu, 10 Oct 2024 16:24:54 +0900 Subject: [PATCH] Fix: qa (#84) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: detail 페이지 뒤로가기 버튼 핸들링 * fix: 토글 닫기 구현 * fix: 아이콘, 텍스트 가운데정렬 * fix: 토글 css 수정 * fix: 가이드 x 버튼 위치 변경 * refactor: 인기 검색어 목록 수정 * feat: 기본 썸네일 추가 * fix: 상세페이지 그라데이션 수정 * fix: 생년월일 항목 삭제 * refactor: 지역명 ㄱㄴㄷ순 정렬 * fix: warning 해결 * fix: 스크롤 범위 추가 * fix: 토스트 메시지 가운데 정렬 * refactor: 지역명 ㄱㄴㄷ순 추가 정렬 * refactor: 코드 개선 * fix: 빌드 오류 수정 --------- Co-authored-by: Doyun Lee --- src/assets/image/img_default.png | Bin 7238 -> 5580 bytes src/components/ToastMessage.tsx | 3 +- src/constants/REGION_LIST.ts | 476 +++++++++--------- src/views/Detail/components/PlaceInfo.tsx | 11 +- src/views/Detail/pages/DetailPage.tsx | 31 +- src/views/Login/components/UserType.tsx | 3 + .../Mypage/components/FavoritePlaceList.tsx | 3 +- src/views/Mypage/components/PersonalInfo.tsx | 21 - .../Search/components/Result/SearchResult.tsx | 3 +- .../components/Search/PopularSearch.tsx | 13 +- .../Search/components/Search/RecentSearch.tsx | 38 +- 11 files changed, 303 insertions(+), 299 deletions(-) diff --git a/src/assets/image/img_default.png b/src/assets/image/img_default.png index ee843bdf4d80f6794c93bd23d4aa7bf841c84e13..c936bdcdef43e79e54e3a44b57a1ccf5c1f78883 100644 GIT binary patch literal 5580 zcmeHL`9IY8AAijlVX{gZyGq(kQ6@)Zlbcv~%FGzX&6aIeDPa?7Iu(}MkQA28FoV%G zwaA#tu}j64b4iDlT$^>@ecx~U{XV|`!T0g~!4EU<$LIaJpYPZ4`MfXg*=_e3c?}r= zK69|QaRVT^0}yp&m!X~1fW%?6$Q`!#JPM$^3I7NVZX59?;i#LPH3*-p_Mrz-u$7Ay z!0qJaa{lt6dqE!dv+?sNtBw zY+2srj)J{I(^6v5M8=iMg_(g`q!1)=nF@HdIZHwRoJ+TeXj!=m`37M97`tm}??FI| ztQ-~ZeTD79mm7=l!`UUFB_NhEVyQHidc^;vS+e8-?1sB*lb?;x&6&o0S~xM3OvqN*2gM^Mc zxBqIxQzKJTzg*l*q4&S8-IK!;&YVmoQz@Ql^*!$q-8r@cKtW(#cf3N)kT>Vx@|gZD z|NFI`I=Z?pcK~j#bO%la!?L|5g-k7;GQ1Nam9Rw_-dvj7Pk<_|0#j4dklea$Jeqm# z>4s;|p6w6YCt@8;A`@WH35}EuhSDQL9S_cE=VUroyq=w%b&)R8tlpZsLz?d{$6hzM2K_27uXd|^xSd`#8EZ?;J?1du}kA8YmI(Yx-L zsnN3=#>gqznTq|>(@_AMk@4`s*~yPd4@k)C9g_-R=|SKm$&s$Dw}=fa37iG2`7#-J30IML+NaJkR-o5Mk@*VH3yu9lN|GotFLwL;+fr|Z!sh;9 z`{`GGeSPl*!){t0O|&FdHklu-iyWDoKCl7|TEaZ|KZiv{P4C|m2jX(fJ@hkU(glM4oeX9zHXK#(|#rnq7ahC;;;c^cLzQPk2}j1)*PisD4H3GTwX zcY$~FBIPMep-_0fCFZ=QJ^^MCmi|1}bq^IP(n~v|5K;AE4@SrW<@kO9cV5e|Sif2= z#hBf+$^@}4U>ZM-x2Yz}y2?4a2+o4HSO80j!sy?4z%}0bIMCCu3EXb-D%caqm}R!Cz3(aix*A&CyocUpm)Ae z4fJ=HMnms{v|%q9&=Ulyo;xzP4ASEDJ|!afi+fO0{Po1dSbvq`y+D0zr-NpIKqK5?qVl6anZI|MGcP1w%pQN*| z)^~SzH?I0G7~lK#4_tWu!M!z%_yQuF7*<*j`-{Y#uHyyW$%08nG}FDXSp$ZQeP~wP$Icb^ol%jSPhCWb z>Ha8JZQ3i^o<&!pcH~PpM;8~S{dFjLTl1{2aD$@{C6Lw09mz;YNFe+>ABu7v&&9Xo zn>gBDDSPj~_8xGi?*^gc6(;?mSM2@+>fmuW+n!#_N_Sruz|y%Y1&uNYUE?XPU_`*g#U< z{mSX37BuQ&b@Xliw>{(s^LY%_Vj@S3I}0BTuT%5hets*!@-;R=cPTPjm2#9M`%jlF z;<;CyN-k8l)QAPn24tmI95elHi`Du+Wmm#2Y_^vjSbh2DS38L$n8V%Jbklcs5y`3q zBE%vxtc`fcjf@*EE8D?jGNnLLGB-hjkftok+cyUzLKoQ(aA1*{oo&)T5^t=9X!DWY@IY2NMM zP+WlstFX^sb=2xL1e67toKqLTBHPq0)K(KtY!vO_nJ))R4AF*hQYKj`n^7^TmK9Ed zL_DVh>w89M=2^$k?CvrFi5T0|rEKY++1g(bTk{18?l~Z?3HO|L233^3(qOb5xnOjm zr5mSyq7|Yk@S1P1#;Qam~u#nVJrP( zPz_d=ej0_G_}=4)Eu8>7bj)xw!&rDh3nVGnk8oP`B3B0Dat<6^v{H*2I9ySoE^^(* zJt$9M9n%J3pN>Vs;^L{fWH=mxKsmgcVuRjwF0En!M;UYe?(O6ASz$AKs(`GIm>N%4 z101%wdiCn{*0{L1%!OIy)4})EnTer df88*ClF~3&HZ^~C@H literal 7238 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 ZM2bf3Ywz-zR2Wro {
- {lineCnt > 1 && - (isClose ? ( - - ) : ( - - ))} + {lineCnt > 1 && ( + + )}
); diff --git a/src/views/Detail/pages/DetailPage.tsx b/src/views/Detail/pages/DetailPage.tsx index 52c4dc9..9304004 100644 --- a/src/views/Detail/pages/DetailPage.tsx +++ b/src/views/Detail/pages/DetailPage.tsx @@ -78,7 +78,7 @@ const DetailPage = () => { useEffect(() => { window.scrollTo(0, 0); - }, [selectedTab]); + }); /** 서버 통신 -> favorite_list 받아오기 */ useAsyncEffect(async () => { @@ -180,12 +180,14 @@ const DetailPage = () => { return (
- - {placeInfo.title} +
+ + {placeInfo.title} +
@@ -195,7 +197,7 @@ const DetailPage = () => { latlng={latlng} detailInfo={detailInfo} /> - +
{selectedTab === '상세정보' || selectedTab === '유니버설' || selectedTab === '지도' || @@ -216,11 +218,19 @@ const detailContainer = css` `; const backgroundImg = (url: string) => css` + width: auto; + + background-position: center center; + background-size: cover; + background-image: url(${url}); + background-repeat: no-repeat; +`; + +const backgroundCss = css` display: flex; justify-content: space-between; flex-direction: column; - width: auto; height: 26.3rem; background: linear-gradient( @@ -228,9 +238,6 @@ const backgroundImg = (url: string) => css` rgb(0 0 0 / 0%) 0%, rgb(0 0 0 / 34%) 100% ); - background-size: cover; - background-image: url(${url}); - background-repeat: no-repeat; `; const title = css` diff --git a/src/views/Login/components/UserType.tsx b/src/views/Login/components/UserType.tsx index a78bade..73193e0 100644 --- a/src/views/Login/components/UserType.tsx +++ b/src/views/Login/components/UserType.tsx @@ -61,6 +61,7 @@ const userTypeLayout = css` display: flex; flex-direction: column; position: relative; + overflow: auto; height: 100%; padding: 2rem; @@ -87,6 +88,8 @@ const contentContainer = css` flex-direction: column; flex: 1; + + margin-bottom: 5rem; `; const subText = css` diff --git a/src/views/Mypage/components/FavoritePlaceList.tsx b/src/views/Mypage/components/FavoritePlaceList.tsx index 70245ac..8a175ba 100644 --- a/src/views/Mypage/components/FavoritePlaceList.tsx +++ b/src/views/Mypage/components/FavoritePlaceList.tsx @@ -1,6 +1,7 @@ import { css } from '@emotion/react'; import { useState } from 'react'; +import { DefaultImage } from '@/assets/image'; import PlaceCard from '@/components/PlaceCard'; import { useAsyncEffect } from '@/hooks/use-async-effect'; @@ -28,7 +29,7 @@ const FavoritePlaceList = (props: placeListProps) => { { - -
  • - 생년월일* - -
    - - - -
    -
    • - @@ -146,13 +135,3 @@ const input = css` ${inputDefault}; `; - -const multiInputSection = css` - display: flex; - justify-content: space-between; -`; - -const birth = (variant: string) => css` - ${inputDefault}; - width: ${variant === 'year' ? '38%' : '28%'}; -`; diff --git a/src/views/Search/components/Result/SearchResult.tsx b/src/views/Search/components/Result/SearchResult.tsx index 8da7495..88067bc 100644 --- a/src/views/Search/components/Result/SearchResult.tsx +++ b/src/views/Search/components/Result/SearchResult.tsx @@ -2,6 +2,7 @@ import { css } from '@emotion/react'; import { MutableRefObject, useEffect, useRef, useState } from 'react'; import { BigInfoIcon } from '@/assets/icon'; +import { DefaultImage } from '@/assets/image'; import Loading from '@/components/Loading'; import PlaceCard from '@/components/PlaceCard'; import { MAP_FACILITIES_API_KEY } from '@/constants/facilities'; @@ -59,7 +60,7 @@ const SearchResult = (props: SearchResultProps) => { contentid={contentid} placeName={title} address={addr1 + addr2} - imgSrc={firstimage || firstimage2 || ''} + imgSrc={firstimage || firstimage2 || DefaultImage} isHeart={heartList.includes(Number(contentid))} buttonDisabled /> diff --git a/src/views/Search/components/Search/PopularSearch.tsx b/src/views/Search/components/Search/PopularSearch.tsx index 8ff23a1..6c7419f 100644 --- a/src/views/Search/components/Search/PopularSearch.tsx +++ b/src/views/Search/components/Search/PopularSearch.tsx @@ -5,14 +5,15 @@ import { COLORS, FONTS } from '@/styles/constants'; import { setStorageSearchWord } from '@/utils/storageSearchWord'; const WORD_LIST_DATA = [ - '비대면 관광', - '대전시립미술관', - '대전 휴양림', - '장미꽃 명소', - '가족과 함께', + '제주도', + '대전', + '해수욕장', + '휴양', + '한강공원', '미술관', '수목원', - '음악 분수', + '유네스코', + '놀이터', ]; const pickRandomWord = (array: string[]) => { diff --git a/src/views/Search/components/Search/RecentSearch.tsx b/src/views/Search/components/Search/RecentSearch.tsx index 8b0f24a..e6ded09 100644 --- a/src/views/Search/components/Search/RecentSearch.tsx +++ b/src/views/Search/components/Search/RecentSearch.tsx @@ -31,18 +31,20 @@ const RecentSearch = () => { const wordButtonList = wordList.map((item) => { return ( -
  • - - +
    • ); }); @@ -65,23 +67,33 @@ const title = css` ${FONTS.Body2}; `; -const word = css` +const wordListCss = css` display: flex; - gap: 0.5rem; - align-items: center; width: max-content; height: 3.7rem; - padding: 0 0.9rem 0 1.5rem; border-radius: 4rem; background-color: ${COLORS.gray1}; `; -const wordText = css` +const btnContainerCss = css` + display: flex; + gap: 0.5rem; + align-items: center; + + padding: 0 0.9rem 0 1.5rem; + + & svg { + min-width: 1.5rem; + } +`; + +const word = css` padding-top: 0.2rem; color: ${COLORS.gray6}; + white-space: nowrap; ${FONTS.Body3} `; @@ -93,7 +105,7 @@ const wordContainer = css` width: 100vw; overflow-x: auto; - & > li:first-child { + & > li:first-of-type { margin-left: 2rem; }