- {t("noAccount")}{" "} + Don't have an account?{" "} - {t("createAccount")} + Create account
diff --git a/src/app/[locale]/(auth)/signup/page.tsx b/src/app/(auth)/signup/page.tsx similarity index 87% rename from src/app/[locale]/(auth)/signup/page.tsx rename to src/app/(auth)/signup/page.tsx index 875ab4a..c431fe9 100644 --- a/src/app/[locale]/(auth)/signup/page.tsx +++ b/src/app/(auth)/signup/page.tsx @@ -1,9 +1,8 @@ "use client"; import { Suspense, useState } from "react"; +import Link from "next/link"; import { useSearchParams } from "next/navigation"; -import { useTranslations } from "next-intl"; -import { Link } from "@/i18n/navigation"; import { createClient } from "@/lib/supabase/client"; import { Button } from "@/components/ui/button"; import { Input } from "@/components/ui/input"; @@ -28,7 +27,6 @@ export default function SignupPage() { } function SignupPageInner() { - const t = useTranslations("auth.signup"); const searchParams = useSearchParams(); // When the user lands here from `/join/- {t("haveAccount")}{" "} + Already have an account?{" "} - {t("signIn")} + Sign in
diff --git a/src/app/[locale]/(dashboard)/automations/[id]/edit/page.tsx b/src/app/(dashboard)/automations/[id]/edit/page.tsx similarity index 100% rename from src/app/[locale]/(dashboard)/automations/[id]/edit/page.tsx rename to src/app/(dashboard)/automations/[id]/edit/page.tsx diff --git a/src/app/[locale]/(dashboard)/automations/[id]/logs/page.tsx b/src/app/(dashboard)/automations/[id]/logs/page.tsx similarity index 100% rename from src/app/[locale]/(dashboard)/automations/[id]/logs/page.tsx rename to src/app/(dashboard)/automations/[id]/logs/page.tsx diff --git a/src/app/[locale]/(dashboard)/automations/new/page.tsx b/src/app/(dashboard)/automations/new/page.tsx similarity index 100% rename from src/app/[locale]/(dashboard)/automations/new/page.tsx rename to src/app/(dashboard)/automations/new/page.tsx diff --git a/src/app/[locale]/(dashboard)/automations/page.tsx b/src/app/(dashboard)/automations/page.tsx similarity index 100% rename from src/app/[locale]/(dashboard)/automations/page.tsx rename to src/app/(dashboard)/automations/page.tsx diff --git a/src/app/[locale]/(dashboard)/broadcasts/[id]/page.tsx b/src/app/(dashboard)/broadcasts/[id]/page.tsx similarity index 100% rename from src/app/[locale]/(dashboard)/broadcasts/[id]/page.tsx rename to src/app/(dashboard)/broadcasts/[id]/page.tsx diff --git a/src/app/[locale]/(dashboard)/broadcasts/new/page.tsx b/src/app/(dashboard)/broadcasts/new/page.tsx similarity index 100% rename from src/app/[locale]/(dashboard)/broadcasts/new/page.tsx rename to src/app/(dashboard)/broadcasts/new/page.tsx diff --git a/src/app/[locale]/(dashboard)/broadcasts/page.tsx b/src/app/(dashboard)/broadcasts/page.tsx similarity index 100% rename from src/app/[locale]/(dashboard)/broadcasts/page.tsx rename to src/app/(dashboard)/broadcasts/page.tsx diff --git a/src/app/[locale]/(dashboard)/contacts/page.tsx b/src/app/(dashboard)/contacts/page.tsx similarity index 100% rename from src/app/[locale]/(dashboard)/contacts/page.tsx rename to src/app/(dashboard)/contacts/page.tsx diff --git a/src/app/[locale]/(dashboard)/dashboard-shell.tsx b/src/app/(dashboard)/dashboard-shell.tsx similarity index 100% rename from src/app/[locale]/(dashboard)/dashboard-shell.tsx rename to src/app/(dashboard)/dashboard-shell.tsx diff --git a/src/app/[locale]/(dashboard)/dashboard/page.tsx b/src/app/(dashboard)/dashboard/page.tsx similarity index 100% rename from src/app/[locale]/(dashboard)/dashboard/page.tsx rename to src/app/(dashboard)/dashboard/page.tsx diff --git a/src/app/[locale]/(dashboard)/flows/[id]/page.tsx b/src/app/(dashboard)/flows/[id]/page.tsx similarity index 100% rename from src/app/[locale]/(dashboard)/flows/[id]/page.tsx rename to src/app/(dashboard)/flows/[id]/page.tsx diff --git a/src/app/[locale]/(dashboard)/flows/[id]/runs/page.tsx b/src/app/(dashboard)/flows/[id]/runs/page.tsx similarity index 100% rename from src/app/[locale]/(dashboard)/flows/[id]/runs/page.tsx rename to src/app/(dashboard)/flows/[id]/runs/page.tsx diff --git a/src/app/[locale]/(dashboard)/flows/page.tsx b/src/app/(dashboard)/flows/page.tsx similarity index 100% rename from src/app/[locale]/(dashboard)/flows/page.tsx rename to src/app/(dashboard)/flows/page.tsx diff --git a/src/app/[locale]/(dashboard)/inbox/page.tsx b/src/app/(dashboard)/inbox/page.tsx similarity index 100% rename from src/app/[locale]/(dashboard)/inbox/page.tsx rename to src/app/(dashboard)/inbox/page.tsx diff --git a/src/app/[locale]/(dashboard)/layout.tsx b/src/app/(dashboard)/layout.tsx similarity index 100% rename from src/app/[locale]/(dashboard)/layout.tsx rename to src/app/(dashboard)/layout.tsx diff --git a/src/app/[locale]/(dashboard)/pipelines/page.tsx b/src/app/(dashboard)/pipelines/page.tsx similarity index 100% rename from src/app/[locale]/(dashboard)/pipelines/page.tsx rename to src/app/(dashboard)/pipelines/page.tsx diff --git a/src/app/[locale]/(dashboard)/settings/page.tsx b/src/app/(dashboard)/settings/page.tsx similarity index 100% rename from src/app/[locale]/(dashboard)/settings/page.tsx rename to src/app/(dashboard)/settings/page.tsx diff --git a/src/app/[locale]/page.tsx b/src/app/[locale]/page.tsx deleted file mode 100644 index b262e23..0000000 --- a/src/app/[locale]/page.tsx +++ /dev/null @@ -1,10 +0,0 @@ -import { redirect } from "@/i18n/navigation"; - -export default async function RootPage({ - params, -}: { - params: Promise<{ locale: string }>; -}) { - const { locale } = await params; - redirect({ href: "/dashboard", locale }); -} diff --git a/src/app/[locale]/join/[token]/page.tsx b/src/app/join/[token]/page.tsx similarity index 81% rename from src/app/[locale]/join/[token]/page.tsx rename to src/app/join/[token]/page.tsx index 5fdc4ee..4767505 100644 --- a/src/app/[locale]/join/[token]/page.tsx +++ b/src/app/join/[token]/page.tsx @@ -23,9 +23,8 @@ // ============================================================ import { useCallback, useEffect, useState } from 'react'; +import Link from 'next/link'; import { useParams } from 'next/navigation'; -import { useTranslations } from 'next-intl'; -import { Link } from '@/i18n/navigation'; import { toast } from 'sonner'; import { AlertTriangle, @@ -66,16 +65,32 @@ interface PeekFail { } type PeekResult = PeekOk | PeekFail; -const FAIL_REASON_KEY: Record{t('verifying')}
+Verifying invitation…
- {t.rich('acceptFooter', { - accountName: peek.account_name, - highlight: (chunks) => ( - {chunks} - ), - })} + Accepting moves your login into{' '} + {peek.account_name}. Your + empty personal account from signup will be cleaned up.
@@ -351,7 +363,7 @@ export default function JoinPage() {- {t.rich('conflictBody', { - accountName: peek.account_name, - highlight: (chunks) => ( - {chunks} - ), - })} + To join{' '} + {peek.account_name}, + sign out and sign up again with a different email address. + The invite link stays valid as long as it hasn't + expired.