Merge branch 'dev' of https://git.jetbrains.space/nalpari/q-cast-iii/qcast-front into dev

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',
               })

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 { toastUp } 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)
+        toastUp({ message: '파일 변환 완료', type: 'success' })
       })
       .catch((err) => {
         console.error(err)
+        toastUp({ message: '파일 변환 실패', type: 'error' })
       })
   }
 

src/components/Roof2.jsx

@@ -789,9 +789,11 @@ export default function Roof2(props) {
             <Button
               className="m-1 p-2"
               onClick={() => {
-                setUseCadFile(false)
+                if (useCadFile) {
-                setCadFileName('')
+                  setUseCadFile(false)
-                handleCadImageInit()
+                  setCadFileName('')
+                  handleCadImageInit()
+                }
               }}
             >
               cad 파일 초기화
@@ -799,15 +801,17 @@ export default function Roof2(props) {
             <Button
               className="m-1 p-2"
               onClick={() => {
-                backImg
+                if (useCadFile) {
-                  .set({
+                  backImg
-                    selectable: false,
+                    .set({
-                  })
+                      selectable: false,
-                  .sendToBack()
+                    })
-                canvas.clear()
+                    .sendToBack()
-                canvas.add(backImg)
+                  canvas.clear()
-                canvas.renderAll()
+                  canvas.add(backImg)
-                setCadFileComplete(true)
+                  canvas.renderAll()
+                  setCadFileComplete(true)
+                }
               }}
             >
               cad 파일 조정 완료

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 }