Skip to content

Commit 065059d

Browse files
parthratra11parthratra11
committed
Merge branch 'main' of https://github.com/parthratra11/Leetcode-Journal into dev
2 parents 6103e30 + d9a74cf commit 065059d

21 files changed

+1469
-282
lines changed

‎app/actions/action.ts

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
'use server'
2+
3+
import { revalidatePath } from 'next/cache'
4+
import { redirect } from 'next/navigation'
5+
import { createClient } from '@/utils/supabase/server'
6+
// import { signinSchema } from '@/validations/validation'
7+
8+
// export async function login(data: { email: string, password: string }) {
9+
// const supabase = await createClient()
10+
// const { success, error } = signinSchema.safeParse(data);
11+
// if (!success) {
12+
// console.log(error);
13+
// return;
14+
// }
15+
// // const data = {
16+
// // email: formData.get('email') as string,
17+
// // password: formData.get('password') as string,
18+
// // }
19+
// const { error: signInError } = await supabase.auth.signInWithPassword(data)
20+
// if (signInError) {
21+
// console.log(signInError);
22+
// return
23+
// }
24+
25+
// revalidatePath('/', 'layout')
26+
// redirect('/dashboard');
27+
// }
28+
29+
// export async function signup(formData: FormData) {
30+
// const supabase = await createClient()
31+
// const data = {
32+
// email: formData.get('email') as string,
33+
// password: formData.get('password') as string,
34+
// }
35+
36+
// const { error } = await supabase.auth.signUp(data)
37+
38+
// if (error) {
39+
// redirect('/error')
40+
// }
41+
42+
// revalidatePath('/', 'layout')
43+
// redirect('/')
44+
// }
45+
46+
export async function signout() {
47+
const supabase = await createClient();
48+
await supabase.auth.signOut();
49+
revalidatePath('/', 'layout');
50+
redirect('/auth/signin');
51+
}

‎app/api/auth/register/route.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import prisma from "@/lib/database/prismaClient";
2-
import { supabase } from "@/lib/supabaseClient";
32
import { hashPassword } from "@/utils/hashing";
3+
import { createClient } from "@/utils/supabase/server";
44
import { signupSchema } from "@/validations/validation";
55
import { NextRequest, NextResponse } from "next/server";
66

