From 90852491892f3727b3f04cfe0221f3b0d05558e5 Mon Sep 17 00:00:00 2001
From: geun1416 <1416geun@naver.com>
Date: Wed, 25 Oct 2023 10:05:31 +0900
Subject: [PATCH] d
---
package-lock.json | 30 +++++
package.json | 1 +
src/assets/css/custom.css | 15 ++-
.../control/setting/ControlReservation.js | 32 +-----
.../control/setting/steps/ReserveStep1.js | 108 +++++++++++-------
5 files changed, 110 insertions(+), 76 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 89128c2..ed55431 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8621,6 +8621,11 @@
}
}
},
+ "enquire.js": {
+ "version": "2.1.6",
+ "resolved": "https://registry.npmjs.org/enquire.js/-/enquire.js-2.1.6.tgz",
+ "integrity": "sha512-/KujNpO+PT63F7Hlpu4h3pE3TokKRHN26JYmQpPyjkRD/N57R7bPDNojMXdi7uveAKjYB7yQnartCxZnFWr0Xw=="
+ },
"enquirer": {
"version": "2.3.6",
"resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
@@ -12557,6 +12562,14 @@
"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
"dev": true
},
+ "json2mq": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/json2mq/-/json2mq-0.2.0.tgz",
+ "integrity": "sha512-SzoRg7ux5DWTII9J2qkrZrqV1gt+rTaoufMxEzXbS26Uid0NwaJd123HcoB80TgubEppxxIGdNxCx50fEoEWQA==",
+ "requires": {
+ "string-convert": "^0.2.0"
+ }
+ },
"json3": {
"version": "3.3.3",
"resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz",
@@ -21756,6 +21769,18 @@
"shepherd.js": "^8.0.0"
}
},
+ "react-slick": {
+ "version": "0.29.0",
+ "resolved": "https://registry.npmjs.org/react-slick/-/react-slick-0.29.0.tgz",
+ "integrity": "sha512-TGdOKE+ZkJHHeC4aaoH85m8RnFyWqdqRfAGkhd6dirmATXMZWAxOpTLmw2Ll/jPTQ3eEG7ercFr/sbzdeYCJXA==",
+ "requires": {
+ "classnames": "^2.2.5",
+ "enquire.js": "^2.1.6",
+ "json2mq": "^0.2.0",
+ "lodash.debounce": "^4.0.8",
+ "resize-observer-polyfill": "^1.5.0"
+ }
+ },
"react-slidedown": {
"version": "2.4.5",
"resolved": "https://registry.npmjs.org/react-slidedown/-/react-slidedown-2.4.5.tgz",
@@ -24030,6 +24055,11 @@
"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
"integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
},
+ "string-convert": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/string-convert/-/string-convert-0.2.1.tgz",
+ "integrity": "sha512-u/1tdPl4yQnPBjnVrmdLo9gtuLvELKsAoRapekWggdiQNvvvum+jYF329d84NAa660KQw7pB2n36KrIKVoXa3A=="
+ },
"string-length": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
diff --git a/package.json b/package.json
index 20a457a..555724e 100644
--- a/package.json
+++ b/package.json
@@ -92,6 +92,7 @@
"react-scroll-up": "1.3.7",
"react-select": "4.0.2",
"react-shepherd": "3.3.0",
+ "react-slick": "^0.29.0",
"react-slidedown": "2.4.5",
"react-sortablejs": "6.0.0",
"react-toastify": "7.0.3",
diff --git a/src/assets/css/custom.css b/src/assets/css/custom.css
index 5b76038..3432d24 100644
--- a/src/assets/css/custom.css
+++ b/src/assets/css/custom.css
@@ -859,7 +859,7 @@ background-size: 75% auto;
.uam-reservation-header .step li{font-size:0.875rem}
.uam-reservation-header .step li + li{margin-left:0.5rem}
.uam-reservation-tab-list{display:flex;}
-.uam-reservation-tab-list .list{display: flex;justify-content:center;align-items:center;flex:1;background-color:#242b3d;padding:0.5rem;font-size:0.875rem;text-align:center;border-radius: 0.357rem;cursor:pointer;}
+.uam-reservation-tab-list .list{display: flex;justify-content:center;align-items:center;flex:1;background-color:#242b3d;padding:0.5rem;font-size:0.875rem;text-align:center;border-radius: 0.357rem;cursor:pointer;border:1px solid #404656;}
.uam-reservation-tab-list .list + .list{margin-left:0.5rem}
.step-wrap{margin-top:1rem;border-radius: 0.357rem;}
.step-box{padding:1rem;background-color:#242b3d;}
@@ -886,8 +886,15 @@ background-size: 75% auto;
.step-wrap .passengers .btn-icon svg{margin-top:4px;}
.step-wrap .finish-btn{text-align:right;margin-top:1rem;}
-
.active-step{color:rgba(255,255,255,0.8);font-weight:500;}
.inactive-step{color:rgba(255,255,255,0.4);}
-.list.active {background-color: #7367f0;color:#fff;font-weight:500;}
-.finish.active{background-color: #ff9f43;color: #fff;}
+.list.active {background-color: #7367f0;border-color:#7367f0;color:#fff;font-weight:500;}
+.finish.active{background-color: #ff9f43;border-color:#ff9f43;color: #fff;}
+
+.step-reservation .uam-reservation-tab-list .btn{margin-left:1rem}
+.step-box{padding:1rem;background-color:#242b3d;}
+.step-reservation-header{text-align:center;}
+.step-reservation-header .place{margin:0.5rem 0;}
+.step-reservation-header .place span{font-size:1.5rem;font-weight:500;color:#fff}
+.step-reservation-header .arrow svg{width:22px;margin-top:-2px;margin-left:8px;margin-right:8px}
+
diff --git a/src/views/control/setting/ControlReservation.js b/src/views/control/setting/ControlReservation.js
index 1af937a..665a88d 100644
--- a/src/views/control/setting/ControlReservation.js
+++ b/src/views/control/setting/ControlReservation.js
@@ -137,20 +137,9 @@ export default function ControlReservation({ modal, handler }) {
{reserveStep === 3 &&