From 0c398f1b92548bb1d0a87f439a64be2cf3235682 Mon Sep 17 00:00:00 2001
From: Bereket Engida <bekacru@gmail.com>
Date: Sat, 5 Oct 2024 21:24:21 +0300
Subject: [PATCH] docs: fix nav layout

---
 docs/app/layout.tsx                           |  1 -
 docs/components/nav-bar.tsx                   | 54 +++++++++----------
 docs/components/nav-mobile.tsx                |  4 +-
 docs/components/theme-toggler.tsx             | 39 +++++++-------
 .../better-auth/src/api/routes/sign-out.ts    |  5 +-
 5 files changed, 52 insertions(+), 51 deletions(-)

diff --git a/docs/app/layout.tsx b/docs/app/layout.tsx
index 36d3be2fa0..57df9c4919 100644
--- a/docs/app/layout.tsx
+++ b/docs/app/layout.tsx
@@ -29,7 +29,6 @@ export default function Layout({ children }: { children: ReactNode }) {
 			>
 				<RootProvider>
 					<NavbarProvider>
-						<BetaNotice />
 						<Navbar />
 						{children}
 					</NavbarProvider>
diff --git a/docs/components/nav-bar.tsx b/docs/components/nav-bar.tsx
index ef6cfb1b2f..4a6be411bc 100644
--- a/docs/components/nav-bar.tsx
+++ b/docs/components/nav-bar.tsx
@@ -1,39 +1,39 @@
+import React from "react";
 import Link from "next/link";
 import { ThemeToggle } from "@/components/theme-toggler";
-import Image from "next/image";
-import { NavbarMobileBtn } from "./nav-mobile";
+import { NavbarMobile, NavbarMobileBtn } from "./nav-mobile";
 import { NavLink } from "./nav-link";
 import { Logo } from "./logo";
-import { PulicBetaBadge } from "./beta/badge";
-import { useState } from "react";
-import { MenuIcon, X } from "lucide-react";
 
 export const Navbar = () => {
 	return (
-		<nav className="sticky z-40 top-0 flex items-center justify-between bg-background backdrop-blur-md">
-			<Link
-				href="/"
-				className="md:border-r md:px-5 px-2.5 py-4 text-foreground md:col-span-2 shrink-0 transition-colors md:w-[--fd-sidebar-width]"
-			>
-				<div className="flex flex-col gap-2 w-full">
-					<div className="flex items-center gap-2">
-						<Logo />
-						<p>BETTER-AUTH.</p>
+		<div className="flex flex-col sticky top-0 bg-background backdrop-blur-md z-30">
+			<nav className="md:grid grid-cols-12 md:border-b top-0 flex items-center justify-between ">
+				<Link
+					href="/"
+					className="md:border-r md:px-5 px-2.5 py-4 text-foreground md:col-span-2 shrink-0 transition-colors md:w-[--fd-sidebar-width]"
+				>
+					<div className="flex flex-col gap-2 w-full">
+						<div className="flex items-center gap-2">
+							<Logo />
+							<p>BETTER-AUTH.</p>
+						</div>
 					</div>
+				</Link>
+				<div className="md:col-span-10 flex items-center justify-end relative">
+					<ul className="md:flex items-center divide-x w-max border-r hidden shrink-0">
+						{navMenu.map((menu, i) => (
+							<NavLink key={menu.name} href={menu.path}>
+								{menu.name}
+							</NavLink>
+						))}
+					</ul>
+					<ThemeToggle />
+					<NavbarMobileBtn />
 				</div>
-			</Link>
-			<div className="md:col-span-10 flex items-center justify-end sticky top-0 z-30 pb-3 w-full font-geist border-b border-black/10 transition duration-200 ease-in-out md:bg-transparent animate-header-slide-down-fade dark:border-white/10  md:backdrop-blur-md">
-				<ul className="md:flex items-center divide-x w-max border-r hidden shrink-0">
-					{navMenu.map((menu, i) => (
-						<NavLink key={menu.name} href={menu.path}>
-							{menu.name}
-						</NavLink>
-					))}
-				</ul>
-				<ThemeToggle />
-				<NavbarMobileBtn />
-			</div>
-		</nav>
+			</nav>
+			<NavbarMobile />
+		</div>
 	);
 };
 
diff --git a/docs/components/nav-mobile.tsx b/docs/components/nav-mobile.tsx
index 7b6dfdb902..854c17b2b8 100644
--- a/docs/components/nav-mobile.tsx
+++ b/docs/components/nav-mobile.tsx
@@ -57,10 +57,10 @@ export const NavbarMobileBtn: React.FC = () => {
 	const { toggleNavbar } = useNavbarMobile();
 
 	return (
-		<div className="flex pt-2 items-center">
+		<div className="flex pt-2 items-center ">
 			<MobileThemeToggle />
 			<button
-				className="text-muted-foreground overflow-hidden  px-2.5 block md:hidden"
+				className="text-muted-foreground overflow-hidden px-2.5 block md:hidden"
 				onClick={() => {
 					toggleNavbar();
 				}}
diff --git a/docs/components/theme-toggler.tsx b/docs/components/theme-toggler.tsx
index 6d89c52c04..e77f52c69d 100644
--- a/docs/components/theme-toggler.tsx
+++ b/docs/components/theme-toggler.tsx
@@ -53,26 +53,25 @@ export function ThemeToggle() {
 export function MobileThemeToggle() {
 	const { theme, setTheme } = useTheme();
 	return (
-		<div className="">
-			{theme === "dark" ? (
-				<Button
-					onClick={() => {
-						setTheme("light");
-					}}
-					variant={"ghost"}
-				>
-					<Sun className="w-4 h-4" />
-				</Button>
-			) : (
-				<Button
-					onClick={() => {
-						setTheme("dark");
-					}}
-					variant={"ghost"}
-				>
-					<MoonIcon className="w-4 h-4" />
-				</Button>
-			)}
+		<div className="md:hidden">
+			<Button
+				className="dark:hidden"
+				onClick={() => {
+					setTheme("light");
+				}}
+				variant={"ghost"}
+			>
+				<Sun className="w-4 h-4" />
+			</Button>
+			<Button
+				className="hidden dark:visible"
+				onClick={() => {
+					setTheme("dark");
+				}}
+				variant={"ghost"}
+			>
+				<MoonIcon className="w-4 h-4" />
+			</Button>
 		</div>
 	);
 }
diff --git a/packages/better-auth/src/api/routes/sign-out.ts b/packages/better-auth/src/api/routes/sign-out.ts
index 17da2e1542..9527ace798 100644
--- a/packages/better-auth/src/api/routes/sign-out.ts
+++ b/packages/better-auth/src/api/routes/sign-out.ts
@@ -1,6 +1,7 @@
 import { z } from "zod";
 import { createAuthEndpoint } from "../call";
 import { deleteSessionCookie } from "../../utils/cookies";
+import { APIError } from "better-call";
 
 export const signOut = createAuthEndpoint(
 	"/sign-out",
@@ -18,7 +19,9 @@ export const signOut = createAuthEndpoint(
 			ctx.context.secret,
 		);
 		if (!sessionCookieToken) {
-			return ctx.json(null);
+			throw new APIError("BAD_REQUEST", {
+				message: "Session not found",
+			});
 		}
 		await ctx.context.internalAdapter.deleteSession(sessionCookieToken);
 		deleteSessionCookie(ctx);