diff --git a/public/admin.png b/public/admin.png new file mode 100644 index 0000000..1b9cc07 Binary files /dev/null and b/public/admin.png differ diff --git a/public/logo.png b/public/logo.png new file mode 100644 index 0000000..0047ca2 Binary files /dev/null and b/public/logo.png differ diff --git a/public/logo_black.png b/public/logo_black.png new file mode 100644 index 0000000..5c25f24 Binary files /dev/null and b/public/logo_black.png differ diff --git a/public/logo_maincolor.png b/public/logo_maincolor.png new file mode 100644 index 0000000..7e55670 Binary files /dev/null and b/public/logo_maincolor.png differ diff --git a/src/components/business/Chat/ChatList.jsx b/src/components/business/Chat/ChatList.jsx index f7c66ad..6c4fce5 100644 --- a/src/components/business/Chat/ChatList.jsx +++ b/src/components/business/Chat/ChatList.jsx @@ -1,5 +1,7 @@ import React, {useEffect, useState} from 'react'; import '../../common/Chat/ChatApp.css'; +import Button from "../../common/Button/Button"; +import FormattedTime from "../../common/Chat/FormattedTime"; /** * 채팅 리스트 컴포넌트 @@ -42,23 +44,42 @@ const ChatList = ({api, onChatRoomClick, closeModal}) => { return (
-

대화

+

대화

{data && data.map((chatRoom, index) => ( -
handleChatRoomClick(chatRoom)}> -

{chatRoom[0]} {chatRoom[2]} {chatRoom[3]}{' '}

-
+
handleChatRoomClick(chatRoom)}> +
+ 기본 이미지 +
+

{chatRoom[2]}

+
+
+
+ +
))}
+
- +
+ diff --git a/src/components/business/FloatingButton/FloatingButton.css b/src/components/business/FloatingButton/FloatingButton.css index ed98fe7..a3882dc 100644 --- a/src/components/business/FloatingButton/FloatingButton.css +++ b/src/components/business/FloatingButton/FloatingButton.css @@ -21,13 +21,13 @@ .floating-button-modal { position: fixed; - top: calc(64%); /* 버튼 바로 위에 위치하도록 수정 */ + top: calc(50% - 10px); /* 버튼 바로 위에 위치하도록 수정 */ right: 20px; /* 화면 오른쪽에 위치하도록 수정 */ transform: translate(0, -50%); overflow: auto; outline: none; border-radius: 25px; - box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.1); + box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.4); background-color: #fff; /* 배경 색상 추가 */ /* 추가적인 스타일 설정 */ } diff --git a/src/components/business/FloatingButton/FloatingButton.jsx b/src/components/business/FloatingButton/FloatingButton.jsx index 89bd0f3..354c8bb 100644 --- a/src/components/business/FloatingButton/FloatingButton.jsx +++ b/src/components/business/FloatingButton/FloatingButton.jsx @@ -1,5 +1,5 @@ import React, {useState} from 'react'; -import './FloatingButton.css'; // 스타일 파일을 추가합니다. +import './FloatingButton.css'; import Modal from 'react-modal'; import ChatApi from "../../../api/chatApi"; import ChatRoom from "../../business/Chat/ChatRoom"; @@ -13,17 +13,14 @@ import ChatList from "../../business/Chat/ChatList"; */ const FloatingButton = () => { const [modalIsOpen, setModalIsOpen] = useState(false); - // const [buttonPosition, setButtonPosition] = useState({ top: 0, left: 0 }); const [selectedChatRoom, setSelectedChatRoom] = useState(null); const openModal = () => { const button = document.querySelector('.floating-button'); if (button) { const rect = button.getBoundingClientRect(); - // setButtonPosition({ top: rect.bottom + window.scrollY, left: rect.left + window.scrollX }); } setModalIsOpen(true); - document.body.style.overflow = 'hidden'; }; /** diff --git a/src/components/common/Chat/ChatApp.css b/src/components/common/Chat/ChatApp.css index 827a4dc..6a8009d 100644 --- a/src/components/common/Chat/ChatApp.css +++ b/src/components/common/Chat/ChatApp.css @@ -12,13 +12,13 @@ .content { padding: 20px; overflow-y: auto; + /*background-color: #f0f0f0;*/ } .bottom-nav { position: absolute; bottom: 0; width: 100%; - background-color: #f0f0f0; padding: 10px; } diff --git a/src/pages/administrator/adminPlanDetail.jsx b/src/pages/administrator/adminPlanDetail.jsx index af74bf9..74a7891 100644 --- a/src/pages/administrator/adminPlanDetail.jsx +++ b/src/pages/administrator/adminPlanDetail.jsx @@ -26,7 +26,7 @@ const AdminPlainDetail = () => { const handleWait = async () => { console.log(longPlanId); try { - alert("정말 입정 대기 시키실 건가요?") + alert("정말 입점 대기 시키실 건가요?") await AdminPlanApi.postWait(longPlanId); alert("입정 대기 완료되었습니다.") navigate("/admin/plan"); // 페이지 이동 diff --git a/src/pages/business/ad.jsx b/src/pages/business/ad.jsx index 083acab..3c1ec42 100644 --- a/src/pages/business/ad.jsx +++ b/src/pages/business/ad.jsx @@ -128,7 +128,7 @@ function convertAboutPost(setPrice, setPostType, setMainImage, setPosts, onChang data = response.data.data.popups.map(popup => { const createdDate = popup.pulledDate.split(" ")[0]; return { - id: popup.planId, + id: popup.popupId, title: popup.title, date: createdDate, }