From 5592f6f57ac6806fbe7fe3cd9fa12db579634c5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=B0=BD=EC=88=98?= Date: Tue, 10 Sep 2024 10:05:54 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A9=94=EB=89=B4=20=EC=84=B8=ED=8C=85=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20=ED=8C=9D=EC=97=85=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/canvas/page.jsx | 2 + src/components/canvas/CanvasMenu.jsx | 70 ++++++++++--------- src/components/canvas/MenuDepth01.jsx | 4 +- .../modal/outerlinesetting/OuterLineWall.jsx | 66 +++++++++++++++++ src/styles/_contents.scss | 6 ++ 5 files changed, 112 insertions(+), 36 deletions(-) create mode 100644 src/components/canvas/modal/outerlinesetting/OuterLineWall.jsx diff --git a/src/app/canvas/page.jsx b/src/app/canvas/page.jsx index 9f11ccb..2022c9c 100644 --- a/src/app/canvas/page.jsx +++ b/src/app/canvas/page.jsx @@ -2,6 +2,7 @@ import CanvasLayout from '@/components/canvas/CanvasLayout' import CanvasMenu from '@/components/canvas/CanvasMenu' +import OuterLineWall from '@/components/canvas/modal/outerlinesetting/OuterLineWall' import SettingModal01 from '@/components/canvas/modal/settoing01/SettingModal01' import Header from '@/components/header/Header' import '@/styles/style.scss' @@ -19,6 +20,7 @@ export default function CanvasPage() { {modalOpen === 'option' && } + {modalOpen === 'outerwall' && } diff --git a/src/components/canvas/CanvasMenu.jsx b/src/components/canvas/CanvasMenu.jsx index 8f9f018..c2e5775 100644 --- a/src/components/canvas/CanvasMenu.jsx +++ b/src/components/canvas/CanvasMenu.jsx @@ -16,7 +16,7 @@ export default function CanvasMenu({setModalOpen}) { } } return( -
+
  • onClickNav(0)}> @@ -42,43 +42,45 @@ export default function CanvasMenu({setModalOpen}) {
-
- - - -
-
- 垂直水平モード - -
-
- -
-
- - - -
-
- - 100% - -
-
- - - -
+ { + (menuNumber === 1 || menuNumber === 2 || menuNumber === 3 || menuNumber === 4) && + <> +
+ + + +
+
+ 垂直水平モード + +
+
+ +
+
+ + + +
+
+ + 100% + +
+
+ + + +
+ + } +
-
- {menuNumber === 0 && } - {menuNumber === 1 && } - {menuNumber === 2 && } +
+ {menuNumber === 2 && } {menuNumber === 3 && } {menuNumber === 4 && } - {menuNumber === 5 && } - {menuNumber === 6 && }
) diff --git a/src/components/canvas/MenuDepth01.jsx b/src/components/canvas/MenuDepth01.jsx index 763f60d..4cf4ae2 100644 --- a/src/components/canvas/MenuDepth01.jsx +++ b/src/components/canvas/MenuDepth01.jsx @@ -2,11 +2,11 @@ import { ToggleonMouse } from "../header/Header" -export default function MenuDepth01(){ +export default function MenuDepth01({setModalOpen}){ return(
    -
  • +
  • setModalOpen('outerwall')}>
  • diff --git a/src/components/canvas/modal/outerlinesetting/OuterLineWall.jsx b/src/components/canvas/modal/outerlinesetting/OuterLineWall.jsx new file mode 100644 index 0000000..b3cb138 --- /dev/null +++ b/src/components/canvas/modal/outerlinesetting/OuterLineWall.jsx @@ -0,0 +1,66 @@ +'use client' + +import { useState } from "react"; +import WithDraggable from "@/components/common/draggable/withDraggable"; + + +export default function OuterLineWall ({modalOpen, setModalOpen}){ + const [buttonAct, setButtonAct] = useState(1); + const [close, setClose] = useState(false) + const HandleClickClose = () => { + setClose(true) + setTimeout(() => { + setModalOpen(''); + setClose(false); + }, 180) + } + return( + +
    +
    +

    外壁線を描

    + +
    +
    +
    + + + + + + +
    +
    +

    設定

    + +
    +
    +
    +
    + ) +} \ No newline at end of file diff --git a/src/styles/_contents.scss b/src/styles/_contents.scss index ff6005c..21c8e46 100644 --- a/src/styles/_contents.scss +++ b/src/styles/_contents.scss @@ -132,6 +132,12 @@ font-weight: 400; color: #fff; padding: 0 7.5px; + transition: all .17s ease-in-out; + } + &.on{ + button{ + background-color: #1083E3; + } } } .size-control{