Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/Searchdairy/AllList.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const AllList = () => {
09:30~11:20
</td>
<td className={styles.detailimage} rowSpan={4}>

</td>
</tr>
<tr className={styles.detailplace}>
Expand Down
26 changes: 20 additions & 6 deletions src/components/Searchdairy/LeftBar.jsx
Original file line number Diff line number Diff line change
@@ -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);
Expand All @@ -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("디테일 일정을 보여줍니다.");
}
};
Expand Down Expand Up @@ -59,11 +59,14 @@ function LeftBar({ onCustomChange }) {
return (
<div>
{/* LeftBarjsx 내용 */}
<button className={styles.buttonFalse}
<button
className={styles.buttonFalse}
style={{
background: custom === 0 ? "#484a64" : "#ebedf8",
}}
value={0} onClick={() => handleAllScheduleClick(0)}>
value={0}
onClick={() => handleAllScheduleClick(0)}
>
전체일정
</button>
{/* 여행 기간 설정을 위한 예시 입력 */}
Expand All @@ -74,12 +77,23 @@ function LeftBar({ onCustomChange }) {
/> */}
{/* 여행 기간에 따른 일차 버튼들 */}
{generateDayButtons()}

{/*편집하기*/}
{/* 편집 완료 및 저장 버튼 */}
<NavLink to="/travelplanedit" style={{ textDecoration: "none" }}>
<button className={styles.buttonEdit}>
<div>편집 하기</div>
</button>
</NavLink>
{/*현재 계획서 적용하기*/}
<button className={styles.buttonUse}
<button
className={styles.buttonUse}
// style={{
// background: custom === 0 ? "#484a64" : "#ebedf8",
// }}
value={-1} onClick={() => handleAllScheduleClick(-1)}>
value={-1}
onClick={() => handleAllScheduleClick(-1)}
>
<div>현재 계획서</div>
적용하기
</button>
Expand Down
2 changes: 1 addition & 1 deletion src/styles/Home/Home.css
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ color: #BFC4D8; */
gap: 10px; /* 항목 사이의 간격 */
padding: 10px; /* 내부 여백 */
background-color: #F3F5FF ; ; /* 배경색 */
height: 320px; /* 최대 높이 설정 */
height: 340px; /* 최대 높이 설정 */
}

.popularplacebox > div {
Expand Down
37 changes: 30 additions & 7 deletions src/styles/diaryContent.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
height: 70px;
border-radius: 8px;
border: none;
margin-top: 400px;
margin-top: 30px;
margin-left: 111px;

/* Primary color */
Expand All @@ -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);

Expand Down Expand Up @@ -163,7 +186,6 @@

.detailtime {
color: var(--grayscale-Gray4, #7f85a3);

/* detail/detail_regular_14 */
width: 198px;
font-family: "SUIT Variable";
Expand Down Expand Up @@ -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);
}
Expand All @@ -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 {
Expand Down
47 changes: 25 additions & 22 deletions src/tempdata/plandatas.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ let allplans = [
// 내가 저장한 관심있는 여행계획서
{
id: 1,
place: "다현 여행기",
place: "다현의 제주도 탐방기",
hashtag: ["가족 여행"],
liked: 0, //내가 좋아요 눌렀는지
img: SeoulImage,
Expand All @@ -28,7 +28,7 @@ let allplans = [
},
{
id: 2,
place: "부산여행기",
place: "상현의 비빔밥 먹방 여행기",
hashtag: ["추억 여행", "가족 여행"],
liked: 0, //내가 좋아요 눌렀는지
img: BusanImage,
Expand All @@ -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,
Expand Down