Skip to content

Job application tracker and AI-powered job search assistant. Helps job seekers manage their search journey with AI resume review, job matching, task logging, and application analytics, all while keeping your data private.

Fix: session based conditional rendering

Khuram Niazb008e1b7efa0
diff --git a/src/app/api/auth/[...nextauth]/route.ts b/src/app/api/auth/[...nextauth]/route.ts
new file mode 100644
index 0000000..7c62e2d
--- /dev/null
+++ b/src/app/api/auth/[...nextauth]/route.ts
@@ -0,0 +1,2 @@
+import { handlers } from "@/auth";
+export const { GET, POST } = handlers;
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 7331bd9..e99a963 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -3,6 +3,7 @@ import { Inter as FontSans } from "next/font/google";
import "./globals.css";
import { cn } from "@/lib/utils";
import { ThemeProvider } from "@/components/theme-provider";
+import { SessionProvider } from "next-auth/react";
const fontSans = FontSans({
subsets: ["latin"],
@@ -17,28 +18,30 @@ export const metadata: Metadata = {
description: "Job Application Tracking System",
};
-export default function RootLayout({
- children,
-}: Readonly<{
+interface Props {
children: React.ReactNode;
-}>) {
+}
+
+export default function RootLayout({ children }: Readonly<Props>) {
return (
- <html lang="en">
- <body
- className={cn(
- "min-h-screen bg-background font-sans antialiased",
- fontSans.variable
- )}
- >
- <ThemeProvider
- attribute="class"
- defaultTheme="system"
- enableSystem
- disableTransitionOnChange
+ <SessionProvider>
+ <html lang="en">
+ <body
+ className={cn(
+ "min-h-screen bg-background font-sans antialiased",
+ fontSans.variable
+ )}
>
- {children}
- </ThemeProvider>
- </body>
- </html>
+ <ThemeProvider
+ attribute="class"
+ defaultTheme="system"
+ enableSystem
+ disableTransitionOnChange
+ >
+ {children}
+ </ThemeProvider>
+ </body>
+ </html>
+ </SessionProvider>
);
}
diff --git a/src/auth.config.ts b/src/auth.config.ts
index 73d3f0c..fcb6bf7 100644
--- a/src/auth.config.ts
+++ b/src/auth.config.ts
@@ -1,17 +1,21 @@
import type { NextAuthConfig } from "next-auth";
+declare module "next-auth" {
+ interface Session {
+ accessToken?: any;
+ }
+}
+
export const authConfig = {
pages: {
signIn: "/signin",
error: "/signin",
},
+ secret: process.env.AUTH_SECRET,
callbacks: {
authorized({ auth, request: { nextUrl } }) {
- console.log("auth: ", auth);
- console.log("PATHNAME: ", nextUrl);
const isLoggedIn = !!auth?.user;
const isOnDashboard = nextUrl.pathname.startsWith("/dashboard");
- console.log("isOnDashboard: ", isOnDashboard);
if (isOnDashboard) {
if (isLoggedIn) return true;
@@ -21,6 +25,11 @@ export const authConfig = {
}
return true;
},
+ async session({ session, token }) {
+ // Send properties to the client, like an access_token from a provider.
+ session.accessToken = token;
+ return session;
+ },
},
providers: [], // Add providers with an empty array for now
} satisfies NextAuthConfig;
diff --git a/src/auth.ts b/src/auth.ts
index b9ea7ad..f4ad80f 100644
--- a/src/auth.ts
+++ b/src/auth.ts
@@ -18,11 +18,12 @@ async function getUser(email: string): Promise<User | undefined> {
}
}
-export const { auth, signIn, signOut } = NextAuth({
+export const { auth, handlers, signIn, signOut } = NextAuth({
...authConfig,
providers: [
Credentials({
async authorize(credentials) {
+ console.log("AUTH: ", auth);
const parsedCredentials = z
.object({ email: z.string().email(), password: z.string().min(6) })
.safeParse(credentials);
@@ -30,7 +31,6 @@ export const { auth, signIn, signOut } = NextAuth({
if (parsedCredentials.success) {
const { email, password } = parsedCredentials.data;
const user = await getUser(email);
- console.log("returnd user: ", user);
if (!user) return null;
const passwordsMatch = await bcrypt.compare(password, user.password);
console.log("passwordmatch", passwordsMatch);
diff --git a/src/components/Header.tsx b/src/components/Header.tsx
index 78103ab..2706f50 100644
--- a/src/components/Header.tsx
+++ b/src/components/Header.tsx
@@ -1,4 +1,3 @@
-import Image from "next/image";
import Link from "next/link";
import { PanelLeft, Briefcase, Search, PowerIcon } from "lucide-react";
import { Input } from "./ui/input";
@@ -20,9 +19,12 @@ import {
} from "@/components/ui/sheet";
import { ModeToggle } from "./ModeToggle";
import { SIDEBAR_LINKS } from "@/lib/constants";
-import { signOut } from "@/auth";
+import { auth, signOut } from "@/auth";
+import UserAvatar from "./UserAvatar";
+import { SessionUser } from "@/models/user";
-function Header() {
+async function Header() {
+ const session = await auth();
return (
<header className="sticky top-0 z-30 flex h-14 items-center gap-4 border-b bg-background px-4 sm:static sm:h-auto sm:border-0 sm:bg-transparent sm:px-6">
<Sheet>
@@ -70,20 +72,8 @@ function Header() {
</div>
<DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button
- variant="outline"
- size="icon"
- className="overflow-hidden rounded-full"
- >
- <Image
- src="/images/placeholder-user.jpg"
- width={36}
- height={36}
- alt="Avatar"
- className="overflow-hidden rounded-full"
- />
- </Button>
+ <DropdownMenuTrigger>
+ <UserAvatar user={session?.user as SessionUser} />
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
<DropdownMenuLabel>My Account</DropdownMenuLabel>
diff --git a/src/components/RecentJobsCard.tsx b/src/components/RecentJobsCard.tsx
index aa9e519..d375e46 100644
--- a/src/components/RecentJobsCard.tsx
+++ b/src/components/RecentJobsCard.tsx
@@ -10,7 +10,7 @@ export default function RecentJobsCard() {
<CardContent className="grid gap-6">
<div className="flex items-center gap-4">
<Avatar className="hidden h-9 w-9 sm:flex">
- <AvatarImage src="/avatars/01.png" alt="Avatar" />
+ {/* <AvatarImage src="/avatars/01.png" alt="Avatar" /> */}
<AvatarFallback>MS</AvatarFallback>
</Avatar>
<div className="grid gap-1">
@@ -23,7 +23,7 @@ export default function RecentJobsCard() {
</div>
<div className="flex items-center gap-4">
<Avatar className="hidden h-9 w-9 sm:flex">
- <AvatarImage src="/avatars/02.png" alt="Avatar" />
+ {/* <AvatarImage src="/avatars/02.png" alt="Avatar" /> */}
<AvatarFallback>FB</AvatarFallback>
</Avatar>
<div className="grid gap-1">
@@ -36,7 +36,7 @@ export default function RecentJobsCard() {
</div>
<div className="flex items-center gap-4">
<Avatar className="hidden h-9 w-9 sm:flex">
- <AvatarImage src="/avatars/03.png" alt="Avatar" />
+ {/* <AvatarImage src="/avatars/03.png" alt="Avatar" /> */}
<AvatarFallback>AM</AvatarFallback>
</Avatar>
<div className="grid gap-1">
@@ -49,7 +49,7 @@ export default function RecentJobsCard() {
</div>
<div className="flex items-center gap-4">
<Avatar className="hidden h-9 w-9 sm:flex">
- <AvatarImage src="/avatars/04.png" alt="Avatar" />
+ {/* <AvatarImage src="/avatars/04.png" alt="Avatar" /> */}
<AvatarFallback>NF</AvatarFallback>
</Avatar>
<div className="grid gap-1">
@@ -62,7 +62,7 @@ export default function RecentJobsCard() {
</div>
<div className="flex items-center gap-4">
<Avatar className="hidden h-9 w-9 sm:flex">
- <AvatarImage src="/avatars/05.png" alt="Avatar" />
+ {/* <AvatarImage src="/avatars/05.png" alt="Avatar" /> */}
<AvatarFallback>SD</AvatarFallback>
</Avatar>
<div className="grid gap-1">
diff --git a/src/components/UserAvatar.tsx b/src/components/UserAvatar.tsx
new file mode 100644
index 0000000..d7a867a
--- /dev/null
+++ b/src/components/UserAvatar.tsx
@@ -0,0 +1,27 @@
+import { Button } from "./ui/button";
+import Image from "next/image";
+import { useSession } from "next-auth/react";
+import { SessionUser } from "@/models/user";
+
+export default function UserAvatar({ user }: { user: SessionUser }) {
+ // const { data: session, status } = useSession();
+ // console.log("session user :", session?.user, status);
+ if (!user) return null;
+ return (
+ <>
+ <Button
+ variant="outline"
+ size="icon"
+ className="overflow-hidden rounded-full"
+ >
+ <Image
+ src="/images/placeholder-user.jpg"
+ width={36}
+ height={36}
+ alt="Avatar"
+ className="overflow-hidden rounded-full"
+ />
+ </Button>
+ </>
+ );
+}
diff --git a/src/middleware.ts b/src/middleware.ts
index 089cbb4..6f6efcd 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -5,5 +5,8 @@ export default NextAuth(authConfig).auth;
export const config = {
// https://nextjs.org/docs/app/building-your-application/routing/middleware#matcher
- matcher: ["/((?!api|_next/static|_next/image|.*\\.png$).*)", "/dashboard"],
+ matcher: [
+ // "/((?!api|_next/static|_next/image|.*\\.png$).*)",
+ "/dashboard",
+ ],
};
diff --git a/src/models/user.ts b/src/models/user.ts
index 2a80a3d..3701e9e 100644
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -4,3 +4,8 @@ export interface User {
email: string;
password: string;
}
+
+export type SessionUser = {
+ name: string;
+ email: string;
+};