From 57699d07cfc3da68fdd8bee0c9d817c2aaa9845a Mon Sep 17 00:00:00 2001 From: deokisys Date: Wed, 18 Dec 2019 14:53:33 +0900 Subject: [PATCH 01/19] Fix category notify box MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 알림창 크기 조절 --- .../components/Organism/CategoryBar/ExpandList/index.jsx | 8 ++------ client/src/components/Organism/CategoryBar/index.jsx | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/client/src/components/Organism/CategoryBar/ExpandList/index.jsx b/client/src/components/Organism/CategoryBar/ExpandList/index.jsx index bc99b75f..c6d93cba 100644 --- a/client/src/components/Organism/CategoryBar/ExpandList/index.jsx +++ b/client/src/components/Organism/CategoryBar/ExpandList/index.jsx @@ -7,7 +7,7 @@ import NotifyList from "../../../Molecules/NotifyList"; const Container = styled.div` display: flex; flex-direction: column; - width: ${props => (props.idx === "999" ? 20 : 15)}rem; + width: ${props => (props.idx === 999 ? "21" : "15")}rem; height: 100%; overflow-y: auto; background-color: var(--color-secondary-minus1); @@ -45,11 +45,7 @@ const Components = ({ idx, open, details, onClick }) => { ) : ( details.map((category, index) => ( - + diff --git a/client/src/components/Organism/CategoryBar/index.jsx b/client/src/components/Organism/CategoryBar/index.jsx index 5da9594d..63c7811f 100644 --- a/client/src/components/Organism/CategoryBar/index.jsx +++ b/client/src/components/Organism/CategoryBar/index.jsx @@ -31,7 +31,7 @@ const OriginWrapper = styled.div` const ListWrapper = styled.div` position: absolute; - width: ${props => (props.open ? (props.idx === "999" ? 20 : 15) : 0)}rem; + width: ${props => (props.open ? (props.idx === 999 ? "21" : "15") : 0)}rem; height: 100%; left: 5em; z-index: 999; @@ -186,11 +186,7 @@ const Components = () => { )} From 530fbc66b84e42e6730e86da2752a6dafe592c3e Mon Sep 17 00:00:00 2001 From: deokisys Date: Wed, 18 Dec 2019 14:57:17 +0900 Subject: [PATCH 02/19] Fix category error page, messenger text no break word MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 카테고리 에러페이지 수정, 메신저 텍스트 특수문자 자르기 수정 --- .../Container/ChatContainer/ChatMessage.jsx | 18 +++++++++--------- client/src/pages/CategoryItems/index.jsx | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/client/src/components/Messenger/Container/ChatContainer/ChatMessage.jsx b/client/src/components/Messenger/Container/ChatContainer/ChatMessage.jsx index 2202cb55..fb9ed3b8 100644 --- a/client/src/components/Messenger/Container/ChatContainer/ChatMessage.jsx +++ b/client/src/components/Messenger/Container/ChatContainer/ChatMessage.jsx @@ -1,6 +1,6 @@ -import styled from "styled-components" -import React from "react" -import { dateDiff2Str, sec2date } from "../../../../utils/converter" +import styled from "styled-components"; +import React from "react"; +import { dateDiff2Str, sec2date } from "../../../../utils/converter"; const Wrap = styled.div` width: 19rem; @@ -9,12 +9,12 @@ const Wrap = styled.div` justify-content: ${props => (props.isSend ? "flex-end" : "flex-end")}; padding: 0.25rem 0.25rem; margin: 0 0.5rem 0 0; -` +`; const MessageText = styled.span` display: inline-block; text-align: left; - word-break: break-all; + word-break: break-word; font-size: var(--font-size-xs); @@ -23,10 +23,10 @@ const MessageText = styled.span` border: solid 0.1rem; border-color: ${props => (props.isSend ? "var(--color-primary-minus0)" : "var(--color-primary)")}; border-radius: 1rem; -` +`; const TimeText = styled.div` font-size: var(--font-size-xxs); -` +`; function ChatMessage(props) { return ( @@ -34,7 +34,7 @@ function ChatMessage(props) { {dateDiff2Str(sec2date(props.Time))} {props.Text} - ) + ); } -export default ChatMessage +export default ChatMessage; diff --git a/client/src/pages/CategoryItems/index.jsx b/client/src/pages/CategoryItems/index.jsx index 70ed3d31..dee877e3 100644 --- a/client/src/pages/CategoryItems/index.jsx +++ b/client/src/pages/CategoryItems/index.jsx @@ -52,7 +52,7 @@ const CategoryItems = ({ match }) => { return ( <> - {title.length ? ( + {title && title.length ? ( From c4b3687c8e508c77ae5581b7ff45f4d08ead30f4 Mon Sep 17 00:00:00 2001 From: deokisys Date: Wed, 18 Dec 2019 16:27:32 +0900 Subject: [PATCH 03/19] Fix tradelist not found MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 거래내역 ui 수정 --- client/src/pages/TradeList/index.jsx | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/client/src/pages/TradeList/index.jsx b/client/src/pages/TradeList/index.jsx index fe58c7d7..c1969392 100644 --- a/client/src/pages/TradeList/index.jsx +++ b/client/src/pages/TradeList/index.jsx @@ -10,6 +10,7 @@ import userContext from "../../context/UserContext"; import apiConfig from "../../config/api"; import pathConfig from "../../config/path"; +import NotFoundImage from "../../assets/notFound.png"; const { apiUrl } = apiConfig; const { logfilter } = pathConfig; @@ -60,6 +61,15 @@ const PageButton = styled.button` color: ${props => (props.currentPage === props.buttonNumber ? "var(--color-primary)" : "black")}; font-size: ${props => (props.currentPage === props.buttonNumber ? "var(--font-size-lg)" : "")}; `; + +const NotFoundDiv = styled.div` + width: 100%; + height: 100%; + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; +`; function TradeList() { const [data, setData] = useState([]); const [isSale, setIsSale] = useState(true); @@ -182,19 +192,18 @@ function TradeList() { /> - {data.map(value => ( - - ))} - {/* getData(isSale, isBuy, dayago, page)} - drawer={drawer} - /> */} + {data.length ? ( + data.map(value => ) + ) : ( + + {"Not + 검색 기록이 없습니다. + + )}