From 8089caafdfa45ca62982ba424200c37f534b6782 Mon Sep 17 00:00:00 2001
From: yoosangwook <yoo32767@gmail.com>
Date: Mon, 22 Jul 2024 11:58:26 +0900
Subject: [PATCH] conflict resolve

---
 src/components/Roof2.jsx |  2 +-
 src/hooks/useMode.js     |  3 +--
 src/store/canvasAtom.js  | 13 +------------
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/components/Roof2.jsx b/src/components/Roof2.jsx
index f46a6baa..f8ffdd8f 100644
--- a/src/components/Roof2.jsx
+++ b/src/components/Roof2.jsx
@@ -7,7 +7,7 @@ import QPolygon from '@/components/fabric/QPolygon'
 
 import RangeSlider from './ui/RangeSlider'
 import { useRecoilState, useRecoilValue } from 'recoil'
-import { canvasAtom, canvasSizeState, fontSizeState, sortedPolygonArray } from '@/store/canvasAtom'
+import { canvasAtom, canvasListState, canvasSizeState, fontSizeState, sortedPolygonArray } from '@/store/canvasAtom'
 import { QLine } from '@/components/fabric/QLine'
 import { getTests, getCanvasState, insertCanvasState } from '@/lib/canvas'
 
diff --git a/src/hooks/useMode.js b/src/hooks/useMode.js
index 7d81ad7f..b7f7ba22 100644
--- a/src/hooks/useMode.js
+++ b/src/hooks/useMode.js
@@ -3,7 +3,7 @@ import QRect from '@/components/fabric/QRect'
 import QPolygon from '@/components/fabric/QPolygon'
 import { findTopTwoIndexesByDistance, getCenterPoint, getDirection, getStartIndex, rearrangeArray } from '@/util/canvas-util'
 import { useRecoilState } from 'recoil'
-import { fontSizeState, roofState, sortedPolygonArray, templatePolygonArrayState, wallState } from '@/store/canvasAtom'
+import { fontSizeState, roofState, sortedPolygonArray, wallState } from '@/store/canvasAtom'
 import { QLine } from '@/components/fabric/QLine'
 
 export const Mode = {
@@ -29,7 +29,6 @@ export function useMode() {
   const [sortedArray, setSortedArray] = useRecoilState(sortedPolygonArray)
   const [roof, setRoof] = useRecoilState(roofState)
   const [wall, setWall] = useRecoilState(wallState)
-  const [templatePolygonState, setTemplatePolygonState] = useRecoilState(templatePolygonArrayState)
 
   const addEvent = (mode) => {
     switch (mode) {
diff --git a/src/store/canvasAtom.js b/src/store/canvasAtom.js
index 8b3ff3f4..23136fb9 100644
--- a/src/store/canvasAtom.js
+++ b/src/store/canvasAtom.js
@@ -36,18 +36,7 @@ export const wallState = atom({
   dangerouslyAllowMutability: true,
 })
 
-<<<<<<< HEAD
 export const canvasListState = atom({
   key: 'canvas',
-=======
-export const templatePolygonArrayState = atom({
-  key: 'templatePolygon',
-  default: {}, //object ex) big, mid, sht = {point : [{x1, y1}, {x2, y1}], direction : left or right or top or bottom}
-})
-
-export const canvasAtom = atom({
-  key: 'canvasState',
->>>>>>> feature/mongo-test
-  default: [],
-  dangerouslyAllowMutability: true,
+  default: [], //object ex) big, mid, sht = {point : [{x1, y1}, {x2, y1}], direction : left or right or top or bottom}
 })