From adb536c5e5664cbe5b8b4a24911560cc754d81e4 Mon Sep 17 00:00:00 2001 From: NamgungJongMin Date: Sun, 28 Jan 2024 00:00:41 +0900 Subject: [PATCH 01/13] Hotfix: fix image error --- {src/assets/icons => public}/city_default.svg | 0 {src/assets => public}/profile_default.svg | 0 src/components/Auth/Signup/Step/StepProfile.tsx | 4 ++-- src/components/MySpaceBody/MySpaceList/MySpaceList.tsx | 3 ++- src/pages/User/MyReview/MyReview.tsx | 3 ++- 5 files changed, 6 insertions(+), 4 deletions(-) rename {src/assets/icons => public}/city_default.svg (100%) rename {src/assets => public}/profile_default.svg (100%) diff --git a/src/assets/icons/city_default.svg b/public/city_default.svg similarity index 100% rename from src/assets/icons/city_default.svg rename to public/city_default.svg diff --git a/src/assets/profile_default.svg b/public/profile_default.svg similarity index 100% rename from src/assets/profile_default.svg rename to public/profile_default.svg diff --git a/src/components/Auth/Signup/Step/StepProfile.tsx b/src/components/Auth/Signup/Step/StepProfile.tsx index 6421ba72..798afc37 100644 --- a/src/components/Auth/Signup/Step/StepProfile.tsx +++ b/src/components/Auth/Signup/Step/StepProfile.tsx @@ -4,13 +4,13 @@ import styles from './Step.module.scss'; import AuthButton from '@/components/Auth/Button/AuthButton'; -import defaultProfile from '@/assets/profile_default.svg'; - import InputImage from '../../Input/InputImage'; import InputNickname from '../../Input/InputNickname'; import {StepProfileProps} from '@/types/auth'; +import defaultProfile from '/profile_default.svg'; + function StepProfile({register, resetField, dirty, error}: StepProfileProps) { const [imageUrl, setImageUrl] = useState(defaultProfile); diff --git a/src/components/MySpaceBody/MySpaceList/MySpaceList.tsx b/src/components/MySpaceBody/MySpaceList/MySpaceList.tsx index 6ba4174d..a0cd89e3 100644 --- a/src/components/MySpaceBody/MySpaceList/MySpaceList.tsx +++ b/src/components/MySpaceBody/MySpaceList/MySpaceList.tsx @@ -7,12 +7,13 @@ import {useInfiniteScroll} from '@/hooks/useInfiniteScroll'; import ObserveTarget from '@/components/Route/ObserveTarget/ObserveTarget'; -import defaultCity from '@/assets/icons/city_default.svg'; import {setSpaceDate} from '@/utils/formatDate'; import {Spaces} from '@/types/sidebar'; import {MySpaceListProps} from '@/types/user'; +import defaultCity from '/city_default.svg'; + function MySpaceList({tab}: MySpaceListProps) { const {data: upcomingData} = useGetSpaces(true); const [outdatedData, hasNextData, inViewRef] = useInfiniteScroll(useGetSpacesOut); diff --git a/src/pages/User/MyReview/MyReview.tsx b/src/pages/User/MyReview/MyReview.tsx index 95260659..4880e107 100644 --- a/src/pages/User/MyReview/MyReview.tsx +++ b/src/pages/User/MyReview/MyReview.tsx @@ -12,13 +12,14 @@ import ReviewImageSlider from '@/components/Detail/Contents/Review/ReviewImageSl import ActionList from '@/components/MyReview/ActionList/ActionList'; import ObserveTarget from '@/components/Route/ObserveTarget/ObserveTarget'; -import defaultImage from '@/assets/icons/city_default.svg'; import Meatball from '@/assets/icons/meatball.svg?react'; import Star from '@/assets/icons/star_fill.svg?react'; import {setMyReviewDate} from '@/utils/formatDate'; import {Reviews} from '@/types/myReview'; +import defaultImage from '/city_default.svg'; + function MyReview() { const {isOpen: isBottomSlideOpen, onOpen: onBottomSlideOpen, onClose: onBottomSlideClose} = useDisclosure(); const [reviews, hasNextData, inViewRef] = useInfiniteScroll(useGetMyReview); From 7bda515151c562379fed0b0c6f2f9776cc83e330 Mon Sep 17 00:00:00 2001 From: NamgungJongMin Date: Sun, 28 Jan 2024 00:00:41 +0900 Subject: [PATCH 02/13] Hotfix: fix image error --- {src/assets/icons => public}/city_default.svg | 0 {src/assets => public}/profile_default.svg | 0 src/components/Auth/Signup/Step/StepProfile.tsx | 4 ++-- src/components/MySpaceBody/MySpaceList/MySpaceList.tsx | 3 ++- src/components/User/EditProfileForm/EditProfileForm.tsx | 3 ++- src/pages/User/MyReview/MyReview.tsx | 3 ++- 6 files changed, 8 insertions(+), 5 deletions(-) rename {src/assets/icons => public}/city_default.svg (100%) rename {src/assets => public}/profile_default.svg (100%) diff --git a/src/assets/icons/city_default.svg b/public/city_default.svg similarity index 100% rename from src/assets/icons/city_default.svg rename to public/city_default.svg diff --git a/src/assets/profile_default.svg b/public/profile_default.svg similarity index 100% rename from src/assets/profile_default.svg rename to public/profile_default.svg diff --git a/src/components/Auth/Signup/Step/StepProfile.tsx b/src/components/Auth/Signup/Step/StepProfile.tsx index 6421ba72..798afc37 100644 --- a/src/components/Auth/Signup/Step/StepProfile.tsx +++ b/src/components/Auth/Signup/Step/StepProfile.tsx @@ -4,13 +4,13 @@ import styles from './Step.module.scss'; import AuthButton from '@/components/Auth/Button/AuthButton'; -import defaultProfile from '@/assets/profile_default.svg'; - import InputImage from '../../Input/InputImage'; import InputNickname from '../../Input/InputNickname'; import {StepProfileProps} from '@/types/auth'; +import defaultProfile from '/profile_default.svg'; + function StepProfile({register, resetField, dirty, error}: StepProfileProps) { const [imageUrl, setImageUrl] = useState(defaultProfile); diff --git a/src/components/MySpaceBody/MySpaceList/MySpaceList.tsx b/src/components/MySpaceBody/MySpaceList/MySpaceList.tsx index 6ba4174d..a0cd89e3 100644 --- a/src/components/MySpaceBody/MySpaceList/MySpaceList.tsx +++ b/src/components/MySpaceBody/MySpaceList/MySpaceList.tsx @@ -7,12 +7,13 @@ import {useInfiniteScroll} from '@/hooks/useInfiniteScroll'; import ObserveTarget from '@/components/Route/ObserveTarget/ObserveTarget'; -import defaultCity from '@/assets/icons/city_default.svg'; import {setSpaceDate} from '@/utils/formatDate'; import {Spaces} from '@/types/sidebar'; import {MySpaceListProps} from '@/types/user'; +import defaultCity from '/city_default.svg'; + function MySpaceList({tab}: MySpaceListProps) { const {data: upcomingData} = useGetSpaces(true); const [outdatedData, hasNextData, inViewRef] = useInfiniteScroll(useGetSpacesOut); diff --git a/src/components/User/EditProfileForm/EditProfileForm.tsx b/src/components/User/EditProfileForm/EditProfileForm.tsx index ad896652..2d1282eb 100644 --- a/src/components/User/EditProfileForm/EditProfileForm.tsx +++ b/src/components/User/EditProfileForm/EditProfileForm.tsx @@ -10,11 +10,12 @@ import InputImage from '@/components/Auth/Input/InputImage'; import InputNickname from '@/components/Auth/Input/InputNickname'; import {s3Request} from '@/api/s3'; -import defaultProfile from '@/assets/profile_default.svg'; import {AuthForm} from '@/types/auth'; import {GetUserProp} from '@/types/sidebar'; +import defaultProfile from '/profile_default.svg'; + function EditProfileForm({data}: {data: GetUserProp | undefined}) { const { register, diff --git a/src/pages/User/MyReview/MyReview.tsx b/src/pages/User/MyReview/MyReview.tsx index 95260659..4880e107 100644 --- a/src/pages/User/MyReview/MyReview.tsx +++ b/src/pages/User/MyReview/MyReview.tsx @@ -12,13 +12,14 @@ import ReviewImageSlider from '@/components/Detail/Contents/Review/ReviewImageSl import ActionList from '@/components/MyReview/ActionList/ActionList'; import ObserveTarget from '@/components/Route/ObserveTarget/ObserveTarget'; -import defaultImage from '@/assets/icons/city_default.svg'; import Meatball from '@/assets/icons/meatball.svg?react'; import Star from '@/assets/icons/star_fill.svg?react'; import {setMyReviewDate} from '@/utils/formatDate'; import {Reviews} from '@/types/myReview'; +import defaultImage from '/city_default.svg'; + function MyReview() { const {isOpen: isBottomSlideOpen, onOpen: onBottomSlideOpen, onClose: onBottomSlideClose} = useDisclosure(); const [reviews, hasNextData, inViewRef] = useInfiniteScroll(useGetMyReview); From 46d898f39225f774f720185280a6c8aeb7804ed8 Mon Sep 17 00:00:00 2001 From: NamgungJongMin Date: Sun, 28 Jan 2024 00:05:10 +0900 Subject: [PATCH 03/13] Tmp --- src/components/User/EditProfileForm/EditProfileForm.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/User/EditProfileForm/EditProfileForm.tsx b/src/components/User/EditProfileForm/EditProfileForm.tsx index 2d1282eb..37c25753 100644 --- a/src/components/User/EditProfileForm/EditProfileForm.tsx +++ b/src/components/User/EditProfileForm/EditProfileForm.tsx @@ -33,6 +33,7 @@ function EditProfileForm({data}: {data: GetUserProp | undefined}) { const navigate = useNavigate(); + const a = 1; const onSubmit: SubmitHandler = async (formData) => { try { const {image, nickname} = formData; From 1c30254917ad12e75d2039efc49a8edd967f6bed Mon Sep 17 00:00:00 2001 From: NamgungJongMin Date: Sun, 28 Jan 2024 00:05:25 +0900 Subject: [PATCH 04/13] Hotfix: fix image error --- src/components/User/EditProfileForm/EditProfileForm.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/User/EditProfileForm/EditProfileForm.tsx b/src/components/User/EditProfileForm/EditProfileForm.tsx index 37c25753..2d1282eb 100644 --- a/src/components/User/EditProfileForm/EditProfileForm.tsx +++ b/src/components/User/EditProfileForm/EditProfileForm.tsx @@ -33,7 +33,6 @@ function EditProfileForm({data}: {data: GetUserProp | undefined}) { const navigate = useNavigate(); - const a = 1; const onSubmit: SubmitHandler = async (formData) => { try { const {image, nickname} = formData; From 1a14b2a98c578178626eff59ad9d29edeb2d4a91 Mon Sep 17 00:00:00 2001 From: NamgungJongMin Date: Sun, 28 Jan 2024 00:07:17 +0900 Subject: [PATCH 05/13] Hotfix: fix image error --- src/components/User/Profile/Profile.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/User/Profile/Profile.tsx b/src/components/User/Profile/Profile.tsx index 5d86025c..1ba29c0c 100644 --- a/src/components/User/Profile/Profile.tsx +++ b/src/components/User/Profile/Profile.tsx @@ -3,10 +3,11 @@ import {useNavigate} from 'react-router-dom'; import styles from './Profile.module.scss'; import Pencil from '@/assets/icons/pencil.svg?react'; -import defaultImage from '@/assets/profile_default.svg'; import {ProfileProps} from '@/types/user'; +import defaultImage from '/profile_default.svg'; + function Profile({data}: ProfileProps) { const navigate = useNavigate(); From 447400969cedd97bf04b2f10afeef4c5e0e4f67c Mon Sep 17 00:00:00 2001 From: NamgungJongMin Date: Sun, 28 Jan 2024 00:09:13 +0900 Subject: [PATCH 06/13] HotFix: fix image error --- src/components/Alarm/TabCapsule/Content/Content.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/Alarm/TabCapsule/Content/Content.tsx b/src/components/Alarm/TabCapsule/Content/Content.tsx index b7859eac..78028330 100644 --- a/src/components/Alarm/TabCapsule/Content/Content.tsx +++ b/src/components/Alarm/TabCapsule/Content/Content.tsx @@ -1,10 +1,11 @@ import styles from './Content.module.scss'; -import DefaultProfile from '@/assets/profile_default.svg?react'; import formatTimeAgo from '@/utils/formatTimeAgo'; import {ContentProps} from '@/types/alarm'; +import DefaultProfile from '/profile_default.svg?react'; + function Content({contents}: ContentProps) { if (!contents[0]) { return
; From 76a0a0be12d6200c14a69e54ab6a8a81f66969a8 Mon Sep 17 00:00:00 2001 From: NamgungJongMin Date: Sun, 28 Jan 2024 01:16:23 +0900 Subject: [PATCH 07/13] Test: test import img for parsing error --- {public => src/assets/icons}/city_default.svg | 0 {public => src/assets/icons}/profile_default.svg | 0 src/components/Alarm/TabCapsule/Content/Content.tsx | 3 +-- src/components/Auth/Signup/Step/StepProfile.tsx | 4 ++-- .../MySpaceBody/MySpaceList/MySpaceList.tsx | 7 ++++--- .../User/EditProfileForm/EditProfileForm.tsx | 3 +-- src/components/User/Profile/Profile.tsx | 11 ++++++++--- src/pages/User/MyReview/MyReview.tsx | 5 +++-- 8 files changed, 19 insertions(+), 14 deletions(-) rename {public => src/assets/icons}/city_default.svg (100%) rename {public => src/assets/icons}/profile_default.svg (100%) diff --git a/public/city_default.svg b/src/assets/icons/city_default.svg similarity index 100% rename from public/city_default.svg rename to src/assets/icons/city_default.svg diff --git a/public/profile_default.svg b/src/assets/icons/profile_default.svg similarity index 100% rename from public/profile_default.svg rename to src/assets/icons/profile_default.svg diff --git a/src/components/Alarm/TabCapsule/Content/Content.tsx b/src/components/Alarm/TabCapsule/Content/Content.tsx index 78028330..5df9b17e 100644 --- a/src/components/Alarm/TabCapsule/Content/Content.tsx +++ b/src/components/Alarm/TabCapsule/Content/Content.tsx @@ -1,11 +1,10 @@ import styles from './Content.module.scss'; +import DefaultProfile from '@/assets/icons/profile_default.svg?react'; import formatTimeAgo from '@/utils/formatTimeAgo'; import {ContentProps} from '@/types/alarm'; -import DefaultProfile from '/profile_default.svg?react'; - function Content({contents}: ContentProps) { if (!contents[0]) { return
; diff --git a/src/components/Auth/Signup/Step/StepProfile.tsx b/src/components/Auth/Signup/Step/StepProfile.tsx index 798afc37..70834d1c 100644 --- a/src/components/Auth/Signup/Step/StepProfile.tsx +++ b/src/components/Auth/Signup/Step/StepProfile.tsx @@ -4,13 +4,13 @@ import styles from './Step.module.scss'; import AuthButton from '@/components/Auth/Button/AuthButton'; +import defaultProfile from '@/assets/icons/profile_default.svg'; + import InputImage from '../../Input/InputImage'; import InputNickname from '../../Input/InputNickname'; import {StepProfileProps} from '@/types/auth'; -import defaultProfile from '/profile_default.svg'; - function StepProfile({register, resetField, dirty, error}: StepProfileProps) { const [imageUrl, setImageUrl] = useState(defaultProfile); diff --git a/src/components/MySpaceBody/MySpaceList/MySpaceList.tsx b/src/components/MySpaceBody/MySpaceList/MySpaceList.tsx index a0cd89e3..ee26f5eb 100644 --- a/src/components/MySpaceBody/MySpaceList/MySpaceList.tsx +++ b/src/components/MySpaceBody/MySpaceList/MySpaceList.tsx @@ -7,12 +7,13 @@ import {useInfiniteScroll} from '@/hooks/useInfiniteScroll'; import ObserveTarget from '@/components/Route/ObserveTarget/ObserveTarget'; +import defaultThumbnail from '@/assets/icons/city_default.svg'; import {setSpaceDate} from '@/utils/formatDate'; import {Spaces} from '@/types/sidebar'; import {MySpaceListProps} from '@/types/user'; -import defaultCity from '/city_default.svg'; +// const defaultThumbnail = 'https://tripvote.s3.ap-northeast-2.amazonaws.com/basic/city_default.svg'; function MySpaceList({tab}: MySpaceListProps) { const {data: upcomingData} = useGetSpaces(true); @@ -34,7 +35,7 @@ function MySpaceList({tab}: MySpaceListProps) { dueDate !== null && styles.dimmed }`} style={{ - backgroundImage: `url(${thumbnail ? thumbnail : defaultCity})`, + backgroundImage: `url(${thumbnail ? thumbnail : defaultThumbnail})`, }} > {dueDate !== null ? (dueDate <= 0 ? '여행중' : `D-${dueDate}`) : ''} @@ -64,7 +65,7 @@ function MySpaceList({tab}: MySpaceListProps) {
diff --git a/src/components/User/EditProfileForm/EditProfileForm.tsx b/src/components/User/EditProfileForm/EditProfileForm.tsx index 2d1282eb..4f6613f4 100644 --- a/src/components/User/EditProfileForm/EditProfileForm.tsx +++ b/src/components/User/EditProfileForm/EditProfileForm.tsx @@ -10,12 +10,11 @@ import InputImage from '@/components/Auth/Input/InputImage'; import InputNickname from '@/components/Auth/Input/InputNickname'; import {s3Request} from '@/api/s3'; +import defaultProfile from '@/assets/icons/profile_default.svg'; import {AuthForm} from '@/types/auth'; import {GetUserProp} from '@/types/sidebar'; -import defaultProfile from '/profile_default.svg'; - function EditProfileForm({data}: {data: GetUserProp | undefined}) { const { register, diff --git a/src/components/User/Profile/Profile.tsx b/src/components/User/Profile/Profile.tsx index 1ba29c0c..e738a87f 100644 --- a/src/components/User/Profile/Profile.tsx +++ b/src/components/User/Profile/Profile.tsx @@ -1,22 +1,27 @@ +import {useEffect} from 'react'; import {useNavigate} from 'react-router-dom'; import styles from './Profile.module.scss'; import Pencil from '@/assets/icons/pencil.svg?react'; +import defaultImage from '@/assets/icons/profile_default.svg'; import {ProfileProps} from '@/types/user'; -import defaultImage from '/profile_default.svg'; - function Profile({data}: ProfileProps) { const navigate = useNavigate(); + useEffect(() => { + console.log(data); + }, []); + return (
From 63eef9179bf7ee65c83b495ec17e2364adb222b9 Mon Sep 17 00:00:00 2001 From: NamgungJongMin Date: Sun, 28 Jan 2024 01:28:39 +0900 Subject: [PATCH 08/13] Hotfix: apply vite public path --- {src/assets/icons => public}/city_default.svg | 0 {src/assets/icons => public}/profile_default.svg | 0 src/components/Auth/Signup/Step/StepProfile.tsx | 4 ++-- src/components/MySpaceBody/MySpaceList/MySpaceList.tsx | 3 +-- .../User/EditProfileForm/EditProfileForm.tsx | 3 ++- src/components/User/Profile/Profile.tsx | 10 +++------- src/pages/User/MyReview/MyReview.tsx | 3 +-- 7 files changed, 9 insertions(+), 14 deletions(-) rename {src/assets/icons => public}/city_default.svg (100%) rename {src/assets/icons => public}/profile_default.svg (100%) diff --git a/src/assets/icons/city_default.svg b/public/city_default.svg similarity index 100% rename from src/assets/icons/city_default.svg rename to public/city_default.svg diff --git a/src/assets/icons/profile_default.svg b/public/profile_default.svg similarity index 100% rename from src/assets/icons/profile_default.svg rename to public/profile_default.svg diff --git a/src/components/Auth/Signup/Step/StepProfile.tsx b/src/components/Auth/Signup/Step/StepProfile.tsx index 70834d1c..7f187fa0 100644 --- a/src/components/Auth/Signup/Step/StepProfile.tsx +++ b/src/components/Auth/Signup/Step/StepProfile.tsx @@ -4,13 +4,13 @@ import styles from './Step.module.scss'; import AuthButton from '@/components/Auth/Button/AuthButton'; -import defaultProfile from '@/assets/icons/profile_default.svg'; - import InputImage from '../../Input/InputImage'; import InputNickname from '../../Input/InputNickname'; import {StepProfileProps} from '@/types/auth'; +const defaultProfile = '/profile_default.svg'; + function StepProfile({register, resetField, dirty, error}: StepProfileProps) { const [imageUrl, setImageUrl] = useState(defaultProfile); diff --git a/src/components/MySpaceBody/MySpaceList/MySpaceList.tsx b/src/components/MySpaceBody/MySpaceList/MySpaceList.tsx index ee26f5eb..0e0e6de9 100644 --- a/src/components/MySpaceBody/MySpaceList/MySpaceList.tsx +++ b/src/components/MySpaceBody/MySpaceList/MySpaceList.tsx @@ -7,13 +7,12 @@ import {useInfiniteScroll} from '@/hooks/useInfiniteScroll'; import ObserveTarget from '@/components/Route/ObserveTarget/ObserveTarget'; -import defaultThumbnail from '@/assets/icons/city_default.svg'; import {setSpaceDate} from '@/utils/formatDate'; import {Spaces} from '@/types/sidebar'; import {MySpaceListProps} from '@/types/user'; -// const defaultThumbnail = 'https://tripvote.s3.ap-northeast-2.amazonaws.com/basic/city_default.svg'; +const defaultThumbnail = '/city_default.svg'; function MySpaceList({tab}: MySpaceListProps) { const {data: upcomingData} = useGetSpaces(true); diff --git a/src/components/User/EditProfileForm/EditProfileForm.tsx b/src/components/User/EditProfileForm/EditProfileForm.tsx index 4f6613f4..7efec938 100644 --- a/src/components/User/EditProfileForm/EditProfileForm.tsx +++ b/src/components/User/EditProfileForm/EditProfileForm.tsx @@ -10,11 +10,12 @@ import InputImage from '@/components/Auth/Input/InputImage'; import InputNickname from '@/components/Auth/Input/InputNickname'; import {s3Request} from '@/api/s3'; -import defaultProfile from '@/assets/icons/profile_default.svg'; import {AuthForm} from '@/types/auth'; import {GetUserProp} from '@/types/sidebar'; +const defaultProfile = '/profile_default.svg'; + function EditProfileForm({data}: {data: GetUserProp | undefined}) { const { register, diff --git a/src/components/User/Profile/Profile.tsx b/src/components/User/Profile/Profile.tsx index e738a87f..d32d8c29 100644 --- a/src/components/User/Profile/Profile.tsx +++ b/src/components/User/Profile/Profile.tsx @@ -1,27 +1,23 @@ -import {useEffect} from 'react'; import {useNavigate} from 'react-router-dom'; import styles from './Profile.module.scss'; import Pencil from '@/assets/icons/pencil.svg?react'; -import defaultImage from '@/assets/icons/profile_default.svg'; import {ProfileProps} from '@/types/user'; +const defaultProfile = '/profile_default.svg'; + function Profile({data}: ProfileProps) { const navigate = useNavigate(); - useEffect(() => { - console.log(data); - }, []); - return (