From dabce818436b502f2604f91fdb3c2f896bcf1d06 Mon Sep 17 00:00:00 2001
From: yoosangwook <yoo32767@gmail.com>
Date: Wed, 4 Sep 2024 18:19:10 +0900
Subject: [PATCH 1/2] Fix file conversion success and failure toast messages

---
 src/components/Playground.jsx |  3 +++
 src/components/Roof2.jsx      | 28 ++++++++++++++++------------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/components/Playground.jsx b/src/components/Playground.jsx
index 2734ac8c..7055c7aa 100644
--- a/src/components/Playground.jsx
+++ b/src/components/Playground.jsx
@@ -14,6 +14,7 @@ import QSelect from '@/components/ui/QSelect'
 import styles from './playground.module.css'
 import { useRecoilState } from 'recoil'
 import { cadFileNameState, useCadFileState } from '@/store/canvasAtom'
+import { QToast } from '@/hooks/useToast'
 
 export default function Playground() {
   const [useCadFile, setUseCadFile] = useRecoilState(useCadFileState)
@@ -47,9 +48,11 @@ export default function Playground() {
         convertDwgToPng(res.data.Files[0].FileName, res.data.Files[0].FileData)
         setUseCadFile(true)
         setCadFileName(res.data.Files[0].FileName)
+        QToast({ message: '파일 변환 완료', type: 'success' })
       })
       .catch((err) => {
         console.error(err)
+        QToast({ message: '파일 변환 실패', type: 'error' })
       })
   }
 
diff --git a/src/components/Roof2.jsx b/src/components/Roof2.jsx
index f77f68c0..93e03304 100644
--- a/src/components/Roof2.jsx
+++ b/src/components/Roof2.jsx
@@ -789,9 +789,11 @@ export default function Roof2(props) {
             <Button
               className="m-1 p-2"
               onClick={() => {
-                setUseCadFile(false)
-                setCadFileName('')
-                handleCadImageInit()
+                if (useCadFile) {
+                  setUseCadFile(false)
+                  setCadFileName('')
+                  handleCadImageInit()
+                }
               }}
             >
               cad 파일 초기화
@@ -799,15 +801,17 @@ export default function Roof2(props) {
             <Button
               className="m-1 p-2"
               onClick={() => {
-                backImg
-                  .set({
-                    selectable: false,
-                  })
-                  .sendToBack()
-                canvas.clear()
-                canvas.add(backImg)
-                canvas.renderAll()
-                setCadFileComplete(true)
+                if (useCadFile) {
+                  backImg
+                    .set({
+                      selectable: false,
+                    })
+                    .sendToBack()
+                  canvas.clear()
+                  canvas.add(backImg)
+                  canvas.renderAll()
+                  setCadFileComplete(true)
+                }
               }}
             >
               cad 파일 조정 완료

From f883f60780375011f035941f3b68009018a5549e Mon Sep 17 00:00:00 2001
From: yoosangwook <yoo32767@gmail.com>
Date: Wed, 4 Sep 2024 18:23:53 +0900
Subject: [PATCH 2/2] Fix toast message function names in Intro and Playground
 components

---
 src/components/Intro.jsx      | 4 ++--
 src/components/Playground.jsx | 6 +++---
 src/hooks/useToast.js         | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/Intro.jsx b/src/components/Intro.jsx
index 0129e7a4..840aff7a 100644
--- a/src/components/Intro.jsx
+++ b/src/components/Intro.jsx
@@ -14,7 +14,7 @@ import { Button } from '@nextui-org/react'
 import SingleDatePicker from './common/datepicker/SingleDatePicker'
 import RangeDatePicker from './common/datepicker/RangeDatePicker'
 import QGrid from './common/grid/QGrid'
-import { QToast } from '@/hooks/useToast'
+import { toastUp } from '@/hooks/useToast'
 
 export default function Intro() {
   const { get } = useAxios()
@@ -127,7 +127,7 @@ export default function Intro() {
           <Button
             color="primary"
             onClick={() => {
-              QToast({
+              toastUp({
                 message: 'This is a toast message',
                 type: 'success',
               })
diff --git a/src/components/Playground.jsx b/src/components/Playground.jsx
index 7055c7aa..624113de 100644
--- a/src/components/Playground.jsx
+++ b/src/components/Playground.jsx
@@ -14,7 +14,7 @@ import QSelect from '@/components/ui/QSelect'
 import styles from './playground.module.css'
 import { useRecoilState } from 'recoil'
 import { cadFileNameState, useCadFileState } from '@/store/canvasAtom'
-import { QToast } from '@/hooks/useToast'
+import { toastUp } from '@/hooks/useToast'
 
 export default function Playground() {
   const [useCadFile, setUseCadFile] = useRecoilState(useCadFileState)
@@ -48,11 +48,11 @@ export default function Playground() {
         convertDwgToPng(res.data.Files[0].FileName, res.data.Files[0].FileData)
         setUseCadFile(true)
         setCadFileName(res.data.Files[0].FileName)
-        QToast({ message: '파일 변환 완료', type: 'success' })
+        toastUp({ message: '파일 변환 완료', type: 'success' })
       })
       .catch((err) => {
         console.error(err)
-        QToast({ message: '파일 변환 실패', type: 'error' })
+        toastUp({ message: '파일 변환 실패', type: 'error' })
       })
   }
 
diff --git a/src/hooks/useToast.js b/src/hooks/useToast.js
index d9c0fdb3..d604c42d 100644
--- a/src/hooks/useToast.js
+++ b/src/hooks/useToast.js
@@ -13,7 +13,7 @@ const toastDefaultOptions = {
   closeOnClick: true,
 }
 
-const QToast = (props) => {
+const toastUp = (props) => {
   // type TypeOptions = 'info' | 'success' | 'warning' | 'error' | 'default'
   const { message, type = 'info', options } = props
   const customOptions = { ...toastDefaultOptions, ...options }
@@ -32,4 +32,4 @@ const QToast = (props) => {
   }
 }
 
-export { QToast }
+export { toastUp }