From 178998e67ca7c501d1899548d26188805cdb086c Mon Sep 17 00:00:00 2001
From: Yamyam-code
Date: Sun, 28 Jan 2024 18:50:51 +0900
Subject: [PATCH 1/2] Fix: vote slide
---
.../SearchList/DateFilter/DateFilter.module.scss | 2 ++
.../SearchFromHome/SearchList/DateFilter/DateFilter.tsx | 6 +++---
.../SearchList/SearchItem/SearchItem.module.scss | 6 +++---
.../SearchFromHome/SearchList/SearchItem/SearchItem.tsx | 4 ++--
.../SearchFromHome/SearchList/SearchList.module.scss | 1 +
5 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/components/SearchFromHome/SearchList/DateFilter/DateFilter.module.scss b/src/components/SearchFromHome/SearchList/DateFilter/DateFilter.module.scss
index a6ec29b0..1cb2c521 100644
--- a/src/components/SearchFromHome/SearchList/DateFilter/DateFilter.module.scss
+++ b/src/components/SearchFromHome/SearchList/DateFilter/DateFilter.module.scss
@@ -42,6 +42,8 @@
box-sizing: border-box;
+ user-select: none;
+
transition:
0.5s opacity,
0.5s height;
diff --git a/src/components/SearchFromHome/SearchList/DateFilter/DateFilter.tsx b/src/components/SearchFromHome/SearchList/DateFilter/DateFilter.tsx
index d230c1dd..c3b8ece1 100644
--- a/src/components/SearchFromHome/SearchList/DateFilter/DateFilter.tsx
+++ b/src/components/SearchFromHome/SearchList/DateFilter/DateFilter.tsx
@@ -50,15 +50,15 @@ function DateFilter({forSearch = undefined, wishesFilter = undefined}: PropsType
style={{height: click ? '136px' : 0, opacity: click ? 1 : 0, padding: click ? '20px 32px' : 0}}
>
{filterData.map((data) => (
- {
selectSort(data);
}}
key={data}
>
{data}
-
+
))}
diff --git a/src/components/SearchFromHome/SearchList/SearchItem/SearchItem.module.scss b/src/components/SearchFromHome/SearchList/SearchItem/SearchItem.module.scss
index eb63fe28..dae8e9ff 100644
--- a/src/components/SearchFromHome/SearchList/SearchItem/SearchItem.module.scss
+++ b/src/components/SearchFromHome/SearchList/SearchItem/SearchItem.module.scss
@@ -31,7 +31,7 @@
}
.text {
- flex: 1;
+ width: 100%;
display: flex;
flex-direction: column;
@@ -42,12 +42,12 @@
transition: 0.3s all linear;
.title {
- max-width: calc(100% - 30px);
+ max-width: 93%;
height: 24px;
+ white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
- text-wrap: nowrap;
@include typography(titleSmall);
}
.info {
diff --git a/src/components/SearchFromHome/SearchList/SearchItem/SearchItem.tsx b/src/components/SearchFromHome/SearchList/SearchItem/SearchItem.tsx
index 8bbe285a..83a636c3 100644
--- a/src/components/SearchFromHome/SearchList/SearchItem/SearchItem.tsx
+++ b/src/components/SearchFromHome/SearchList/SearchItem/SearchItem.tsx
@@ -31,12 +31,12 @@ function SearchItem({forSearch, data, categoryChange}: PropsType) {
alt={`${data.title}의 사진`}
style={{opacity: categoryChange ? 0 : 1, padding: data.thumbnail ? 0 : '12px'}}
/>
-
+
{title}
{category}·{location}
-
+
{forSearch.placeID !== 'undefined' && }
diff --git a/src/components/SearchFromHome/SearchList/SearchList.module.scss b/src/components/SearchFromHome/SearchList/SearchList.module.scss
index b2b9fb3c..6a182ba6 100644
--- a/src/components/SearchFromHome/SearchList/SearchList.module.scss
+++ b/src/components/SearchFromHome/SearchList/SearchList.module.scss
@@ -24,6 +24,7 @@
padding: 24px 20px;
}
.slide {
+ width: 100%;
height: 100%;
display: flex;
From 65af2dba35d2d1f93c49171a1027ed4bf8a557bb Mon Sep 17 00:00:00 2001
From: Yamyam-code
Date: Sun, 28 Jan 2024 19:42:27 +0900
Subject: [PATCH 2/2] Fix: fix QA
---
src/components/Home/Onboarding/Onboarding.tsx | 8 +++++++-
.../PopularList/PopularList.module.scss | 1 +
.../LocationFliterPage/PopularList/PopularList.tsx | 3 +--
.../SearchList/Map/MapItems/MapItem/MapItem.tsx | 2 +-
.../SlideButton/RightButton/RightButton.module.scss | 3 ++-
src/components/SlideButton/SlideButton.tsx | 2 +-
src/components/WishItem/WishItem.tsx | 3 ++-
7 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/components/Home/Onboarding/Onboarding.tsx b/src/components/Home/Onboarding/Onboarding.tsx
index 05f72ca6..9c6fda0d 100644
--- a/src/components/Home/Onboarding/Onboarding.tsx
+++ b/src/components/Home/Onboarding/Onboarding.tsx
@@ -1,4 +1,5 @@
import {useState} from 'react';
+import {Cookies} from 'react-cookie';
import {useNavigate} from 'react-router-dom';
import styles from './Onboarding.module.scss';
@@ -16,6 +17,7 @@ interface PropsType {
function Onboarding({set}: PropsType) {
const [isVote, setIsVote] = useState(false);
const navigate = useNavigate();
+ const cookie = new Cookies().get('isLogin');
const data = [
{
@@ -89,7 +91,11 @@ function Onboarding({set}: PropsType) {
className={styles.modal__voteButton}
onClick={() => {
vote();
- navigate('/vote');
+ if (cookie) {
+ navigate('/trip');
+ } else {
+ navigate('/auth/login');
+ }
}}
style={{
height: isVote ? '6.4rem' : 0,
diff --git a/src/components/SearchFromHome/SearchList/LocationFilter/LocationFliterPage/PopularList/PopularList.module.scss b/src/components/SearchFromHome/SearchList/LocationFilter/LocationFliterPage/PopularList/PopularList.module.scss
index 54fcc594..112546bb 100644
--- a/src/components/SearchFromHome/SearchList/LocationFilter/LocationFliterPage/PopularList/PopularList.module.scss
+++ b/src/components/SearchFromHome/SearchList/LocationFilter/LocationFliterPage/PopularList/PopularList.module.scss
@@ -7,6 +7,7 @@
gap: 8px;
p {
+ width: 6rem;
height: 3.8rem;
border-radius: 48px;
diff --git a/src/components/SearchFromHome/SearchList/LocationFilter/LocationFliterPage/PopularList/PopularList.tsx b/src/components/SearchFromHome/SearchList/LocationFilter/LocationFliterPage/PopularList/PopularList.tsx
index 9a6da3ab..7075d11e 100644
--- a/src/components/SearchFromHome/SearchList/LocationFilter/LocationFliterPage/PopularList/PopularList.tsx
+++ b/src/components/SearchFromHome/SearchList/LocationFilter/LocationFliterPage/PopularList/PopularList.tsx
@@ -49,13 +49,12 @@ function PopularList({pick, setPick, setArea, setSigungu}: PropsType) {
setSigungu('전주시');
}
}
-
return (