Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pr/232 #242

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Pr/232 #242

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
810fd0d
Login button showing after successfull login bug -> FIXED
shiv-2810 Nov 9, 2023
90fff9e
Login button showing after successfull login bug -> FIXED
shiv-2810 Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions app/(marketing)/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { cn } from "@/lib/utils"
import { buttonVariants } from "@/components/ui/button"
import { MainNav } from "@/components/main-nav"
import { SiteFooter } from "@/components/site-footer"
import { getCurrentUser } from "@/lib/session"

interface MarketingLayoutProps {
children: React.ReactNode
Expand All @@ -13,22 +14,23 @@ interface MarketingLayoutProps {
export default async function MarketingLayout({
children,
}: MarketingLayoutProps) {
const user = await getCurrentUser();
return (
<div className="flex min-h-screen flex-col">
<header className="container z-40 bg-background">
<div className="flex h-20 items-center justify-between py-6">
<MainNav items={marketingConfig.mainNav} />
<nav>
{ (!user) ? <nav>
<Link
href="/login"
className={cn(
buttonVariants({ variant: "secondary", size: "sm" }),
"px-4"
)}
)}
>
Login
</Link>
</nav>
</nav> : null }
</div>
</header>
<main className="flex-1">{children}</main>
Expand Down