From 6d8d76f7d605f4a11f50f74da50e76de8810707c Mon Sep 17 00:00:00 2001
From: sihyuuun
Date: Wed, 5 Oct 2022 01:21:00 +0900
Subject: [PATCH] =?UTF-8?q?[=EC=B6=94=EA=B0=80]=20checkout=20modal=20?=
=?UTF-8?q?=EC=B6=94=EA=B0=80=20#50?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/css/CheckoutModal.css | 18 ++++++++++++++
src/css/Navigation.css | 50 +++++++++++++++++----------------------
src/tsx/CheckoutModal.tsx | 40 +++++++++++++++++++++++++++++++
src/tsx/Navigation.tsx | 6 ++---
4 files changed, 83 insertions(+), 31 deletions(-)
create mode 100644 src/css/CheckoutModal.css
create mode 100644 src/tsx/CheckoutModal.tsx
diff --git a/src/css/CheckoutModal.css b/src/css/CheckoutModal.css
new file mode 100644
index 0000000..fd16df6
--- /dev/null
+++ b/src/css/CheckoutModal.css
@@ -0,0 +1,18 @@
+.Checkout {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ padding-top: 15px;
+}
+#CheckoutBtn {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ border: none;
+ background-color: #50b4d2;
+ width: 100px;
+}
+#CheckoutOKBtn {
+ border: none;
+ background-color: #50b4d2;
+}
diff --git a/src/css/Navigation.css b/src/css/Navigation.css
index 7be6f21..02008e8 100644
--- a/src/css/Navigation.css
+++ b/src/css/Navigation.css
@@ -9,12 +9,6 @@
background-color: #50b4d2;
}
-.menu__list {
- display: flex;
- justify-content: center;
- color: white;
-}
-
@media (max-width: 1799px) {
.burger__menu,
.x__menu {
@@ -50,7 +44,7 @@
position: fixed;
left: 0;
top: 75px;
- background-color: #50b4d2;
+ background-color: white;
z-index: 1;
box-shadow: 2px 0px 1px rgba(44, 44, 44, 0.137);
}
@@ -95,22 +89,23 @@
}
.Hello {
- padding-left: 20px;
- /* padding: 30px; */
+ padding: 10px 20px;
display: flex;
+ font-size: larger;
justify-content: center;
flex-direction: column;
- white-space: pre-line;
+ margin-bottom: 0px;
+ padding-right: 0px;
}
.Use_List {
- padding-left: 20px;
- /* padding: 30px; */
+ padding: 10px 20px;
display: flex;
justify-content: center;
flex-direction: column;
- padding-bottom: 20px;
- margin-top: 20px;
+ border: 1px solid rgba(0, 0, 0, 60%);
+ margin: 10px;
+ font-size: large;
}
.info {
@@ -118,20 +113,9 @@
padding-left: 5px;
}
-.checkOut {
- background-color: white;
- border-radius: 30px;
- padding: auto;
- /* width: fit-content;
- display: flex;
- justify-content: center; */
-}
-
.dividingLine {
- margin-top: 0%;
- margin-bottom: 0%;
- margin-left: 2%;
- margin-right: 2%;
+ margin: 0px;
+ color: black;
}
.headerText {
@@ -144,5 +128,15 @@
.headerTextTitle {
color: white;
- font-size: large;
+ font-size: larger;
+}
+
+#LogoutBtn {
+ background-color: #d5d5d5;
+ border: none;
+ cursor: pointer;
+ margin-left: 105px;
+ bottom: 0;
+ font-size: medium;
+ border-radius: 5px;
}
diff --git a/src/tsx/CheckoutModal.tsx b/src/tsx/CheckoutModal.tsx
new file mode 100644
index 0000000..9866ecb
--- /dev/null
+++ b/src/tsx/CheckoutModal.tsx
@@ -0,0 +1,40 @@
+import React, { useState } from "react";
+import Button from "react-bootstrap/Button";
+import Modal from "react-bootstrap/Modal";
+import "bootstrap/dist/css/bootstrap.min.css";
+import "../css/CheckoutModal.css";
+
+export default function CheckoutModal() {
+ const [show, setShow] = useState(false);
+
+ const handleShow = () => setShow(!show);
+
+ return (
+ <>
+
+
+
+
+
+ 테라스 퇴실 확인
+
+
+
+ 테라스를 퇴실하시겠습니까?
+
+
+
+
+
+
+ >
+ );
+}
diff --git a/src/tsx/Navigation.tsx b/src/tsx/Navigation.tsx
index 4e5f99e..21c8f3f 100644
--- a/src/tsx/Navigation.tsx
+++ b/src/tsx/Navigation.tsx
@@ -1,6 +1,6 @@
import "../css/Navigation.css?after";
import { useState } from "react";
-
+import CheckoutModal from "./CheckoutModal";
function Navigation(): JSX.Element {
const [menuToggle, setMenuToggle] = useState(false);
//초기값은 false
@@ -40,6 +40,7 @@ function Navigation(): JSX.Element {
홍길동님
반갑습니다!
+
@@ -55,9 +56,8 @@ function Navigation(): JSX.Element {
{"2022-09-05"}
{"12:37~15:37"}
+
-
-