diff --git a/src/app/[locale]/layout.js b/src/app/[locale]/layout.js
index 9ae6b1b9..71410d17 100644
--- a/src/app/[locale]/layout.js
+++ b/src/app/[locale]/layout.js
@@ -2,14 +2,19 @@
import { useCurrentLocale } from '@/locales/client'
import { LocaleProvider } from './LocaleProvider'
+import ServerError from './error'
+import { ErrorBoundary } from 'next/dist/client/components/error-boundary'
export default function LocaleLayout({ children }) {
const locale = useCurrentLocale()
+
return (
<>
-
- {children}
-
+
}>
+
}>
+ {children}
+
+
)
}
diff --git a/src/app/[locale]/management/plan/page.jsx b/src/app/[locale]/management/plan/page.jsx
index 61937238..5fefa62a 100644
--- a/src/app/[locale]/management/plan/page.jsx
+++ b/src/app/[locale]/management/plan/page.jsx
@@ -1,7 +1,10 @@
import Hero from '@/components/Hero'
import Plan from '@/components/management/Plan'
+import { initCheck } from '@/util/session-util'
+
+export default async function ManagementPlanPage() {
+ await initCheck()
-export default function ManagementPlanPage() {
return (
<>
diff --git a/src/app/[locale]/management/stuff/page.jsx b/src/app/[locale]/management/stuff/page.jsx
index 15131ba6..e2d3c1cd 100644
--- a/src/app/[locale]/management/stuff/page.jsx
+++ b/src/app/[locale]/management/stuff/page.jsx
@@ -1,7 +1,10 @@
import Hero from '@/components/Hero'
import Stuff from '@/components/management/Stuff'
+import { initCheck } from '@/util/session-util'
+
+export default async function ManagementStuffPage() {
+ await initCheck()
-export default function ManagementStuffPage() {
return (
<>
diff --git a/src/app/[locale]/master/company/page.jsx b/src/app/[locale]/master/company/page.jsx
index 6ee60f0e..15eda41c 100644
--- a/src/app/[locale]/master/company/page.jsx
+++ b/src/app/[locale]/master/company/page.jsx
@@ -1,7 +1,10 @@
import Hero from '@/components/Hero'
import Company from '@/components/master/Company'
+import { initCheck } from '@/util/session-util'
+
+export default async function MasterCompanyPage() {
+ await initCheck()
-export default function MasterCompanyPage() {
return (
<>
diff --git a/src/app/[locale]/master/price/page.jsx b/src/app/[locale]/master/price/page.jsx
index c0e5a40d..a641d6bb 100644
--- a/src/app/[locale]/master/price/page.jsx
+++ b/src/app/[locale]/master/price/page.jsx
@@ -1,7 +1,10 @@
import Hero from '@/components/Hero'
import Price from '@/components/master/Price'
+import { initCheck } from '@/util/session-util'
+
+export default async function MasterPricePage() {
+ await initCheck()
-export default function MasterPricePage() {
return (
<>
diff --git a/src/app/[locale]/page.js b/src/app/[locale]/page.js
index e2c11aed..bbdcd96d 100644
--- a/src/app/[locale]/page.js
+++ b/src/app/[locale]/page.js
@@ -1,6 +1,6 @@
-import MainPage from '@/components/Main'
import { getSession } from '@/lib/authActions'
import { getCurrentLocale } from '@/locales/server'
+import MainPage from '@/components/Main'
export default async function page() {
const session = await getSession()
diff --git a/src/app/[locale]/playground/page.jsx b/src/app/[locale]/playground/page.jsx
index b8a7f496..66d83c34 100644
--- a/src/app/[locale]/playground/page.jsx
+++ b/src/app/[locale]/playground/page.jsx
@@ -1,6 +1,14 @@
import Playground from '@/components/Playground'
+import { initCheck } from '@/util/session-util'
+
+export default async function PlaygroundPage() {
+ // const { session } = await checkSession()
+
+ // if (!session.isLoggedIn) {
+ // redirect('/login')
+ // }
+ await initCheck()
-export default function PlaygroundPage() {
return (
<>
diff --git a/src/app/[locale]/roof/page.jsx b/src/app/[locale]/roof/page.jsx
index 4d9703f3..f5b8e611 100644
--- a/src/app/[locale]/roof/page.jsx
+++ b/src/app/[locale]/roof/page.jsx
@@ -1,7 +1,10 @@
import Hero from '@/components/Hero'
import Roof from '@/components/Roof'
+import { initCheck } from '@/util/session-util'
+
+export default async function RoofPage() {
+ await initCheck()
-export default function RoofPage() {
return (
<>
diff --git a/src/app/[locale]/roof2/RoofSelect.jsx b/src/app/[locale]/roof2/RoofSelect.jsx
index 3d14d535..d759398b 100644
--- a/src/app/[locale]/roof2/RoofSelect.jsx
+++ b/src/app/[locale]/roof2/RoofSelect.jsx
@@ -6,42 +6,123 @@ import { useAxios } from '@/hooks/useAxios'
export default function RoofSelect() {
const [roofMaterials, setRoofMaterials] = useState([])
+ const [manufacturers, setManufacturers] = useState([])
const [trestles, setTrestles] = useState([])
+ const [modules, setModules] = useState([])
+ const [originTrestles, setOriginTrestles] = useState([])
+
+ const [roofMaterialId, setRoofMaterialId] = useState(null)
+ const [manufacturerId, setManufacturerId] = useState(null)
+ const [trestleId, setTrestleId] = useState(null)
const { get } = useAxios()
- const handleRoofMaterialOnChange = (e) => {
- const id = e.target.value
- setTrestles([])
- get({ url: `/api/trestle/v1.0/trestles/${id}` }).then((res) => {
- setTrestles(res)
- })
- }
-
useEffect(() => {
- get({ url: '/api/roof-material/v1.0/roof-materials' }).then((res) => {
+ get({ url: '/api/roof-material/roof-material-infos' }).then((res) => {
+ //TODO: error handling
+ if (!res) return
+
setRoofMaterials(res)
})
}, [])
- return (
- <>
-
- {roofMaterials.length > 0 && (
-
- )}
- {trestles.length > 0 && (
-
- )}
-
-
+ useEffect(() => {
+ if (!roofMaterialId) {
+ return
+ }
+
+ get({ url: `/api/roof-material/roof-material-infos/${roofMaterialId}/trestles` }).then((res) => {
+ if (res.length === 0) {
+ return
+ }
+ setOriginTrestles(res)
+ const manufactural = res.map((trestle) => {
+ return { id: trestle.manufacturerId, name: trestle.manufacturerName }
+ })
+ // Remove duplicates
+ const uniqueManufactural = Array.from(new Set(manufactural.map((a) => a.id))).map((id) => {
+ return manufactural.find((a) => a.id === id)
+ })
+
+ setManufacturers(uniqueManufactural)
+ })
+ }, [roofMaterialId])
+
+ useEffect(() => {
+ if (!manufacturerId) {
+ return
+ }
+
+ const trestles = originTrestles.filter((trestle) => trestle.manufacturerId === manufacturerId)
+ setTrestles(trestles)
+ }, [manufacturerId])
+
+ useEffect(() => {
+ if (!trestleId) {
+ return
+ }
+ get({ url: `/api/module/module-infos?roofMaterialId=${roofMaterialId}&trestleId=${trestleId}` }).then((res) => {
+ if (res.length === 0) {
+ return
+ }
+ setModules(res)
+ })
+ }, [trestleId])
+
+ const handleRoofMaterialOnChange = (e) => {
+ const roofMaterialId = e.target.value
+ setRoofMaterialId(roofMaterialId)
+ setManufacturers([])
+ setManufacturerId(null)
+ setTrestleId(null)
+ setTrestles([])
+ setModules([])
+ }
+
+ const handleManufacturersOnChange = (e) => {
+ const manufacturerId = Number(e.target.value)
+ setTrestles([])
+ setManufacturerId(manufacturerId)
+ setTrestleId(null)
+ setModules([])
+ }
+
+ const handleTrestlesOnChange = (e) => {
+ const trestleId = Number(e.target.value)
+ setTrestleId(trestleId)
+ setModules([])
+ }
+
+ return (
+
+ {roofMaterials.length > 0 && (
+
+ )}
+ {manufacturers.length > 0 && (
+
+ )}
+ {trestles.length > 0 && (
+
+ )}
+ {modules.length > 0 && (
+
+ )}
+
)
}
diff --git a/src/app/[locale]/roof2/page.jsx b/src/app/[locale]/roof2/page.jsx
index 6e9df6bf..72881d11 100644
--- a/src/app/[locale]/roof2/page.jsx
+++ b/src/app/[locale]/roof2/page.jsx
@@ -1,17 +1,15 @@
-'use client'
-
import Roof2 from '@/components/Roof2'
-import { textState } from '@/store/canvasAtom'
-import { useEffect } from 'react'
-import { useRecoilState } from 'recoil'
import RoofSelect from '@/app/[locale]/roof2/RoofSelect'
+import { initCheck } from '@/util/session-util'
-export default function Roof2Page() {
- const [text, setText] = useRecoilState(textState)
-
- useEffect(() => {
- console.log(text)
- }, [])
+export default async function Roof2Page() {
+ const session = await initCheck()
+ const roof2Props = {
+ name: session.name || '',
+ userId: session.userId || '',
+ email: session.email || '',
+ isLoggedIn: session.isLoggedIn,
+ }
return (
<>
@@ -21,7 +19,7 @@ export default function Roof2Page() {