Merge pull request #3 from esbnet/feature/clerk-auth

Feature/clerk auth
esbnet · Mar 4, 2024 · 176f8c8 · 176f8c8
2 parents 5f70903 + a528224
commit 176f8c8
Show file tree

Hide file tree

Showing 19 changed files with 654 additions and 59 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,6 +27,7 @@ yarn-error.log*
 
 # local env files
 .env*.local
+.env
 
 # vercel
 .vercel

diff --git a/__middleware.ts b/__middleware.ts
@@ -0,0 +1,8 @@
+import { i18n } from "@/i18n";
+import createMiddleware from "next-intl/middleware";
+
+export default createMiddleware(i18n);
+
+export const config = {
+  matcher: ["/((?!api|_next|.*\\..*).*)"],
+};
diff --git a/app/(auth)/(routes)/sign-in/[[...sign-in]]/page.tsx b/app/(auth)/(routes)/sign-in/[[...sign-in]]/page.tsx
@@ -0,0 +1,5 @@
+import { SignUp } from "@clerk/nextjs";
+
+export default function Page() {
+  return <SignUp />;
+}
diff --git a/app/(auth)/(routes)/sign-up/[[...sign-up]]/page.tsx b/app/(auth)/(routes)/sign-up/[[...sign-up]]/page.tsx
@@ -0,0 +1,5 @@
+import { SignUp } from "@clerk/nextjs";
+
+export default function Page() {
+  return <SignUp />;
+}
diff --git a/app/(auth)/layout.tsx b/app/(auth)/layout.tsx
@@ -0,0 +1,13 @@
+import { Locale } from "@/i18n";
+
+export default function AuthLayout({
+  children,
+  params,
+}: {
+  children: React.ReactNode;
+  params: { locale: Locale };
+}) {
+  return (
+    <div className="flex items-center justify-center h-full">{children}</div>
+  );
+}
diff --git a/app/(dashboard)/(routes)/dashboard/page.tsx b/app/(dashboard)/(routes)/dashboard/page.tsx
@@ -0,0 +1,11 @@
+import { Locale } from "@/i18n";
+import { UserButton } from "@clerk/nextjs";
+
+export default function Dashboard({ params }: { params: { locale: Locale } }) {
+  return (
+    <div>
+      <p>Dashboard Page</p>
+      <UserButton afterSignOutUrl="/" />
+    </div>
+  );
+}
diff --git a/app/(landing)/page.tsx b/app/(landing)/page.tsx
@@ -0,0 +1,18 @@
+import { Button } from "@/components/ui/button";
+import Link from "next/link";
+
+export default function LandingPage() {
+  return (
+    <div>
+      Landing Page (desprotegido)
+      <div>
+        <Link href="/sign-in">
+          <Button>Login</Button>
+        </Link>
+        <Link href="/sign-up">
+          <Button>Register</Button>
+        </Link>
+      </div>
+    </div>
+  );
+}
diff --git a/app/[locale]/(dashboard)/(routes)/dashboard/page.tsx b/app/[locale]/(dashboard)/(routes)/dashboard/page.tsx
diff --git a/app/[locale]/(landing)/page.tsx b/app/[locale]/(landing)/page.tsx
diff --git a/app/[locale]/tmp.tsx b/app/[locale]/tmp.tsx
diff --git a/app/api/auth/[kindeAuth]/route.ts b/app/api/auth/[kindeAuth]/route.ts
@@ -0,0 +1,3 @@
+import { handleAuth } from "@kinde-oss/kinde-auth-nextjs/server";
+
+export const GET = handleAuth();
diff --git a/app/[locale]/favicon.ico → app/favicon.ico b/app/[locale]/favicon.ico → app/favicon.ico
diff --git a/app/[locale]/globals.css → app/globals.css b/app/[locale]/globals.css → app/globals.css
diff --git a/app/[locale]/layout.tsx → app/layout.tsx b/app/[locale]/layout.tsx → app/layout.tsx
@@ -1,17 +1,18 @@
-import { i18n } from "@/i18n";
 import type { Metadata } from "next";
 import { Inter } from "next/font/google";
 import "./globals.css";
 
+import { ClerkProvider } from "@clerk/nextjs";
+
 const inter = Inter({ subsets: ["latin"] });
 
-export async function generateStaticParams() {
-  const languages = i18n.locales.map((locale) => ({
-    locale,
-  }));
+// export async function generateStaticParams() {
+//   const languages = i18n.locales.map((locale) => ({
+//     locale,
+//   }));
 
-  return languages;
-}
+//   return languages;
+// }
 
 export const metadata: Metadata = {
   title: "Genius",
@@ -20,14 +21,14 @@ export const metadata: Metadata = {
 
 export default function RootLayout({
   children,
-  params,
 }: Readonly<{
   children: React.ReactNode;
-  params: { locale: string };
 }>) {
   return (
-    <html lang={params.locale}>
-      <body className={inter.className}>{children}</body>
-    </html>
+    <ClerkProvider>
+      <html lang="pt-BR">
+        <body className={inter.className}>{children}</body>
+      </html>
+    </ClerkProvider>
   );
 }
diff --git a/i18n.ts b/i18n.ts
@@ -7,6 +7,7 @@ export const i18n = {
   defaultLocale,
   locales,
   localeDetection: true,
+  publicRoutes: ["/"],
 };
 
 export type Locale = (typeof langs)[number];

diff --git a/middleware.ts b/middleware.ts
@@ -1,8 +1,9 @@
-import { i18n } from "@/i18n";
-import createMiddleware from "next-intl/middleware";
+import { authMiddleware } from "@clerk/nextjs";
 
-export default createMiddleware(i18n);
+export default authMiddleware({
+  publicRoutes: ["/", "/api/webhook"],
+});
 
 export const config = {
-  matcher: ["/((?!api|_next|.*\\..*).*)"],
+  matcher: ["/((?!.*\\..*|_next).*)", "/", "/(api|trpc)(.*)"],
 };
diff --git a/next.config.mjs b/next.config.mjs
@@ -1,8 +1,9 @@
-import createNextIntlPlugin from "next-intl/plugin";
+// import createNextIntlPlugin from "next-intl/plugin";
 
-const withNextIntl = createNextIntlPlugin();
+// const withNextIntl = createNextIntlPlugin();
 
 /** @type {import('next').NextConfig} */
 const nextConfig = {};
 
-export default withNextIntl(nextConfig);
+// export default withNextIntl(nextConfig);
+export default nextConfig;
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,7 @@ yarn-error.log* @@
     # local env files
     .env*.local
+    .env
     # vercel
     .vercel
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import { handleAuth } from "@kinde-oss/kinde-auth-nextjs/server";

		export const GET = handleAuth();