Merge pull request #16 from 4bujak-4bujak/fix/nav

fix: nav fix
4bujak-4bujak · May 27, 2024 · 234556b · 234556b
2 parents a11648d + 9cccd37
commit 234556b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/components/footer/Footer.tsx b/src/components/footer/Footer.tsx
@@ -8,7 +8,7 @@ const Footer = () => {
 
   return (
     <footer>
-      <nav className="w-[393px] h-[97.02px] px-[25px] pt-[15px] pb-[35px] bg-white border-t border-stone-50 justify-between items-center inline-flex">
+      <nav className=" fixed bottom-0 w-[393px] h-[97.02px] px-[25px] bg-white border-t border-stone-50 justify-between items-center inline-flex z-[9999]">
         <Link href="/">
           <div className="h-[44.84px] flex-col justify-start items-center gap-2.5 inline-flex">
             <div className="w-[22.06px] h-[21.82px] flex-col justify-center items-center">
@@ -37,10 +37,10 @@ const Footer = () => {
             </div>
           </div>
         </Link>
-        <Link href="/">
+        <Link href="/map">
           <div className="h-[43.75px] flex-col justify-start items-center gap-2.5 inline-flex">
             <div className="w-[22.06px] h-[21.82px]  flex-col  justify-center items-center">
-              {filteredPathName === 'navigation' ? (
+              {filteredPathName === 'map' ? (
                 <img className="w-5 h-5  " src="/CheckedNavigation.svg" />
               ) : (
                 <img className="w-5 h-5 " src="/Navigation.svg" />
@@ -51,10 +51,10 @@ const Footer = () => {
             </div>
           </div>
         </Link>
-        <Link href="/">
+        <Link href="/community">
           <div className="h-[44.84px] flex-col justify-start items-center gap-2.5 inline-flex">
             <div className="w-[22.06px] h-[21.82px] flex-col justify-center items-center">
-              {filteredPathName === 'resoulvation' ? (
+              {filteredPathName === 'community' ? (
                 <img className="w-5 h-5 " src="/CheckedCommunity.svg" />
               ) : (
                 <img className="w-5 h-5 " src="/Community.svg" />
@@ -65,10 +65,10 @@ const Footer = () => {
             </div>
           </div>
         </Link>
-        <Link href="/">
+        <Link href="/mypage">
           <div className="h-[44.84px] flex-col justify-start items-center gap-2.5 inline-flex">
             <div className="w-[22.06px] h-[21.82px] flex-col justify-center items-center">
-              {filteredPathName === 'resoulvation' ? (
+              {filteredPathName === 'mypage' ? (
                 <img className="w-5 h-5 " src="/CheckedProfile.svg" />
               ) : (
                 <img className="w-5 h-5 " src="/Profile.svg" />

diff --git a/src/components/header/Header.tsx b/src/components/header/Header.tsx
@@ -1,6 +1,6 @@
 const Header = () => {
   return (
-    <header className="w-[393px] h-12 px-4 py-2 justify-center items-center gap-[176.35px] inline-flex mt-[40px]">
+    <header className="sticky top-0 w-[393px] h-12 px-4 py-1 justify-center items-center gap-[176.35px] inline-flex  bg-white z-[9999] ">
       <img className="w-[116.35px] h-8" src="/NavLogo.png" />
       <div className="justify-end items-center gap-6 inline-flex">
         <div className="w-[22px] h-[22px] relative">