From a5049d5e7279514c2d271e3d28f4e0d31eb69e77 Mon Sep 17 00:00:00 2001
From: Doyup Kim <103116643+doyupK@users.noreply.github.com>
Date: Mon, 18 Sep 2023 22:23:01 +0900
Subject: [PATCH 1/2] hotFix. editor css bug, add toolbar items (#207)
* fix. toast editor css bug & add editor toolbarItems
---
.../components/communityEditor.tsx | 17 ++++++++++-------
apps/web/src/styles/globalStyles.ts | 6 ++----
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/apps/web/src/components/community/communityForm/components/communityEditor.tsx b/apps/web/src/components/community/communityForm/components/communityEditor.tsx
index b6317bd3..f610aaad 100644
--- a/apps/web/src/components/community/communityForm/components/communityEditor.tsx
+++ b/apps/web/src/components/community/communityForm/components/communityEditor.tsx
@@ -1,6 +1,5 @@
import '@toast-ui/editor/dist/toastui-editor.css';
import '@toast-ui/editor/dist/i18n/ko-kr';
-
import { Editor } from '@toast-ui/react-editor';
import type { EditorProps } from '@toast-ui/react-editor';
import * as React from 'react';
@@ -14,6 +13,15 @@ interface CommunityEditorProps {
const CommunityEditor = (props: CommunityEditorProps) => {
const { editor, plugins, init } = props;
+ const toolbarItems = [
+ ['heading', 'bold', 'italic', 'strike'],
+ ['hr'],
+ ['ul', 'ol', 'task'],
+ ['table', 'link'],
+ ['image'],
+ ['code'],
+ ['scrollSync'],
+ ];
React.useEffect(() => {
if (init) init();
}, []);
@@ -27,12 +35,7 @@ const CommunityEditor = (props: CommunityEditorProps) => {
initialEditType="wysiwyg"
initialValue=" "
language="ko-KR"
- toolbarItems={[
- ['bold', 'strike'],
- ['hr'],
- ['image', 'link'],
- ['code', 'codeblock'],
- ]}
+ toolbarItems={toolbarItems}
plugins={plugins}
hideModeSwitch
/>
diff --git a/apps/web/src/styles/globalStyles.ts b/apps/web/src/styles/globalStyles.ts
index 2069c52b..91662166 100644
--- a/apps/web/src/styles/globalStyles.ts
+++ b/apps/web/src/styles/globalStyles.ts
@@ -31,13 +31,11 @@ const GlobalStyle = createGlobalStyle`
all: unset;
cursor: pointer;
}
-
- .toastui-editor-contents *{
+
+ .toastui-editor-contents {
display: flex;
flex-direction: column;
- justify-content: center;
align-items: center;
- align-content: center;
}
.toastui-editor-contents img{
From e1f362d81b9530a7c2c747a029f63573c7a98b97 Mon Sep 17 00:00:00 2001
From: Doyup Kim <103116643+doyupK@users.noreply.github.com>
Date: Thu, 21 Sep 2023 01:02:15 +0900
Subject: [PATCH 2/2] Develop (#209)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* fix: 최종 QA 리스트업 수정 (#196)
* feat: 매물 워터마크 추가
* fix: 마이페이지 판매 완료버튼 완료 이후 동작 X
* Bug fix.magazine banner fix (#198)
* fix. delete useMemo magazine banner
---------
Co-authored-by: Junseo <66871265+blan19@users.noreply.github.com>
* Bug fix.delete use client syntax (#200)
* fix. delete use client syntax
* Add.toast UI editor align (#202)
* fix : delete magazine useMemo (banner) (#199)
* Bug fix.magazine banner fix (#198)
* fix. delete useMemo magazine banner
---------
Co-authored-by: Junseo <66871265+blan19@users.noreply.github.com>
---------
Co-authored-by: Junseo <66871265+blan19@users.noreply.github.com>
* fix: delete use client syntax (#201)
* fix: 최종 QA 리스트업 수정 (#196)
* feat: 매물 워터마크 추가
* fix: 마이페이지 판매 완료버튼 완료 이후 동작 X
* Bug fix.magazine banner fix (#198)
* fix. delete useMemo magazine banner
---------
Co-authored-by: Junseo <66871265+blan19@users.noreply.github.com>
* Bug fix.delete use client syntax (#200)
* fix. delete use client syntax
---------
Co-authored-by: Junseo <66871265+blan19@users.noreply.github.com>
* fix. override add toastui-editor-contents p, img tag(flex, radius)
---------
Co-authored-by: Junseo <66871265+blan19@users.noreply.github.com>
* Add.toast UI editor align (#204)
* fix : delete magazine useMemo (banner) (#199)
* Bug fix.magazine banner fix (#198)
* fix. delete useMemo magazine banner
---------
Co-authored-by: Junseo <66871265+blan19@users.noreply.github.com>
---------
Co-authored-by: Junseo <66871265+blan19@users.noreply.github.com>
* fix: delete use client syntax (#201)
* fix: 최종 QA 리스트업 수정 (#196)
* feat: 매물 워터마크 추가
* fix: 마이페이지 판매 완료버튼 완료 이후 동작 X
* Bug fix.magazine banner fix (#198)
* fix. delete useMemo magazine banner
---------
Co-authored-by: Junseo <66871265+blan19@users.noreply.github.com>
* Bug fix.delete use client syntax (#200)
* fix. delete use client syntax
---------
Co-authored-by: Junseo <66871265+blan19@users.noreply.github.com>
* fix. override add toastui-editor-contents p, img tag(flex, radius)
* fix. override add toastui-editor-contents p, img tag(flex, radius)
---------
Co-authored-by: Junseo <66871265+blan19@users.noreply.github.com>
* Fix.editor css (#206)
* fix. toast editor css bug & add editor toolbarItems
* Fix.product price (#208)
* hotFix. editor css bug, add toolbar items (#207)
* fix. toast editor css bug & add editor toolbarItems
* fix. product price handling
---------
Co-authored-by: Junseo <66871265+blan19@users.noreply.github.com>
---
apps/web/src/components/market/marketCard/marketCard.tsx | 2 +-
.../components/marketDetailHeader/marketDetailHeader.tsx | 2 +-
apps/web/src/components/market/marketRow/marketRow.tsx | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/apps/web/src/components/market/marketCard/marketCard.tsx b/apps/web/src/components/market/marketCard/marketCard.tsx
index 5a859dc0..0052e7ec 100644
--- a/apps/web/src/components/market/marketCard/marketCard.tsx
+++ b/apps/web/src/components/market/marketCard/marketCard.tsx
@@ -192,7 +192,7 @@ const MarketColumn = (
{price && price === 1
? '판매 완료'
- : price !== 1
+ : price !== 0
? `${formatter(price * 10000)}원`
: '상담'}
diff --git a/apps/web/src/components/market/marketDetail/components/marketDetailHeader/marketDetailHeader.tsx b/apps/web/src/components/market/marketDetail/components/marketDetailHeader/marketDetailHeader.tsx
index d25988cf..1f3031b6 100644
--- a/apps/web/src/components/market/marketDetail/components/marketDetailHeader/marketDetailHeader.tsx
+++ b/apps/web/src/components/market/marketDetail/components/marketDetailHeader/marketDetailHeader.tsx
@@ -104,7 +104,7 @@ const MarketDetailHeader = ({
{price && price === 1
? '판매 완료'
- : price !== 1
+ : price !== 0
? `${formatter(price * 10000)}원`
: '상담'}
diff --git a/apps/web/src/components/market/marketRow/marketRow.tsx b/apps/web/src/components/market/marketRow/marketRow.tsx
index d7b88cb4..95b982b8 100644
--- a/apps/web/src/components/market/marketRow/marketRow.tsx
+++ b/apps/web/src/components/market/marketRow/marketRow.tsx
@@ -205,7 +205,7 @@ const MarketRow = ({
{price && price === 1
? '판매 완료'
- : price !== 1
+ : price !== 0
? `${formatter(price * 10000)}원`
: '상담'}