Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
♻️ Update billing link
Luke Vella37f9571ca228
diff --git a/apps/landing/src/app/[locale]/(main)/pricing/page.tsx b/apps/landing/src/app/[locale]/(main)/pricing/page.tsxindex 01d7d6cd3..ce05f5076 100644--- a/apps/landing/src/app/[locale]/(main)/pricing/page.tsx+++ b/apps/landing/src/app/[locale]/(main)/pricing/page.tsx@@ -84,7 +84,7 @@ const FAQ = async ({ t }: { t: TFunction<"pricing"> }) => {a: (<LinkclassName="text-link"- href={linkToApp("/account/billing")}+ href={linkToApp("/settings/billing")}/>),b: <strong />,@@ -110,7 +110,7 @@ const FAQ = async ({ t }: { t: TFunction<"pricing"> }) => {a: (<LinkclassName="text-link"- href={linkToApp("/account/billing")}+ href={linkToApp("/settings/billing")}/>),b: <strong />,diff --git a/apps/landing/src/app/[locale]/(main)/pricing/pricing-table.tsx b/apps/landing/src/app/[locale]/(main)/pricing/pricing-table.tsxindex 1f4887d56..eaa2a0c46 100644--- a/apps/landing/src/app/[locale]/(main)/pricing/pricing-table.tsx+++ b/apps/landing/src/app/[locale]/(main)/pricing/pricing-table.tsx@@ -153,7 +153,7 @@ export function PriceTables() {</TabsContent><hr /><Button asChild variant="primary" className="w-full">- <Link href={linkToApp("/account/billing")}>+ <Link href={linkToApp("/settings/billing")}><Transt={t}ns="pricing"diff --git a/apps/landing/src/posts/july-recap.md b/apps/landing/src/posts/july-recap.mdindex b60257b31..0b33e175e 100644--- a/apps/landing/src/posts/july-recap.md+++ b/apps/landing/src/posts/july-recap.md@@ -28,7 +28,7 @@ If you haven't jumped aboard yet, the launch price for Rallly Pro is still up fo**As an early adopter, you will not be impacted by future price increases**, so you will be benefitting from significantly reduced rates once more features are added.If you haven't already, you should check out the new [feedback portal](https://feedback.rallly.co) to see what features are coming next.-Ready to go Pro? You can upgrade from your [billing page](https://app.rallly.co/account/billing).+Ready to go Pro? You can upgrade from your [billing page](https://app.rallly.co/settings/billing).### Pricing Updatesdiff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/page.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/page.tsxindex b0128d4db..4e9149bdc 100644--- a/apps/web/src/app/[locale]/(space)/(dashboard)/page.tsx+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/page.tsx@@ -134,7 +134,7 @@ export default async function Page() {</Tile><IfCloudHosted><Tile asChild>- <Link href="/account/billing">+ <Link href="/settings/billing"><BillingPageIcon /><TileTitle><Trans i18nKey="billing" defaults="Billing" />diff --git a/apps/web/src/app/[locale]/account/settings-menu.tsx b/apps/web/src/app/[locale]/account/settings-menu.tsxdeleted file mode 100644index 46a7152cd..000000000--- a/apps/web/src/app/[locale]/account/settings-menu.tsx+++ /dev/null@@ -1,39 +0,0 @@-"use client";--import { Tabs, TabsContent, TabsList, TabsTrigger } from "@rallly/ui/page-tabs";-import Link from "next/link";-import { usePathname } from "next/navigation";--import { Trans } from "@/components/trans";-import { IfCloudHosted } from "@/contexts/environment";--export function SettingsLayout({ children }: { children: React.ReactNode }) {- const pathname = usePathname();-- return (- <Tabs value={pathname}>- <TabsList>- <TabsTrigger asChild value="/account/profile">- <Link href="/account/profile">- <Trans i18nKey="profile" defaults="Profile" />- </Link>- </TabsTrigger>- <TabsTrigger asChild value="/account/preferences">- <Link href="/account/preferences">- <Trans i18nKey="preferences" defaults="Preferences" />- </Link>- </TabsTrigger>- <IfCloudHosted>- <TabsTrigger asChild value="/account/billing">- <Link href="/account/billing">- <Trans i18nKey="billing" defaults="Billing" />- </Link>- </TabsTrigger>- </IfCloudHosted>- </TabsList>- <TabsContent className="mt-4" value={pathname}>- {children}- </TabsContent>- </Tabs>- );-}diff --git a/apps/web/src/app/api/stripe/portal/helpers/create-portal-session.ts b/apps/web/src/app/api/stripe/portal/helpers/create-portal-session.tsindex 0d42f4aa4..a996c76dc 100644--- a/apps/web/src/app/api/stripe/portal/helpers/create-portal-session.ts+++ b/apps/web/src/app/api/stripe/portal/helpers/create-portal-session.ts@@ -11,7 +11,7 @@ export function createStripePortalSessionHandler(path = "") {return async (request: NextRequest) => {const sessionId = request.nextUrl.searchParams.get("session_id");const returnPath =- request.nextUrl.searchParams.get("return_path") ?? "/account/billing";+ request.nextUrl.searchParams.get("return_path") ?? "/settings/billing";let customerId: string | undefined;diff --git a/apps/web/src/components/user-dropdown.tsx b/apps/web/src/components/user-dropdown.tsxindex 81129691b..3405ca97a 100644--- a/apps/web/src/components/user-dropdown.tsx+++ b/apps/web/src/components/user-dropdown.tsx@@ -86,7 +86,10 @@ export const UserDropdown = ({ className }: { className?: string }) => {</DropdownMenuItem><IfCloudHosted><DropdownMenuItem asChild={true}>- <Link href="/account/billing" className="flex items-center gap-x-2">+ <Link+ href="/settings/billing"+ className="flex items-center gap-x-2"+ ><CreditCardIcon className="size-4 text-muted-foreground" /><Trans i18nKey="Billing" defaults="Billing" /></Link>diff --git a/apps/web/src/features/navigation/command-menu/command-menu.tsx b/apps/web/src/features/navigation/command-menu/command-menu.tsxindex e1c53333b..fd7d1010d 100644--- a/apps/web/src/features/navigation/command-menu/command-menu.tsx+++ b/apps/web/src/features/navigation/command-menu/command-menu.tsx@@ -100,7 +100,7 @@ export function CommandMenu() {<PreferencesPageIcon size="sm" /><NavigationCommandLabel label={t("preferences")} /></CommandItem>- <CommandItem onSelect={() => handleSelect("/account/billing")}>+ <CommandItem onSelect={() => handleSelect("/settings/billing")}><BillingPageIcon size="sm" /><NavigationCommandLabel label={t("billing")} /></CommandItem>