From ff31ab12058b40f40935e3e7a7d8255442124b58 Mon Sep 17 00:00:00 2001 From: kim gisu Date: Tue, 31 Dec 2024 04:39:08 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=ED=9A=8C=EC=9B=90=ED=83=88?= =?UTF-8?q?=ED=87=B4=EB=AA=A8=EB=8B=AC=EC=B0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.jsx | 5 + .../popup/JoinGroupPopup/JoinGroupPop.jsx | 3 +- .../SecessionUserPopup/SecessionUserPopup.jsx | 166 ++++++++++++++++++ 3 files changed, 173 insertions(+), 1 deletion(-) create mode 100644 src/components/popup/SecessionUserPopup/SecessionUserPopup.jsx diff --git a/src/App.jsx b/src/App.jsx index 563d063..eb0b846 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -10,6 +10,7 @@ import SignUp from './pages/SignUp'; import CheckPointRecordPage from './Dispose/CheckPointRecordPage'; import AnotherCheckPointRecordPage from './Dispose/AnotherCheckPointRecordPage'; import JoinGroupPopup from './components/popup/JoinGroupPopup/JoinGroupPop'; +import SecessionUserPopup from './components/popup/SecessionUserPopup/SecessionUserPopup'; function App() { return ( @@ -31,6 +32,10 @@ function App() { element={} /> } /> + } + /> diff --git a/src/components/popup/JoinGroupPopup/JoinGroupPop.jsx b/src/components/popup/JoinGroupPopup/JoinGroupPop.jsx index d92f85e..edaff10 100644 --- a/src/components/popup/JoinGroupPopup/JoinGroupPop.jsx +++ b/src/components/popup/JoinGroupPopup/JoinGroupPop.jsx @@ -33,7 +33,8 @@ const Title = styled.div` line-height: 35px; /* identical to box height */ - color: #ab0909; + color: ${(props) => props.theme.colors.main}; + font-style: normal; /* Inside auto layout */ flex: none; diff --git a/src/components/popup/SecessionUserPopup/SecessionUserPopup.jsx b/src/components/popup/SecessionUserPopup/SecessionUserPopup.jsx new file mode 100644 index 0000000..e58c96c --- /dev/null +++ b/src/components/popup/SecessionUserPopup/SecessionUserPopup.jsx @@ -0,0 +1,166 @@ +import React, { useState, useEffect } from 'react'; +import { + PopupContainer, + PopupInner, +} from '../../../styled_components/popupStyle'; +import useClosePopupAnimation from '../../../hooks/useClosePopupAnimation'; +import styled from 'styled-components'; +import LGButton from '../../LGButton/LGButton'; + +const PopUpInnerBox1 = styled.div` + overflow: hidden; + display: flex; + flex-direction: column; + align-items: center; + padding: 60px 40px; + gap: 40px; + + width: 40%; + height: 90%; + + background: #ffffff; + border-radius: 20px; + .input_secession { + box-sizing: border-box; + + width: 372px; + height: 50px; + + border: 1px solid #bbbbbb; + border-radius: 10px; + } +`; +const Title = styled.div` + /* 그룹 정보 */ + + font-family: ${(props) => props.theme.font.main}; + font-style: normal; + font-weight: 700; + font-size: 28px; + line-height: 35px; + /* identical to box height */ + + color: ${(props) => props.theme.colors.main}; + + /* Inside auto layout */ + flex: none; + order: 0; + flex-grow: 0; +`; +const Content = styled.div` + font-family: ${(props) => props.theme.font.main}; + font-size: 1rem; + line-height: 35px; + color: black; + .red { + color: ${(props) => props.theme.colors.main}; + } + .red-bold { + color: ${(props) => props.theme.colors.main}; + font-weight: 700; + } +`; + +const ButtonContainer = styled.div` + display: flex; + flex-direction: row; + width: 100%; + justify-content: space-around; +`; + +const Circle = styled.div` + /* Frame 52901 */ + + /* Auto layout */ + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + padding: 20px; + gap: 10px; + + width: 50px; + height: 50px; + + background-color: ${(props) => props.theme.colors.sub}; + border-radius: 50px; + + /* Inside auto layout */ + flex: none; + order: 0; + flex-grow: 0; +`; +const SecessionUserPopup = ({ onClose = false }) => { + const [isClosing, setIsClosing] = useState(false); // 닫힘 상태 관리 + const [inputValue, setInputValue] = useState(''); // input 값 관리 + + const handleClose = () => { + setIsClosing(true); // 닫히는 애니메이션 시작 + }; + + // input 값 변경 핸들러 추가 + const handleInputChange = (e) => { + setInputValue(e.target.value); + }; + + useClosePopupAnimation(isClosing, onClose); + + return ( + + + + + + + + + 계정 삭제 요청 + + 계정 삭제 완료 시{' '} + 데이터가 삭제되며 복구할 수 없습니다. +
위 내용에 동의하실 경우 입력창 내에
+ ‘탈퇴하겠습니다’ 글자를 + 입력해주세요. + + + + + + + + + + ); +}; + +export default SecessionUserPopup; From d27895b357d511ab9d7cafa4662d7b5a749042b6 Mon Sep 17 00:00:00 2001 From: kim gisu Date: Tue, 31 Dec 2024 18:12:43 +0900 Subject: [PATCH 2/2] fix:git_conflict_resolve --- src/App.jsx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/App.jsx b/src/App.jsx index 999c0ab..3b49121 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -19,14 +19,10 @@ function App() {
- } /> } /> } /> -<<<<<<< HEAD } /> -======= } /> ->>>>>>> 81d4ab40785cf0b7a88b88d4b80adbd014999a3a }