Merge branch 'develop' into mysql-driver

outerbase · Aug 25, 2024 · c7b0ba4 · c7b0ba4
2 parents a7a230d + ba9d3b4
commit c7b0ba4
Show file tree

Hide file tree

Showing 21 changed files with 541 additions and 325 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/public/hero-banner.jpg b/public/hero-banner.jpg
diff --git a/src/app/(public)/layout.tsx b/src/app/(public)/layout.tsx
@@ -3,6 +3,7 @@ import { Inter } from "next/font/google";
 import { Toaster } from "@/components/ui/sonner";
 import { Fragment } from "react";
 import Script from "next/script";
+import { cn } from "@/lib/utils";
 
 const inter = Inter({ subsets: ["latin"] });
 
@@ -12,7 +13,7 @@ export default async function RootLayout({
   children: React.ReactNode;
 }) {
   return (
-    <body className={inter.className} suppressHydrationWarning>
+    <body className={cn(inter.className, "dark")}>
       <Fragment>{children}</Fragment>
       <Toaster />
       <Analytics />

diff --git a/src/app/(public)/login/github/callback/route.ts b/src/app/(public)/login/github/callback/route.ts
@@ -52,7 +52,6 @@ export async function GET(request: Request): Promise<Response> {
       },
     });
   } catch (e) {
-    console.error(e);
     // the specific error message depends on the provider
     if (e instanceof OAuth2RequestError) {
       // invalid code

diff --git a/src/app/(public)/login/page.tsx b/src/app/(public)/login/page.tsx
@@ -9,7 +9,7 @@ export default async function LoginPage() {
 
   return (
     <div className="flex h-screen w-screen dark flex-col lg:flex-row">
-      <div className="lg:w-1/2 h-full bg-black flex justify-center items-center order-2">
+      <div className="lg:w-1/2 h-full flex justify-center items-center order-2">
         <div className="text-white max-w-[500px] flex flex-col gap-4 text-lg">
           <LogoLoading />
 
@@ -41,15 +41,15 @@ export default async function LoginPage() {
           </ul>
         </div>
       </div>
-      <div className="lg:w-1/2 h-full flex justify-center items-center bg-white order-1">
+      <div className="lg:w-1/2 h-full flex justify-center items-center order-1 bg-zinc-900">
         <div className="w-[300px] flex flex-col gap-4 text-lg">
           <p className="font-mono">Login to your account</p>
 
           {GITHUB_LOGIN_SUPPORT && (
             <Link
               prefetch={false}
               href="/login/github"
-              className="border-2 border-black rounded-lg p-4 flex gap-4 items-center font-bold hover:bg-gray-200 text-black"
+              className="border-2 border-white rounded-lg p-4 flex gap-4 items-center font-bold hover:bg-gray-800 text-white"
             >
               <svg
                 width="98"
@@ -73,7 +73,7 @@ export default async function LoginPage() {
             <Link
               prefetch={false}
               href="/login/google"
-              className="border-2 border-black rounded-lg p-4 flex gap-4 items-center font-bold hover:bg-gray-200 text-black"
+              className="border-2 border-white rounded-lg p-4 flex gap-4 items-center font-bold hover:bg-gray-800 text-white"
             >
               <img src="/google.png" className="w-6 h-6" alt="Google" />
               Continue with Google