Merge branch 'main' of https://github.com/SCBJ-7/SCBJ-FE into feature/#…

…342-refactor-search

package.json

@@ -37,7 +37,7 @@
     "react-hook-form": "^7.49.3",
     "react-icons": "^4.12.0",
     "react-modal": "^3.16.1",
-    "react-router-dom": "^6.21.1",
+    "react-router-dom": "^6.22.3",
     "react-snap": "^1.23.0",
     "react-window": "^1.8.10",
     "styled-components": "^6.1.6",

src/apis/axiosInstance.ts

@@ -7,14 +7,15 @@ import {
   STATUS_CODE,
 } from "@constants/api";
 import { PATH } from "@constants/path";
+import axios from "axios";
+
+import { fetchNewToken } from "./fetchNewToken";
+
 import type {
   AxiosError,
   AxiosRequestConfig,
   InternalAxiosRequestConfig,
 } from "axios";
-import axios from "axios";
-
-import { fetchNewToken } from "./fetchNewToken";
 
 export const axiosInstance = axios.create({
   baseURL: BASE_URL,

src/apis/fetchLogin.ts

@@ -1,8 +1,9 @@
-import { BASE_URL, END_POINTS } from "@/constants/api";
+import axios from "axios";
 
 import type { EmailValidateData, LoginData } from "@type/login";
 import type { ResponseData } from "@type/responseType";
-import axios from "axios";
+
+import { BASE_URL, END_POINTS } from "@/constants/api";
 
 interface LoginProps {
   email: string;

src/constants/api.ts

@@ -5,6 +5,7 @@ export const END_POINTS = {
   LOGOUT: "/v1/members/logout",
   SIGNUP: "/v1/members/signup",
   ALARM: "/v1/alarms",
+  PASSWORD: "/v1/members/password",
   HASALARM: "/v1/alarms/status",
   ROOM: (productId: string) => `/v1/products/${productId}`,
   RESERVATION: "/v1/reservations",

src/mocks/handler.ts

@@ -48,8 +48,7 @@ export const handlers = [
     warning 없애기용.
     cdn에 폰트 요청하는걸 가로채지 못했다고 warning 띄우길래 적용했습니다.
   */
-  http.get("*", (req) => {
-    console.log(req);
+  http.get("*", () => {
     return;
   }),
 ];

src/mocks/handlers/email.ts

@@ -1,8 +1,8 @@
-import { END_POINTS } from "@constants/api";
+import { BASE_URL, END_POINTS } from "@constants/api";
 import { http, HttpResponse } from "msw";
 
 export const getEmailVerification = (scenarioProps?: string) => {
-  return http.post(`https://3.34.147.187.nip.io${END_POINTS.EMAIL}`, () => {
+  return http.post(`${BASE_URL}${END_POINTS.EMAIL}`, () => {
     const pageParams = new URLSearchParams(window.location.search);
     const scenario = pageParams.get("scenario");
 

src/pages/passwordResetPage/components/passwordResetSubmitBtn.tsx/PasswordResetSubmitBtn.tsx

@@ -4,6 +4,8 @@ import { useNavigate } from "react-router-dom";
 
 import * as S from "../../PasswordReset.style";
 
+import { BASE_URL, END_POINTS } from "@/constants/api";
+
 const PasswordResetSubmitBtn = () => {
   const navigate = useNavigate();
   const {
@@ -15,7 +17,7 @@ const PasswordResetSubmitBtn = () => {
   const handleOnSubmit = async () => {
     const data = getValues(["email", "password"]);
     await axios
-      .patch("https://3.34.147.187.nip.io/v1/members/password", {
+      .patch(`${BASE_URL}${END_POINTS.PASSWORD}`, {
         email: data[0],
         password: data[1],
       })

src/pages/signUpPage/components/signUpSubmitBtn/SignUpSubmitBtn.tsx

@@ -4,6 +4,8 @@ import { useNavigate } from "react-router-dom";
 
 import * as S from "../../SignUp.style";
 
+import { BASE_URL, END_POINTS } from "@/constants/api";
+
 const SignUpSubmitBtn = () => {
   const navigate = useNavigate();
 
@@ -23,7 +25,7 @@ const SignUpSubmitBtn = () => {
       "term2",
     ]);
     await axios
-      .post("https://3.34.147.187.nip.io/v1/members/signup", {
+      .post(`${BASE_URL}${END_POINTS.SIGNUP}`, {
         email: data[0],
         password: data[1],
         name: data[2],

src/pages/transferWritingPricePage/inputSection/InputSection.style.ts

@@ -25,6 +25,7 @@ export const Input = styled(motion.input)`
   box-shadow: 4px 4px 10px 0 rgba(0, 0, 0, 0.04);
 
   text-align: center;
+  /* padding-right: 40px; */
   transition: 0.2s;
 
   &::placeholder {

tests/e2eTests/models/SignupPage.ts

@@ -1,5 +1,7 @@
 import { Page } from "@playwright/test";
 
+import { BASE_URL, END_POINTS } from "@/constants/api";
+
 export class Signup {
   page: Page;
 
@@ -56,7 +58,7 @@ export class Signup {
 
     const response = await this.page.waitForResponse(
       (response) =>
-        response.url() === "https://3.34.147.187.nip.io/v1/members/email" &&
+        response.url() === `${BASE_URL}${END_POINTS.EMAIL}` &&
         response.status() === 200,
     );