From 98680aecf9fe72b1249f38c8b7caa85313920016 Mon Sep 17 00:00:00 2001 From: minsik Date: Thu, 12 Sep 2024 16:21:03 +0900 Subject: [PATCH] =?UTF-8?q?-=20menu=20link=20=EC=B6=94=EA=B0=80=20-=20moda?= =?UTF-8?q?l=20=EC=9C=84=EC=B9=98=EC=88=98=EC=A0=95=20-=20logout?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/[locale]/page.js | 3 +-- .../common/draggable/withDraggable.jsx | 8 ++++++-- src/components/floor-plan/MenuDepth01.jsx | 2 +- .../modal/outerlinesetting/OuterLineWall.jsx | 2 +- .../modal/setting01/SettingModal01.jsx | 2 +- src/components/header/Header.jsx | 18 +++++++++++------- src/lib/authActions.js | 4 +--- src/locales/ko.json | 1 + src/styles/_modal.scss | 2 -- 9 files changed, 23 insertions(+), 19 deletions(-) diff --git a/src/app/[locale]/page.js b/src/app/[locale]/page.js index b45f2690..aa5d3f7e 100644 --- a/src/app/[locale]/page.js +++ b/src/app/[locale]/page.js @@ -1,9 +1,8 @@ -import { getSession } from '@/lib/authActions' // import { getCurrentLocale } from '@/locales/server' import MainPage from '@/components/Main' export default async function page() { - const session = await getSession() + // const session = await getSession() // const currentLocale = getCurrentLocale() diff --git a/src/components/common/draggable/withDraggable.jsx b/src/components/common/draggable/withDraggable.jsx index 9f322583..b6c2920b 100644 --- a/src/components/common/draggable/withDraggable.jsx +++ b/src/components/common/draggable/withDraggable.jsx @@ -1,15 +1,19 @@ 'use client' -import { useState } from 'react' +import { useEffect, useState } from 'react' import Draggable from 'react-draggable' -export default function WithDraggable({ isShow, children }) { +export default function WithDraggable({ isShow, children, pos }) { const [position, setPosition] = useState({ x: 0, y: 0 }) const handleOnDrag = (data) => { setPosition({ x: data.x, y: data.y }) } + useEffect(() => { + setPosition({ ...pos }) + }, []) + return ( <> {isShow && ( diff --git a/src/components/floor-plan/MenuDepth01.jsx b/src/components/floor-plan/MenuDepth01.jsx index 08eac1f4..170fd820 100644 --- a/src/components/floor-plan/MenuDepth01.jsx +++ b/src/components/floor-plan/MenuDepth01.jsx @@ -33,7 +33,7 @@ export default function MenuDepth01(props) { @@ -81,21 +83,21 @@ export default function Header(props) { onMouseEnter={(e) => ToggleonMouse(e, 'add', 'li > ul')} onMouseLeave={(e) => ToggleonMouse(e, 'remove', 'li > ul')} > - {getMessage('header.menus.community.notice')} + {getMessage('header.menus.community.notice')}
  • ToggleonMouse(e, 'add', 'li > ul')} onMouseLeave={(e) => ToggleonMouse(e, 'remove', 'li > ul')} > - {getMessage('header.menus.community.faq')} + {getMessage('header.menus.community.faq')}
  • ToggleonMouse(e, 'add', 'li > ul')} onMouseLeave={(e) => ToggleonMouse(e, 'remove', 'li > ul')} > - {getMessage('header.menus.community.archive')} + {getMessage('header.menus.community.archive')}
    • @@ -107,7 +109,9 @@ export default function Header(props) {
    - +
    diff --git a/src/lib/authActions.js b/src/lib/authActions.js index eafddadd..c19ba0f0 100644 --- a/src/lib/authActions.js +++ b/src/lib/authActions.js @@ -4,9 +4,7 @@ import { cookies } from 'next/headers' import { redirect } from 'next/navigation' import { getIronSession } from 'iron-session' - -import { getUserByIdAndPassword } from './user' -import { defaultSession, sessionOptions } from './session' +import { sessionOptions } from './session' export async function logout() { const session = await getSession() diff --git a/src/locales/ko.json b/src/locales/ko.json index cf7d758f..bb7451d3 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -17,6 +17,7 @@ "plan.menu.placement.surface.initial.setting": "배치면 초기 설정", "plan.menu.root.cover": "지붕덮개", "plan.menu.root.cover.outline.drawing": "외벽선 그리기", + "plan.menu.root.cover.auxiliary.line.drawing": "보조선 그리기", "modal.cover.outline.drawing": "외벽선 작성", "modal.cover.outline": "외벽선", "modal.cover.outline.right.angle": "직각", diff --git a/src/styles/_modal.scss b/src/styles/_modal.scss index c57e5968..0dd9d68f 100644 --- a/src/styles/_modal.scss +++ b/src/styles/_modal.scss @@ -22,8 +22,6 @@ .modal-pop-wrap { position: fixed; - top: 200px; - right: 100px; width: 100%; min-width: 380px; max-width: fit-content;