From 09eb82ab0e818258b5c15ba8ea380dea8c6b16f1 Mon Sep 17 00:00:00 2001 From: sondahyun <88223753+sondahyun@users.noreply.github.com> Date: Wed, 21 Feb 2024 03:05:52 +0900 Subject: [PATCH 1/3] [ADD] --- src/styles/Home/Home.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/Home/Home.css b/src/styles/Home/Home.css index c0768a9..6bcaadb 100644 --- a/src/styles/Home/Home.css +++ b/src/styles/Home/Home.css @@ -82,7 +82,7 @@ color: #BFC4D8; */ gap: 10px; /* 항목 사이의 간격 */ padding: 10px; /* 내부 여백 */ background-color: #F3F5FF ; ; /* 배경색 */ - height: 320px; /* 최대 높이 설정 */ + height: 340px; /* 최대 높이 설정 */ } .popularplacebox > div { From c6ac822c64ddc9a4b8c9e142b908ed0fb555250b Mon Sep 17 00:00:00 2001 From: sondahyun <88223753+sondahyun@users.noreply.github.com> Date: Wed, 21 Feb 2024 03:46:38 +0900 Subject: [PATCH 2/3] [FIX] --- src/components/Searchdairy/AllList.jsx | 2 +- src/components/Searchdairy/LeftBar.jsx | 26 +++++++++++++----- src/styles/diaryContent.module.css | 37 +++++++++++++++++++++----- 3 files changed, 51 insertions(+), 14 deletions(-) diff --git a/src/components/Searchdairy/AllList.jsx b/src/components/Searchdairy/AllList.jsx index 6915f59..04915a6 100644 --- a/src/components/Searchdairy/AllList.jsx +++ b/src/components/Searchdairy/AllList.jsx @@ -53,7 +53,7 @@ const AllList = () => { 09:30~11:20 - + diff --git a/src/components/Searchdairy/LeftBar.jsx b/src/components/Searchdairy/LeftBar.jsx index 42dcc45..46deb26 100644 --- a/src/components/Searchdairy/LeftBar.jsx +++ b/src/components/Searchdairy/LeftBar.jsx @@ -1,5 +1,6 @@ import React, { useState } from "react"; import styles from "../../styles/diaryContent.module.css"; +import { NavLink, Link } from "react-router-dom"; function LeftBar({ onCustomChange }) { const [custom, setCustom] = useState(0); @@ -13,8 +14,7 @@ function LeftBar({ onCustomChange }) { onCustomChange(e); // 부모 컴포넌트로 customDuration 전달 if (e === 0) { console.log("전체 일정을 보여줍니다."); - } - else if (e > 0) { + } else if (e > 0) { console.log("디테일 일정을 보여줍니다."); } }; @@ -59,11 +59,14 @@ function LeftBar({ onCustomChange }) { return (
{/* LeftBarjsx 내용 */} - {/* 여행 기간 설정을 위한 예시 입력 */} @@ -74,12 +77,23 @@ function LeftBar({ onCustomChange }) { /> */} {/* 여행 기간에 따른 일차 버튼들 */} {generateDayButtons()} + + {/*편집하기*/} + {/* 편집 완료 및 저장 버튼 */} + + + {/*현재 계획서 적용하기*/} - diff --git a/src/styles/diaryContent.module.css b/src/styles/diaryContent.module.css index 2223d0c..dbde859 100644 --- a/src/styles/diaryContent.module.css +++ b/src/styles/diaryContent.module.css @@ -22,7 +22,7 @@ height: 70px; border-radius: 8px; border: none; - margin-top: 400px; + margin-top: 30px; margin-left: 111px; /* Primary color */ @@ -40,6 +40,29 @@ color: #ffffff; } +.buttonEdit { + /* 현재 계획서 적용하기 */ + width: 138px; + height: 70px; + border-radius: 8px; + border: none; + margin-top: 300px; + margin-left: 111px; + + /* Primary color */ + background: var(--grayscale-White, #cfc8ff); + /* botton/botton_bold_16 */ + font-family: "SUIT Variable"; + font-style: normal; + font-weight: 700; + font-size: 16px; + line-height: 170%; + /* or 27px */ + text-align: center; + + /* grayscale/White */ + color: #ffffff; +} .nickname { color: var(--grayscale-Gray3, #bfc4d8); @@ -163,7 +186,6 @@ .detailtime { color: var(--grayscale-Gray4, #7f85a3); - /* detail/detail_regular_14 */ width: 198px; font-family: "SUIT Variable"; @@ -208,9 +230,9 @@ } .detailimage { - margin-top: 150px; - width: 122px; - height: 122px; + margin-top: 100px; + width: 135px; + height: 135px; border-radius: 10px; background: var(--grayscale-Gray2, #ebedf8); } @@ -220,9 +242,10 @@ margin-bottom: 100px; background: var(--grayscale-White, #fff); box-shadow: 4px 4px 8px 0px rgba(0, 0, 0, 0.1); - width: 380px; - height: 132px; + width: 375px; + height: 160px; flex-shrink: 0; + padding: 10px; } .heartImage { From 034bb9a3b97a38a1580cc649251c1936634b6cf6 Mon Sep 17 00:00:00 2001 From: sondahyun <88223753+sondahyun@users.noreply.github.com> Date: Wed, 21 Feb 2024 04:46:58 +0900 Subject: [PATCH 3/3] dd --- src/tempdata/plandatas.js | 47 +++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/src/tempdata/plandatas.js b/src/tempdata/plandatas.js index 7853075..17f3c79 100644 --- a/src/tempdata/plandatas.js +++ b/src/tempdata/plandatas.js @@ -9,7 +9,7 @@ let allplans = [ // 내가 저장한 관심있는 여행계획서 { id: 1, - place: "다현 여행기", + place: "다현의 제주도 탐방기", hashtag: ["가족 여행"], liked: 0, //내가 좋아요 눌렀는지 img: SeoulImage, @@ -28,7 +28,7 @@ let allplans = [ }, { id: 2, - place: "부산여행기", + place: "상현의 비빔밥 먹방 여행기", hashtag: ["추억 여행", "가족 여행"], liked: 0, //내가 좋아요 눌렀는지 img: BusanImage, @@ -47,112 +47,115 @@ let allplans = [ }, { id: 3, - place: "제주도여행기", + place: "제주도 카페 탐방", hashtag: ["가족 여행"], liked: 1, img: JejuImage, }, { id: 4, - place: "경주여행기", + place: "유적지 탐방", hashtag: ["추억 여행", "가족 여행"], liked: 1, img: GyeonjuImage, }, { id: 5, - place: "속초여행기", + place: "속초 맛집 투어", hashtag: ["가족 여행"], - liked: 1, + liked: 0, img: SokchoImage, }, { id: 6, - place: "여수여행기", + place: "게장 먹방기", hashtag: ["추억 여행", "가족 여행"], liked: 1, img: YeosuImage, }, { id: 7, - place: "제주도여행기", + place: "돌하르방과 함꼐한 여행", hashtag: ["가족 여행"], - liked: 1, + liked: 0, img: JejuImage, }, { id: 8, - place: "부산여행기", + place: "부산 여행", hashtag: ["추억 여행", "가족 여행"], liked: 1, img: BusanImage, }, { id: 9, - place: "제주도여행기", + place: "반갑수광", hashtag: ["가족 여행"], liked: 1, img: JejuImage, }, { id: 10, - place: "부산여행기", + place: "광안리 맛집 투어", hashtag: ["추억 여행", "가족 여행"], liked: 1, img: BusanImage, }, { id: 11, - place: "제주도여행기", + place: "제주기행", hashtag: ["가족 여행"], liked: 1, img: JejuImage, }, { id: 12, - place: "부산여행기", + place: "갈매기와 함께한 하루", hashtag: ["추억 여행", "가족 여행"], liked: 1, img: BusanImage, }, { id: 13, - place: "제주도1", + place: "유적지 탐방", hashtag: ["가족 여행"], liked: 1, - img: JejuImage, + img: GyeonjuImage, }, { id: 14, - place: "울릉도2", + place: "여수밤바다", hashtag: ["추억 여행", "가족 여행"], liked: 1, + img: YeosuImage, }, { id: 15, - place: "제주도3", + place: "속초", hashtag: ["가족 여행"], liked: 1, - img: JejuImage, + img: SokchoImage, }, { id: 16, - place: "울릉도4", + place: "상현이의 여행", hashtag: ["추억 여행", "가족 여행"], liked: 1, + img: SokchoImage, }, { id: 17, - place: "제주도5", + place: "찬영이의 여행", hashtag: ["가족 여행"], liked: 1, img: JejuImage, }, { id: 18, - place: "울릉도6", + place: "부산으로 떠난 우정여행", hashtag: ["추억 여행", "가족 여행"], liked: 1, + img: BusanImage, }, { id: 19,