From d50edc0fdd02251f7cc170dfb9f44df386924964 Mon Sep 17 00:00:00 2001 From: minseokiim Date: Mon, 29 Jan 2024 02:57:11 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix:=20=EC=98=A4=ED=83=80=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EB=A6=AC=EB=93=9C=EB=AF=B8=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 169 +++++------------- components/detail/ReservationDetail/index.tsx | 4 +- components/order/complete/detail/index.tsx | 18 +- types/detail/types.ts | 2 +- 4 files changed, 53 insertions(+), 140 deletions(-) diff --git a/README.md b/README.md index 22074999..c622fb16 100644 --- a/README.md +++ b/README.md @@ -1,147 +1,66 @@ -This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app). +# -## Getting Started +(프로젝트 설명?) +
-First, run the development server: +### ☘️ 배포 사이트 +https://dev.dhlbrqe2v28e4.amplifyapp.com/home +
-```bash -npm run dev -# or -yarn dev -# or -pnpm dev -# or -bun dev -``` -Open [http://localhost:3000](http://localhost:3000) with your browser to see the result. +### 개발 기간 +2023.12.26 - 2024.01.29 -You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file. +
-This project uses [`next/font`](https://nextjs.org/docs/basic-features/font-optimization) to automatically optimize and load Inter, a custom Google Font. +## 🎞️ 시연 영상 +(링크) +
-## Learn More +## ✨ 팀원 +| | | | | | | +| :-----------------------------------------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------: | :-----------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------: |:------------------------------------------------------------------------------------------------------------: | +| **FE_김민섭 (팀장)** | **FE_김민서** | **FE_김지민** | **FE_박수연** | **FE_박준규** | **FE_이승연** | +| 민섭님 | **회원가입 / 로그인**
-회원가입시 유효성 검사
- 이메일/닉네임 중복 체크
- 토큰 관리

**마이페이지**
- 유저 정보 조회 및 닉네임 수정
- 계좌 등록/수정/삭제
- 예치금 내역 조회/출금
- 찜 목록 조회 및 찜 삭제
- 구매 목록 조회 및 구매 상세내역 조회
- 판매내역(게시중/게시만료) 조회 및 삭제
- 게시만료 타입에 따라 상태 구분
- 리뷰 등록/수정/삭제/조회 | **판매페이지**
- 판매 가능한 숙박권 조회
- 판매할 상품 가격 및 종료날짜, 캐치특가 여부 및 종료날짜 및 가격, 판매자한마디 설정 및 등록
판매한 상품 수정/삭제

**메인 페이지**
- 캐치특가 상품 및 리뷰 조회

**캐치특가 페이지**
- 캐치특가 상품 조회
-무한 스크롤 기능
-지역, 드롭다운 필터를 사용한 세분화 조회

**리뷰 페이지**
- 무한 스크롤 기능

**공동 컴포넌트**
- 모달 구현 | **구매 페이지**
- 상품 정보 조회
- 이용자 정보 등록
- 결제 수단 설정

**결제 완료 페이지**
- 상품 정보 / 예약 정보 조회

**검색 결과 페이지**
- 필터링, 무한스크롤 기반 한 상품 리스트 조회
- 지도에서 상품 위치, 상품 정보 조회

**공동 컴포넌트**
- 상단 app bar / 하단 nav bar 구현 | **상세검색 페이지**
- 지역선택 및 숙소유형 버튼 필터 구현
- 범위선택 달력 및 인원 수 선택 카운터 구현

**체크인 마감임박(메인 & 페이지)**
- 일주일 조회 및 선택 가능한 달력 구현
- 지역선택 필터 재사용 및 적용
- 상품 무한 스크롤 구현

**상품 상세페이지**
- 상품 이미지 스와이퍼(캐러셀) 구현
-찜하기 기능 구현

**공동 컴포넌트**
- 버튼 구현 (슬라이드, 체크박스, 찜버튼)
- ToastAlert 구현 및 커스텀 훅 추가 구현
- 상품 공동 컴포넌트 구현
- 단일선택 및 범위선택 달력 구현
- 검색 필터 공동 컴포넌트화 | **채팅**
- 실시간 채팅을 위한 웹소켓 연결
- 구매자/판매자간 채팅방 생성 기능 구현
- 채팅 주고 받기 기능 구현
- 네고하기 및 네고 가격 결제 기능 구현 | +
+
-To learn more about Next.js, take a look at the following resources: -- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API. -- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial. +
-You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome! +## 💡 기능 소개 +(설명추가) -## Deploy on Vercel -The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js. +## ⚒️ 기술 스택 -Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details. +### SKILL & UI + -# PACKAGE MANAGER +### CLOUD & SOCKET + -| BADGE | BADGE-URL | -| :-------------------------------------------------------------------------------------------------------------------------------- | :----------------------------------------------------------------------------------- | -| [![npm](https://img.shields.io/badge/npm-cb3837?style=for-the-badge&logo=npm&logoColor=white)](https://www.npmjs.com/package/npm) | https://img.shields.io/badge/npm-cb3837?style=for-the-badge&logo=npm&logoColor=white | +### VALIDATION & UTILITY + -# SKILL +### LINT + -| BADGE | BADGE-URL | -| :--------------------------------------------------------------------------------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------------- | -| [![Next.js](https://img.shields.io/badge/Next.js-000?logo=nextdotjs&logoColor=fff&style=for-the-badge)](https://www.npmjs.com/package/next) | https://img.shields.io/badge/Next.js-000?logo=nextdotjs&logoColor=fff&style=for-the-badge | -| [![typescript](https://img.shields.io/badge/TypeScript-007ACC?style=for-the-badge&logo=typescript&logoColor=white)](https://www.typescriptlang.org/) | https://img.shields.io/badge/TypeScript-007ACC?style=for-the-badge&logo=typescript&logoColor=white | +### TEST + -# UI +### SERVER & CLIENT STATE MANAGEMENT + -| BADGE | BADGE-URL | -| :---------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :--------------------------------------------------------------------------------------------------------- | -| [![tailwindcss](https://img.shields.io/badge/Tailwind%20CSS-06B6D4?style=for-the-badge&logo=Tailwind%20CSS&logoColor=white)](https://tailwindcss.com/docs/installation) | https://img.shields.io/badge/Tailwind%20CSS-06B6D4?style=for-the-badge&logo=Tailwind%20CSS&logoColor=white | -| [![Material-ui](https://img.shields.io/badge/MUI-007fff?style=for-the-badge&logo=MUI&logoColor=white)](https://mui.com/material-ui/) | https://img.shields.io/badge/MUI-007fff?style=for-the-badge&logo=MUI&logoColor=white | +### SCROLL & ANIMATION + -# IDE +### DATE + -| BADGE | BADGE-URL | -| :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------------------------------------- | -| [![Visual Studio Code](https://img.shields.io/badge/Visual%20Studio%20COde-007acc?style=for-the-badge&logo=visual%20Studio%20COde&logoColor=white)](https://code.visualstudio.com/) | https://img.shields.io/badge/Visual%20Studio%20COde-007acc?style=for-the-badge&logo=visual%20Studio%20COde&logoColor=white | +### IDE & OTHERS + -# CLOUD - -| BADGE | BADGE-URL | -| :--------------------------------------------------------------------------------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------------- | -| [![amplify](https://img.shields.io/badge/amplify-ff9900?style=for-the-badge&logo=aws%20amplify&logoColor=white)](https://aws.amazon.com/ko/amplify/) | https://img.shields.io/badge/amplify-ff9900?style=for-the-badge&logo=aws%20amplify&logoColor=white | - -# BUILD - -| BADGE | BADGE-URL | -| :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | :------------------------------------------------------------------------------------------------------- | -| [![Create Next App](https://img.shields.io/badge/Create%20Next%20App-000000?style=for-the-badge&logo=Next.js&logoColor=white)](https://nextjs.org/docs/pages/api-reference/create-next-app) | https://img.shields.io/badge/Create%20Next%20App-000000?style=for-the-badge&logo=Next.js&logoColor=white | - -# VALIDATION - -| BADGE | BADGE-URL | -| :-------------------------------------------------------------------------------------------------------------------------------- | :----------------------------------------------------------------------------------- | -| [![zod](https://img.shields.io/badge/zod-3e67b1?style=for-the-badge&logo=Zod&logoColor=white)](https://www.npmjs.com/package/zod) | https://img.shields.io/badge/zod-3e67b1?style=for-the-badge&logo=Zod&logoColor=white | - -# UTILITY - -| BADGE | BADGE-URL | -| :-------------------------------------------------------------------------------------------------------------------------------------------- | :----------------------------------------------------------------------------------------- | -| [![lodash](https://img.shields.io/badge/lodash-3492ff?style=for-the-badge&logo=lodash&logoColor=white)](https://www.npmjs.com/package/lodash) | https://img.shields.io/badge/lodash-3492ff?style=for-the-badge&logo=lodash&logoColor=white | - -# TEST - -| BADGE | BADGE-URL | -| :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | :----------------------------------------------------------------------------------------------------------- | -| [![jest](https://img.shields.io/badge/jest-c21325?style=for-the-badge&logo=jest&logoColor=white)](https://jestjs.io/) | https://img.shields.io/badge/jest-c21325?style=for-the-badge&logo=jest&logoColor=white | -| [![React Testing Library](https://img.shields.io/badge/testing%20library-323330?style=for-the-badge&logo=testing-library&logoColor=red)](https://testing-library.com/docs/react-testing-library/intro/) | https://img.shields.io/badge/testing%20library-323330?style=for-the-badge&logo=testing-library&logoColor=red | -| [![playwright](https://img.shields.io/badge/playwright-2EAD33?style=for-the-badge&logo=playwright&logoColor=white)](https://playwright.dev/) | https://img.shields.io/badge/playwright-2EAD33?style=for-the-badge&logo=playwright&logoColor=white | - -# SOCKET - -| BADGE | BADGE-URL | -| :--------------------------------------------------------------------------------------------------------------------------------------------------- | :--------------------------------------------------------------------------------------- | -| [![SockJS](https://img.shields.io/badge/sockjs-000000?style=for-the-badge&logo=npm&logoColor=white)](https://www.npmjs.com/package/sockjs) | https://img.shields.io/badge/sockjs-000000?style=for-the-badge&logo=npm&logoColor=white | -| [![stompjs](https://img.shields.io/badge/stompjs-0366D6?style=for-the-badge&logo=npm&logoColor=white)](https://www.npmjs.com/package/@stomp/stompjs) | https://img.shields.io/badge/stompjs-0366D6?style=for-the-badge&logo=npm&logoColor=white | - -# SERVER STATE MANAGEMENT - -| BADGE | BADGE-URL | -| :------------------------------------------------------------------------------------------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------------------- | -| [![react-query](https://img.shields.io/badge/React%20Query-ff4154?style=for-the-badge&logo=React%20Query&logoColor=white)](https://tanstack.com/query/latest/) | https://img.shields.io/badge/React%20Query-ff4154?style=for-the-badge&logo=React%20Query&logoColor=white | -| [![axios](https://img.shields.io/badge/axios-5a29e4?style=for-the-badge&logo=axios&logoColor=white)](https://www.npmjs.com/package/axios) | https://img.shields.io/badge/axios-5a29e4?style=for-the-badge&logo=axios&logoColor=white | - -# SCROLL - -| BADGE | BADGE-URL | -| :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :--------------------------------------------------------------------------------------------------------------------- | -| [![react-infinite-scroll-component](https://img.shields.io/badge/react%20infinite%20scroll%20component-E3FF73?style=for-the-badge&logo=npm&logoColor=white)](https://www.npmjs.com/package/react-infinite-scroll-component) | https://img.shields.io/badge/react%20infinite%20scroll%20component-E3FF73?style=for-the-badge&logo=npm&logoColor=white | - -# LINT - -| BADGE | BADGE-URL | -| :----------------------------------------------------------------------------------------------------------------------------------------------------- | :---------------------------------------------------------------------------------------------- | -| [![eslint](https://img.shields.io/badge/eslint-3A33D1?style=for-the-badge&logo=eslint&logoColor=white)](https://www.npmjs.com/package/eslint) | https://img.shields.io/badge/eslint-3A33D1?style=for-the-badge&logo=eslint&logoColor=white | -| [![prettier](https://img.shields.io/badge/prettier-1A2C34?style=for-the-badge&logo=prettier&logoColor=F7BA3E)](https://www.npmjs.com/package/prettier) | https://img.shields.io/badge/prettier-1A2C34?style=for-the-badge&logo=prettier&logoColor=F7BA3E | -| [![husky](https://img.shields.io/badge/husky-9A6946?style=for-the-badge&logo=npm&logoColor=white)](https://www.npmjs.com/package/husky) | https://img.shields.io/badge/husky-9A6946?style=for-the-badge&logo=npm&logoColor=white | - -# FORM - -| BADGE | BADGE-URL | -| :----------------------------------------------------------------------------------------------------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------------------------------- | -| [![React Hook Form](https://img.shields.io/badge/React%20Hook%20Form-ff4154?style=for-the-badge&logo=React%20Hook%20Form&logoColor=white)](https://react-hook-form.com/) | https://img.shields.io/badge/React%20Hook%20Form-ff4154?style=for-the-badge&logo=React%20Hook%20Form&logoColor=white | - -# DATE - -| BADGE | BADGE-URL | -| :-------------------------------------------------------------------------------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------- | -| [![moment](https://img.shields.io/badge/momnet-61B2A7?style=for-the-badge&logo=npm&logoColor=white)](https://momentjs.com/) | https://img.shields.io/badge/momnet-61B2A7?style=for-the-badge&logo=npm&logoColor=white | -| [![date-fns](https://img.shields.io/badge/datefns-770C56?style=for-the-badge&logo=datefns&logoColor=white)](https://www.npmjs.com/package/date-fns) | https://img.shields.io/badge/datefns-770C56?style=for-the-badge&logo=datefns&logoColor=white | - -# CLIENT STATE MANAGEMENT - -| BADGE | BADGE-URL | -| :---------------------------------------------------------------------------------------------------------------------------------------------------------------- | :---------------------------------------------------------------------------------------- | -| [![recoil](https://img.shields.io/badge/Recoil-3578E5?style=for-the-badge&logo=redux&logoColor=white)](https://recoiljs.org/ko/docs/introduction/getting-started) | https://img.shields.io/badge/Recoil-3578E5?style=for-the-badge&logo=redux&logoColor=white | - -# ANIMATION - -| BADGE | BADGE-URL | -| :------------------------------------------------------------------------------------------------------------------------------------------------------ | :-------------------------------------------------------------------------------------------------- | -| [![framer-motion](https://img.shields.io/badge/framer%20motion-0055FF?style=for-the-badge&logo=framer&logoColor=white)](https://www.framer.com/motion/) | https://img.shields.io/badge/framer%20motion-0055FF?style=for-the-badge&logo=framer&logoColor=white | + +
+
\ No newline at end of file diff --git a/components/detail/ReservationDetail/index.tsx b/components/detail/ReservationDetail/index.tsx index 7a2d68d5..37191af6 100644 --- a/components/detail/ReservationDetail/index.tsx +++ b/components/detail/ReservationDetail/index.tsx @@ -10,7 +10,7 @@ const ReservationDetail = ({ commission, totalPrice, paymentMethod, - nikName, + nickName, }: ReservationDetailProps) => { return ( <> @@ -68,7 +68,7 @@ const ReservationDetail = ({

판매자

-

{nikName}

+

{nickName}

diff --git a/components/order/complete/detail/index.tsx b/components/order/complete/detail/index.tsx index e37b7b4f..9a4168d2 100644 --- a/components/order/complete/detail/index.tsx +++ b/components/order/complete/detail/index.tsx @@ -4,12 +4,10 @@ import React from 'react'; import ReservationSummary from '@/components/detail/ReservationSummary'; import ReservationDetail from '@/components/detail/ReservationDetail'; import { useQueryGetPurchaseDetail } from '@/api/mypage/query'; -import { useRecoilValue } from 'recoil'; -import { negoPriceSelector } from '@/atoms/chat/chatContentAtom'; const OrderDetail = ({ id }: { id: number }) => { - const negoPrice = useRecoilValue(negoPriceSelector); const { data } = useQueryGetPurchaseDetail(id); + console.log(data); const commission = data?.sellPrice.sellPrice * 0.05; const bookingDetails = { @@ -35,20 +33,16 @@ const OrderDetail = ({ id }: { id: number }) => { transportation={data?.accommodation.transportation} checkIn={data?.accommodation.checkIn} checkOut={data?.accommodation.checkOut} - sellPrice={negoPrice ? negoPrice.sellPrice : data?.sellPrice.sellPrice} + sellPrice={data?.sellPrice.sellPrice} /> ); diff --git a/types/detail/types.ts b/types/detail/types.ts index 31278ac2..31b951a5 100644 --- a/types/detail/types.ts +++ b/types/detail/types.ts @@ -11,5 +11,5 @@ export type ReservationDetailProps = { paymentMethod: string; sellPrice: number; commission: number; - nikName: string; + nickName: string; };