Skip to content

Commit

Permalink
Yuhyun (#45)
Browse files Browse the repository at this point in the history
* feat: 리뷰 조회 기능

* work

* feat : add image change

* feat: 리뷰 등록 기능 (+별점)

* work

* fix : text change

* conflict 해결

* feat : connect togglelike api

* feat : add refetch

* feat: 리뷰 삭제 진행 중

* feat : work

* feat : image delete add

* feat: 리뷰 삭제

* feat: 호텔 정보 추가

* feat: 리뷰 조회 테스트 페이지 생성

* work

* work

* fix: 리뷰 등록, 조회 페이지 변경

* conflict 해결

* .

* feat : 리뷰 등록 완료 시 호텔 상세 페이지로 이동

* feat: 리뷰 수정 진행 중

* feat: 리뷰 수정

* feat: 리뷰 수정폼 수정(+ 별점)

* design: 리뷰 디자인 수정

* design: 리뷰 목록, 등록폼 디자인 수정

* work

* feat: 로그인 한 사용자만 리뷰 등록

* feat: 리뷰 작성자만 수정, 삭제 가능

* feat: 리뷰 등록, 수정일 표시

* feat: 전체 리뷰 평균 평점 추가

* work

* feat: 리뷰  정렬 방식 추가

* .

* feat : add myreview

* fix: 전체 리뷰 닫기 버튼 오류 수정

* fix: 리뷰 수정 후 페이지 새로고침

* .

* .

* feat : add map

* delete useless code

* 네이버 지역검색 API로 행사 검색

* WIP: NearbyAmenitiesMap component update

* del: clustering.js

* .

* WIP: map

* com

* 행사 마커 추가

* .

* 행사 수정

---------

Co-authored-by: git990412 <[email protected]>
Co-authored-by: git990412 <[email protected]>
Co-authored-by: kyumho kim <[email protected]>
  • Loading branch information
4 people authored Mar 21, 2024
1 parent 7c2bd93 commit ca7e5cc
Show file tree
Hide file tree
Showing 11 changed files with 879 additions and 503 deletions.
14 changes: 7 additions & 7 deletions next.config.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/** @type {import('next').NextConfig} */
const nextConfig = {
images: {
domains: [
'kr.object.ncloudstorage.com',
'blog.kakaocdn.net',
'www.lottehotel.com',
],
},
images: {
domains: [
'kr.object.ncloudstorage.com',
'blog.kakaocdn.net',
'www.lottehotel.com',
],
},
}

module.exports = nextConfig
156 changes: 42 additions & 114 deletions package-lock.json

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,6 @@
"eslint-config-next": "^14.1.0",
"postcss": "^8",
"tailwindcss": "^3.3.0"
}
},
"proxy": "https://openapi.naver.com"
}
91 changes: 46 additions & 45 deletions src/app/layout.js
Original file line number Diff line number Diff line change
@@ -1,61 +1,62 @@
import "@/styles/globals.css";
import TanstackProvider from "@/context/TanstackProvider";
import RecoilProvider from "@/context/RecoilProvider";
import { ToastContainer } from "react-toastify";
import {ToastContainer} from "react-toastify";
import Navbar from "@/components/NavBar";
import Footer from "@/components/ui/Footer";
import { Providers } from "@/app/providers";
import {Providers} from "@/app/providers";
import Script from "next/script";
import "react-toastify/dist/ReactToastify.css";

export const metadata = {
title: {
default: "HOTSHARE",
template: "%s | HOTSHARE",
},
description: "home",
title: {
default: "HOTSHARE",
template: "%s | HOTSHARE",
},
description: "home",
};

export default function RootLayout({ children }) {
return (
<html lang="ko">
<head>
<link
rel="icon"
type="image/png"
sizes="128x128"
href="/hotshare_icon.png"
/>
</head>
<body className="font-jalnan w-full h-screen overflow-auto flex flex-col justify-between">
export default function RootLayout({children}) {
return (
<html lang="ko">
<head>
<link
rel="icon"
type="image/png"
sizes="128x128"
href="/hotshare_icon.png"
/>
</head>
<body className="font-jalnan w-full h-screen overflow-auto flex flex-col justify-between">
<Script
strategy="beforeInteractive"
src={`https://openapi.map.naver.com/openapi/v3/maps.js?ncpClientId=${process.env.NEXT_PUBLIC_NAVER_MAP_CLIENT_ID}&submodules=geocoder`}
strategy="beforeInteractive"
src={`https://openapi.map.naver.com/openapi/v3/maps.js?ncpClientId=${process.env.NEXT_PUBLIC_NAVER_MAP_CLIENT_ID}&submodules=geocoder`}
/>
<Providers>
<ToastContainer
position="top-center"
autoClose={2000}
pauseOnHover={false}
pauseOnFocusLoss={false}
/>
<RecoilProvider>
<TanstackProvider>
<header className="fixed top-0 w-full mx-auto bg-white dark:border-slate-600/40 z-[999] dark:bg-base-100">
<div className="max-w-screen-xl mx-auto">
<Navbar />
</div>
<hr />
</header>
<main className="w-full h-auto order-1 max-w-screen-xl mx-auto mt-[72px]">
{children}
</main>
<Footer />
<div id="portal"></div>
</TanstackProvider>
</RecoilProvider>
<ToastContainer
position="top-center"
autoClose={2000}
pauseOnHover={false}
pauseOnFocusLoss={false}
/>
<RecoilProvider>
<TanstackProvider>
<header
className="fixed top-0 w-full mx-auto bg-white dark:border-slate-600/40 z-[999] dark:bg-base-100">
<div className="max-w-screen-xl mx-auto">
<Navbar/>
</div>
<hr/>
</header>
<main className="w-full h-auto order-1 max-w-screen-xl mx-auto mt-[72px]">
{children}
</main>
<Footer/>
<div id="portal"></div>
</TanstackProvider>
</RecoilProvider>
</Providers>
</body>
</html>
);
</body>
</html>
);
}
7 changes: 4 additions & 3 deletions src/app/providers.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
'use client'

import { NextUIProvider } from '@nextui-org/react'
import {NextUIProvider} from '@nextui-org/react'

export function Providers({ children }) {
return <NextUIProvider>{children}</NextUIProvider>
export function Providers({children}) {
return (
<NextUIProvider>{children}</NextUIProvider>)
}
Loading

0 comments on commit ca7e5cc

Please sign in to comment.