77
export async function POST(request: NextRequest) {
8+
const supabase = await createClient();
89
const body = await request.json();
910
const { email, password, fullName, leetcodeUsername, gender } = body;
1011
try {

‎app/api/auth/user/route.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import prisma from '@/lib/database/prismaClient';
22
import { NextResponse } from 'next/server';
3+
import { createClient } from '@/utils/supabase/server'
34

4-
export async function POST(request: Request) {
5+
export async function GET(request: Request) {
56
try {
6-
7-
const { supabaseId } = await request.json();
7+
const supabase = await createClient();
8+
const supabaseId = (await supabase.auth.getUser()).data.user?.id;
89
const userData = await prisma.user.findUnique({
910
where: { supabaseId },
1011
select: {
@@ -23,7 +24,7 @@ export async function POST(request: Request) {
2324
return NextResponse.json({ message: 'User not found' }, { status: 404 });
2425
}
2526

26-
return NextResponse.json({ user: userData },{status: 200});
27+
return NextResponse.json({ user: userData }, { status: 200 });
2728
} catch (err) {
2829
console.error('Error fetching user data:', err);
2930
return NextResponse.json({ message: 'Error fetching user data' }, { status: 500 });

‎app/dashboard/layout.tsx

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import { AppSidebar } from "@/components/dashboardComponents/AppSidebar";
2+
import { SidebarProvider, SidebarTrigger } from "@/components/ui/sidebar";
3+
import type { Metadata } from "next";
4+
5+
export const metadata: Metadata = {
6+
title: "LeetCode Journal",
7+
description: "Track your LeetCode progress and boost your coding skills",
8+
};
9+
10+
export default function RootLayout({
11+
children,
12+
}: {
13+
children: React.ReactNode;
14+
}) {
15+
return (
16+
<SidebarProvider>
17+
<AppSidebar />
18+
<main className="w-full">{children}</main>
19+
</SidebarProvider>
20+
);
21+
}

‎app/dashboard/page.tsx

+43-81
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,59 @@
11
"use client";
22

33
import { useEffect } from "react";
4-
import { useRouter } from "next/navigation";
5-
import { useAuthStore } from "@/store/AuthStore/useAuthStore";
6-
import Navbar from "@/components/header";
74
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
85
import { Skeleton } from "@/components/ui/skeleton";
6+
import { useAuthStore } from "@/store/AuthStore/useAuthStore";
7+
import DashboardNavbar from "@/components/dashboardComponents/DashboardNavbar";
8+
import { DashboardContentSkeleton } from "@/components/dashboardComponents/DashboardContentSkeleton";
9+
10+
function DashboardContent({ authUser }: any) {
11+
return (
12+
<main className="container mx-auto p-4 space-y-6">
13+
<h1 className="text-3xl font-bold">Welcome, {authUser?.fullName}</h1>
14+
<Card>
15+
<CardHeader>
16+
<CardTitle>Your Profile</CardTitle>
17+
</CardHeader>
18+
<CardContent className="space-y-2">
19+
<p>
20+
<span className="font-medium">LeetCode Username:</span>{" "}
21+
{authUser?.leetcodeUsername}
22+
</p>
23+
<p>
24+
<span className="font-medium">Gender:</span> {authUser?.gender}
25+
</p>
26+
</CardContent>
27+
</Card>
28+
29+
<Card>
30+
<CardHeader>
31+
<CardTitle>LeetCode Stats</CardTitle>
32+
</CardHeader>
33+
<CardContent>
34+
<p className="text-muted-foreground">
35+
LeetCode stats are coming soon!
36+
</p>
37+
</CardContent>
38+
</Card>
39+
</main>
40+
);
41+
}
942

1043
export default function Dashboard() {
11-
const router = useRouter();
1244
const { authUser, fetchAuthUser, authUserLoading } = useAuthStore();
1345

1446
useEffect(() => {
1547
fetchAuthUser();
1648
}, [fetchAuthUser]);
17-
18-
useEffect(() => {
19-
if (!authUserLoading && !authUser) {
20-
router.push("/auth/signin");
21-
}
22-
}, [authUserLoading, authUser, router]);
23-
24-
if (authUserLoading) {
25-
return <DashboardSkeleton />;
26-
}
27-
28-
if (!authUser) {
29-
return null;
30-
}
31-
32-
return (
33-
<div className="min-h-screen">
34-
<Navbar userId={authUser.id} />
35-
<main className="container mx-auto p-4 space-y-6">
36-
<h1 className="text-3xl font-bold">Welcome, {authUser.fullName}</h1>
37-
38-
<Card>
39-
<CardHeader>
40-
<CardTitle>Your Profile</CardTitle>
41-
</CardHeader>
42-
<CardContent className="space-y-2">
43-
<p>
44-
<span className="font-medium">LeetCode Username:</span>{" "}
45-
{authUser.leetcodeUsername}
46-
</p>
47-
<p>
48-
<span className="font-medium">Gender:</span> {authUser.gender}
49-
</p>
50-
</CardContent>
51-
</Card>
52-
53-
<Card>
54-
<CardHeader>
55-
<CardTitle>LeetCode Stats</CardTitle>
56-
</CardHeader>
57-
<CardContent>
58-
{/* LeetCode stats component will go here */}
59-
<p className="text-muted-foreground">
60-
LeetCode stats are coming soon!
61-
</p>
62-
</CardContent>
63-
</Card>
64-
</main>
65-
</div>
66-
);
67-
}
68-
69-
function DashboardSkeleton() {
7049
return (
71-
<div className="min-h-screen">
72-
{/* <Navbar userId={} /> */}
73-
<main className="container mx-auto p-4 space-y-6">
74-
<Skeleton className="h-10 w-[250px]" />
75-
76-
<Card>
77-
<CardHeader>
78-
<Skeleton className="h-7 w-[100px]" />
79-
</CardHeader>
80-
<CardContent className="space-y-2">
81-
<Skeleton className="h-5 w-full" />
82-
<Skeleton className="h-5 w-full" />
83-
</CardContent>
84-
</Card>
85-
86-
<Card>
87-
<CardHeader>
88-
<Skeleton className="h-7 w-[120px]" />
89-
</CardHeader>
90-
<CardContent>
91-
<Skeleton className="h-20 w-full" />
92-
</CardContent>
93-
</Card>
94-
</main>
50+
<div className="min-h-screen w-full">
51+
<DashboardNavbar isLoading={authUserLoading} userId={authUser?.id} />
52+
{authUserLoading ? (
53+
<DashboardContentSkeleton />
54+
) : (
55+
<DashboardContent authUser={authUser} />
56+
)}
9557
</div>
9658
);
9759
}

‎app/globals.css

+1-2
Original file line numberDiff line numberDiff line change
@@ -92,5 +92,4 @@
9292
body {
9393
@apply bg-background text-foreground;
9494
}
95-
}
96-
95+
}

‎components/AuthComponent/SigninForm.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ import { signinSchema } from "@/validations/validation";
3333
type SigninFormValues = z.infer<typeof signinSchema>;
3434

3535
export default function SigninForm() {
36-
const { isSigningIn, signin, signinError } = useAuthStore();
37-
const router = useRouter();
36+
const router = useRouter()
37+
const { isSigningIn,signin, signinError } = useAuthStore();
3838
const [showPassword, setShowPassword] = useState(false);
3939

4040
const form = useForm<SigninFormValues>({
@@ -46,7 +46,7 @@ export default function SigninForm() {
4646
});
4747

4848
const onSubmit = (data: SigninFormValues) => {
49-
signin(data, router);
49+
signin(data, router)
5050
};
5151

5252
return (

0 commit comments

Comments
 (0)