Merge pull request #156 from gnims-project/dev

Upload/Main Merge #100

Author: AngelaChaejung

src/components/signup/Signup.jsx

@@ -42,8 +42,6 @@ const Signup = () => {
   const userPasswordRef = useRef();
   const PasswordCheckRef = useRef();
 
-  //이름, 이메일, 비밀번호, 닉네임 정규 표현식
-
   //아이디 비밀번호가 틀렸을시 문구
   const [regulation, SetRegulation] = useState({
     regulationName: "",
@@ -90,7 +88,7 @@ const Signup = () => {
   //이메일
   const emailValidationTest = (emailValidation) => {
     const emailRegulationExp =
-      /^[a-zA-Z0-9+-_.]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+$/;
+      /^[A-Za-z0-9_\.\-]+@[A-Za-z0-9\-]+\.[A-Za-z0-9\-]+/;
     if (emailRegulationExp.test(emailValidation.value)) {
       SetRegulation(() => ({
         ...regulation,
@@ -128,7 +126,7 @@ const Signup = () => {
 
   //비밀번호
   const passwordValidationTest = (passwordValidation) => {
-    const passwordRegulationExp = /^(?=.*[a-zA-Z])(?=.*\\d)[a-zA-Z\\d]{8,16}$/;
+    const passwordRegulationExp = /^(?=.*[a-zA-Z])(?=.*[0-9]).{8,16}$/;
     if (passwordRegulationExp.test(passwordValidation.value)) {
       SetRegulation(() => ({
         ...regulation,
@@ -590,6 +588,7 @@ const Signup = () => {
                     onChange={onValidity}
                     bgColor={style.bgColorPassword}
                     shadow={style.shadowPassword}
+                    maxLength={16}
                   />
                 </div>
                 <div className="flex items-center h-[40px]">
@@ -609,6 +608,7 @@ const Signup = () => {
                     ref={PasswordCheckRef}
                     bgColor={style.bgColorPasswordCheck}
                     shadow={style.shadowPasswordCheck}
+                    maxLength={16}
                   />
                 </div>
                 <div className="flex items-center h-[40px]">

src/shared/AxiosInstance.jsx

@@ -1,13 +1,8 @@
 import axios from "axios";
 
 export const instance = axios.create({
-  //로컬
-  //baseURL: "http://localhost:3001",
   //본서버
   baseURL: "https://eb.jxxhxxx.shop",
-  //민우님 개인서버
-  //baseURL: "http://hayangaeul.shop/auth/login",
-  // baseURL: "http://hayangaeul.shop",
 });
 
 //서버에 요청을 보내기 전
@@ -36,7 +31,15 @@ instance.interceptors.response.use(
       window.location.href = "/login";
       return;
     }
-
+    if (errMsg === 400) {
+      window.location.href = "/main";
+      return;
+    }
+    if (errMsg === 403) {
+      alert("팔로우한 사람들만 일정을 볼 수 있습니다.");
+      window.history.back(-1);
+      return;
+    }
     if (errMsg === 500) {
       window.location.href = "/500error";
       return;