Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
🏗️ Move account settings (#1814)
Luke Vellabfa3b0818ef4
diff --git a/apps/landing/src/app/[locale]/(main)/pricing/page.tsx b/apps/landing/src/app/[locale]/(main)/pricing/page.tsxindex ce05f5076..01d7d6cd3 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("/settings/billing")}+ href={linkToApp("/account/billing")}/>),b: <strong />,@@ -110,7 +110,7 @@ const FAQ = async ({ t }: { t: TFunction<"pricing"> }) => {a: (<LinkclassName="text-link"- href={linkToApp("/settings/billing")}+ href={linkToApp("/account/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 b151a8a4b..797dbc37b 100644--- a/apps/landing/src/app/[locale]/(main)/pricing/pricing-table.tsx+++ b/apps/landing/src/app/[locale]/(main)/pricing/pricing-table.tsx@@ -157,7 +157,7 @@ export function PriceTables() {</TabsContent><hr /><Button asChild variant="primary" className="w-full">- <Link href={linkToApp("/settings/billing")}>+ <Link href={linkToApp("/account/billing")}><Transt={t}ns="pricing"diff --git a/apps/landing/src/posts/july-recap.md b/apps/landing/src/posts/july-recap.mdindex 0b33e175e..b60257b31 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/settings/billing).+Ready to go Pro? You can upgrade from your [billing page](https://app.rallly.co/account/billing).### Pricing Updatesdiff --git a/apps/web/next.config.js b/apps/web/next.config.jsindex 6d448d19a..ac7f5ae95 100644--- a/apps/web/next.config.js+++ b/apps/web/next.config.js@@ -56,6 +56,21 @@ const nextConfig = {destination: "/api/notifications/unsubscribe",permanent: true,},+ {+ source: "/settings/profile",+ destination: "/account/profile",+ permanent: true,+ },+ {+ source: "/settings/preferences",+ destination: "/account/preferences",+ permanent: true,+ },+ {+ source: "/settings/billing",+ destination: "/account/billing",+ permanent: true,+ },];},devIndicators: {diff --git a/apps/web/src/app/[locale]/(space)/settings/billing/components/payment-method.tsx b/apps/web/src/app/[locale]/(space)/account/billing/components/payment-method.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(space)/settings/billing/components/payment-method.tsxrename to apps/web/src/app/[locale]/(space)/account/billing/components/payment-method.tsxdiff --git a/apps/web/src/app/[locale]/(space)/settings/billing/components/subscription-price.tsx b/apps/web/src/app/[locale]/(space)/account/billing/components/subscription-price.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(space)/settings/billing/components/subscription-price.tsxrename to apps/web/src/app/[locale]/(space)/account/billing/components/subscription-price.tsxdiff --git a/apps/web/src/app/[locale]/(space)/settings/billing/components/subscription-status.tsx b/apps/web/src/app/[locale]/(space)/account/billing/components/subscription-status.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(space)/settings/billing/components/subscription-status.tsxrename to apps/web/src/app/[locale]/(space)/account/billing/components/subscription-status.tsxdiff --git a/apps/web/src/app/[locale]/(space)/settings/billing/page.tsx b/apps/web/src/app/[locale]/(space)/account/billing/page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(space)/settings/billing/page.tsxrename to apps/web/src/app/[locale]/(space)/account/billing/page.tsxdiff --git a/apps/web/src/app/[locale]/(space)/settings/components/settings-layout.tsx b/apps/web/src/app/[locale]/(space)/account/components/settings-layout.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(space)/settings/components/settings-layout.tsxrename to apps/web/src/app/[locale]/(space)/account/components/settings-layout.tsxdiff --git a/apps/web/src/app/[locale]/(space)/settings/components/sign-out-button.tsx b/apps/web/src/app/[locale]/(space)/account/components/sign-out-button.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(space)/settings/components/sign-out-button.tsxrename to apps/web/src/app/[locale]/(space)/account/components/sign-out-button.tsxdiff --git a/apps/web/src/app/[locale]/(space)/settings/layout.tsx b/apps/web/src/app/[locale]/(space)/account/layout.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(space)/settings/layout.tsxrename to apps/web/src/app/[locale]/(space)/account/layout.tsxdiff --git a/apps/web/src/app/[locale]/(space)/settings/loading.tsx b/apps/web/src/app/[locale]/(space)/account/loading.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(space)/settings/loading.tsxrename to apps/web/src/app/[locale]/(space)/account/loading.tsxdiff --git a/apps/web/src/app/[locale]/(space)/settings/preferences/actions.ts b/apps/web/src/app/[locale]/(space)/account/preferences/actions.tssimilarity index 100%rename from apps/web/src/app/[locale]/(space)/settings/preferences/actions.tsrename to apps/web/src/app/[locale]/(space)/account/preferences/actions.tsdiff --git a/apps/web/src/app/[locale]/(space)/settings/preferences/components/date-time-preferences.tsx b/apps/web/src/app/[locale]/(space)/account/preferences/components/date-time-preferences.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(space)/settings/preferences/components/date-time-preferences.tsxrename to apps/web/src/app/[locale]/(space)/account/preferences/components/date-time-preferences.tsxdiff --git a/apps/web/src/app/[locale]/(space)/settings/preferences/components/language-preference.tsx b/apps/web/src/app/[locale]/(space)/account/preferences/components/language-preference.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(space)/settings/preferences/components/language-preference.tsxrename to apps/web/src/app/[locale]/(space)/account/preferences/components/language-preference.tsxdiff --git a/apps/web/src/app/[locale]/(space)/settings/preferences/loading.tsx b/apps/web/src/app/[locale]/(space)/account/preferences/loading.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(space)/settings/preferences/loading.tsxrename to apps/web/src/app/[locale]/(space)/account/preferences/loading.tsxdiff --git a/apps/web/src/app/[locale]/(space)/settings/preferences/page.tsx b/apps/web/src/app/[locale]/(space)/account/preferences/page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(space)/settings/preferences/page.tsxrename to apps/web/src/app/[locale]/(space)/account/preferences/page.tsxdiff --git a/apps/web/src/app/[locale]/(space)/settings/preferences/preferences-page.tsx b/apps/web/src/app/[locale]/(space)/account/preferences/preferences-page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(space)/settings/preferences/preferences-page.tsxrename to apps/web/src/app/[locale]/(space)/account/preferences/preferences-page.tsxdiff --git a/apps/web/src/app/[locale]/(space)/settings/profile/actions.ts b/apps/web/src/app/[locale]/(space)/account/profile/actions.tssimilarity index 100%rename from apps/web/src/app/[locale]/(space)/settings/profile/actions.tsrename to apps/web/src/app/[locale]/(space)/account/profile/actions.tsdiff --git a/apps/web/src/app/[locale]/(space)/settings/profile/delete-account-dialog.tsx b/apps/web/src/app/[locale]/(space)/account/profile/delete-account-dialog.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(space)/settings/profile/delete-account-dialog.tsxrename to apps/web/src/app/[locale]/(space)/account/profile/delete-account-dialog.tsxdiff --git a/apps/web/src/app/[locale]/(space)/settings/profile/page.tsx b/apps/web/src/app/[locale]/(space)/account/profile/page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(space)/settings/profile/page.tsxrename to apps/web/src/app/[locale]/(space)/account/profile/page.tsxdiff --git a/apps/web/src/app/[locale]/(space)/settings/profile/profile-email-address.tsx b/apps/web/src/app/[locale]/(space)/account/profile/profile-email-address.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(space)/settings/profile/profile-email-address.tsxrename to apps/web/src/app/[locale]/(space)/account/profile/profile-email-address.tsxdiff --git a/apps/web/src/app/[locale]/(space)/settings/profile/profile-picture.tsx b/apps/web/src/app/[locale]/(space)/account/profile/profile-picture.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(space)/settings/profile/profile-picture.tsxrename to apps/web/src/app/[locale]/(space)/account/profile/profile-picture.tsxdiff --git a/apps/web/src/app/[locale]/(space)/settings/profile/profile-settings.tsx b/apps/web/src/app/[locale]/(space)/account/profile/profile-settings.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(space)/settings/profile/profile-settings.tsxrename to apps/web/src/app/[locale]/(space)/account/profile/profile-settings.tsxdiff --git a/apps/web/src/app/[locale]/(space)/settings/settings-menu.tsx b/apps/web/src/app/[locale]/(space)/account/settings-menu.tsxsimilarity index 75%rename from apps/web/src/app/[locale]/(space)/settings/settings-menu.tsxrename to apps/web/src/app/[locale]/(space)/account/settings-menu.tsxindex a88332152..46a7152cd 100644--- a/apps/web/src/app/[locale]/(space)/settings/settings-menu.tsx+++ b/apps/web/src/app/[locale]/(space)/account/settings-menu.tsx@@ -13,19 +13,19 @@ export function SettingsLayout({ children }: { children: React.ReactNode }) {return (<Tabs value={pathname}><TabsList>- <TabsTrigger asChild value="/settings/profile">- <Link href="/settings/profile">+ <TabsTrigger asChild value="/account/profile">+ <Link href="/account/profile"><Trans i18nKey="profile" defaults="Profile" /></Link></TabsTrigger>- <TabsTrigger asChild value="/settings/preferences">- <Link href="/settings/preferences">+ <TabsTrigger asChild value="/account/preferences">+ <Link href="/account/preferences"><Trans i18nKey="preferences" defaults="Preferences" /></Link></TabsTrigger><IfCloudHosted>- <TabsTrigger asChild value="/settings/billing">- <Link href="/settings/billing">+ <TabsTrigger asChild value="/account/billing">+ <Link href="/account/billing"><Trans i18nKey="billing" defaults="Billing" /></Link></TabsTrigger>diff --git a/apps/web/src/app/[locale]/(space)/components/sidebar/nav-user.tsx b/apps/web/src/app/[locale]/(space)/components/sidebar/nav-user.tsxindex ed7234db1..a4ed6040e 100644--- a/apps/web/src/app/[locale]/(space)/components/sidebar/nav-user.tsx+++ b/apps/web/src/app/[locale]/(space)/components/sidebar/nav-user.tsx@@ -17,8 +17,8 @@ export function NavUser({const pathname = usePathname();return (<Link- href="/settings/profile"- data-state={pathname.startsWith("/settings") ? "active" : "inactive"}+ href="/account/profile"+ data-state={pathname.startsWith("/account") ? "active" : "inactive"}className="group relative flex w-full items-center gap-3 rounded-md p-3 text-sm hover:bg-gray-200 data-[state=active]:bg-gray-200"><OptimizedAvatarImage size="md" src={image} name={name} />diff --git a/apps/web/src/app/[locale]/(space)/layout.tsx b/apps/web/src/app/[locale]/(space)/layout.tsxindex b975acede..4e7796d43 100644--- a/apps/web/src/app/[locale]/(space)/layout.tsx+++ b/apps/web/src/app/[locale]/(space)/layout.tsx@@ -36,7 +36,7 @@ export default async function Layout({className="rounded-full"size="icon">- <Link href="/settings/profile">+ <Link href="/account/profile"><OptimizedAvatarImagesrc={user.image}name={user.name}diff --git a/apps/web/src/app/[locale]/(space)/page.tsx b/apps/web/src/app/[locale]/(space)/page.tsxindex 3e44bf49c..3cbec76a0 100644--- a/apps/web/src/app/[locale]/(space)/page.tsx+++ b/apps/web/src/app/[locale]/(space)/page.tsx@@ -125,7 +125,7 @@ export default async function Page() {</h2><TileGrid><Tile asChild>- <Link href="/settings/profile">+ <Link href="/account/profile"><ProfilePageIcon /><TileTitle><Trans i18nKey="profile" defaults="Profile" />@@ -134,7 +134,7 @@ export default async function Page() {</Tile><Tile asChild>- <Link href="/settings/preferences">+ <Link href="/account/preferences"><PreferencesPageIcon /><TileTitle><Trans i18nKey="preferences" defaults="Preferences" />@@ -143,7 +143,7 @@ export default async function Page() {</Tile><IfCloudHosted><Tile asChild>- <Link href="/settings/billing">+ <Link href="/account/billing"><BillingPageIcon /><TileTitle><Trans i18nKey="billing" defaults="Billing" />diff --git a/apps/web/src/app/[locale]/setup/page.tsx b/apps/web/src/app/[locale]/setup/page.tsxindex 250cbb8a4..966f4ec2d 100644--- a/apps/web/src/app/[locale]/setup/page.tsx+++ b/apps/web/src/app/[locale]/setup/page.tsx@@ -1,6 +1,6 @@import { redirect } from "next/navigation";-import { ProfilePicture } from "@/app/[locale]/(space)/settings/profile/profile-picture";+import { ProfilePicture } from "@/app/[locale]/(space)/account/profile/profile-picture";import { requireUser } from "@/auth/queries";import { Logo } from "@/components/logo";import { Trans } from "@/components/trans";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 a996c76dc..0d42f4aa4 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") ?? "/settings/billing";+ request.nextUrl.searchParams.get("return_path") ?? "/account/billing";let customerId: string | undefined;diff --git a/apps/web/src/app/api/user/verify-email-change/route.ts b/apps/web/src/app/api/user/verify-email-change/route.tsindex d97539409..dccdd1e2b 100644--- a/apps/web/src/app/api/user/verify-email-change/route.ts+++ b/apps/web/src/app/api/user/verify-email-change/route.ts@@ -72,5 +72,5 @@ export const GET = async (request: NextRequest) => {await handleEmailChange(token);- return NextResponse.redirect(new URL("/settings/profile", request.url));+ return NextResponse.redirect(new URL("/account/profile", request.url));};diff --git a/apps/web/src/components/pay-wall-dialog.tsx b/apps/web/src/components/pay-wall-dialog.tsxindex 42fce74f0..1f57fccc5 100644--- a/apps/web/src/components/pay-wall-dialog.tsx+++ b/apps/web/src/components/pay-wall-dialog.tsx@@ -175,7 +175,7 @@ export function PayWallDialog({ children, ...forwardedProps }: DialogProps) {<LinkonClick={() => dialog.dismiss()}className="text-link"- href="/settings/billing"+ href="/account/billing"/>),}}diff --git a/apps/web/src/components/user-dropdown.tsx b/apps/web/src/components/user-dropdown.tsxindex fab6cf6ad..cfe834e13 100644--- a/apps/web/src/components/user-dropdown.tsx+++ b/apps/web/src/components/user-dropdown.tsx@@ -76,10 +76,7 @@ export const UserDropdown = ({ className }: { className?: string }) => {</DropdownMenuItem><IfAuthenticated><DropdownMenuItem asChild={true}>- <Link- href="/settings/profile"- className="flex items-center gap-x-2"- >+ <Link href="/account/profile" className="flex items-center gap-x-2"><UserIcon className="size-4 text-muted-foreground" /><Trans i18nKey="profile" defaults="Profile" /></Link>@@ -87,7 +84,7 @@ export const UserDropdown = ({ className }: { className?: string }) => {</IfAuthenticated><DropdownMenuItem asChild={true}><Link- href="/settings/preferences"+ href="/account/preferences"className="flex items-center gap-x-2"><Settings2Icon className="size-4 text-muted-foreground" />@@ -96,10 +93,7 @@ export const UserDropdown = ({ className }: { className?: string }) => {</DropdownMenuItem><IfCloudHosted><DropdownMenuItem asChild={true}>- <Link- href="/settings/billing"- className="flex items-center gap-x-2"- >+ <Link href="/account/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 5d906f269..7bc171d39 100644--- a/apps/web/src/features/navigation/command-menu/command-menu.tsx+++ b/apps/web/src/features/navigation/command-menu/command-menu.tsx@@ -107,15 +107,15 @@ export function CommandMenu() {<CommandGroupheading={<Trans i18nKey="settings" defaults="Settings" />}>- <CommandItem onSelect={() => handleSelect("/settings/profile")}>+ <CommandItem onSelect={() => handleSelect("/account/profile")}><ProfilePageIcon size="sm" /><NavigationCommandLabel label={t("profile")} /></CommandItem>- <CommandItem onSelect={() => handleSelect("/settings/preferences")}>+ <CommandItem onSelect={() => handleSelect("/account/preferences")}><PreferencesPageIcon size="sm" /><NavigationCommandLabel label={t("preferences")} /></CommandItem>- <CommandItem onSelect={() => handleSelect("/settings/billing")}>+ <CommandItem onSelect={() => handleSelect("/account/billing")}><BillingPageIcon size="sm" /><NavigationCommandLabel label={t("billing")} /></CommandItem>