From 69bdc77ce28309e97a84b263c982643ef384a96a Mon Sep 17 00:00:00 2001 From: ProblmZro Date: Sat, 18 May 2024 12:11:14 +0900 Subject: [PATCH 1/5] =?UTF-8?q?refactor:=20=EB=AA=A8=EB=8B=AC=EC=B0=BD=20?= =?UTF-8?q?=EA=B8=80=EC=94=A8=EC=B2=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Modal/style.js | 3 ++- src/pages/Settings.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/Modal/style.js b/src/components/Modal/style.js index fb23d931..2129b259 100644 --- a/src/components/Modal/style.js +++ b/src/components/Modal/style.js @@ -31,7 +31,7 @@ export const ModalMainContent = styled.div` color: ${(props) => props.modalTheme === ModalTheme.NORMAL ? "#7bab6e" : "#FF6B6B"}; font-weight: 700; - padding-bottom: 2px; + letter-spacing: -0.02em; `; export const ModalSubContent = styled.div` @@ -41,6 +41,7 @@ export const ModalSubContent = styled.div` font-weight: 400; color: ${(props) => props.modalTheme === ModalTheme.NORMAL ? "#7bab6e" : "#FF6B6B"}; + letter-spacing: -0.02em; `; export const ModalBtnWrapper = styled.div` diff --git a/src/pages/Settings.js b/src/pages/Settings.js index 9e659787..64e6c579 100644 --- a/src/pages/Settings.js +++ b/src/pages/Settings.js @@ -173,7 +173,7 @@ const Settings = () => { iconSrc={"images/ic_logout.svg"} iconAlt={"icon_logout"} mainContent={"로그아웃 하시겠습니까?"} - subContent={"보다 안전하게 로그아웃을 진행해 드릴게요."} + subContent={"안전하게 로그아웃을 진행해 드릴게요."} btnContent={"로그아웃"} btnContent2={"취소"} onClickBtn={logout} From c6b917e6ffd2027df2236a1ebec6025a44e0979d Mon Sep 17 00:00:00 2001 From: ProblmZro Date: Sat, 18 May 2024 12:14:19 +0900 Subject: [PATCH 2/5] =?UTF-8?q?refactor:=20=EB=B3=B4=EA=B4=80=ED=95=A8=20?= =?UTF-8?q?=EB=B0=9B=EC=9D=80=20=EB=82=A0=EC=A7=9C=20=EA=B3=84=EC=82=B0=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/date.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/utils/date.js b/src/utils/date.js index 1efc2539..19d96a57 100644 --- a/src/utils/date.js +++ b/src/utils/date.js @@ -25,8 +25,7 @@ export const getCalculatedDiff = (date) => { export const getDDayLabel = (date) => { const diff = getCalculatedDiff(date); - - if (diff === 0) return "D-Day"; - if (diff > 0) return `D-${diff}`; + // if (diff === 0) return "D-Day"; + // if (diff > 0) return `D-${diff}`; return `D+${Math.abs(diff)}`; }; From 655e5eae9fdebc4fceafb3a870b576f44971eb1b Mon Sep 17 00:00:00 2001 From: ProblmZro Date: Sat, 18 May 2024 12:29:29 +0900 Subject: [PATCH 3/5] =?UTF-8?q?refactor:=20=EB=B3=B4=EA=B4=80=ED=95=A8=20?= =?UTF-8?q?=EA=B8=B0=EB=8F=84=20=EA=B0=84=EA=B2=A9=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/pages/Main/Locker/LockerPrayerList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/pages/Main/Locker/LockerPrayerList.js b/src/components/pages/Main/Locker/LockerPrayerList.js index c0388740..05a26188 100644 --- a/src/components/pages/Main/Locker/LockerPrayerList.js +++ b/src/components/pages/Main/Locker/LockerPrayerList.js @@ -35,7 +35,7 @@ const S = { ); box-shadow: 0px 2px 8px var(--color-locker-content-shadow); border-radius: 16px; - margin: 12px 24px; + margin: 12px 24px 0px 24px; outline: ${({ isChecked }) => isChecked ? `2px solid var(--color-dark-green)` : `var(--color-white)`}; transition: all 0.3s ease-in-out; From 02df1f0b0828870a1416d0333987deb0ce965d91 Mon Sep 17 00:00:00 2001 From: ProblmZro Date: Wed, 22 May 2024 18:01:40 +0900 Subject: [PATCH 4/5] =?UTF-8?q?refactor:=20=EB=B9=84=EB=B0=80=EB=B2=88?= =?UTF-8?q?=ED=98=B8=20=EB=B3=80=EA=B2=BD=20=EB=AA=A8=EB=8B=AC=EC=B0=BD=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ChangeInfo/ChangePw.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/components/ChangeInfo/ChangePw.js b/src/components/ChangeInfo/ChangePw.js index 85325ebb..8f8ce433 100644 --- a/src/components/ChangeInfo/ChangePw.js +++ b/src/components/ChangeInfo/ChangePw.js @@ -9,7 +9,6 @@ import Modal from "../Modal/Modal"; import { ReactComponent as NextArrowGray } from "../../images/ic_next_arrow_gray.svg"; import { ReactComponent as NextArrowWhite } from "../../images/ic_next_arrow_white.svg"; - const ModalContent = styled.div` position: fixed; top: 50%; @@ -40,7 +39,7 @@ const ModalButton1 = styled.button` font-size: 18px; `; -const ChangePw = ({setShowChangePw}) => { +const ChangePw = ({ setShowChangePw }) => { const [pw, setPw] = useState(""); const [matchingPw, setMatchingPw] = useState(""); const [invalidPwInfo, setInvalidPwInfo] = useState(""); @@ -111,7 +110,7 @@ const ChangePw = ({setShowChangePw}) => { // isModalOn={showModal} iconSrc={"images/lock.svg"} iconAlt={"lock"} - mainContent={"비밀번호가 재설정되었습니다."} + mainContent={"비밀번호가 변경되었습니다."} subContent={"바뀐 비밀번호로 로그인하세요."} btnContent={"확인"} onClickBtn={handleCloseModal} @@ -168,7 +167,7 @@ const ChangePw = ({setShowChangePw}) => { }} > 재설정하기 - {isAllValid ? : } + {isAllValid ? : } @@ -190,6 +189,6 @@ const Wrapper = styled.div` align-items: center; background-color: #ffffff; z-index: 101; -` +`; export default ChangePw; From dae35064aa0b10958e98e63d57ba893684e18ee5 Mon Sep 17 00:00:00 2001 From: ProblmZro Date: Wed, 29 May 2024 16:05:39 +0900 Subject: [PATCH 5/5] =?UTF-8?q?refactor:=20=EB=B9=84=EB=B0=80=EB=B2=88?= =?UTF-8?q?=ED=98=B8=20=EB=B3=80=EA=B2=BD=20=EB=AA=A8=EB=8B=AC=EC=B0=BD=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Find/PwResult.js | 90 ++++++++++++++++++++++++--------- src/utils/date.js | 2 - 2 files changed, 65 insertions(+), 27 deletions(-) diff --git a/src/components/Find/PwResult.js b/src/components/Find/PwResult.js index b9f487b0..97be5ec8 100644 --- a/src/components/Find/PwResult.js +++ b/src/components/Find/PwResult.js @@ -2,7 +2,7 @@ import { useState } from "react"; import Button, { ButtonSize, ButtonTheme } from "../Button/Button"; import Input from "../Input/Input"; import UserHeader from "../UserHeader"; -import styled, { keyframes } from 'styled-components'; +import styled, { keyframes } from "styled-components"; import BlackScreen from "../BlackScreen/BlackScreen"; import publicapi from "../../api/publicapi"; import { useNavigate } from "react-router-dom"; @@ -19,7 +19,6 @@ const ModalContent = styled.div` justify-content: center; align-items: center; background-color: white; - gap: 8px; border-radius: 16px; padding: 16px; color: #7bab6e; @@ -37,20 +36,20 @@ const AnimationContainer = styled.div` display: flex; flex-direction: column; align-items: center; - background-color: #FFFFFF; + background-color: #ffffff; `; const ModalButton1 = styled.button` flex-grow: 1; flex-basis: 0; - background-color: #7BAB6E; + background-color: #7bab6e; border-style: none; border-radius: 16px; padding: 16px 0; - color: #FFFFFF; + color: #ffffff; font-size: 18px; `; -const PwResult = ({id}) => { +const PwResult = ({ id }) => { const [pw, setPw] = useState(""); const [matchingPw, setMatchingPw] = useState(""); const [invalidPwInfo, setInvalidPwInfo] = useState(""); @@ -59,18 +58,19 @@ const PwResult = ({id}) => { const navigate = useNavigate(); - const handleCloseModal = () =>{ + const handleCloseModal = () => { setShowModal(false); - navigate('/login'); + navigate("/login"); }; - const isAllValid = pw && matchingPw && !invalidPwInfo && !invalidMatchingPwInfo; + const isAllValid = + pw && matchingPw && !invalidPwInfo && !invalidMatchingPwInfo; const pwRegEx = /^[a-zA-Z0-9!@#$%^&*()_+{}|:"<>?~\[\]\\;',./]{8,16}$/; const pwCheck = (pw) => { return pwRegEx.test(pw); - } + }; const pwChangeHandler = (e) => { setPw(e.target.value); @@ -113,7 +113,7 @@ const PwResult = ({id}) => { setShowModal(false); console.log(e); } - } + }; return ( @@ -121,33 +121,44 @@ const PwResult = ({id}) => { <> e.stopPropagation()}> - lock + lock
- 비밀번호가 재설정 되었습니다. + 비밀번호가 변경되었습니다.
- 바뀐 비밀번호로 로그인하세요 + 바뀐 비밀번호로 로그인하세요.
-
- - 확인 - +
+ 확인
- )} + )} 비밀번호 재설정
{ marginTop: "64px", }} > -
- - -
+
+ + +