refactor: 폴더 구조 변경

Myongji-Graduate · Feb 21, 2024 · f0e3675 · f0e3675
1 parent d3b9e5b
commit f0e3675
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/app/file-upload/page.tsx → app/(template)/file-upload/page.tsx b/app/file-upload/page.tsx → app/(template)/file-upload/page.tsx
@@ -1,4 +1,4 @@
-import Template from '../ui/view/atom/template';
+import Template from '../../ui/view/atom/template';
 
 export default function Page() {
   return (

diff --git a/app/ui/view/template/layout.tsx → app/(template)/layout.tsx b/app/ui/view/template/layout.tsx → app/(template)/layout.tsx
@@ -1,21 +1,12 @@
-'use client';
-import { usePathname } from 'next/navigation';
-import NavigationBar from '../molecule/navigation-bar';
 import Image from 'next/image';
-
+import NavigationBar from '../ui/view/molecule/navigation-bar';
 interface LayoutProps {
   children: React.ReactNode;
 }
 
 function Layout({ children }: LayoutProps) {
-  const pathname = usePathname();
-  const isMainPage = pathname === '/';
-
-  return isMainPage ? (
-    children
-  ) : (
-    <div className="bg-white w-[100vw] h-[100vh]">
-      <NavigationBar />
+  return (
+    <>
       <Image
         src="/assets/background.png"
         width={800}
@@ -24,7 +15,7 @@ function Layout({ children }: LayoutProps) {
         alt="background"
       />
       <div className="flex justify-center">{children}</div>
-    </div>
+    </>
   );
 }
 

diff --git a/app/layout.tsx b/app/layout.tsx
@@ -1,6 +1,6 @@
 import type { Metadata } from 'next';
 import './globals.css';
-import Layout from './ui/view/template/layout';
+import NavigationBar from './ui/view/molecule/navigation-bar';
 
 export const metadata: Metadata = {
   title: 'Create Next App',
@@ -21,7 +21,10 @@ export default function RootLayout({
         />
       </head>
       <body>
-        <Layout>{children}</Layout>
+        <div className="bg-white w-[100vw] h-[100vh]">
+          <NavigationBar />
+          {children}
+        </div>
       </body>
     </html>
   );