Skip to content

Commit 866a5d1

Browse files
committed
Feat #40 : 예약 버튼 수정
1 parent f626f12 commit 866a5d1

File tree

5 files changed

+11
-6
lines changed

5 files changed

+11
-6
lines changed

app/reservation/page.jsx

+7-3
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ export default function Reservation() {
9494
}, [reserveTime]);
9595

9696
return (
97+
<>
9798
<main>
9899
<Modal
99100
title="예약 정보가 맞나요?"
@@ -148,12 +149,15 @@ export default function Reservation() {
148149
/>
149150
</div>
150151
</div>
152+
</main>
153+
<div className="fixed bottom-0 flex w-full full:w-[25rem]">
151154
<button
152-
disabled={reserveTime!="Invalid Date"?false:true}
155+
disabled={!!reserveTime=="Invalid Date"}
153156
onClick={openModal}
154-
className={reserveTime!="Invalid Date"?"rounded-lg bg-blue-600 w-full h-10 mt-3 text-center text-white text-lg font-bold":"rounded-lg bg-neutral-200 w-full h-10 mt-3 text-center text-white text-lg font-bold"}>
157+
className={reserveTime!="Invalid Date" ? "bg-blue-600 w-full h-10 mt-3 text-center text-white text-lg font-bold":"rounded-lg bg-neutral-200 w-full h-10 mt-3 text-center text-white text-lg font-bold"}>
155158
예약하기
156159
</button>
157-
</main>
160+
</div>
161+
</>
158162
);
159163
}

components/ImgAndDesc/index.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export default function ImgAndDesc({ imgURL, title, desc }) {
22
return (
3-
<div className="my-5 mb-10 shadow">
3+
<div className="my-5 shadow">
44
<img className="rounded-t-xl" src={imgURL} alt={title + ' 사진'} width="100%"></img>
55
<div className="p-4">
66
<h2 className="font-bold text-lg">{title}</h2>

components/ReservationBtn/index.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export default function ReservationBtn({ time, status, selected, value, setSelec
77
onClick={() => setSelectedTime(value)}
88
className={`rounded-lg p-3 ${
99
status == true && selected == true
10-
? 'bg-blue-600 text-white'
10+
? 'bg-primary-main text-white'
1111
: status == true && selected == false
1212
? 'bg-sky-50 border-2 border-blue-500'
1313
: 'bg-neutral-200'

styles/global.css

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ main {
2222
background-color : white;
2323
box-shadow: rgba(100, 100, 111, 0.2) 0px 10px 30px 0px;
2424
height : var(--vh);
25+
max-height : var(--vh);
2526

2627
padding : 0 1rem;
2728
}

tailwind.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ module.exports = {
2525
dark: '#0B123B',
2626
lightdark: '#165EB0',
2727
main: '#1a70d2',
28-
bright: '#2D4CFA',
28+
bright: '#639EE0',
2929
light: '#4363E1',
3030
},
3131
secondary: {

0 commit comments

Comments
 (0)