qcast3/qcast-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

📌GlobalSpinner 조건 수정

Browse Source
This commit is contained in:
yoosangwook 2025-01-13 13:28:10 +09:00
parent a78ca8bc34
commit fe203f2905
6 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/community/layout.js Normal file
View File

@ -0,0 +1,10 @@
import { Suspense } from 'react'
import GlobalSpinner from '@/components/common/spinner/GlobalSpinner'
export default function CommunityLayout({ children }) {
return (
<>
<Suspense fallback={<GlobalSpinner />}>{children}</Suspense>
</>
)
}

2
src/app/floor-plan/estimate/[mid]/page.jsx
View File

@ -1,6 +1,6 @@
import Estimate from '@/components/estimate/Estimate'
export default function EstimatePage({}) {
export default async function EstimatePage({}) {
return (
<>
<Estimate />

16
src/app/floor-plan/layout.js
View File

@ -4,6 +4,8 @@ import { usePathname } from 'next/navigation'
import FloorPlanProvider from './FloorPlanProvider'
import FloorPlan from '@/components/floor-plan/FloorPlan'
import CanvasLayout from '@/components/floor-plan/CanvasLayout'
import { Suspense } from 'react'
import GlobalSpinner from '@/components/common/spinner/GlobalSpinner'
export default function FloorPlanLayout({ children }) {
console.log('🚀 ~ FloorPlanLayout ~ FloorPlanLayout:')
@ -12,16 +14,18 @@ export default function FloorPlanLayout({ children }) {
return (
<>
<FloorPlanProvider>
<FloorPlan>
{/* {pathname.includes('estimate') || pathname.includes('simulator') ? (
<Suspense fallback={<GlobalSpinner />}>
<FloorPlanProvider>
<FloorPlan>
{/* {pathname.includes('estimate') || pathname.includes('simulator') ? (
<div className="canvas-layout">{children}</div>
) : (
<CanvasLayout>{children}</CanvasLayout>
)} */}
<CanvasLayout>{children}</CanvasLayout>
</FloorPlan>
</FloorPlanProvider>
<CanvasLayout>{children}</CanvasLayout>
</FloorPlan>
</FloorPlanProvider>
</Suspense>
</>
)
}

2
src/app/floor-plan/page.jsx
View File

@ -1,6 +1,6 @@
import CanvasFrame from '@/components/floor-plan/CanvasFrame'
export default function FloorPlanPage() {
export default async function FloorPlanPage() {
return (
<>
<CanvasFrame />

2
src/app/floor-plan/simulator/[mid]/page.jsx
View File

@ -1,6 +1,6 @@
import Simulator from '@/components/simulator/Simulator'
export default function SimulatorPage() {
export default async function SimulatorPage() {
return (
<>
<Simulator />

34
src/app/layout.js
View File

@ -15,6 +15,8 @@ import './globals.css'
import '../styles/style.scss'
import '../styles/contents.scss'
import Footer from '@/components/footer/Footer'
import { Suspense } from 'react'
import GlobalSpinner from '@/components/common/spinner/GlobalSpinner'
export const metadata = {
title: 'Create Next App',
@ -64,22 +66,24 @@ export default async function RootLayout({ children }) {
<GlobalDataProvider>
<html lang="en">
<body>
{headerPathname === '/login' || headerPathname === '/join' ? (
<QcastProvider>{children}</QcastProvider>
) : (
<QcastProvider>
<div className="wrap">
<Header userSession={sessionProps} />
<div className="content">
<Dimmed />
<SessionProvider useSession={sessionProps}>{children}</SessionProvider>
<Suspense fallback={<GlobalSpinner />}>
{headerPathname === '/login' || headerPathname === '/join' ? (
<QcastProvider>{children}</QcastProvider>
) : (
<QcastProvider>
<div className="wrap">
<Header userSession={sessionProps} />
<div className="content">
<Dimmed />
<SessionProvider useSession={sessionProps}>{children}</SessionProvider>
</div>
<Footer />
</div>
<Footer />
</div>
</QcastProvider>
)}
<QModal />
<PopupManager />
</QcastProvider>
)}
<QModal />
<PopupManager />
</Suspense>
</body>
</html>
</GlobalDataProvider>