Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions apps/web/src/routes/__root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import {
import { lazy } from "react";

import { NotFoundDocument } from "@/components/not-found";
import { fetchUser } from "@/functions/auth";
import appCss from "@/styles.css?url";

interface RouterContext {
Expand All @@ -21,10 +20,6 @@ const KEYWORDS =
"AI notepad, privacy-first AI, on-device AI, local AI, edge AI, meeting notes, personal knowledge base, AI notetaking, AI notetaker, Argmax, Deepgram, secure transcription, notepad app, notetaking app";

export const Route = createRootRouteWithContext<RouterContext>()({
beforeLoad: async () => {
const user = await fetchUser();
return { user };
},
head: () => ({
meta: [
{ charSet: "utf-8" },
Expand Down
1 change: 1 addition & 0 deletions apps/web/src/routes/_view/app/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ export const Route = createFileRoute("/_view/app/")({
throw redirect({ to: "/app/account" });
}
},
loader: async ({ context }) => ({ user: context.user }),
});
8 changes: 6 additions & 2 deletions apps/web/src/routes/_view/app/route.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
import { createFileRoute, redirect } from "@tanstack/react-router";

import { fetchUser } from "@/functions/auth";

export const Route = createFileRoute("/_view/app")({
beforeLoad: async ({ context }) => {
if (!context.user) {
beforeLoad: async () => {
const user = await fetchUser();
if (!user) {
throw redirect({ to: "/" });
}
return { user };
},
});
27 changes: 25 additions & 2 deletions apps/web/src/routes/_view/file-transcription.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createFileRoute, Link } from "@tanstack/react-router";
import { useMemo, useState } from "react";
import { useEffect, useMemo, useState } from "react";

import NoteEditor, { type JSONContent } from "@hypr/tiptap/editor";
import { EMPTY_TIPTAP_DOC } from "@hypr/tiptap/shared";
Expand All @@ -10,6 +10,7 @@ import {
TranscriptDisplay,
} from "@/components/transcription/transcript-display";
import { UploadArea } from "@/components/transcription/upload-area";
import { getSupabaseBrowserClient } from "@/functions/supabase";

export const Route = createFileRoute("/_view/file-transcription")({
component: Component,
Expand All @@ -19,7 +20,29 @@ export const Route = createFileRoute("/_view/file-transcription")({
});

function Component() {
const { user } = Route.useRouteContext();
const [user, setUser] = useState<{ email?: string } | null>(null);

useEffect(() => {
let isMounted = true;
async function loadUser() {
try {
const supabase = getSupabaseBrowserClient();
const { data } = await supabase.auth.getUser();
if (!isMounted) return;
if (data.user?.email) {
setUser({ email: data.user.email });
} else {
setUser(null);
}
} catch {
if (isMounted) setUser(null);
}
}
loadUser();
return () => {
isMounted = false;
};
}, []);
const [file, setFile] = useState<File | null>(null);
const [isProcessing, setIsProcessing] = useState(false);
const [transcript, setTranscript] = useState<string | null>(null);
Expand Down
1 change: 0 additions & 1 deletion apps/web/src/routes/_view/route.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { Header } from "@/components/header";

export const Route = createFileRoute("/_view")({
component: Component,
loader: async ({ context }) => ({ user: context.user }),
});

interface HeroContextType {
Expand Down