diff --git a/docs/git commit message Convention.pdf b/docs/git commit message Convention.pdf new file mode 100644 index 00000000..1df33833 Binary files /dev/null and b/docs/git commit message Convention.pdf differ diff --git a/src/app/layout.js b/src/app/layout.js index c3ac72de..30a6e8ee 100644 --- a/src/app/layout.js +++ b/src/app/layout.js @@ -10,10 +10,10 @@ import { ToastContainer } from 'react-toastify' import Header from '@/components/header/Header' import QModal from '@/components/common/modal/QModal' +import { QcastProvider } from './QcastProvider' import './globals.css' import '../styles/style.scss' -import { QcastProvider } from './QcastProvider' const inter = Inter({ subsets: ['latin'] }) diff --git a/src/components/Roof2.jsx b/src/components/Roof2.jsx index d8b4c25e..fe79d2b5 100644 --- a/src/components/Roof2.jsx +++ b/src/components/Roof2.jsx @@ -42,6 +42,7 @@ import { SurfaceShapeModal } from '@/components/ui/SurfaceShape' import { changeAllGableRoof, drawDirectionStringToArrow } from '@/util/qpolygon-utils' import ThumbnailList from '@/components/ui/ThumbnailLIst' import ObjectPlacement from '@/components/ui/ObjectPlacement' +import { globalLocaleStore } from '@/store/localeAtom' export default function Roof2(props) { const { name, userId, email, isLoggedIn } = props @@ -58,7 +59,9 @@ export default function Roof2(props) { setBackImg, } = useCanvas('canvas') - const { get } = useAxios() + const globalLocaleState = useRecoilValue(globalLocaleStore) + + const { get } = useAxios(globalLocaleState) const canvasRef = useRef(null) diff --git a/src/components/auth/Login.jsx b/src/components/auth/Login.jsx index 326f5720..d71870e2 100644 --- a/src/components/auth/Login.jsx +++ b/src/components/auth/Login.jsx @@ -11,10 +11,9 @@ import { useRecoilState } from 'recoil' import { globalLocaleStore } from '@/store/localeAtom' import { modalContent, modalState } from '@/store/modalAtom' -export default function Login(props) { +export default function Login() { const { patch } = useAxios() - const { currentLocale } = props const { getMessage } = useMessage() const [globalLocaleState, setGlbalLocaleState] = useRecoilState(globalLocaleStore) const [isSelected, setIsSelected] = useState(globalLocaleState === 'ko' ? true : false) diff --git a/src/components/floor-plan/CanvasLayout.jsx b/src/components/floor-plan/CanvasLayout.jsx index 71c48845..9990aa21 100644 --- a/src/components/floor-plan/CanvasLayout.jsx +++ b/src/components/floor-plan/CanvasLayout.jsx @@ -1,15 +1,15 @@ 'use client' -import { useState } from 'react' +import { useEffect, useState } from 'react' import CanvasFrame from './CanvasFrame' import { useRecoilState, useRecoilValue } from 'recoil' import { currentMenuState, stepState } from '@/store/canvasAtom' export default function CanvasLayout() { const [plans, setPlans] = useState([ - { id: 0, name: 'Plan 1' }, - { id: 1, name: 'Plan 2' }, - { id: 2, name: 'Plan 3' }, + { id: 0, name: 'Plan 1', isCurrent: false }, + { id: 1, name: 'Plan 2', isCurrent: false }, + { id: 2, name: 'Plan 3', isCurrent: false }, ]) const [idxNum, setIdxNum] = useState(null) @@ -26,6 +26,12 @@ export default function CanvasLayout() { setPlans([...plans, { id: plans.length, name: `Plan ${plans.length + 1}` }]) } + useEffect(() => { + if (plans.length === 1) { + setPlans([{ id: 0, name: 'Plan 1', isCurrent: false }]) + } + }, []) + return (