diff --git a/.env.production b/.env.production index 91d91ce1..2c41bf76 100644 --- a/.env.production +++ b/.env.production @@ -1,6 +1,6 @@ NEXT_PUBLIC_TEST="테스트변수입니다. production" -NEXT_PUBLIC_API_SERVER_PATH="http://localhost:8080" +NEXT_PUBLIC_API_SERVER_PATH="http://1.248.227.176:38080" DATABASE_URL="" diff --git a/public/static/images/canvas/alert_close.svg b/public/static/images/canvas/alert_close.svg new file mode 100644 index 00000000..54356b59 --- /dev/null +++ b/public/static/images/canvas/alert_close.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/public/static/images/canvas/outline_cul.svg b/public/static/images/canvas/outline_cul.svg new file mode 100644 index 00000000..36cd021a --- /dev/null +++ b/public/static/images/canvas/outline_cul.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/public/static/images/canvas/pop_tip.svg b/public/static/images/canvas/pop_tip.svg new file mode 100644 index 00000000..7e33336a --- /dev/null +++ b/public/static/images/canvas/pop_tip.svg @@ -0,0 +1,4 @@ + + + + diff --git a/public/static/images/canvas/reset_ico.svg b/public/static/images/canvas/reset_ico.svg new file mode 100644 index 00000000..14fac20a --- /dev/null +++ b/public/static/images/canvas/reset_ico.svg @@ -0,0 +1,3 @@ + + + diff --git a/public/static/images/common/select_dark_arr.svg b/public/static/images/common/select_dark_arr.svg new file mode 100644 index 00000000..aa74665c --- /dev/null +++ b/public/static/images/common/select_dark_arr.svg @@ -0,0 +1,3 @@ + + + diff --git a/public/static/images/sub/simulation_guide.svg b/public/static/images/sub/simulation_guide.svg new file mode 100644 index 00000000..3f164b96 --- /dev/null +++ b/public/static/images/sub/simulation_guide.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/components/floor-plan/FloorPlan.jsx b/src/components/floor-plan/FloorPlan.jsx index 2c9d1685..699c96c5 100644 --- a/src/components/floor-plan/FloorPlan.jsx +++ b/src/components/floor-plan/FloorPlan.jsx @@ -9,8 +9,8 @@ import '@/styles/contents.scss' import CanvasMenu from '@/components/floor-plan/CanvasMenu' import SettingModal01 from '@/components/floor-plan/modal/setting01/SettingModal01' import CanvasLayout from '@/components/floor-plan/CanvasLayout' -import OuterLineWall from '@/components/floor-plan/modal/outerlinesetting/OuterLineWall' import DotLineGrid from '@/components/floor-plan/modal/grid/DotLineGrid' +import WallLineSetting from '@/components/floor-plan/modal/outerlinesetting/WallLineSetting' export default function FloorPlan() { const [showCanvasSettingModal, setShowCanvasSettingModal] = useState(false) @@ -84,7 +84,8 @@ export default function FloorPlan() {
{showCanvasSettingModal && } - {showOutlineModal && } + {/*{showOutlineModal && }*/} + {showOutlineModal && } {showDotLineGridModal && }
diff --git a/src/components/floor-plan/modal/outerlinesetting/Angle.jsx b/src/components/floor-plan/modal/outerlinesetting/Angle.jsx new file mode 100644 index 00000000..ca3ea288 --- /dev/null +++ b/src/components/floor-plan/modal/outerlinesetting/Angle.jsx @@ -0,0 +1,33 @@ +import Image from 'next/image' +import { useMessage } from '@/hooks/useMessage' + +export default function Angle() { + const { getMessage } = useMessage() + return ( + <> +
+
+
+
+ {getMessage('modal.cover.outline.angle')} +
+ +
+ +
+
+ {getMessage('modal.cover.outline.arrow')} +
+ +
+ +
+
+
+ react +
+
+
+ + ) +} diff --git a/src/components/floor-plan/modal/outerlinesetting/Diagonal.jsx b/src/components/floor-plan/modal/outerlinesetting/Diagonal.jsx new file mode 100644 index 00000000..9ae9f02e --- /dev/null +++ b/src/components/floor-plan/modal/outerlinesetting/Diagonal.jsx @@ -0,0 +1,59 @@ +import { useMessage } from '@/hooks/useMessage' + +export default function Diagonal() { + const { getMessage } = useMessage() + return ( + <> +
+
+
+ + {getMessage('modal.cover.outline.diagonal')} +
+ {getMessage('modal.cover.outline.length')} + +
+ +
+ +
+
+
+
+ {getMessage('modal.cover.outline.length')} +
+ +
+ +
+
+ {getMessage('modal.cover.outline.arrow')} +
+ + + + +
+
+
+
+
+ {getMessage('modal.cover.outline.length')} +
+ +
+
+
+ {getMessage('modal.cover.outline.arrow')} +
+ + + + +
+
+
+
+ + ) +} diff --git a/src/components/floor-plan/modal/outerlinesetting/DoublePitch.jsx b/src/components/floor-plan/modal/outerlinesetting/DoublePitch.jsx new file mode 100644 index 00000000..ea386d4b --- /dev/null +++ b/src/components/floor-plan/modal/outerlinesetting/DoublePitch.jsx @@ -0,0 +1,67 @@ +import { useMessage } from '@/hooks/useMessage' + +export default function DoublePitch() { + const { getMessage } = useMessage() + return ( + <> +
+
+
+ {getMessage('modal.cover.outline.angle')} +
+ +
+ +
+
+
+
+ {getMessage('modal.cover.outline.length')} +
+ +
+ +
+
+ {getMessage('modal.cover.outline.arrow')} +
+ + + + +
+
+
+
+
+
+
+ {getMessage('modal.cover.outline.angle')} +
+ +
+ +
+
+
+
+ {getMessage('modal.cover.outline.length')} +
+ +
+ +
+
+ {getMessage('modal.cover.outline.arrow')} +
+ + + + +
+
+
+
+ + ) +} diff --git a/src/components/floor-plan/modal/outerlinesetting/OuterLineWall.jsx b/src/components/floor-plan/modal/outerlinesetting/OuterLineWall.jsx index 6e9f1c34..9dfa85c8 100644 --- a/src/components/floor-plan/modal/outerlinesetting/OuterLineWall.jsx +++ b/src/components/floor-plan/modal/outerlinesetting/OuterLineWall.jsx @@ -1,154 +1,39 @@ 'use client' -import WithDraggable from '@/components/common/draggable/withDraggable' import { useMessage } from '@/hooks/useMessage' -import { OUTER_LINE_TYPE } from '@/store/outerLineAtom' -import { onlyNumberInputChange, onlyNumberWithDotInputChange } from '@/util/input-utils' import { useOuterLineWall } from '@/hooks/roofcover/useOuterLineWall' +import { onlyNumberInputChange } from '@/util/input-utils' export default function OuterLineWall(props) { - const { setShowOutlineModal } = props const { getMessage } = useMessage() - const { points, length1, setLength1, length2, setLength2, length1Ref, length2Ref, arrow1, arrow2, type, setType, handleFix, handleRollback } = - useOuterLineWall() - + const { length1, setLength1, length1Ref, arrow1, setArrow1 } = useOuterLineWall() return ( - -
-
-

{getMessage('modal.cover.outline.drawing')}

- -
-
-
- - - - - - +
+
+
+ {getMessage('modal.cover.outline.length')} +
+ onlyNumberInputChange(e, setLength1)} + placeholder="3000" + />
-
-

{getMessage('modal.cover.outline.setting')}

- {type === OUTER_LINE_TYPE.OUTER_LINE ? ( -
-
- - onlyNumberInputChange(e, setLength1)} - placeholder="3000" - /> -
-
- - -
-
- ) : type === OUTER_LINE_TYPE.RIGHT_ANGLE ? ( -
-
- - onlyNumberInputChange(e, setLength1)} - placeholder="3000" - /> -
-
- - -
-
- - onlyNumberInputChange(e, setLength2)} - placeholder="3000" - /> -
-
- - -
-
- ) : type === OUTER_LINE_TYPE.ANGLE ? ( -
-
- - onlyNumberInputChange(e, setLength1)} - placeholder="3000" - /> -
-
- - onlyNumberWithDotInputChange(e, setAngle1)} - className="input-origin block" - /> -
-
- ) : ( - <> - )} -
- - - - -
+ +
+
+ {getMessage('modal.cover.outline.arrow')} +
+ + + +
- +
) } diff --git a/src/components/floor-plan/modal/outerlinesetting/RightAngle.jsx b/src/components/floor-plan/modal/outerlinesetting/RightAngle.jsx new file mode 100644 index 00000000..815ab087 --- /dev/null +++ b/src/components/floor-plan/modal/outerlinesetting/RightAngle.jsx @@ -0,0 +1,45 @@ +import { useMessage } from '@/hooks/useMessage' + +export default function RightAngle() { + const { getMessage } = useMessage() + return ( +
+
+
+ {getMessage('modal.cover.outline.length')} +
+ +
+ +
+
+ {getMessage('modal.cover.outline.arrow')} +
+ + + + +
+
+
+
+
+ {getMessage('modal.cover.outline.length')} +
+ +
+ +
+
+ {getMessage('modal.cover.outline.arrow')} +
+ + + + +
+
+
+
+ ) +} diff --git a/src/components/floor-plan/modal/outerlinesetting/WallLineSetting.jsx b/src/components/floor-plan/modal/outerlinesetting/WallLineSetting.jsx new file mode 100644 index 00000000..7e90bfb9 --- /dev/null +++ b/src/components/floor-plan/modal/outerlinesetting/WallLineSetting.jsx @@ -0,0 +1,83 @@ +'use client' + +import WithDraggable from '@/components/common/draggable/withDraggable' +import { useMessage } from '@/hooks/useMessage' +import { OUTER_LINE_TYPE } from '@/store/outerLineAtom' +import { useOuterLineWall } from '@/hooks/roofcover/useOuterLineWall' +import OuterLineWall from '@/components/floor-plan/modal/outerlinesetting/OuterLineWall' +import RightAngle from '@/components/floor-plan/modal/outerlinesetting/RightAngle' +import Angle from '@/components/floor-plan/modal/outerlinesetting/Angle' +import DoublePitch from '@/components/floor-plan/modal/outerlinesetting/DoublePitch' +import Diagonal from '@/components/floor-plan/modal/outerlinesetting/Diagonal' + +export default function WallLineSetting(props) { + const { setShowOutlineModal } = props + const { getMessage } = useMessage() + const { type, setType, handleFix, handleRollback } = useOuterLineWall() + + return ( + +
+
+

{getMessage('modal.cover.outline.drawing')}

+ +
+
+
+ + + + + + +
+ {type === OUTER_LINE_TYPE.OUTER_LINE ? ( + + ) : type === OUTER_LINE_TYPE.RIGHT_ANGLE ? ( + + ) : type === OUTER_LINE_TYPE.DOUBLE_PITCH ? ( + + ) : type === OUTER_LINE_TYPE.ANGLE ? ( + + ) : type === OUTER_LINE_TYPE.DIAGONAL_LINE ? ( + + ) : ( + <> + )} +
+ + +
+
+
+ + ) +} diff --git a/src/components/header/Header.jsx b/src/components/header/Header.jsx index 456cb09f..04fd56c6 100644 --- a/src/components/header/Header.jsx +++ b/src/components/header/Header.jsx @@ -137,7 +137,9 @@ export default function Header(props) {
- + + +