From 39e8554efffe0e676b30aeb5275517f667db5ada Mon Sep 17 00:00:00 2001
From: yoosangwook <yoo32767@gmail.com>
Date: Thu, 22 Aug 2024 16:59:04 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=EC=8D=B8=EB=84=A4=EC=9D=BC=20=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                    |  3 ++-
 package.json                        |  2 +-
 src/app/[locale]/roof2/page.jsx     |  4 ++--
 src/components/Roof2.jsx            | 24 +++++++++++++++++++--
 src/components/ui/ThumbnailLIst.jsx | 24 +++++++++++++++++----
 src/hooks/useCanvas.js              | 33 +++++++++++++++++++++--------
 src/lib/Axios.js                    | 10 ++++-----
 src/lib/authActions.js              |  5 +++--
 src/util/session-util.js            |  2 ++
 yarn.lock                           | 10 ++++-----
 10 files changed, 86 insertions(+), 31 deletions(-)

diff --git a/.env.development b/.env.development
index 943a5d6b..63233935 100644
--- a/.env.development
+++ b/.env.development
@@ -1,6 +1,7 @@
 NEXT_PUBLIC_TEST="테스트변수입니다. development"
 
-NEXT_PUBLIC_API_SERVER_PATH="http://1.248.227.176:38080"
+# NEXT_PUBLIC_API_SERVER_PATH="http://1.248.227.176:38080"
+NEXT_PUBLIC_API_SERVER_PATH="http://localhost:8080"
 
 DATABASE_URL="sqlserver://mssql.devgrr.kr:1433;database=qcast;user=qcast;password=Qwertqaz12345;trustServerCertificate=true"
 
diff --git a/package.json b/package.json
index b52c82d0..628550a1 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "react-responsive-modal": "^6.4.2",
     "react-toastify": "^10.0.5",
     "recoil": "^0.7.7",
