From f8621d2d787caedac5efd2872ec2a09cbc662ede Mon Sep 17 00:00:00 2001
From: yoosangwook <swyoo@interplug.co.kr>
Date: Fri, 23 May 2025 15:33:13 +0900
Subject: [PATCH 1/4] fix: update NEXT_PUBLIC_CONVERTER_API_URL in environment
 files for secure API access

---
 .env.development | 3 ++-
 .env.production  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.env.development b/.env.development
index f35f6208..8890f8d4 100644
--- a/.env.development
+++ b/.env.development
@@ -7,7 +7,8 @@ NEXT_PUBLIC_API_HOST_URL="http://1.248.227.176:5000"
 SESSION_SECRET="i3iHH1yp2/2SpQSIySQ4bpyc4g0D+zCF9FAn5xUG0+Y="
 
 # NEXT_PUBLIC_CONVERTER_API_URL="https://v2.convertapi.com/convert/dwg/to/png?Secret=secret_bV5zuYMyyIYFlOb3"
-NEXT_PUBLIC_CONVERTER_API_URL="https://v2.convertapi.com/convert/dwg/to/png?Secret=secret_yAS4QDalL9jgQ7vS"
+# NEXT_PUBLIC_CONVERTER_API_URL="https://v2.convertapi.com/convert/dwg/to/png?Secret=secret_yAS4QDalL9jgQ7vS"
+NEXT_PUBLIC_CONVERTER_API_URL="https://v2.convertapi.com/convert/dwg/to/png?Secret=secret_a0FLEK6M2oTpXInK"
 
 NEXT_PUBLIC_Q_ORDER_AUTO_LOGIN_URL="http://q-order-stg.q-cells.jp:8120/eos/login/autoLogin"
 NEXT_PUBLIC_Q_MUSUBI_AUTO_LOGIN_URL="http://q-musubi-stg.q-cells.jp:8120/qm/login/autoLogin"
diff --git a/.env.production b/.env.production
index b2d50cdd..a68a4305 100644
--- a/.env.production
+++ b/.env.production
@@ -7,7 +7,8 @@ NEXT_PUBLIC_API_HOST_URL="https://www.hanasys.jp/"
 SESSION_SECRET="i3iHH1yp2/2SpQSIySQ4bpyc4g0D+zCF9FAn5xUG0+Y="
 
 # NEXT_PUBLIC_CONVERTER_API_URL="https://v2.convertapi.com/convert/dwg/to/png?Secret=secret_bV5zuYMyyIYFlOb3"
-NEXT_PUBLIC_CONVERTER_API_URL="https://v2.convertapi.com/convert/dwg/to/png?Secret=secret_yAS4QDalL9jgQ7vS"
+# NEXT_PUBLIC_CONVERTER_API_URL="https://v2.convertapi.com/convert/dwg/to/png?Secret=secret_yAS4QDalL9jgQ7vS"
+NEXT_PUBLIC_CONVERTER_API_URL="https://v2.convertapi.com/convert/dwg/to/png?Secret=secret_a0FLEK6M2oTpXInK"
 
 # NEXT_PUBLIC_Q_ORDER_AUTO_LOGIN_URL="https://q-order.q-cells.jp/eos/login/autoLogin"
 # NEXT_PUBLIC_Q_MUSUBI_AUTO_LOGIN_URL="https://q-musubi.q-cells.jp/qm/login/autoLogin"

From c029560c4a33d487ed7d9ca701c92b8ae9a9282a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=AF=BC=EC=8B=9D?=
 <43837214+Minsiki@users.noreply.github.com>
Date: Fri, 23 May 2025 15:49:33 +0900
Subject: [PATCH 2/4] =?UTF-8?q?=EC=99=B8=EB=B2=BD=EC=84=A0=20=EC=9E=91?=
 =?UTF-8?q?=EC=84=B1=20=ED=8C=9D=EC=97=85=20=EC=95=88=EB=82=B4=20=EB=AC=B8?=
 =?UTF-8?q?=EA=B5=AC=20=EC=B6=94=EA=B0=80=20=EB=B0=8F=20=EA=B4=80=EB=A0=A8?=
 =?UTF-8?q?=20=EB=8B=A4=EA=B5=AD=EC=96=B4=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../floor-plan/modal/outerlinesetting/WallLineSetting.jsx        | 1 +
 src/locales/ja.json                                              | 1 +
 src/locales/ko.json                                              | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/components/floor-plan/modal/outerlinesetting/WallLineSetting.jsx b/src/components/floor-plan/modal/outerlinesetting/WallLineSetting.jsx
