Merge branch 'qcast-pub' into dev

This commit is contained in:
minsik 2024-10-23 14:49:59 +09:00
commit fdb0860c59
2 changed files with 20 additions and 7 deletions

View File

@ -8,12 +8,12 @@ import Header from '@/components/header/Header'
import QModal from '@/components/common/modal/QModal' import QModal from '@/components/common/modal/QModal'
import Dimmed from '@/components/ui/Dimmed' import Dimmed from '@/components/ui/Dimmed'
import SessionProvider from './SessionProvider' import SessionProvider from './SessionProvider'
import LocaleSwitch from '@/components/LocaleSwitch'
import PopupManager from '@/components/common/popupManager/PopupManager' import PopupManager from '@/components/common/popupManager/PopupManager'
import './globals.css' import './globals.css'
import '../styles/style.scss' import '../styles/style.scss'
import '../styles/contents.scss' import '../styles/contents.scss'
import Footer from '@/components/footer/Footer'
export const metadata = { export const metadata = {
title: 'Create Next App', title: 'Create Next App',
@ -69,12 +69,7 @@ export default async function RootLayout({ children }) {
<SessionProvider useSession={sessionProps}>{children}</SessionProvider> <SessionProvider useSession={sessionProps}>{children}</SessionProvider>
</QcastProvider> </QcastProvider>
</div> </div>
<footer> <Footer />
<div className="footer-inner flex justify-center">
<span>COPYRIGHT©2024 Hanwha Japan All Rights Reserved.</span>
<LocaleSwitch />
</div>
</footer>
</div> </div>
)} )}
<QModal /> <QModal />

View File

@ -0,0 +1,18 @@
'use client'
import LocaleSwitch from '@/components/LocaleSwitch'
import { usePathname } from 'next/navigation'
export default function Footer() {
return (
<>
{usePathname() !== '/floor-plan' && (
<footer>
<div className="footer-inner flex justify-center">
<span>COPYRIGHT©2024 Hanwha Japan All Rights Reserved.</span>
<LocaleSwitch />
</div>
</footer>
)}
</>
)
}