fix: hide back button in navbar on home page and resolve padding issu… (

#1213)
code100x · Sep 24, 2024 · 2f37b07 · 2f37b07
1 parent f5353da
commit 2f37b07
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/app/payout-methods/page.tsx b/src/app/payout-methods/page.tsx
@@ -31,7 +31,7 @@ export default function Page() {
 
   return (
     <div className="h-max pb-4 transition-colors duration-500 md:p-8">
-      <div className="mb-6 flex flex-col items-start justify-center px-4 pt-3 sm:px-8">
+      <div className="mb-6 flex flex-col items-start justify-center px-4 md:pt-20 pt-24 sm:px-8">
         <div className="my-2 mb-6 text-3xl text-black transition-colors duration-500 dark:text-white">
           <h1 className="mt-16 font-semibold text-black dark:text-white sm:mt-12">
             Payout Methods

diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx
@@ -2,7 +2,7 @@
 
 import { motion, AnimatePresence } from 'framer-motion';
 import { useSession } from 'next-auth/react';
-import { useRouter } from 'next/navigation';
+import { usePathname, useRouter } from 'next/navigation';
 import { useState } from 'react';
 import Link from 'next/link';
 import { ArrowLeft, Menu } from 'lucide-react';
@@ -15,7 +15,7 @@ export const Navbar = () => {
   const { data: session } = useSession();
   const router = useRouter();
   const [isMenuOpen, setIsMenuOpen] = useState(false);
-
+  const pathname = usePathname();
   const toggleMenu = () => setIsMenuOpen(!isMenuOpen);
 
   const navItemVariants = {
@@ -42,7 +42,7 @@ export const Navbar = () => {
           damping: 10,
           stiffness: 100,
         }}
-        className="fixed z-[999] top-0 w-full border-b border-primary/10 bg-background"
+        className="fixed top-0 z-[999] w-full border-b border-primary/10 bg-background"
       >
         <div className="wrapper flex w-full items-center justify-between p-3">
           <motion.div
@@ -52,7 +52,7 @@ export const Navbar = () => {
             variants={navItemVariants}
             custom={0}
           >
-            {session?.user && (
+            {session?.user && pathname !== '/home' && (
               <Button
                 onClick={() => router.back()}
                 variant={'ghost'}

diff --git a/src/components/big-calendar/calendar.tsx b/src/components/big-calendar/calendar.tsx
@@ -201,7 +201,7 @@ const CalendarPageComponent: React.FC<CalendarPageProps> = ({ isAdmin }) => {
   };
 
   return (
-    <main className="w-full">
+    <main className="w-full pt-20">
       {isAdmin && (
         <Button onClick={() => setIsAddEventDialogOpen(true)}>Add Event</Button>
       )}