Theme

midday-ai · Dec 2, 2023 · 12e152b · 12e152b
1 parent 1fe7709
commit 12e152b
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 16 deletions.
diff --git a/apps/dashboard/src/app/api/auth/callback/route.ts b/apps/dashboard/src/app/api/auth/callback/route.ts
@@ -11,6 +11,7 @@ export async function GET(req: NextRequest) {
   const cookieStore = cookies();
   const requestUrl = new URL(req.url);
   const code = requestUrl.searchParams.get("code");
+  const returnTo = requestUrl.searchParams.get("return_to");
   const provider = requestUrl.searchParams.get("provider");
 
   if (provider) {
@@ -22,5 +23,5 @@ export async function GET(req: NextRequest) {
     await supabase.auth.exchangeCodeForSession(code);
   }
 
-  return NextResponse.redirect(requestUrl.origin);
+  return NextResponse.redirect(`${requestUrl.origin}/${returnTo}`);
 }
diff --git a/apps/dashboard/src/components/google-sign-in.tsx b/apps/dashboard/src/components/google-sign-in.tsx
@@ -3,15 +3,18 @@
 import { createClient } from "@midday/supabase/client";
 import { Button } from "@midday/ui/button";
 import { Icons } from "@midday/ui/icons";
+import { useSearchParams } from "next/navigation";
 
 export function GoogleSignIn() {
   const supabase = createClient();
+  const searchParams = useSearchParams();
+  const returnTo = searchParams.get("return_to");
 
   const handleSignIn = async () => {
     await supabase.auth.signInWithOAuth({
       provider: "google",
       options: {
-        redirectTo: `${location.origin}/api/auth/callback?provider=google`,
+        redirectTo: `${location.origin}/api/auth/callback?return_to=${returnTo}&provider=google`,
       },
     });
   };

diff --git a/apps/dashboard/src/components/sign-out.tsx b/apps/dashboard/src/components/sign-out.tsx
@@ -15,7 +15,7 @@ export function SignOut() {
   const handleSignOut = async () => {
     setLoading(true);
     signOutAction();
-    router.refresh();
+    router.replace("/");
   };
 
   return (

diff --git a/apps/dashboard/src/middleware.ts b/apps/dashboard/src/middleware.ts
@@ -16,7 +16,14 @@ export async function middleware(request: NextRequest) {
   const { data } = await supabase.auth.getSession();
 
   if (!data.session && request.nextUrl.pathname !== "/") {
-    return NextResponse.redirect(new URL("/", request.url));
+    const url = new URL("/", request.url);
+    const encodedSearchParams = encodeURIComponent(
+      `${request.nextUrl.pathname.substring(1)}${request.nextUrl.search}`
+    );
+
+    url.searchParams.append("return_to", encodedSearchParams);
+
+    return NextResponse.redirect(url);
   }
 
   if (

diff --git a/apps/website/public/overview-light.png b/apps/website/public/overview-light.png
diff --git a/apps/website/src/components/startpage.tsx b/apps/website/src/components/startpage.tsx
@@ -105,40 +105,52 @@ export function StartPage() {
         <div className="md:h-[730px] dark:md:h-[830px] flex">
           <div className="grid md:grid-cols-6 grid-cols-3 gap-[32px] m-auto mt-12">
             <div className="w-[100px] text-center leading-tight">
-              <div className="w-[100px] h-[65px] border border-[#2C2C2C] rounded-lg mb-2 flex items-center justify-center">
+              <div className="w-[100px] h-[65px] border border-[#DCDAD2] dark:border-[#2C2C2C] rounded-lg mb-2 flex items-center justify-center">
                 <Icons.OpenSource />
               </div>
-              <span className="text-[#606060] text-sm">{t("open")}</span>
+              <span className="text-[#878787] dark:text-[#606060] text-sm">
+                {t("open")}
+              </span>
             </div>
             <div className="w-[100px] text-center leading-tight">
-              <div className="w-[100px] h-[65px] border border-[#2C2C2C] rounded-lg mb-2 flex items-center justify-center">
+              <div className="w-[100px] h-[65px] border border-[#DCDAD2] dark:border-[#2C2C2C] rounded-lg mb-2 flex items-center justify-center">
                 <Icons.ChartGantt />
               </div>
-              <span className="text-[#606060] text-sm">{t("live")}</span>
+              <span className="text-[#878787] dark:text-[#606060] text-sm">
+                {t("live")}
+              </span>
             </div>
             <div className="w-[100px] text-center leading-tight">
-              <div className="w-[100px] h-[65px] border border-[#2C2C2C] rounded-lg mb-2 flex items-center justify-center">
+              <div className="w-[100px] h-[65px] border border-[#DCDAD2] dark:border-[#2C2C2C] rounded-lg mb-2 flex items-center justify-center">
                 <Icons.FileDocument />
               </div>
-              <span className="text-[#606060] text-sm">{t("document")}</span>
+              <span className="text-[#878787] dark:text-[#606060] text-sm">
+                {t("document")}
+              </span>
             </div>
             <div className="w-[100px] text-center leading-tight">
-              <div className="w-[100px] h-[65px] border border-[#2C2C2C] rounded-lg mb-2 flex items-center justify-center">
+              <div className="w-[100px] h-[65px] border border-[#DCDAD2] dark:border-[#2C2C2C] rounded-lg mb-2 flex items-center justify-center">
                 <Icons.ReceiptText />
               </div>
-              <span className="text-[#606060] text-sm">{t("reciept")}</span>
+              <span className="text-[#878787] dark:text-[#606060] text-sm">
+                {t("reciept")}
+              </span>
             </div>
             <div className="w-[100px] text-center leading-tight">
-              <div className="w-[100px] h-[65px] border border-[#2C2C2C] rounded-lg mb-2 flex items-center justify-center">
+              <div className="w-[100px] h-[65px] border border-[#DCDAD2] dark:border-[#2C2C2C] rounded-lg mb-2 flex items-center justify-center">
                 <Icons.TimeCog />
               </div>
-              <span className="text-[#606060] text-sm">{t("time")}</span>
+              <span className="text-[#878787] dark:text-[#606060] text-sm">
+                {t("time")}
+              </span>
             </div>
             <div className="w-[100px] text-center leading-tight">
-              <div className="w-[100px] h-[65px] border border-[#2C2C2C] rounded-lg mb-2 flex items-center justify-center">
+              <div className="w-[100px] h-[65px] border border-[#DCDAD2] dark:border-[#2C2C2C] rounded-lg mb-2 flex items-center justify-center">
                 <Icons.CreationOutline />
               </div>
-              <span className="text-[#606060] text-sm">{t("ai")}</span>
+              <span className="text-[#878787] dark:text-[#606060] text-sm">
+                {t("ai")}
+              </span>
             </div>
           </div>