Landing

midday-ai · Dec 4, 2023 · c88b094 · c88b094
1 parent b9fdea5
commit c88b094
Show file tree

Hide file tree

Showing 18 changed files with 320 additions and 293 deletions.
diff --git a/apps/dashboard/package.json b/apps/dashboard/package.json
@@ -45,7 +45,7 @@
   "devDependencies": {
     "@midday/tsconfig": "workspace:*",
     "@t3-oss/env-nextjs": "^0.7.1",
-    "@types/node": "^20.10.2",
+    "@types/node": "^20.10.3",
     "@types/react": "^18.2.41",
     "@types/react-dom": "^18.2.17",
     "typescript": "^5.3.2"

diff --git a/apps/dashboard/src/app/[locale]/layout.tsx b/apps/dashboard/src/app/[locale]/layout.tsx
@@ -4,7 +4,6 @@ import { Provider } from "./provider";
 export default async function Layout({
   dashboard,
   login,
-
   params: { locale },
 }: {
   dashboard: React.ReactNode;

diff --git a/apps/dashboard/src/app/api/auth/callback/route.ts b/apps/dashboard/src/app/api/auth/callback/route.ts
@@ -13,6 +13,7 @@ export async function GET(req: NextRequest) {
   const code = requestUrl.searchParams.get("code");
   const returnTo = requestUrl.searchParams.get("return_to");
   const provider = requestUrl.searchParams.get("provider");
+  const onboardingVisited = cookieStore.get(Cookies.OnboardingVisited)?.value;
 
   if (provider) {
     cookieStore.set(Cookies.PrefferedSignInProvider, provider);
@@ -23,6 +24,11 @@ export async function GET(req: NextRequest) {
     await supabase.auth.exchangeCodeForSession(code);
   }
 
+  if (!onboardingVisited) {
+    cookieStore.set(Cookies.OnboardingVisited, "true");
+    return NextResponse.redirect(`${requestUrl.origin}/onboarding`);
+  }
+
   if (returnTo) {
     return NextResponse.redirect(`${requestUrl.origin}/${returnTo}`);
   }

diff --git a/apps/dashboard/src/app/api/download/zip/route.ts b/apps/dashboard/src/app/api/download/zip/route.ts
@@ -1,19 +1,33 @@
+import { getUser } from "@midday/supabase/cached-queries";
+import { getVaultRecursiveQuery } from "@midday/supabase/queries";
 import { createClient } from "@midday/supabase/server";
+import { download } from "@midday/supabase/storage";
 import { BlobReader, BlobWriter, ZipWriter } from "@zip.js/zip.js";
 
 export const preferredRegion = "fra1";
 export const runtime = "edge";
+export const dynamic = "force-dynamic";
 
 export async function GET(req, res) {
-  const promises = [];
-  const supabase = createClient();
   const requestUrl = new URL(req.url);
+  const supabase = createClient();
+  const user = await getUser();
   const path = requestUrl.searchParams.get("path");
   const filename = requestUrl.searchParams.get("filename");
 
+  const promises: any = [];
+
+  const files = await getVaultRecursiveQuery(supabase, {
+    teamId: user.data.team_id,
+    path,
+  });
+
   files.forEach((file) => {
     promises.push(
-      supabaseClient.storage.from(bucket).download(`${folder}/${file.name}`)
+      download(supabase, {
+        bucket: "vault",
+        path: `${file.basePath}/${file.name}`,
+      })
     );
   });
 
@@ -32,20 +46,21 @@ export async function GET(req, res) {
   });
 
   downloadedFiles.forEach((downloadedFile) => {
-    if (downloadedFile) {
+    if (downloadedFile?.blob) {
       zipWriter.add(downloadedFile.name, new BlobReader(downloadedFile.blob));
     }
   });
 
-  //   const { data } = await supabase.storage.from("vault").download(path);
-  //   const responseHeaders = new Headers(res.headers);
+  const responseHeaders = new Headers(res.headers);
+
+  responseHeaders.set(
+    "Content-Disposition",
+    `attachment; filename="${filename}.zip"`
+  );
 
-  //   responseHeaders.set(
-  //     "Content-Disposition",
-  //     `attachment; filename="${filename}"`
-  //   );
+  const data = await zipWriter.close();
 
-  //   return new Response(data, {
-  //     headers: responseHeaders,
-  //   });
+  return new Response(data, {
+    headers: responseHeaders,
+  });
 }
diff --git a/apps/dashboard/src/app/layout.tsx b/apps/dashboard/src/app/layout.tsx
@@ -26,9 +26,15 @@ export const metadata: Metadata = {
   ],
 };
 
-export default function Layout({ children }: { children: ReactElement }) {
+export default function Layout({
+  children,
+  params,
+}: {
+  children: ReactElement;
+  params: { locale: string };
+}) {
   return (
-    <html lang="en" suppressHydrationWarning>
+    <html lang={params.locale} suppressHydrationWarning>
       <body className={cn(fontSans.variable, "whitespace-pre-line")}>
         <ThemeProvider
           attribute="class"

diff --git a/apps/dashboard/src/components/charts/chart-period.tsx b/apps/dashboard/src/components/charts/chart-period.tsx
@@ -1,7 +1,6 @@
 "use client";
 
 import { DateRangePicker } from "@midday/ui/date-range-picker";
-import { Icons } from "@midday/ui/icons";
 import {
   Select,
   SelectContent,
@@ -21,12 +20,12 @@ export function ChartPeriod({ initialValue, defaultValue, disabled }) {
       to: parseAsString.withDefault(initialValue?.to ?? undefined),
       from: parseAsString.withDefault(initialValue?.from ?? undefined),
       period: parseAsString.withDefault(
-        initialValue?.period ?? defaultValue.period,
+        initialValue?.period ?? defaultValue.period
       ),
     },
     {
       shallow: false,
-    },
+    }
   );
 
   if (state?.from) {
@@ -40,7 +39,7 @@ export function ChartPeriod({ initialValue, defaultValue, disabled }) {
   } else {
     placeholder = `${placeholder} -${format(
       new Date(defaultValue.to),
-      "LLL dd, y",
+      "LLL dd, y"
     )} `;
   }
 

diff --git a/apps/dashboard/src/components/charts/chart-type.tsx b/apps/dashboard/src/components/charts/chart-type.tsx
@@ -20,7 +20,7 @@ export function ChartType({ initialValue, disabled }) {
     initialValue,
     (_, newState) => {
       return newState;
-    },
+    }
   );
 
   return (

diff --git a/apps/dashboard/src/components/tables/vault/data-table-row.tsx b/apps/dashboard/src/components/tables/vault/data-table-row.tsx
@@ -29,11 +29,8 @@ import {
 import {
   DropdownMenu,
   DropdownMenuContent,
-  DropdownMenuGroup,
   DropdownMenuItem,
   DropdownMenuPortal,
-  DropdownMenuSeparator,
-  DropdownMenuShortcut,
   DropdownMenuSub,
   DropdownMenuSubContent,
   DropdownMenuSubTrigger,
@@ -209,7 +206,7 @@ export function DataTableRow({ data, addOptimisticData }) {
                     <DropdownMenuItem>
                       {data.isFolder ? (
                         <a
-                          href={`/api/download/zip?path=${folderPath}&filename=${data.name}`}
+                          href={`/api/download/zip?path=${filepath}&filename=${data.name}`}
                           download
                           className="truncate"
                         >
@@ -292,7 +289,7 @@ export function DataTableRow({ data, addOptimisticData }) {
           <ContextMenuItem>
             {data.isFolder ? (
               <a
-                href={`/api/download/zip?path=${folderPath}&filename=${data.name}`}
+                href={`/api/download/zip?path=${filepath}&filename=${data.name}`}
                 download
                 className="truncate"
               >

diff --git a/apps/dashboard/src/locales/client.ts b/apps/dashboard/src/locales/client.ts
@@ -1,6 +1,5 @@
 "use client";
 
-import { createT } from "next-international";
 import { createI18nClient } from "next-international/client";
 
 export const languages = ["en", "sv"];

diff --git a/apps/dashboard/src/utils/constants.ts b/apps/dashboard/src/utils/constants.ts
@@ -3,4 +3,5 @@ export const Cookies = {
   SpendingPeriod: "spending-period",
   ChartType: "chart-type",
   TransactionsPeriod: "transactions-period",
+  OnboardingVisited: "onboarding-visited",
 };
diff --git a/apps/website/package.json b/apps/website/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@midday/tsconfig": "workspace:*",
-    "@types/node": "^20.10.2",
+    "@types/node": "^20.10.3",
     "@types/react": "^18.2.41",
     "@types/react-dom": "^18.2.17"
   }

diff --git a/apps/website/src/app/layout.tsx b/apps/website/src/app/layout.tsx
@@ -25,9 +25,15 @@ export const metadata: Metadata = {
   ],
 };
 
-export default function Layout({ children }: { children: ReactElement }) {
+export default function Layout({
+  children,
+  params,
+}: {
+  children: ReactElement;
+  params: { locale: string };
+}) {
   return (
-    <html lang="en" suppressHydrationWarning>
+    <html lang={params.locale} suppressHydrationWarning>
       <body className={cn(fontSans.variable, "whitespace-pre-line")}>
         <ThemeProvider
           attribute="class"