-
-
-
-
{children}
+
+
+
+ {headerPathname === '/login' || headerPathname === '/join' ? (
+ {children}
+ ) : (
+
+
-
-
-
- )}
-
-
-
-
+
+ )}
+
+
+
+
+
)
}
diff --git a/src/app/management/ManagementProvider.js b/src/app/management/ManagementProvider.js
index 197b30c0..fb57e948 100644
--- a/src/app/management/ManagementProvider.js
+++ b/src/app/management/ManagementProvider.js
@@ -1,20 +1,18 @@
'ues client'
-import { createContext, useEffect, useState } from 'react'
+import { createContext } from 'react'
-export const ManagementContext = createContext({
- managementState: {},
- setManagementState: () => {},
-})
+export const ManagementContext = createContext({})
const ManagementProvider = ({ children }) => {
- const [managementState, setManagementState] = useState({})
+ // const [managementState, setManagementState] = useState({})
- useEffect(() => {
- console.log('🚀 ~ managementState:', managementState)
- }, [managementState])
+ // useEffect(() => {
+ // console.log('🚀 ~ managementState:', managementState)
+ // }, [managementState])
- return
{children}
+ // return
{children}
+ return
{children}
}
export default ManagementProvider
diff --git a/src/common/common.js b/src/common/common.js
index e2e31889..a28542e9 100644
--- a/src/common/common.js
+++ b/src/common/common.js
@@ -112,6 +112,7 @@ export const POLYGON_TYPE = {
WALL: 'wall',
TRESTLE: 'trestle',
MODULE_SETUP_SURFACE: 'moduleSetupSurface',
+ MODULE: 'module',
}
export const SAVE_KEY = [
diff --git a/src/components/Main.jsx b/src/components/Main.jsx
index 1a436582..5f6c1052 100644
--- a/src/components/Main.jsx
+++ b/src/components/Main.jsx
@@ -41,12 +41,12 @@ export default function MainPage(mainPageProps) {
if (searchRadioType === 'object') {
setStuffSearch({
...stuffSearch,
- schObjectNo: searchTxt,
+ schObjectNo: searchTxt.trim(),
code: 'M',
})
router.push('/management/stuff', { scroll: false })
} else {
- setSearchForm({ ...searchForm, searchValue: searchTxt, mainFlag: 'Y' })
+ setSearchForm({ ...searchForm, searchValue: searchTxt.trim(), mainFlag: 'Y' })
router.push('/community/faq')
}
}
diff --git a/src/components/Playground.jsx b/src/components/Playground.jsx
index e3d185ec..1d5820ff 100644
--- a/src/components/Playground.jsx
+++ b/src/components/Playground.jsx
@@ -1,27 +1,28 @@
'use client'
-import { useRef, useState, useEffect } from 'react'
+import { useRef, useState, useEffect, useContext } from 'react'
+import Image from 'next/image'
import { useRecoilState } from 'recoil'
import { v4 as uuidv4 } from 'uuid'
import { FaAnglesUp } from 'react-icons/fa6'
import { FaAnglesDown } from 'react-icons/fa6'
+import { Button } from '@nextui-org/react'
+import ColorPicker from './common/color-picker/ColorPicker'
+import { cadFileNameState, googleMapFileNameState, useCadFileState, useGoogleMapFileState } from '@/store/canvasAtom'
import { useAxios } from '@/hooks/useAxios'
import { useMessage } from '@/hooks/useMessage'
import { useMasterController } from '@/hooks/common/useMasterController'
-import { convertDwgToPng } from '@/lib/cadAction'
-import { cadFileNameState, googleMapFileNameState, useCadFileState, useGoogleMapFileState } from '@/store/canvasAtom'
-
-import { Button } from '@nextui-org/react'
-import ColorPicker from './common/color-picker/ColorPicker'
import { useSwal } from '@/hooks/useSwal'
-
-import styles from './playground.module.css'
-import Image from 'next/image'
-
+import { convertDwgToPng } from '@/lib/cadAction'
+import { GlobalDataContext } from '@/app/GlobalDataProvider'
import QInput from './common/input/Qinput'
import QSelect from './common/select/QSelect'
import QPagination from './common/pagination/QPagination'
+import QSelectBox from './common/select/QSelectBox'
+import SampleReducer from './sample/SampleReducer'
+
+import styles from './playground.module.css'
export default function Playground() {
const [useCadFile, setUseCadFile] = useRecoilState(useCadFileState)
@@ -36,7 +37,7 @@ export default function Playground() {
const converterUrl = process.env.NEXT_PUBLIC_CONVERTER_API_URL
const { getMessage } = useMessage()
const { swalFire } = useSwal()
- const { getRoofMaterialList, getModuleTypeItemList } = useMasterController()
+ const { getRoofMaterialList, getModuleTypeItemList, getTrestleList, getConstructionList, getTrestleDetailList } = useMasterController()
const [color, setColor] = useState('#ff0000')
@@ -48,6 +49,8 @@ export default function Playground() {
const [users, setUsers] = useState([])
+ const { managementState, setManagementState, managementStateLoaded } = useContext(GlobalDataContext)
+
useEffect(() => {
console.log('textInput:', textInput)
}, [textInput])
@@ -154,6 +157,75 @@ export default function Playground() {
console.log('users:', users)
}, [users])
+ const codes = [
+ {
+ clHeadCd: '203800',
+ clCode: 'HEI_455',
+ clCodeNm: '세로 455mm이하',
+ clPriority: 1,
+ name: '세로 455mm이하',
+ id: 'HEI_455',
+ },
+ {
+ clHeadCd: '203800',
+ clCode: 'HEI_500',
+ clCodeNm: '세로 500mm이하',
+ clPriority: 2,
+ name: '세로 500mm이하',
+ id: 'HEI_500',
+ },
+ {
+ clHeadCd: '203800',
+ clCode: 'HEI_606',
+ clCodeNm: '세로 606mm이하',
+ clPriority: 3,
+ name: '세로 606mm이하',
+ id: 'HEI_606',
+ },
+ {
+ clHeadCd: '203800',
+ clCode: 'WID_606',
+ clCodeNm: '가로 606mm이하',
+ clPriority: 4,
+ name: '가로 606mm이하',
+ id: 'WID_606',
+ },
+ {
+ clHeadCd: '203800',
+ clCode: 'ETC',
+ clCodeNm: '기타',
+ clPriority: 5,
+ name: '기타',
+ id: 'ETC',
+ },
+ ]
+
+ const [myData, setMyData] = useState({
+ roofMatlCd: 'ROOF_ID_WA_53A',
+ roofMatlNm: '화와 A',
+ roofMatlNmJp: '和瓦A',
+ widAuth: 'R',
+ widBase: '265.000',
+ lenAuth: 'R',
+ lenBase: '235.000',
+ roofPchAuth: null,
+ roofPchBase: null,
+ raftAuth: 'C',
+ raftBaseCd: 'HEI_455',
+ id: 'ROOF_ID_WA_53A',
+ name: '화와 A',
+ selected: true,
+ nameJp: '和瓦A',
+ length: 235,
+ width: 265,
+ layout: 'P',
+ hajebichi: null,
+ })
+
+ const handleChangeMyData = () => {
+ setMyData({ ...myData, raftBaseCd: 'HEI_500' })
+ }
+
return (
<>
@@ -166,16 +238,70 @@ export default function Playground() {
}}
>
지붕재 목록 조회 API 호출
-
+ {' '}
{' '}
+ {' '}
+ {' '}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{managementStateLoaded?.objectNo}
+
+
+
+