Skip to content

Commit

Permalink
Merge pull request #2 from Basics-School/main
Browse files Browse the repository at this point in the history 
resoponsivnesss added
  • Loading branch information
@ktisakib
ktisakib authored Dec 19, 2024
2 parents 36507c9 + cf2ed82 commit 8360786
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 42 deletions.
2 changes: 1 addition & 1 deletion src/app/layout.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default function RootLayout({
return (
<ClerkProvider>
<html lang="en">
<body className="antialiased" >
<body className="antialiased overflow-x-hidden" >
{children}
</body>
</html>
Expand Down
2 changes: 1 addition & 1 deletion src/components/layouts/footer.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ export function SiteFooter() {

function DownloadButtons() {
return (
<div className="flex items-center md:gap-x-5 gap-y-5 justify-center md:justify-start ">
<div className="flex items-center md:gap-x-5 gap-x-2 gap-y-5 justify-center md:justify-start ">
<Link

href='/'
Expand Down
74 changes: 38 additions & 36 deletions src/components/layouts/header.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,50 +40,52 @@ const Header = () => {
</Link>
<TopcitiesDropdownList />
</div>
<nav className='lg:flex gap-6 flex-1 items-center justify-end hidden '>
<ul className='contents text-lg font-semibold'>
<nav className='xl:flex gap-6 flex-1 items-center justify-end hidden '>
<ul className='contents 2xl:text-lg *:text-nowrap font-semibold'>
<Link href={"/"} >Premium Access</Link >
<Link href={"/"} >Agents-Builders</Link >
<Link href={"/"} >Lead Market</Link >
<Link href={"/"} >Advertise</Link >
<Link href={"/"} >Download App</Link >
</ul>
</nav>
<div id="header-action" className=' flex gap-4 items-center'>
<Link href={"/list"} className={cn(buttonVariants({ variant: 'default' }), 'bg-background hover:bg-muted font-bold text-black')}>
<span>List your property</span>
<span className='text-xs bg-yellow-400 rounded py-px px-2'>Free</span>
</Link>
<div className='flex gap-4'>
<div id="header-action" className='hidden lg:flex gap-4 items-center'>
<Link href={"/list"} className={cn(buttonVariants({ variant: 'default' }), 'bg-background hover:bg-muted font-bold text-black')}>
<span>List your property</span>
<span className='text-xs bg-yellow-400 rounded py-px px-2'>Free</span>
</Link>

{isSignedIn ? (
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Image src={user?.imageUrl || '/placeholder.svg'}
width={35} height={35} alt='user profile'
className='rounded-full'
/>
</DropdownMenuTrigger>
<DropdownMenuContent>
<DropdownMenuLabel>My Account</DropdownMenuLabel>
<DropdownMenuSeparator />
<DropdownMenuItem>
<Link href={'/user'}>Profile</Link>
</DropdownMenuItem>
<DropdownMenuItem>
<Link href={'/user#/my-listing'}>My Listing</Link>
</DropdownMenuItem>
<DropdownMenuItem>
<SignOutButton>Logout</SignOutButton>
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
) : (
<AuthModal>
<Button variant="default" className="bg-background hover:bg-muted text-black">
Login / Signup
</Button>
</AuthModal>
)}
{isSignedIn ? (
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Image src={user?.imageUrl || '/placeholder.svg'}
width={35} height={35} alt='user profile'
className='rounded-full'
/>
</DropdownMenuTrigger>
<DropdownMenuContent>
<DropdownMenuLabel>My Account</DropdownMenuLabel>
<DropdownMenuSeparator />
<DropdownMenuItem>
<Link href={'/user'}>Profile</Link>
</DropdownMenuItem>
<DropdownMenuItem>
<Link href={'/user#/my-listing'}>My Listing</Link>
</DropdownMenuItem>
<DropdownMenuItem>
<SignOutButton>Logout</SignOutButton>
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
) : (
<AuthModal>
<Button variant="default" className="bg-background hover:bg-muted text-black">
Login / Signup
</Button>
</AuthModal>
)}
</div>
<HeaderMenuSheet />
</div>
</header>
Expand Down
10 changes: 6 additions & 4 deletions src/components/layouts/site-header.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ export function SiteHeader() {
<div id="logo" className="text-2xl font-extrabold text-white">
SFTAREA
</div>
<div className="container mx-auto flex h-16 items-center justify-center">
<div className="container mx-auto hidden lg:flex h-16 items-center justify-center">
<NavigationMenu className={`flex items-center bg-transparent justify-center transition-colors duration-300 ease-in-out`}>
<NavigationMenuList className="bg-transparent">
<NavigationMenuItem className="">
Expand Down Expand Up @@ -869,20 +869,22 @@ export function SiteHeader() {
</NavigationMenuList>
</NavigationMenu>
</div>
<div id="header-action" className='flex gap-4 items-center'>
<Link href={"/list"} className={cn(buttonVariants({ variant: 'default' }), 'bg-background hover:bg-muted font-bold text-black')}>
<div id="header-action" className=' gap-4 items-center flex '>
<div className="hidden lg:flex gap-4" >
<Link href={"/list"} className={cn(buttonVariants({ variant: 'default' }), ' bg-background hover:bg-muted font-bold text-black')}>
<span>List your property</span>
<span className='text-xs bg-yellow-400 rounded py-px px-2'>Free</span>
</Link>
<Link className={cn(buttonVariants({ variant: 'default' }), "bg-background hover:bg-muted text-black")} href="/login">
Login / Signup
</Link>
</div>
<HeaderMenuSheet />
</div>
</div>
)}
{!scrolled && (<div className="container mx-auto flex h-16 items-center justify-center">
<NavigationMenu className={`flex items-center bg-transparent justify-center transition-colors duration-300 ease-in-out`}>
<NavigationMenu className={`hidden lg:flex items-center bg-transparent justify-center transition-colors duration-300 ease-in-out`}>
<NavigationMenuList className="bg-transparent">
<NavigationMenuItem className="">
<NavigationMenuTrigger className={triggerClasses}>Buy</NavigationMenuTrigger>
Expand Down

0 comments on commit 8360786

Please sign in to comment.