Skip to content

Commit

Permalink
Develop (#209)
Browse files Browse the repository at this point in the history
* fix: 최종 QA 리스트업 수정 (#196)

* feat: 매물 워터마크 추가

* fix: 마이페이지 판매 완료버튼 완료 이후 동작 X

* Bug fix.magazine banner fix (#198)


* fix. delete useMemo magazine banner

---------

Co-authored-by: Junseo <[email protected]>

* 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 <[email protected]>

---------

Co-authored-by: Junseo <[email protected]>

* 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 <[email protected]>

* Bug fix.delete use client syntax (#200)



* fix. delete use client syntax

---------

Co-authored-by: Junseo <[email protected]>

* fix. override add toastui-editor-contents p, img tag(flex, radius)

---------

Co-authored-by: Junseo <[email protected]>

* 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 <[email protected]>

---------

Co-authored-by: Junseo <[email protected]>

* 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 <[email protected]>

* Bug fix.delete use client syntax (#200)



* fix. delete use client syntax

---------

Co-authored-by: Junseo <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
  • Loading branch information
doyupK and blan19 authored Sep 20, 2023
1 parent a5049d5 commit e1f362d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion apps/web/src/components/market/marketCard/marketCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ const MarketColumn = (
<Typography fontSize="body-14" fontWeight="bold" color="system-1">
{price && price === 1
? '판매 완료'
: price !== 1
: price !== 0
? `${formatter(price * 10000)}원`
: '상담'}
</Typography>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ const MarketDetailHeader = ({
<p className="market_price">
{price && price === 1
? '판매 완료'
: price !== 1
: price !== 0
? `${formatter(price * 10000)}원`
: '상담'}
</p>
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/market/marketRow/marketRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ const MarketRow = ({
<Typography fontSize="body-14" fontWeight="bold" color="system-1">
{price && price === 1
? '판매 완료'
: price !== 1
: price !== 0
? `${formatter(price * 10000)}원`
: '상담'}
</Typography>
Expand Down

1 comment on commit e1f362d

@vercel
Copy link

@vercel vercel bot commented on e1f362d Sep 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.