diff --git a/src/assets/landing/landing-img.webp b/src/assets/landing/landing-img.webp deleted file mode 100644 index c78c3d0..0000000 Binary files a/src/assets/landing/landing-img.webp and /dev/null differ diff --git a/src/assets/landing/logo-white.svg b/src/assets/landing/logo-white.svg deleted file mode 100644 index 0e9ef90..0000000 --- a/src/assets/landing/logo-white.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/components/TextField.tsx b/src/components/TextField.tsx index b104722..dc67479 100644 --- a/src/components/TextField.tsx +++ b/src/components/TextField.tsx @@ -82,7 +82,7 @@ const Input = forwardRef( ref: Ref, ) => { const wrapperClassNames = cn( - "flex w-fit gap-1.5 border rounded-[0.375rem] border-gray-30 focus-within:border-red-20 placeholder:text-gray-40 bg-white", + "flex w-fit gap-1.5 border rounded-[0.375rem] border-gray-30 focus-within:border-blue-20 placeholder:text-gray-40 bg-white", { "w-full": fullWidth, "bg-gray-20 text-gray-40": disabled, diff --git a/src/index.css b/src/index.css index 64a18fe..691f1af 100644 --- a/src/index.css +++ b/src/index.css @@ -26,11 +26,3 @@ ::-webkit-scrollbar-button { display: none; } - -input:-webkit-autofill, -input:-webkit-autofill:hover, -input:-webkit-autofill:focus { - -webkit-box-shadow: 0 0 0px 1000px white inset !important; - box-shadow: 0 0 0px 1000px white inset !important; - -webkit-text-fill-color: #000 !important; -} diff --git a/src/layouts/AuthLayout.tsx b/src/layouts/AuthLayout.tsx index d944e18..b8c486b 100644 --- a/src/layouts/AuthLayout.tsx +++ b/src/layouts/AuthLayout.tsx @@ -2,8 +2,10 @@ import { Outlet } from "react-router-dom"; export default function AuthLayout() { return ( -
- +
+
+ +
); } diff --git a/src/pages/AuthPage/SigninPage.tsx b/src/pages/AuthPage/SigninPage.tsx index 94790e4..db592e2 100644 --- a/src/pages/AuthPage/SigninPage.tsx +++ b/src/pages/AuthPage/SigninPage.tsx @@ -3,13 +3,12 @@ import { useState, useEffect } from "react"; import { AxiosError } from "axios"; import { useNavigate, Link } from "react-router-dom"; -import Logo from "../../assets/landing/logo-white.svg?react"; +import Logo from "../../assets/logo/thejulge.svg?react"; import Spinner from "./components/Spinner"; import { useAuthForm } from "./hooks/useAuthForm"; import { postAuthentication } from "@/apis/services/authenticationService"; -import LandingImage from "@/assets/landing/landing-img.webp"; import Button from "@/components/Button"; import TextField from "@/components/TextField"; import { ROUTES } from "@/constants/router"; @@ -36,8 +35,7 @@ export default function SigninPage() { } }, [user, navigate]); - const handleSubmit = async (e: React.FormEvent) => { - e.preventDefault(); + const handleSubmit = async () => { if (isSubmitting) return; setIsSubmitting(true); @@ -99,78 +97,60 @@ export default function SigninPage() { }; return ( -
-
- - +
+ + + + +
{ + e.preventDefault(); + if (isFormValid) { + handleSubmit(); + } + }} + > + + + + + + + +

+ 회원이 아니신가요?{" "} + + 회원가입하기 -

- -
-
-

- 더 나은 - 조건, -
- 더 나은 선택 -

-

- 당신에게{" "} - 더 - 줄게요. -

- LandingImage -
- -
-
-
- - - - -

- 아직 계정이 없으신가요?{" "} - - 회원가입 - -

-
-
-
-
+

+
); } diff --git a/src/pages/AuthPage/SignupPage.tsx b/src/pages/AuthPage/SignupPage.tsx index 967c58a..9f34e09 100644 --- a/src/pages/AuthPage/SignupPage.tsx +++ b/src/pages/AuthPage/SignupPage.tsx @@ -5,13 +5,12 @@ import clsx from "clsx"; import { useNavigate, Link } from "react-router-dom"; import IconCheck from "../../assets/icon/check.svg?react"; -import Logo from "../../assets/landing/logo-white.svg?react"; +import Logo from "../../assets/logo/thejulge.svg?react"; import Spinner from "./components/Spinner"; import { useAuthForm } from "./hooks/useAuthForm"; import { postUser } from "@/apis/services/userService"; -import LandingImage from "@/assets/landing/landing-img.webp"; import Button from "@/components/Button"; import TextField from "@/components/TextField"; import { ROUTES } from "@/constants/router"; @@ -35,7 +34,6 @@ export default function SignupPage() { const [isSubmitting, setIsSubmitting] = useState(false); useEffect(() => { - if (!user || location.pathname === ROUTES.AUTH.SIGNUP) return; if (user) { if (user.type === "employer") { navigate(ROUTES.SHOP.ROOT); @@ -103,175 +101,141 @@ export default function SignupPage() { }; return ( -
-
- - - -
-
-
-

- 더 나은 - 조건, -
- 더 나은 선택 -

-

- 당신에게{" "} - 더 - 줄게요. -

- LandingImage -
-
-
-
{ - e.preventDefault(); - handleSubmit(); +
+ + + + + { + e.preventDefault(); + handleSubmit(); + }} + > + + + + + + +
+ + 회원 유형 + +
+ - - -
-
- - - - -

- 이미 가입하셨나요?{" "} - + )} +

+ 알바님 + + +
-
-
-
+ + + + + +

+ 이미 가입하셨나요?{" "} + + 로그인하기 + +

+ ); }