Merge branch 'main' of https://github.com/Team-Blitz-Steady/steady-cl…

…ient into feat/#103/steady-manage
Team-Blitz-Steady · Nov 5, 2023 · a8e6119 · a8e6119
2 parents 9adf5f0 + c7e16a0
commit a8e6119
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 17 deletions.
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -5,6 +5,7 @@ import { cn } from "@/lib/utils";
 import { Theme } from "@radix-ui/themes";
 import "@radix-ui/themes/styles.css";
 import AppBar from "@/components/_common/AppBar";
+import Footer from "@/components/_common/Footer";
 import "./global.css";
 
 const inter = Inter({
@@ -27,11 +28,12 @@ const RootLayout = ({ children }: { children: React.ReactNode }) => {
         <Theme>
           <div
             className={cn(
-              `max-mobile:w-9/10 mx-auto flex w-3/4 flex-col items-center pb-30`,
+              `max-mobile:w-9/10 mx-auto flex w-3/4 flex-col items-center`,
             )}
           >
-            <AppBar isLogin={false} />
-            {children}
+            <AppBar isLogin={true} />
+            <div className={cn("my-30")}>{children}</div>
+            <Footer />
           </div>
         </Theme>
         <Toaster />

diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -8,7 +8,6 @@ import Button, { buttonSize } from "@/components/_common/Button";
 import Icon from "@/components/_common/Icon";
 import Input from "@/components/_common/Input";
 import StickyButton from "@/components/_common/StickyButton";
-import CopyRight from "../../public/images/copyright.svg";
 import Dolphin from "../../public/images/dolphin.png";
 import First from "../../public/images/first.svg";
 import Second from "../../public/images/second.svg";
@@ -490,19 +489,6 @@ const Home = () => {
           />
         </button>
       </section>
-      <footer className="flex h-250 w-screen items-center justify-evenly bg-st-gray-50">
-        <Image
-          src={CopyRight}
-          alt="CopyRight"
-          width={300}
-          height={200}
-        />
-        <div className="flex items-center justify-center gap-50">
-          <div className="font-bold">이용약관</div>
-          <div className="font-bold">개인정보처리방침</div>
-          <div className="font-bold">서비스 소개</div>
-        </div>
-      </footer>
       <div className="fixed bottom-40 right-10 z-10 flex gap-10">
         <div
           className="flex h-65 w-65 cursor-pointer items-center justify-center rounded-full bg-st-primary"

diff --git a/src/components/_common/Footer/index.tsx b/src/components/_common/Footer/index.tsx
@@ -0,0 +1,33 @@
+"use client";
+
+import Image from "next/image";
+import { usePathname } from "next/navigation";
+import CopyRight from "@/images/copyright.svg";
+import { cn } from "@/lib/utils";
+
+const Footer = () => {
+  const pathname = usePathname();
+
+  return (
+    <footer
+      className={`${cn(
+        "-bottom-30 flex h-250 w-screen items-center justify-evenly bg-st-gray-50",
+        pathname === "/" ? "" : "hidden",
+      )}`}
+    >
+      <Image
+        src={CopyRight}
+        alt="CopyRight"
+        width={300}
+        height={200}
+      />
+      <div className="flex items-center justify-center gap-50">
+        <div className="font-bold">이용약관</div>
+        <div className="font-bold">개인정보처리방침</div>
+        <div className="font-bold">서비스 소개</div>
+      </div>
+    </footer>
+  );
+};
+
+export default Footer;