Merge branch 'dev' of https://git.hanasys.jp/qcast3/onsitesurvey into feature/survey

README.md

@@ -25,7 +25,7 @@ const data = cache.getQueryData(['user', 'info']) as UserState
 ```
 const popupController = usePopupController()
 
-onClick={() => popupController.setMemberInfomationPopup(true)}
+onClick={() => popupController.setMemberInformationPopup(true)}
 onClick={() => popupController.setZipCodePopup(true)}
 ```
 
@@ -34,6 +34,6 @@ onClick={() => popupController.setZipCodePopup(true)}
 ```
 const popupController = usePopupController()
 
-onClick={() => popupController.setMemberInfomationPopup(false)}
+onClick={() => popupController.setMemberInformationPopup(false)}
 onClick={() => popupController.setZipCodePopup(false)}
 ```

src/app/layout.tsx

@@ -2,7 +2,6 @@ import type { Metadata } from 'next'
 import ReactQueryProviders from '@/providers/ReactQueryProvider'
 import PopupController from '@/components/ui/PopupController'
 import '@/styles/style.scss'
-import { headers } from 'next/headers'
 import type { ReactNode } from 'react'
 
 export const metadata: Metadata = {

src/app/survey-sale/basic-info/page.tsx

@@ -1,6 +1,4 @@
 import BasicForm from '@/components/survey-sale/detail/BasicForm'
-import Footer from '@/components/ui/common/Footer'
-import Header from '@/components/ui/common/Header'
 
 export default function page() {
   return (

src/app/survey-sale/roof-info/page.tsx

@@ -1,6 +1,4 @@
 import RoofInfoForm from '@/components/survey-sale/detail/RoofInfoForm'
-import Footer from '@/components/ui/common/Footer'
-import Header from '@/components/ui/common/Header'
 
 export default function page() {
   return (

src/components/popup/ZipCodePopup.tsx

@@ -26,7 +26,7 @@ export default function ZipCodePopup() {
                   </div>
                   <div className="modal-name">住所検索</div>
                 </div>
-                <button className="modal-close" onClick={() => popupController.setZipCodePopup({ zipCodePopup: false })}></button>
+                <button className="modal-close" onClick={() => popupController.setZipCodePopup(false)}></button>
               </div>
             </div>
             <div className="modal-body">