index 36d79cb6..72308b15 100644
--- a/src/components/floor-plan/modal/outerlinesetting/WallLineSetting.jsx
+++ b/src/components/floor-plan/modal/outerlinesetting/WallLineSetting.jsx
@@ -162,6 +162,7 @@ export default function WallLineSetting(props) {
             <></>
           )}
         </div>
+        <div className="normal-font mt10">{getMessage('outerLine.property.info')}</div>
         <div className="grid-btn-wrap">
           <button className="btn-frame modal mr5" onClick={handleRollback}>
             {getMessage('modal.cover.outline.rollback')}
diff --git a/src/locales/ja.json b/src/locales/ja.json
index 7f46f0e8..4ba19494 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -1090,6 +1090,7 @@
   "roof.exceed.count": "屋根材は4つまで選択可能です。",
   "outerLine.property.fix": "外壁線の属性設定 を完了しますか？",
   "outerLine.property.close": "外壁線の属性設定 を終了しますか？",
+  "outerLine.property.info": "外壁線は反時計回りで作成してください。",
   "want.to.complete.auxiliary.creation": "補助線の作成を完了しますか?",
   "module.layout.setup.has.zero.value": "モジュールの列数、段数を入力して下さい。",
   "modal.placement.initial.setting.plan.drawing.only.number": "(※数字は[半角]入力のみ可能です。)",
diff --git a/src/locales/ko.json b/src/locales/ko.json
index 11dfb30d..0d2ecc83 100644
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@@ -1091,6 +1091,7 @@
   "roof.exceed.count": "지붕재는 4개까지 선택 가능합니다.",
   "outerLine.property.fix": "외벽선 속성 설정을 완료하시겠습니까?",
   "outerLine.property.close": "외벽선 속성 설정을 종료하시겠습니까?",
+  "outerLine.property.info": "외벽선은 반시계 방향으로 작성해 주세요.",
   "want.to.complete.auxiliary.creation": "보조선 작성을 완료하시겠습니까?",
   "module.layout.setup.has.zero.value": "모듈의 열수, 단수를 입력해 주세요.",
   "modal.placement.initial.setting.plan.drawing.only.number": "(※ 숫자는 [반각]입력만 가능합니다.)",

From 2cbcd19b65421cd063cddce9f769cccd9ece7ff0 Mon Sep 17 00:00:00 2001
From: "hyojun.choi" <chlgkwk123@nate.com>
Date: Fri, 23 May 2025 15:55:26 +0900
Subject: [PATCH 3/4] =?UTF-8?q?-=20=EB=8F=99=EC=84=A0=20=EC=9D=B4=EB=8F=99?=
 =?UTF-8?q?=20=EC=8B=9C=20=EB=9D=BC=EC=9D=B8=20=EC=95=88=EC=9E=A1=ED=9E=88?=
 =?UTF-8?q?=EB=8A=94=20=ED=98=84=EC=83=81=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/roofcover/useMovementSetting.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/hooks/roofcover/useMovementSetting.js b/src/hooks/roofcover/useMovementSetting.js
