-
- Businesses
-
+ Businesses
{businessComponents.map((component) => (
-
+
{component.description}
))}
@@ -122,17 +111,11 @@ export function UnsignedNav() {
-
- Projects
-
+ Projects
{projectComponents.map((component) => (
-
+
{component.description}
))}
@@ -141,17 +124,11 @@ export function UnsignedNav() {
-
- Blogs
-
+ Blogs
{blogComponents.map((component) => (
-
+
{component.description}
))}
@@ -160,10 +137,7 @@ export function UnsignedNav() {
-
+
Docs
@@ -177,7 +151,7 @@ export function UnsignedNav() {
Login
diff --git a/src/lib/supabase/clientComponentClient.ts b/src/lib/supabase/clientComponentClient.ts
new file mode 100644
index 0000000..9a6ebd4
--- /dev/null
+++ b/src/lib/supabase/clientComponentClient.ts
@@ -0,0 +1,5 @@
+import { createBrowserClient } from "@supabase/ssr";
+
+export function createSupabaseClient() {
+ return createBrowserClient(process.env.NEXT_PUBLIC_SUPABASE_URL!, process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!);
+}
diff --git a/src/lib/supabase/middleware.ts b/src/lib/supabase/middleware.ts
new file mode 100644
index 0000000..996f463
--- /dev/null
+++ b/src/lib/supabase/middleware.ts
@@ -0,0 +1,57 @@
+import { createServerClient } from "@supabase/ssr";
+import { NextResponse, type NextRequest } from "next/server";
+
+export async function updateSession(request: NextRequest) {
+ let supabaseResponse = NextResponse.next({
+ request,
+ });
+
+ const supabase = createServerClient(
+ process.env.NEXT_PUBLIC_SUPABASE_URL!,
+ process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!,
+ {
+ cookies: {
+ getAll() {
+ return request.cookies.getAll();
+ },
+ setAll(cookiesToSet) {
+ cookiesToSet.forEach(({ name, value, options }) => request.cookies.set(name, value));
+ supabaseResponse = NextResponse.next({
+ request,
+ });
+ cookiesToSet.forEach(({ name, value, options }) => supabaseResponse.cookies.set(name, value, options));
+ },
+ },
+ }
+ );
+
+ // IMPORTANT: Avoid writing any logic between createServerClient and
+ // supabase.auth.getUser(). A simple mistake could make it very hard to debug
+ // issues with users being randomly logged out.
+
+ const {
+ data: { user },
+ } = await supabase.auth.getUser();
+
+ if (!user && !request.nextUrl.pathname.startsWith("/auth") && !request.nextUrl.pathname.startsWith("/auth")) {
+ // no user, potentially respond by redirecting the user to the login page
+ const url = request.nextUrl.clone();
+ url.pathname = "/auth";
+ return NextResponse.redirect(url);
+ }
+
+ // IMPORTANT: You *must* return the supabaseResponse object as it is. If you're
+ // creating a new response object with NextResponse.next() make sure to:
+ // 1. Pass the request in it, like so:
+ // const myNewResponse = NextResponse.next({ request })
+ // 2. Copy over the cookies, like so:
+ // myNewResponse.cookies.setAll(supabaseResponse.cookies.getAll())
+ // 3. Change the myNewResponse object to fit your needs, but avoid changing
+ // the cookies!
+ // 4. Finally:
+ // return myNewResponse
+ // If this is not done, you may be causing the browser and server to go out
+ // of sync and terminate the user's session prematurely!
+
+ return supabaseResponse;
+}
diff --git a/src/lib/supabase/server.ts b/src/lib/supabase/server.ts
deleted file mode 100644
index df4e8c5..0000000
--- a/src/lib/supabase/server.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { createServerClient } from "@supabase/ssr";
-import { cookies } from "next/headers";
-
-export const createClient = () => {
- const cookieStore = cookies();
-
- return createServerClient(process.env.NEXT_PUBLIC_SUPABASE_URL!, process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!, {
- cookies: {
- getAll() {
- return cookieStore.getAll();
- },
- setAll(cookiesToSet) {
- try {
- cookiesToSet.forEach(({ name, value, options }) => {
- cookieStore.set(name, value, options);
- });
- } catch (error) {
- // The `set` method was called from a Server Component.
- // This can be ignored if you have middleware refreshing
- // user sessions.
- }
- },
- },
- });
-};
diff --git a/src/lib/supabase/serverComponentClient.ts b/src/lib/supabase/serverComponentClient.ts
new file mode 100644
index 0000000..7f224fa
--- /dev/null
+++ b/src/lib/supabase/serverComponentClient.ts
@@ -0,0 +1,19 @@
+import { createServerClient, type CookieOptions } from "@supabase/ssr";
+import { cookies } from "next/headers";
+
+export function createSupabaseClient() {
+ const cookieStore = cookies();
+
+ return createServerClient(process.env.NEXT_PUBLIC_SUPABASE_URL!, process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!, {
+ cookies: {
+ getAll() {
+ return cookieStore.getAll();
+ },
+ setAll(cookiesToSet) {
+ try {
+ cookiesToSet.forEach(({ name, value, options }) => cookieStore.set(name, value, options));
+ } catch {}
+ },
+ },
+ });
+}
diff --git a/src/middleware.ts b/src/middleware.ts
new file mode 100644
index 0000000..9226aa2
--- /dev/null
+++ b/src/middleware.ts
@@ -0,0 +1,19 @@
+import { type NextRequest } from "next/server";
+import { updateSession } from "@/lib/supabase/middleware";
+
+export async function middleware(request: NextRequest) {
+ return await updateSession(request);
+}
+
+export const config = {
+ matcher: [
+ /*
+ * Match all request paths except for the ones starting with:
+ * - _next/static (static files)
+ * - _next/image (image optimization files)
+ * - favicon.ico (favicon file)
+ * Feel free to modify this pattern to include more paths.
+ */
+ "/((?!_next/static|_next/image|$|favicon.ico|.*\\.(?:svg|png|jpg|jpeg|gif|webp)$).*)",
+ ],
+};