Skip to content
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/components/ChangeInfo/ChangePw.js
Original file line number Diff line number Diff line change
Expand Up @@ -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%;
Expand Down Expand Up @@ -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("");
Expand Down Expand Up @@ -111,7 +110,7 @@ const ChangePw = ({setShowChangePw}) => {
// isModalOn={showModal}
iconSrc={"images/lock.svg"}
iconAlt={"lock"}
mainContent={"비밀번호가 재설정되었습니다."}
mainContent={"비밀번호가 변경되었습니다."}
subContent={"바뀐 비밀번호로 로그인하세요."}
btnContent={"확인"}
onClickBtn={handleCloseModal}
Expand Down Expand Up @@ -168,7 +167,7 @@ const ChangePw = ({setShowChangePw}) => {
}}
>
재설정하기
{isAllValid ? <NextArrowWhite/> : <NextArrowGray/>}
{isAllValid ? <NextArrowWhite /> : <NextArrowGray />}
</Button>
</div>
</div>
Expand All @@ -190,6 +189,6 @@ const Wrapper = styled.div`
align-items: center;
background-color: #ffffff;
z-index: 101;
`
`;

export default ChangePw;
3 changes: 2 additions & 1 deletion src/components/Modal/style.js
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand All @@ -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`
Expand Down
2 changes: 1 addition & 1 deletion src/components/pages/Main/Locker/LockerPrayerList.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ const Settings = () => {
iconSrc={"images/ic_logout.svg"}
iconAlt={"icon_logout"}
mainContent={"로그아웃 하시겠습니까?"}
subContent={"보다 안전하게 로그아웃을 진행해 드릴게요."}
subContent={"안전하게 로그아웃을 진행해 드릴게요."}
btnContent={"로그아웃"}
btnContent2={"취소"}
onClickBtn={logout}
Expand Down
5 changes: 2 additions & 3 deletions src/utils/date.js
Original file line number Diff line number Diff line change
Expand Up @@ -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}`;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

사용하는 부분 있는지 확인해보고, 없다면 지워주세요

return `D+${Math.abs(diff)}`;
};