index d7680150..19e44d2e 100644
--- a/src/hooks/roofcover/useMovementSetting.js
+++ b/src/hooks/roofcover/useMovementSetting.js
@@ -90,6 +90,7 @@ export function useMovementSetting(id) {
       wall.baseLines.forEach((line) => {
         if (type === TYPE.UP_DOWN) {
           line.set({ selectable: true, visible: true, stroke: '#1083E3', strokeWidth: 5 })
+          line.setCoords()
           line.bringToFront()
         } else {
           line.set({ selectable: false, visible: false })

From dc6989b30397ef48e51556faf5499dcd54dbd4ed Mon Sep 17 00:00:00 2001
From: "hyojun.choi" <chlgkwk123@nate.com>
Date: Mon, 26 May 2025 09:52:30 +0900
Subject: [PATCH 4/4] =?UTF-8?q?=EC=A7=80=EB=B6=95=EC=9E=AC=20=EB=AA=A9?=
 =?UTF-8?q?=EB=A1=9D=20Header=EC=97=90=EC=84=9C=20=EC=A1=B0=ED=9A=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/floor-plan/CanvasFrame.jsx | 28 ------------------
 src/components/header/Header.jsx          | 35 +++++++++++++++++++++++
 2 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/src/components/floor-plan/CanvasFrame.jsx b/src/components/floor-plan/CanvasFrame.jsx
index 5aa0332e..0b806d0c 100644
--- a/src/components/floor-plan/CanvasFrame.jsx
+++ b/src/components/floor-plan/CanvasFrame.jsx
@@ -36,34 +36,6 @@ import { hotkeyStore } from '@/store/hotkeyAtom'
 import { usePopup } from '@/hooks/usePopup'
 
 export default function CanvasFrame() {
-  const [roofMaterials, setRoofMaterials] = useRecoilState(roofMaterialsAtom)
-  const { getRoofMaterialList } = useMasterController()
-  useEffect(() => {
-    async function initRoofMaterial() {
-      if (roofMaterials.length !== 0) {
-        return
-      }
-      const { data } = await getRoofMaterialList()
-
-      const roofLists = data.map((item, idx) => ({
-        ...item,
-        id: item.roofMatlCd,
-        name: item.roofMatlNm,
-        selected: idx === 0,
-        index: idx,
-        nameJp: item.roofMatlNmJp,
-        length: item.lenBase && parseInt(item.lenBase),
-        width: item.widBase && parseInt(item.widBase),
-        raft: item.raftBase && parseInt(item.raftBase),
-        layout: ['ROOF_ID_SLATE', 'ROOF_ID_SINGLE'].includes(item.roofMatlCd) ? ROOF_MATERIAL_LAYOUT.STAIRS : ROOF_MATERIAL_LAYOUT.PARALLEL,
-        hajebichi: item.roofPchBase && parseInt(item.roofPchBase),
-        pitch: item.pitch ? parseInt(item.pitch) : 4,
-        angle: item.angle ? parseInt(item.angle) : 21.8,
-      }))
-      setRoofMaterials(roofLists)
-    }
-    initRoofMaterial()
-  }, [])
   const canvasRef = useRef(null)
   const { canvas } = useCanvas('canvas')
   const { canvasLoadInit, gridInit } = useCanvasConfigInitialize()
diff --git a/src/components/header/Header.jsx b/src/components/header/Header.jsx
index 7c71788a..ef7dfa6c 100644
--- a/src/components/header/Header.jsx
+++ b/src/components/header/Header.jsx
@@ -22,6 +22,9 @@ import { QcastContext } from '@/app/QcastProvider'
 import { usePopup } from '@/hooks/usePopup'
 import { commonCodeState } from '@/store/commonCodeAtom'
 import { isObjectNotEmpty } from '@/util/common-utils'
+import { roofMaterialsAtom } from '@/store/settingAtom'
+import { useMasterController } from '@/hooks/common/useMasterController'
+import { ROOF_MATERIAL_LAYOUT } from '@/components/floor-plan/modal/placementShape/PlacementShapeSetting'
 
 export const ToggleonMouse = (e, act, target) => {
   const listWrap = e.target.closest(target)
@@ -72,6 +75,38 @@ export default function Header(props) {
   const [commonCode, setCommonCode] = useRecoilState(commonCodeState)
   const { promiseGet } = useAxios()
 
+  /**
+   * 지붕재 목록 Header에서 조회
+   */
+  const [roofMaterials, setRoofMaterials] = useRecoilState(roofMaterialsAtom)
+  const { getRoofMaterialList } = useMasterController()
+  useEffect(() => {
+    async function initRoofMaterial() {
+      if (roofMaterials.length !== 0) {
+        return
+      }
+      const { data } = await getRoofMaterialList()
+
+      const roofLists = data.map((item, idx) => ({
+        ...item,
+        id: item.roofMatlCd,
+        name: item.roofMatlNm,
+        selected: idx === 0,
+        index: idx,
+        nameJp: item.roofMatlNmJp,
+        length: item.lenBase && parseInt(item.lenBase),
+        width: item.widBase && parseInt(item.widBase),
+        raft: item.raftBase && parseInt(item.raftBase),
+        layout: ['ROOF_ID_SLATE', 'ROOF_ID_SINGLE'].includes(item.roofMatlCd) ? ROOF_MATERIAL_LAYOUT.STAIRS : ROOF_MATERIAL_LAYOUT.PARALLEL,
+        hajebichi: item.roofPchBase && parseInt(item.roofPchBase),
+        pitch: item.pitch ? parseInt(item.pitch) : 4,
+        angle: item.angle ? parseInt(item.angle) : 21.8,
+      }))
+      setRoofMaterials(roofLists)
+    }
+    initRoofMaterial()
+  }, [])
+
   useEffect(() => {
     const getCommonCode = async () => {
       await promiseGet({ url: '/api/commcode/qc-comm-code' }).then((res) => {