-    "uuid": "^9.0.1"
+    "uuid": "^10.0.0"
   },
   "devDependencies": {
     "@turf/turf": "^7.0.0",
diff --git a/src/app/[locale]/roof2/page.jsx b/src/app/[locale]/roof2/page.jsx
index 8d707367..6b1b8cb0 100644
--- a/src/app/[locale]/roof2/page.jsx
+++ b/src/app/[locale]/roof2/page.jsx
@@ -3,7 +3,7 @@ import RoofSelect from '@/app/[locale]/roof2/RoofSelect'
 import { initCheck } from '@/util/session-util'
 
 export default async function Roof2Page() {
-  await initCheck()
+  const session = await initCheck()
 
   return (
     <>
@@ -13,7 +13,7 @@ export default async function Roof2Page() {
         </div>
       </div>
       <div className="flex flex-col justify-center my-8 pt-20">
-        <Roof2 />
+        <Roof2 session={session} />
       </div>
     </>
   )
diff --git a/src/components/Roof2.jsx b/src/components/Roof2.jsx
index 0dd124cc..0f02aad9 100644
--- a/src/components/Roof2.jsx
+++ b/src/components/Roof2.jsx
@@ -2,6 +2,7 @@
 
 import { useCanvas } from '@/hooks/useCanvas'
 import { useEffect, useState, useRef } from 'react'
+import { v4 as uuidv4 } from 'uuid'
 import { useMode } from '@/hooks/useMode'
 import { Button } from '@nextui-org/react'
 import RangeSlider from './ui/RangeSlider'
@@ -23,8 +24,9 @@ import { QPolygon } from '@/components/fabric/QPolygon'
 import ThumbnailList from './ui/ThumbnailLIst'
 import CanvasWithContextMenu from '@/util/context-util'
 import { Mode } from '@/common/common'
+import { get } from '@/lib/Axios'
 
-export default function Roof2() {
+export default function Roof2({ session }) {
   const { canvas, handleRedo, handleUndo, setCanvasBackgroundWithDots, saveImage, addCanvas } = useCanvas('canvas')
 
   const canvasRef = useRef(null)
@@ -60,6 +62,7 @@ export default function Roof2() {
   const [thumbnails, setThumbnails] = useState([])
   const thumbnailProps = {
     thumbnails,
+    canvas,
   }
 
   const {
@@ -85,6 +88,23 @@ export default function Roof2() {
 
   // const [canvasState, setCanvasState] = useRecoilState(canvasAtom)
 
+  useEffect(() => {
+    get({ url: `/api/canvas-management/canvas-statuses/by-object/test123240822001` }).then((res) => {
+      const arrangeData = res.map((item) => {
+        console.log(item.canvasStatus.replace(/##/g, '"').replace(/\\/g, ''))
+        const test = item.canvasStatus.replace(/##/g, '"').replace(/\\/g, '')
+        const test2 = test.substring(1, test.length - 1)
+        return {
+          id: item.id,
+          userId: item.userId,
+          imageName: `/canvasState/${item.imageName}.png`,
+          canvasStatus: JSON.stringify(test2),
+        }
+      })
+      setThumbnails(arrangeData)
+    })
+  }, [])
+
   useEffect(() => {
     if (!canvas) {
       return
@@ -632,7 +652,7 @@ export default function Roof2() {
                 </Button>
               </>
             )}
-            <Button className="m-1 p-2" onClick={() => saveImage('title')}>
+            <Button className="m-1 p-2" onClick={() => saveImage(uuidv4(), session.userId, setThumbnails)}>
               저장
             </Button>
             {/*<Button className="m-1 p-2" onClick={rotateShape}>
diff --git a/src/components/ui/ThumbnailLIst.jsx b/src/components/ui/ThumbnailLIst.jsx
index 26c40099..f8eae026 100644
--- a/src/components/ui/ThumbnailLIst.jsx
+++ b/src/components/ui/ThumbnailLIst.jsx
@@ -1,10 +1,19 @@
-import { Card, Image } from '@nextui-org/react'
+'use client'
+
 import { memo } from 'react'
+import { Card, Image } from '@nextui-org/react'
 
 function ThumbnailList(props) {
-  const { thumbnails } = props
+  const { thumbnails, canvas } = props
+  console.log('thumbnails', thumbnails)
 
-  console.log('ThumbnailList')
+  const handleSelectThumb = (canvasStatus) => {
+    console.log('canvasStatus', canvasStatus.length)
+    canvas?.clear() // 캔버스를 초기화합니다.
+    canvas?.loadFromJSON(JSON.parse(canvasStatus), function () {
+      canvas?.renderAll() // 캔버스를 다시 그립니다.
+    })
+  }
 
   return (
     <>
@@ -12,7 +21,14 @@ function ThumbnailList(props) {
         {thumbnails.length > 0 &&
           thumbnails.map((thumbnail, index) => (
             <Card isFooterBlurred radius="lg" className="border-none m-2">
-              <Image alt="Woman listing to music" className="object-cover" height={200} src="https://nextui.org/images/hero-card.jpeg" width={200} />
+              <Image
+                alt="Woman listing to music"
+                className="object-cover"
+                height={200}
+                src={thumbnail.imageName}
+                width={200}
+                onClick={() => handleSelectThumb(thumbnail.canvasStatus)}
+              />
             </Card>
           ))}
       </div>
diff --git a/src/hooks/useCanvas.js b/src/hooks/useCanvas.js
index cde867b1..63d740de 100644
--- a/src/hooks/useCanvas.js
+++ b/src/hooks/useCanvas.js
@@ -11,6 +11,7 @@ import { defineQLine } from '@/util/qline-utils'
 import { defineQPloygon } from '@/util/qpolygon-utils'
 import { writeImage } from '@/lib/canvas'
 import { useCanvasEvent } from '@/hooks/useCanvasEvent'
+import { post } from '@/lib/Axios'
 
 export function useCanvas(id) {
   const [canvas, setCanvas] = useState()
@@ -333,7 +334,7 @@ export function useCanvas(id) {
    * 이미지로 저장하는 함수
    * @param {string} title - 저장할 이미지 이름
    */
-  const saveImage = async (title = 'canvas') => {
+  const saveImage = async (title = 'canvas', userId, setThumbnails) => {
     removeMouseLines()
     await writeImage(title, canvas?.toDataURL('image/png').replace('data:image/png;base64,', ''))
       .then((res) => {
@@ -342,6 +343,19 @@ export function useCanvas(id) {
       .catch((err) => {
         console.log('err', err)
       })
+
+    const canvasStatus = addCanvas()
+
+    const patternData = {
+      userId: userId,
+      imageName: title,
+      objectNo: 'test123240822001',
+      canvasStatus: JSON.stringify(canvasStatus).replace(/"/g, '##'),
+    }
+
+    await post({ url: '/api/canvas-management/canvas-statuses', data: patternData })
+
+    setThumbnails((prev) => [...prev, { imageName: `/canvasState/${title}.png`, userId, canvasStatus: JSON.stringify(canvasStatus) }])
   }
 
   const handleFlip = () => {
@@ -435,15 +449,16 @@ export function useCanvas(id) {
     const str = JSON.stringify(objs)
 
     canvas?.clear()
+    return str
 
-    setTimeout(() => {
-      // 역직렬화하여 캔버스에 객체를 다시 추가합니다.
-      canvas?.loadFromJSON(JSON.parse(str), function () {
-        // 모든 객체가 로드되고 캔버스에 추가된 후 호출됩니다.
-        console.log(canvas?.getObjects().filter((obj) => obj.name === 'roof'))
-        canvas?.renderAll() // 캔버스를 다시 그립니다.
-      })
-    }, 1000)
+    // setTimeout(() => {
+    //   // 역직렬화하여 캔버스에 객체를 다시 추가합니다.
+    //   canvas?.loadFromJSON(JSON.parse(str), function () {
+    //     // 모든 객체가 로드되고 캔버스에 추가된 후 호출됩니다.
+    //     console.log(canvas?.getObjects().filter((obj) => obj.name === 'roof'))
+    //     canvas?.renderAll() // 캔버스를 다시 그립니다.
+    //   })
+    // }, 1000)
   }
 
   return {
diff --git a/src/lib/Axios.js b/src/lib/Axios.js
index cae33f3e..d773d352 100644
--- a/src/lib/Axios.js
+++ b/src/lib/Axios.js
@@ -24,32 +24,32 @@ axiosInstance.interceptors.request.use(undefined, (error) => {
   // }
 })
 
-export const get = (url) =>
+export const get = ({ url }) =>
   axiosInstance
     .get(url)
     .then((res) => res.data)
     .catch(console.error)
 
-export const post = (url, data) =>
+export const post = ({ url, data }) =>
   axiosInstance
     .post(url, data)
     .then((res) => res.data)
     .catch(console.error)
 
-export const put = (url, data) =>
+export const put = ({ url, data }) =>
   axiosInstance
     .put(url, data)
     .then((res) => res.data)
     .catch(console.error)
 
-export const patch = (url, data) =>
+export const patch = ({ url, data }) =>
   axiosInstance
     .patch(url, data)
 
     .then((res) => res.data)
     .catch(console.error)
 
-export const del = (url) =>
+export const del = ({ url }) =>
   axiosInstance
     .delete(url)
     .then((res) => res.data)
diff --git a/src/lib/authActions.js b/src/lib/authActions.js
index 1ca7bd31..60fac21a 100644
--- a/src/lib/authActions.js
+++ b/src/lib/authActions.js
@@ -48,8 +48,9 @@ export async function login(formData) {
     throw Error('Wrong Credentials!')
   }
 
-  session.name = loginUser.USER_ID
-  session.email = loginUser.SALE_STORE_ID
+  session.name = loginUser.name
+  session.userId = loginUser.userId
+  session.email = loginUser.email
   session.isLoggedIn = true
   console.log('session:', session)
 
diff --git a/src/util/session-util.js b/src/util/session-util.js
index ab8b120c..6f818e43 100644
--- a/src/util/session-util.js
+++ b/src/util/session-util.js
@@ -7,4 +7,6 @@ export const initCheck = async () => {
   if (!session.isLoggedIn) {
     redirect('/login')
   }
+
+  return session
 }
diff --git a/yarn.lock b/yarn.lock
index 5fd9f909..d0d3b65e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6108,16 +6108,16 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2:
   resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
+uuid@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-10.0.0.tgz#5a95aa454e6e002725c79055fd42aaba30ca6294"
+  integrity sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==
+
 uuid@^8.3.0:
   version "8.3.2"
   resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-uuid@^9.0.1:
-  version "9.0.1"
-  resolved "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz"
-  integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==
-
 w3c-hr-time@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz"