@@ -370,7 +420,7 @@ const UserSignUp = ({ social }: Props) => {
success={success.nickName}
onChange={handleInput}
/>
-
@@ -382,48 +432,56 @@ const UserSignUp = ({ social }: Props) => {
placeholder="영문, 숫자, 특수문자를 조합하여 최소 8자 이상"
error={error.password}
onChange={handleInput}
- onBlur={isValidPassword}
/>
-
setCkPassword(e.target.value)}
- onBlur={isValidPassword}
+ error={
+ ckPassword !== password && ckPassword !== ''
+ ? '비밀번호가 일치하지 않습니다.'
+ : ''
+ }
+ onChange={handleInput}
/>
)}
+
+
-
-
+
theme.device.mobile} {
+ width: 100%;
+ padding: 2rem 1.8rem;
+ }
`
const Form = styled.form`
display: flex;
@@ -481,19 +544,36 @@ const Form = styled.form`
display: flex;
align-items: flex-center;
gap: 0.6rem;
+ }
+
+ .btn-div {
+ flex: 1 1 1;
button {
+ width: 100%;
position: relative;
- top: 2rem;
+ top: 1.8rem;
}
}
.grid-div {
- width: 100%;
display: grid;
- grid-template-columns: repeat(2, 1fr);
- row-gap: 1.6rem;
+ grid-template-columns: 1fr 1fr;
column-gap: 0.6rem;
}
+
+ @media ${({ theme }) => theme.device.mobile} {
+ .flex-div {
+ width: 100%;
+ display: grid;
+ grid-template-columns: 2fr 1fr;
+ gap: 0.6rem;
+ }
+
+ .grid-div {
+ grid-template-columns: 1fr;
+ row-gap: 2rem;
+ }
+ }
`
export default UserSignUp
diff --git a/client/src/store/hooks/useTokenCheck.tsx b/client/src/store/hooks/useTokenCheck.tsx
deleted file mode 100644
index 06ec292e..00000000
--- a/client/src/store/hooks/useTokenCheck.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { useEffect } from 'react'
-import { useNavigate } from 'react-router-dom'
-import { userLogout } from '../../utils/userfunc'
-import { getCookie } from '../../utils/Cookie'
-
-const useTokenCheck = () => {
- const navigate = useNavigate()
-
- useEffect(() => {
- const checkToken = () => {
- if (!getCookie('access')) {
- navigate('/sign-in', { replace: true })
- }
- }
-
- checkToken()
- }, [])
-}
-
-export default useTokenCheck
diff --git a/client/src/utils/userfunc.ts b/client/src/utils/userfunc.ts
index cd3a0ef4..f2c62474 100644
--- a/client/src/utils/userfunc.ts
+++ b/client/src/utils/userfunc.ts
@@ -12,6 +12,42 @@ export const checkPassword = (password: string): boolean => {
return pwdRegex.test(password)
}
+export const checkDate = (date: string): boolean => {
+ // yyyy-mm-dd
+ const dateRegex = /^\d{4}-\d{2}-\d{2}$/
+
+ if (!dateRegex.test(date)) {
+ return false
+ }
+
+ const convertedDate = new Date(date)
+ convertedDate.setHours(0, 0, 0, 0)
+
+ if (isNaN(convertedDate.getTime())) {
+ return false
+ }
+
+ const Today = new Date()
+ Today.setHours(0, 0, 0, 0)
+
+ if (Today < convertedDate) {
+ // 현재 날짜보다 미래를 입력했으면 false
+ return false
+ }
+
+ return true
+}
+
+export const checkNumber = (nums: string): boolean => {
+ const converted = Number(nums)
+
+ if (typeof converted === 'number' && converted > 0 && converted < 500) {
+ return true
+ }
+
+ return false
+}
+
export const userLogout = () => {
removeCookie('access', { path: '/' })
removeCookie('refresh', { path: '/' })