From afac47ae789b98433cb6a41eced41fa881741ec3 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 13:43:31 +0900 Subject: [PATCH] =?UTF-8?q?=ED=8C=9D=EC=97=85=20=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?=EB=B0=8F=20=EB=A9=94=EB=89=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../images/canvas/arr_btn_ico_white.svg | 3 ++ src/app/canvas/page.jsx | 6 ++-- src/app/inputwrap/page.jsx | 5 +++ src/components/canvas/CanvasMenu.jsx | 15 ++++---- src/components/canvas/MenuDepth01.jsx | 4 +-- .../modal/outerlinesetting/OuterLineWall.jsx | 36 +++++++++++++++---- .../modal/settoing01/SettingModal01.jsx | 5 ++- src/styles/_modal.scss | 21 +++++++++++ src/styles/_reset.scss | 32 ++++++++++++++++- 9 files changed, 103 insertions(+), 24 deletions(-) create mode 100644 public/static/images/canvas/arr_btn_ico_white.svg diff --git a/public/static/images/canvas/arr_btn_ico_white.svg b/public/static/images/canvas/arr_btn_ico_white.svg new file mode 100644 index 0000000..31e0478 --- /dev/null +++ b/public/static/images/canvas/arr_btn_ico_white.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/app/canvas/page.jsx b/src/app/canvas/page.jsx index 2022c9c..ae49636 100644 --- a/src/app/canvas/page.jsx +++ b/src/app/canvas/page.jsx @@ -15,12 +15,12 @@ export default function CanvasPage() {
- +
- {modalOpen === 'option' && } - {modalOpen === 'outerwall' && } + +
diff --git a/src/app/inputwrap/page.jsx b/src/app/inputwrap/page.jsx index 9557695..c27b980 100644 --- a/src/app/inputwrap/page.jsx +++ b/src/app/inputwrap/page.jsx @@ -29,8 +29,10 @@ export default function InputWrapPage (){

Input WRAP

+
+

DatePicker WRAP

@@ -68,6 +70,9 @@ export default function InputWrapPage (){ + diff --git a/src/components/canvas/CanvasMenu.jsx b/src/components/canvas/CanvasMenu.jsx index c2e5775..b395209 100644 --- a/src/components/canvas/CanvasMenu.jsx +++ b/src/components/canvas/CanvasMenu.jsx @@ -3,7 +3,7 @@ import { useState } from "react"; import Qselect from "../common/select/Qselect"; import MenuDepth01 from "./MenuDepth01"; -export default function CanvasMenu({setModalOpen}) { +export default function CanvasMenu() { const [menuNumber, setMenuNumber] = useState(null); const [vertical, setVertical] = useState(true); const SelectOption = [ @@ -42,8 +42,7 @@ export default function CanvasMenu({setModalOpen}) {
- { - (menuNumber === 1 || menuNumber === 2 || menuNumber === 3 || menuNumber === 4) && + {(menuNumber !== 6 && menuNumber !== 5) && <>
@@ -58,7 +57,7 @@ export default function CanvasMenu({setModalOpen}) {
- +
@@ -72,13 +71,13 @@ export default function CanvasMenu({setModalOpen}) {
- - } - + } + + {(menuNumber === 5) && 'asdasd'}
- {menuNumber === 2 && } + {menuNumber === 2 && } {menuNumber === 3 && } {menuNumber === 4 && }
diff --git a/src/components/canvas/MenuDepth01.jsx b/src/components/canvas/MenuDepth01.jsx index 4cf4ae2..763f60d 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({setModalOpen}){ +export default function MenuDepth01(){ return(
    -
  • setModalOpen('outerwall')}>
    • +
    • diff --git a/src/components/canvas/modal/outerlinesetting/OuterLineWall.jsx b/src/components/canvas/modal/outerlinesetting/OuterLineWall.jsx index b3cb138..270f03a 100644 --- a/src/components/canvas/modal/outerlinesetting/OuterLineWall.jsx +++ b/src/components/canvas/modal/outerlinesetting/OuterLineWall.jsx @@ -4,19 +4,18 @@ import { useState } from "react"; import WithDraggable from "@/components/common/draggable/withDraggable"; -export default function OuterLineWall ({modalOpen, setModalOpen}){ +export default function OuterLineWall (){ const [buttonAct, setButtonAct] = useState(1); const [close, setClose] = useState(false) const HandleClickClose = () => { setClose(true) setTimeout(() => { - setModalOpen(''); setClose(false); }, 180) } return( -
    +

    外壁線を描

    @@ -38,26 +37,49 @@ export default function OuterLineWall ({modalOpen, setModalOpen}){

    設定

    - +
    +
    + + +
    +
    + + +
    +
    +
    + + + + +
    diff --git a/src/components/canvas/modal/settoing01/SettingModal01.jsx b/src/components/canvas/modal/settoing01/SettingModal01.jsx index 43354a7..151f2fc 100644 --- a/src/components/canvas/modal/settoing01/SettingModal01.jsx +++ b/src/components/canvas/modal/settoing01/SettingModal01.jsx @@ -17,19 +17,18 @@ const propsClick = { onClick: HandleBtnClick } -export default function SettingModal01 ({modalOpen, setModalOpen}){ +export default function SettingModal01 (){ const [buttonAct, setButtonAct] = useState(1); const [close, setClose] = useState(false) const HandleClickClose = () => { setClose(true) setTimeout(() => { - setModalOpen(''); setClose(false); }, 180) } return( -
    +

    Canvas設定

    diff --git a/src/styles/_modal.scss b/src/styles/_modal.scss index 05b0e4a..32411b9 100644 --- a/src/styles/_modal.scss +++ b/src/styles/_modal.scss @@ -24,6 +24,9 @@ &.sm{ max-width: 450px; } + &.ssm{ + max-width: 380px; + } &.mount{ animation: mountpop .17s ease-in-out forwards; } @@ -80,6 +83,12 @@ button{ width: calc(50% - 5px); } + &.btn{ + gap: 5px; + button{ + width: calc(50% - 2.5px); + } + } } &.for-line{ button{ @@ -88,4 +97,16 @@ } } } + .outer-line-wrap{ + border-top: 1px solid #3C3C3C; + margin-top: 10px; + padding-top: 15px; + margin-bottom: 15px; + > div{ + margin-bottom: 15px; + &:last-child{ + margin-bottom: 0; + } + } + } } \ No newline at end of file diff --git a/src/styles/_reset.scss b/src/styles/_reset.scss index f96cd52..0401850 100644 --- a/src/styles/_reset.scss +++ b/src/styles/_reset.scss @@ -127,7 +127,7 @@ button{ // button .btn-frame{ display: inline-block; - padding: 0 10px; + padding: 0 9px; height: 34px; line-height: 34px; border-radius: 2px; @@ -255,6 +255,15 @@ button{ } // input +.form-input{ + label{ + display: block; + color: #aaa; + font-size: 12px; + font-weight: 500; + margin-bottom: 10px; + } +} input[type=text]{ &.input-origin{ display: inline-block; @@ -267,8 +276,13 @@ input[type=text]{ font-weight: 500; font-family: 'Pretendard', sans-serif; padding: 0 10px; + letter-spacing: 0px; &::placeholder{ font-size: 12px; + letter-spacing: 0px; + } + &.block{ + width: 100%; } } } @@ -376,4 +390,20 @@ input[type=text]{ } } } + &.dark{ + text-align: center; + background-color: #272727; + border: 1px solid #484848; + span{ + color: #Fff; + &:after{ + background: url(../../public/static/images/canvas/arr_btn_ico_white.svg)no-repeat center; + } + } + &:hover, + &.act{ + background-color: #1083E3; + border: 1px solid #1083E3; + } + } } \ No newline at end of file