Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
♻️ Remove app layout (#2293)
Luke Vellaf3754e762b64
diff --git a/apps/web/src/app/[locale]/(app)/(optional-space)/layout.tsx b/apps/web/src/app/[locale]/(app)/(optional-space)/layout.tsxdeleted file mode 100644index f219269fc..000000000--- a/apps/web/src/app/[locale]/(app)/(optional-space)/layout.tsx+++ /dev/null@@ -1,20 +0,0 @@-import { BillingProvider } from "@/features/billing/client";-import { isQuickCreateEnabled } from "@/features/quick-create";-import {- createPrivateSSRHelper,- createPublicSSRHelper,-} from "@/trpc/server/create-ssr-helper";--export default async function Layout({- children,-}: {- children: React.ReactNode;-}) {- const helpers = isQuickCreateEnabled- ? await createPublicSSRHelper()- : await createPrivateSSRHelper();-- await helpers.billing.getTier.prefetch();-- return <BillingProvider>{children}</BillingProvider>;-}diff --git a/apps/web/src/app/[locale]/(app)/layout.tsx b/apps/web/src/app/[locale]/(optional-space)/layout.tsxsimilarity index 51%rename from apps/web/src/app/[locale]/(app)/layout.tsxrename to apps/web/src/app/[locale]/(optional-space)/layout.tsxindex 7815909c0..7bd96c010 100644--- a/apps/web/src/app/[locale]/(app)/layout.tsx+++ b/apps/web/src/app/[locale]/(optional-space)/layout.tsx@@ -1,28 +1,30 @@import { dehydrate, HydrationBoundary } from "@tanstack/react-query";-import { TimeZoneChangeDetector } from "@/app/[locale]/timezone-change-detector";import { PreferencesProvider } from "@/contexts/preferences";-import { createPublicSSRHelper } from "@/trpc/server/create-ssr-helper";-import { ConnectedDayjsProvider } from "@/utils/dayjs";+import { BillingProvider } from "@/features/billing/client";+import { isQuickCreateEnabled } from "@/features/quick-create";+import {+ createPrivateSSRHelper,+ createPublicSSRHelper,+} from "@/trpc/server/create-ssr-helper";-export default async function AppLayout({+export default async function Layout({children,}: {children: React.ReactNode;}) {- const helpers = await createPublicSSRHelper();+ const helpers = isQuickCreateEnabled+ ? await createPublicSSRHelper()+ : await createPrivateSSRHelper();await Promise.all([- helpers.user.getMe.prefetch(),helpers.billing.getTier.prefetch(),+ helpers.user.getMe.prefetch(),]);return (<HydrationBoundary state={dehydrate(helpers.queryClient)}><PreferencesProvider>- <ConnectedDayjsProvider>- {children}- <TimeZoneChangeDetector />- </ConnectedDayjsProvider>+ <BillingProvider>{children}</BillingProvider></PreferencesProvider></HydrationBoundary>);diff --git a/apps/web/src/app/[locale]/(app)/(optional-space)/new/back-button.tsx b/apps/web/src/app/[locale]/(optional-space)/new/back-button.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(optional-space)/new/back-button.tsxrename to apps/web/src/app/[locale]/(optional-space)/new/back-button.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(optional-space)/new/loading.tsx b/apps/web/src/app/[locale]/(optional-space)/new/loading.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(optional-space)/new/loading.tsxrename to apps/web/src/app/[locale]/(optional-space)/new/loading.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(optional-space)/new/page.tsx b/apps/web/src/app/[locale]/(optional-space)/new/page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(optional-space)/new/page.tsxrename to apps/web/src/app/[locale]/(optional-space)/new/page.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/admin-page-loader.tsx b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/admin-page-loader.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/admin-page-loader.tsxrename to apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/admin-page-loader.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/admin-page.tsx b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/admin-page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/admin-page.tsxrename to apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/admin-page.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/duplicate-dialog.tsx b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/duplicate-dialog.tsxsimilarity index 94%rename from apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/duplicate-dialog.tsxrename to apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/duplicate-dialog.tsxindex a06d482af..4455b60b7 100644--- a/apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/duplicate-dialog.tsx+++ b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/duplicate-dialog.tsx@@ -11,10 +11,9 @@ import {DialogTitle,} from "@rallly/ui/dialog";import { useRouter } from "next/navigation";--import { DuplicateForm } from "@/app/[locale]/(app)/(optional-space)/poll/[urlId]/duplicate-form";import { Trans } from "@/i18n/client";import { trpc } from "@/trpc/client";+import { DuplicateForm } from "./duplicate-form";const formName = "duplicate-form";export function DuplicateDialog({diff --git a/apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/duplicate-form.tsx b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/duplicate-form.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/duplicate-form.tsxrename to apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/duplicate-form.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/edit-details/page.tsx b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-details/page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/edit-details/page.tsxrename to apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-details/page.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/edit-options/page.tsx b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-options/page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/edit-options/page.tsxrename to apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-options/page.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/edit-settings/page.tsx b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-settings/page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/edit-settings/page.tsxrename to apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-settings/page.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/guest-poll-alert.tsx b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/guest-poll-alert.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/guest-poll-alert.tsxrename to apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/guest-poll-alert.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/layout.tsx b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/layout.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/layout.tsxrename to apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/layout.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/loading.tsx b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/loading.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/loading.tsxrename to apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/loading.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/page.tsx b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/page.tsxrename to apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/page.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/components/control-panel-menu-item.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/components/control-panel-menu-item.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/(dashboard)/components/control-panel-menu-item.tsxrename to apps/web/src/app/[locale]/(space)/(dashboard)/components/control-panel-menu-item.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/components/feedback-menu-item.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/components/feedback-menu-item.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/(dashboard)/components/feedback-menu-item.tsxrename to apps/web/src/app/[locale]/(space)/(dashboard)/components/feedback-menu-item.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/components/space-sidebar-menu.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/components/space-sidebar-menu.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/(dashboard)/components/space-sidebar-menu.tsxrename to apps/web/src/app/[locale]/(space)/(dashboard)/components/space-sidebar-menu.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/components/space-sidebar-provider.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/components/space-sidebar-provider.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/(dashboard)/components/space-sidebar-provider.tsxrename to apps/web/src/app/[locale]/(space)/(dashboard)/components/space-sidebar-provider.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/components/upgrade-menu-item.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/components/upgrade-menu-item.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/(dashboard)/components/upgrade-menu-item.tsxrename to apps/web/src/app/[locale]/(space)/(dashboard)/components/upgrade-menu-item.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/dashboard-home.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/dashboard-home.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/(dashboard)/dashboard-home.tsxrename to apps/web/src/app/[locale]/(space)/(dashboard)/dashboard-home.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/events/events-infinite-list.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/events/events-infinite-list.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/(dashboard)/events/events-infinite-list.tsxrename to apps/web/src/app/[locale]/(space)/(dashboard)/events/events-infinite-list.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/events/events-page.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/events/events-page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/(dashboard)/events/events-page.tsxrename to apps/web/src/app/[locale]/(space)/(dashboard)/events/events-page.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/events/events-tabbed-view.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/events/events-tabbed-view.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/(dashboard)/events/events-tabbed-view.tsxrename to apps/web/src/app/[locale]/(space)/(dashboard)/events/events-tabbed-view.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/events/page.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/events/page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/(dashboard)/events/page.tsxrename to apps/web/src/app/[locale]/(space)/(dashboard)/events/page.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/events/schema.ts b/apps/web/src/app/[locale]/(space)/(dashboard)/events/schema.tssimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/(dashboard)/events/schema.tsrename to apps/web/src/app/[locale]/(space)/(dashboard)/events/schema.tsdiff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/layout.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/layout.tsxsimilarity index 83%rename from apps/web/src/app/[locale]/(app)/(space)/(dashboard)/layout.tsxrename to apps/web/src/app/[locale]/(space)/(dashboard)/layout.tsxindex b080b4a04..9704728f0 100644--- a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/layout.tsx+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/layout.tsx@@ -14,19 +14,18 @@ import {import { dehydrate, HydrationBoundary } from "@tanstack/react-query";import { Settings2Icon } from "lucide-react";import Link from "next/link";-import { ControlPanelMenuItem } from "@/app/[locale]/(app)/(space)/(dashboard)/components/control-panel-menu-item";-import { FeedbackMenuItem } from "@/app/[locale]/(app)/(space)/(dashboard)/components/feedback-menu-item";-import { SpaceSidebarMenu } from "@/app/[locale]/(app)/(space)/(dashboard)/components/space-sidebar-menu";-import { UpgradeMenuItem } from "@/app/[locale]/(app)/(space)/(dashboard)/components/upgrade-menu-item";import { NavUser } from "@/components/nav-user";-import { UserLocaleSync } from "@/components/user-provider";import { LicenseLimitWarning } from "@/features/licensing/components/license-limit-warning";import { CommandMenu } from "@/features/navigation/command-menu";import { SpaceDropdown } from "@/features/space/components/space-dropdown";import { Trans } from "@/i18n/client";import { IfFeatureEnabled } from "@/lib/feature-flags/client";import { createPrivateSSRHelper } from "@/trpc/server/create-ssr-helper";+import { ControlPanelMenuItem } from "./components/control-panel-menu-item";+import { FeedbackMenuItem } from "./components/feedback-menu-item";+import { SpaceSidebarMenu } from "./components/space-sidebar-menu";import { SpaceSidebarProvider } from "./components/space-sidebar-provider";+import { UpgradeMenuItem } from "./components/upgrade-menu-item";export default async function Layout({children,@@ -42,7 +41,6 @@ export default async function Layout({return (<HydrationBoundary state={dehydrate(helpers.queryClient)}>- <UserLocaleSync /><SpaceSidebarProvider><CommandMenu /><Sidebar>diff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/loading.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/loading.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/(dashboard)/loading.tsxrename to apps/web/src/app/[locale]/(space)/(dashboard)/loading.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/page.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/(dashboard)/page.tsxrename to apps/web/src/app/[locale]/(space)/(dashboard)/page.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/password-setup-alert.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/password-setup-alert.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/(dashboard)/password-setup-alert.tsxrename to apps/web/src/app/[locale]/(space)/(dashboard)/password-setup-alert.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/page.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/polls/page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/page.tsxrename to apps/web/src/app/[locale]/(space)/(dashboard)/polls/page.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/polls-page.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/polls/polls-page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/polls-page.tsxrename to apps/web/src/app/[locale]/(space)/(dashboard)/polls/polls-page.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/polls-tabbed-view.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/polls/polls-tabbed-view.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/polls-tabbed-view.tsxrename to apps/web/src/app/[locale]/(space)/(dashboard)/polls/polls-tabbed-view.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/schema.ts b/apps/web/src/app/[locale]/(space)/(dashboard)/polls/schema.tssimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/schema.tsrename to apps/web/src/app/[locale]/(space)/(dashboard)/polls/schema.tsdiff --git a/apps/web/src/app/[locale]/(app)/(space)/layout.tsx b/apps/web/src/app/[locale]/(space)/layout.tsxsimilarity index 75%rename from apps/web/src/app/[locale]/(app)/(space)/layout.tsxrename to apps/web/src/app/[locale]/(space)/layout.tsxindex d62aa8f87..038bc7eca 100644--- a/apps/web/src/app/[locale]/(app)/(space)/layout.tsx+++ b/apps/web/src/app/[locale]/(space)/layout.tsx@@ -1,5 +1,6 @@import { dehydrate, HydrationBoundary } from "@tanstack/react-query";import { redirect } from "next/navigation";+import { PreferencesProvider } from "@/contexts/preferences";import { BillingProvider } from "@/features/billing/client";import { SpaceProvider } from "@/features/space/client";import { getPathname } from "@/lib/pathname";@@ -13,6 +14,8 @@ export default async function Layout({}) {const helpers = await createPrivateSSRHelper();+ await Promise.all([helpers.user.getMe.prefetch()]);+const space = await helpers.spaces.getCurrent.fetch();if (!space) {@@ -24,9 +27,11 @@ export default async function Layout({return (<HydrationBoundary state={dehydrate(helpers.queryClient)}>- <SpaceProvider>- <BillingProvider>{children}</BillingProvider>- </SpaceProvider>+ <PreferencesProvider>+ <SpaceProvider>+ <BillingProvider>{children}</BillingProvider>+ </SpaceProvider>+ </PreferencesProvider></HydrationBoundary>);}diff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/[...notfound]/page.tsx b/apps/web/src/app/[locale]/(space)/settings/[...notfound]/page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/[...notfound]/page.tsxrename to apps/web/src/app/[locale]/(space)/settings/[...notfound]/page.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/api-keys/components/api-keys-list.tsx b/apps/web/src/app/[locale]/(space)/settings/api-keys/components/api-keys-list.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/api-keys/components/api-keys-list.tsxrename to apps/web/src/app/[locale]/(space)/settings/api-keys/components/api-keys-list.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/api-keys/components/create-api-key-button.tsx b/apps/web/src/app/[locale]/(space)/settings/api-keys/components/create-api-key-button.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/api-keys/components/create-api-key-button.tsxrename to apps/web/src/app/[locale]/(space)/settings/api-keys/components/create-api-key-button.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/api-keys/components/revoke-api-key-button.tsx b/apps/web/src/app/[locale]/(space)/settings/api-keys/components/revoke-api-key-button.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/api-keys/components/revoke-api-key-button.tsxrename to apps/web/src/app/[locale]/(space)/settings/api-keys/components/revoke-api-key-button.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/api-keys/page.tsx b/apps/web/src/app/[locale]/(space)/settings/api-keys/page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/api-keys/page.tsxrename to apps/web/src/app/[locale]/(space)/settings/api-keys/page.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/billing/components/billing-plan.tsx b/apps/web/src/app/[locale]/(space)/settings/billing/components/billing-plan.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/billing/components/billing-plan.tsxrename to apps/web/src/app/[locale]/(space)/settings/billing/components/billing-plan.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/billing/components/manage-seats-dialog.tsx b/apps/web/src/app/[locale]/(space)/settings/billing/components/manage-seats-dialog.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/billing/components/manage-seats-dialog.tsxrename to apps/web/src/app/[locale]/(space)/settings/billing/components/manage-seats-dialog.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/billing/page-client.tsx b/apps/web/src/app/[locale]/(space)/settings/billing/page-client.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/billing/page-client.tsxrename to apps/web/src/app/[locale]/(space)/settings/billing/page-client.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/billing/page.tsx b/apps/web/src/app/[locale]/(space)/settings/billing/page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/billing/page.tsxrename to apps/web/src/app/[locale]/(space)/settings/billing/page.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/calendars/components/calendar-connection-list.tsx b/apps/web/src/app/[locale]/(space)/settings/calendars/components/calendar-connection-list.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/calendars/components/calendar-connection-list.tsxrename to apps/web/src/app/[locale]/(space)/settings/calendars/components/calendar-connection-list.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/calendars/components/connect-calendar-dropdown.tsx b/apps/web/src/app/[locale]/(space)/settings/calendars/components/connect-calendar-dropdown.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/calendars/components/connect-calendar-dropdown.tsxrename to apps/web/src/app/[locale]/(space)/settings/calendars/components/connect-calendar-dropdown.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/calendars/components/default-calendar-select.tsx b/apps/web/src/app/[locale]/(space)/settings/calendars/components/default-calendar-select.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/calendars/components/default-calendar-select.tsxrename to apps/web/src/app/[locale]/(space)/settings/calendars/components/default-calendar-select.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/calendars/page.tsx b/apps/web/src/app/[locale]/(space)/settings/calendars/page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/calendars/page.tsxrename to apps/web/src/app/[locale]/(space)/settings/calendars/page.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/components/sidebar.tsx b/apps/web/src/app/[locale]/(space)/settings/components/sidebar.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/components/sidebar.tsxrename to apps/web/src/app/[locale]/(space)/settings/components/sidebar.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/general/components/delete-space-button.tsx b/apps/web/src/app/[locale]/(space)/settings/general/components/delete-space-button.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/general/components/delete-space-button.tsxrename to apps/web/src/app/[locale]/(space)/settings/general/components/delete-space-button.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/general/components/leave-space-button.tsx b/apps/web/src/app/[locale]/(space)/settings/general/components/leave-space-button.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/general/components/leave-space-button.tsxrename to apps/web/src/app/[locale]/(space)/settings/general/components/leave-space-button.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/general/components/space-settings-form.tsx b/apps/web/src/app/[locale]/(space)/settings/general/components/space-settings-form.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/general/components/space-settings-form.tsxrename to apps/web/src/app/[locale]/(space)/settings/general/components/space-settings-form.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/general/page-client.tsx b/apps/web/src/app/[locale]/(space)/settings/general/page-client.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/general/page-client.tsxrename to apps/web/src/app/[locale]/(space)/settings/general/page-client.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/general/page.tsx b/apps/web/src/app/[locale]/(space)/settings/general/page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/general/page.tsxrename to apps/web/src/app/[locale]/(space)/settings/general/page.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/layout.tsx b/apps/web/src/app/[locale]/(space)/settings/layout.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/layout.tsxrename to apps/web/src/app/[locale]/(space)/settings/layout.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/loading.tsx b/apps/web/src/app/[locale]/(space)/settings/loading.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/loading.tsxrename to apps/web/src/app/[locale]/(space)/settings/loading.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/members/components/invite-dropdown-menu.tsx b/apps/web/src/app/[locale]/(space)/settings/members/components/invite-dropdown-menu.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/members/components/invite-dropdown-menu.tsxrename to apps/web/src/app/[locale]/(space)/settings/members/components/invite-dropdown-menu.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/members/components/invite-member-button.tsx b/apps/web/src/app/[locale]/(space)/settings/members/components/invite-member-button.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/members/components/invite-member-button.tsxrename to apps/web/src/app/[locale]/(space)/settings/members/components/invite-member-button.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/members/components/invite-member-dialog.tsx b/apps/web/src/app/[locale]/(space)/settings/members/components/invite-member-dialog.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/members/components/invite-member-dialog.tsxrename to apps/web/src/app/[locale]/(space)/settings/members/components/invite-member-dialog.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/members/components/member-dropdown-menu.tsx b/apps/web/src/app/[locale]/(space)/settings/members/components/member-dropdown-menu.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/members/components/member-dropdown-menu.tsxrename to apps/web/src/app/[locale]/(space)/settings/members/components/member-dropdown-menu.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/members/page-client.tsx b/apps/web/src/app/[locale]/(space)/settings/members/page-client.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/members/page-client.tsxrename to apps/web/src/app/[locale]/(space)/settings/members/page-client.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/members/page.tsx b/apps/web/src/app/[locale]/(space)/settings/members/page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/members/page.tsxrename to apps/web/src/app/[locale]/(space)/settings/members/page.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/notifications/notifications-page.tsx b/apps/web/src/app/[locale]/(space)/settings/notifications/notifications-page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/notifications/notifications-page.tsxrename to apps/web/src/app/[locale]/(space)/settings/notifications/notifications-page.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/notifications/page.tsx b/apps/web/src/app/[locale]/(space)/settings/notifications/page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/notifications/page.tsxrename to apps/web/src/app/[locale]/(space)/settings/notifications/page.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/preferences/components/date-time-preferences.tsx b/apps/web/src/app/[locale]/(space)/settings/preferences/components/date-time-preferences.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/preferences/components/date-time-preferences.tsxrename to apps/web/src/app/[locale]/(space)/settings/preferences/components/date-time-preferences.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/preferences/components/language-preference.tsx b/apps/web/src/app/[locale]/(space)/settings/preferences/components/language-preference.tsxsimilarity index 94%rename from apps/web/src/app/[locale]/(app)/(space)/settings/preferences/components/language-preference.tsxrename to apps/web/src/app/[locale]/(space)/settings/preferences/components/language-preference.tsxindex 3bce4d0c5..ffdec824e 100644--- a/apps/web/src/app/[locale]/(app)/(space)/settings/preferences/components/language-preference.tsx+++ b/apps/web/src/app/[locale]/(space)/settings/preferences/components/language-preference.tsx@@ -13,6 +13,7 @@ import Link from "next/link";import { useForm } from "react-hook-form";import * as z from "zod";import { LanguageSelect } from "@/components/poll/language-selector";+import { useUser } from "@/components/user-provider";import { Trans } from "@/i18n/client";import { useLocale } from "@/lib/locale/client";import { trpc } from "@/trpc/client";@@ -22,6 +23,7 @@ const formSchema = z.object({});export const LanguagePreference = () => {+ const { user } = useUser();const { locale, changeLocale } = useLocale();const updateLocale = trpc.user.updateLocale.useMutation({onSuccess: (_data, variables) => {@@ -30,7 +32,7 @@ export const LanguagePreference = () => {});const form = useForm({defaultValues: {- language: locale,+ language: user?.locale ?? locale,},resolver: zodResolver(formSchema),});diff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/preferences/components/theme-preference.tsx b/apps/web/src/app/[locale]/(space)/settings/preferences/components/theme-preference.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/preferences/components/theme-preference.tsxrename to apps/web/src/app/[locale]/(space)/settings/preferences/components/theme-preference.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/preferences/page.tsx b/apps/web/src/app/[locale]/(space)/settings/preferences/page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/preferences/page.tsxrename to apps/web/src/app/[locale]/(space)/settings/preferences/page.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/preferences/preferences-page.tsx b/apps/web/src/app/[locale]/(space)/settings/preferences/preferences-page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/preferences/preferences-page.tsxrename to apps/web/src/app/[locale]/(space)/settings/preferences/preferences-page.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/profile/delete-account-dialog.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/delete-account-dialog.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/profile/delete-account-dialog.tsxrename to apps/web/src/app/[locale]/(space)/settings/profile/delete-account-dialog.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/profile/page.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/profile/page.tsxrename to apps/web/src/app/[locale]/(space)/settings/profile/page.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/profile/profile-email-address.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/profile-email-address.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/profile/profile-email-address.tsxrename to apps/web/src/app/[locale]/(space)/settings/profile/profile-email-address.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/profile/profile-page.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/profile-page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/profile/profile-page.tsxrename to apps/web/src/app/[locale]/(space)/settings/profile/profile-page.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/profile/profile-picture.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/profile-picture.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/profile/profile-picture.tsxrename to apps/web/src/app/[locale]/(space)/settings/profile/profile-picture.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/profile/profile-settings.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/profile-settings.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/profile/profile-settings.tsxrename to apps/web/src/app/[locale]/(space)/settings/profile/profile-settings.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/security/components/change-password-form.tsx b/apps/web/src/app/[locale]/(space)/settings/security/components/change-password-form.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/security/components/change-password-form.tsxrename to apps/web/src/app/[locale]/(space)/settings/security/components/change-password-form.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/security/components/setup-password-form.tsx b/apps/web/src/app/[locale]/(space)/settings/security/components/setup-password-form.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/security/components/setup-password-form.tsxrename to apps/web/src/app/[locale]/(space)/settings/security/components/setup-password-form.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/security/page.tsx b/apps/web/src/app/[locale]/(space)/settings/security/page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/security/page.tsxrename to apps/web/src/app/[locale]/(space)/settings/security/page.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/spaces/components/leave-space-dialog.test.tsx b/apps/web/src/app/[locale]/(space)/settings/spaces/components/leave-space-dialog.test.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/spaces/components/leave-space-dialog.test.tsxrename to apps/web/src/app/[locale]/(space)/settings/spaces/components/leave-space-dialog.test.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/spaces/components/leave-space-dialog.tsx b/apps/web/src/app/[locale]/(space)/settings/spaces/components/leave-space-dialog.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/spaces/components/leave-space-dialog.tsxrename to apps/web/src/app/[locale]/(space)/settings/spaces/components/leave-space-dialog.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/spaces/components/spaces-list.tsx b/apps/web/src/app/[locale]/(space)/settings/spaces/components/spaces-list.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/spaces/components/spaces-list.tsxrename to apps/web/src/app/[locale]/(space)/settings/spaces/components/spaces-list.tsxdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/spaces/page.tsx b/apps/web/src/app/[locale]/(space)/settings/spaces/page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/(space)/settings/spaces/page.tsxrename to apps/web/src/app/[locale]/(space)/settings/spaces/page.tsxdiff --git a/apps/web/src/app/[locale]/(app)/invite/[urlId]/invite-page-loader.tsx b/apps/web/src/app/[locale]/invite/[urlId]/invite-page-loader.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/invite/[urlId]/invite-page-loader.tsxrename to apps/web/src/app/[locale]/invite/[urlId]/invite-page-loader.tsxdiff --git a/apps/web/src/app/[locale]/(app)/invite/[urlId]/invite-page.tsx b/apps/web/src/app/[locale]/invite/[urlId]/invite-page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/invite/[urlId]/invite-page.tsxrename to apps/web/src/app/[locale]/invite/[urlId]/invite-page.tsxdiff --git a/apps/web/src/app/[locale]/(app)/invite/[urlId]/loading.tsx b/apps/web/src/app/[locale]/invite/[urlId]/loading.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/invite/[urlId]/loading.tsxrename to apps/web/src/app/[locale]/invite/[urlId]/loading.tsxdiff --git a/apps/web/src/app/[locale]/(app)/invite/[urlId]/page.tsx b/apps/web/src/app/[locale]/invite/[urlId]/page.tsxsimilarity index 86%rename from apps/web/src/app/[locale]/(app)/invite/[urlId]/page.tsxrename to apps/web/src/app/[locale]/invite/[urlId]/page.tsxindex bdca08b6a..a45dd8bc9 100644--- a/apps/web/src/app/[locale]/(app)/invite/[urlId]/page.tsx+++ b/apps/web/src/app/[locale]/invite/[urlId]/page.tsx@@ -3,10 +3,10 @@ import { absoluteUrl } from "@rallly/utils/absolute-url";import { dehydrate, HydrationBoundary } from "@tanstack/react-query";import type { Metadata } from "next";import { notFound } from "next/navigation";-import { InvitePageLoader } from "@/app/[locale]/(app)/invite/[urlId]/invite-page-loader";import { PermissionProvider } from "@/contexts/permissions";+import { PreferencesProvider } from "@/contexts/preferences";import { createPublicSSRHelper } from "@/trpc/server/create-ssr-helper";-+import { InvitePageLoader } from "./invite-page-loader";import Providers from "./providers";export default async function Page(props: {@@ -26,6 +26,7 @@ export default async function Page(props: {const trpc = await createPublicSSRHelper();await Promise.all([+ trpc.user.getMe.prefetch(),trpc.polls.get.prefetch({ urlId: params.urlId }),trpc.polls.participants.list.prefetch({ pollId: params.urlId }),trpc.polls.comments.list.prefetch({ pollId: params.urlId }),@@ -33,11 +34,13 @@ export default async function Page(props: {return (<HydrationBoundary state={dehydrate(trpc.queryClient)}>- <Providers>- <PermissionProvider>- <InvitePageLoader />- </PermissionProvider>- </Providers>+ <PreferencesProvider>+ <Providers>+ <PermissionProvider>+ <InvitePageLoader />+ </PermissionProvider>+ </Providers>+ </PreferencesProvider></HydrationBoundary>);}diff --git a/apps/web/src/app/[locale]/(app)/invite/[urlId]/providers.tsx b/apps/web/src/app/[locale]/invite/[urlId]/providers.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/(app)/invite/[urlId]/providers.tsxrename to apps/web/src/app/[locale]/invite/[urlId]/providers.tsxdiff --git a/apps/web/src/app/[locale]/loading.tsx b/apps/web/src/app/[locale]/loading.tsxnew file mode 100644index 000000000..7102dc9f6--- /dev/null+++ b/apps/web/src/app/[locale]/loading.tsx@@ -0,0 +1,5 @@+import { RouterLoadingIndicator } from "@/components/router-loading-indicator";++export default function Loading() {+ return <RouterLoadingIndicator />;+}diff --git a/apps/web/src/app/[locale]/timezone-change-detector.test.tsx b/apps/web/src/app/[locale]/timezone-change-detector.test.tsxindex 070c8f575..70993e41f 100644--- a/apps/web/src/app/[locale]/timezone-change-detector.test.tsx+++ b/apps/web/src/app/[locale]/timezone-change-detector.test.tsx@@ -4,15 +4,6 @@ import { render, screen } from "@/test/test-utils";import { TimeZoneChangeDetector } from "./timezone-change-detector";-const mockUpdatePreferences = vi.fn();--vi.mock("@/contexts/preferences", () => ({- usePreferences: () => ({- preferences: { timeZone: "America/New_York" },- updatePreferences: mockUpdatePreferences,- }),-}));-let mockTimeZone = "America/New_York";vi.mock("@/utils/date-time-utils", () => ({getBrowserTimeZone: () => mockTimeZone,@@ -26,7 +17,6 @@ describe("TimeZoneChangeDetector", () => {beforeEach(() => {localStorage.clear();mockTimeZone = "America/New_York";- mockUpdatePreferences.mockReset();});afterEach(() => {@@ -46,27 +36,27 @@ describe("TimeZoneChangeDetector", () => {expect(screen.getByText("Timezone Change Detected")).toBeInTheDocument();});- it("accepting timezone change updates preferences and localStorage", async () => {+ it("accepting timezone change calls onTimeZoneChange and updates localStorage", async () => {const user = userEvent.setup();+ const mockOnTimeZoneChange = vi.fn();localStorage.setItem("previousTimeZone", "Fake/Timezone");- render(<TimeZoneChangeDetector />);+ render(<TimeZoneChangeDetector onTimeZoneChange={mockOnTimeZoneChange} />);await user.click(screen.getByText("Yes, update my timezone"));- expect(mockUpdatePreferences).toHaveBeenCalledWith({- timeZone: "America/New_York",- });+ expect(mockOnTimeZoneChange).toHaveBeenCalledWith("America/New_York");expect(localStorage.getItem("previousTimeZone")).toBe("America/New_York");});- it("declining timezone change updates localStorage without changing preferences", async () => {+ it("declining timezone change updates localStorage without calling onTimeZoneChange", async () => {const user = userEvent.setup();+ const mockOnTimeZoneChange = vi.fn();localStorage.setItem("previousTimeZone", "Fake/Timezone");- render(<TimeZoneChangeDetector />);+ render(<TimeZoneChangeDetector onTimeZoneChange={mockOnTimeZoneChange} />);await user.click(screen.getByText("No, keep the current timezone"));- expect(mockUpdatePreferences).not.toHaveBeenCalled();+ expect(mockOnTimeZoneChange).not.toHaveBeenCalled();expect(localStorage.getItem("previousTimeZone")).toBe("America/New_York");});diff --git a/apps/web/src/app/[locale]/timezone-change-detector.tsx b/apps/web/src/app/[locale]/timezone-change-detector.tsxindex 537b5842f..24381733a 100644--- a/apps/web/src/app/[locale]/timezone-change-detector.tsx+++ b/apps/web/src/app/[locale]/timezone-change-detector.tsx@@ -1,5 +1,3 @@-"use client";-import { usePostHog } from "@rallly/posthog/client";import { Button } from "@rallly/ui/button";import {@@ -10,15 +8,19 @@ import {DialogTitle,} from "@rallly/ui/dialog";import React, { useState } from "react";-import { usePreferences } from "@/contexts/preferences";import { Trans } from "@/i18n/client";import { getBrowserTimeZone } from "@/utils/date-time-utils";import { safeLocalStorage } from "@/utils/local-storage";-export function TimeZoneChangeDetector() {+export function TimeZoneChangeDetector({+ initialTimeZone,+ onTimeZoneChange,+}: {+ initialTimeZone?: string;+ onTimeZoneChange?: (timeZone: string) => void;+}) {const [open, setOpen] = useState(false);- const { preferences, updatePreferences } = usePreferences();const currentTimeZone = getBrowserTimeZone();const [previousTimeZone, setPreviousTimeZone] = useState(() => {@@ -27,7 +29,7 @@ export function TimeZoneChangeDetector() {return cachedPreviousTimeZone;}- const timeZone = preferences.timeZone ?? currentTimeZone;+ const timeZone = initialTimeZone ?? currentTimeZone;safeLocalStorage.setItem("previousTimeZone", timeZone);@@ -69,8 +71,8 @@ export function TimeZoneChangeDetector() {<Buttonvariant="primary"onClick={() => {- localStorage.setItem("previousTimeZone", currentTimeZone);- updatePreferences({ timeZone: currentTimeZone });+ safeLocalStorage.setItem("previousTimeZone", currentTimeZone);+ onTimeZoneChange?.(currentTimeZone);setOpen(false);posthog?.capture("timezone change accepted", {previousTimeZone,@@ -86,7 +88,7 @@ export function TimeZoneChangeDetector() {<ButtononClick={() => {setPreviousTimeZone(currentTimeZone);- localStorage.setItem("previousTimeZone", currentTimeZone);+ safeLocalStorage.setItem("previousTimeZone", currentTimeZone);setOpen(false);posthog?.capture("timezone change rejected", {previousTimeZone,diff --git a/apps/web/src/components/poll/desktop-poll.tsx b/apps/web/src/components/poll/desktop-poll.tsxindex b428154df..915fb196b 100644--- a/apps/web/src/components/poll/desktop-poll.tsx+++ b/apps/web/src/components/poll/desktop-poll.tsx@@ -27,7 +27,6 @@ import { useVotingForm } from "@/components/poll/voting-form";import { usePermissions } from "@/contexts/permissions";import { usePoll } from "@/contexts/poll";import { Trans, useTranslation } from "@/i18n/client";-import {useParticipants,useVisibleParticipants,diff --git a/apps/web/src/components/poll/manage-poll.tsx b/apps/web/src/components/poll/manage-poll.tsxindex c83693056..6140801c6 100644--- a/apps/web/src/components/poll/manage-poll.tsx+++ b/apps/web/src/components/poll/manage-poll.tsx@@ -24,8 +24,7 @@ import {} from "lucide-react";import Link from "next/link";import * as React from "react";--import { DuplicateDialog } from "@/app/[locale]/(app)/(optional-space)/poll/[urlId]/duplicate-dialog";+import { DuplicateDialog } from "@/app/[locale]/(optional-space)/poll/[urlId]/duplicate-dialog";import { SchedulePollDialog } from "@/components/poll/manage-poll/schedule-poll-dialog";import { ProBadge } from "@/components/pro-badge";import { usePoll } from "@/contexts/poll";diff --git a/apps/web/src/components/user-provider.tsx b/apps/web/src/components/user-provider.tsxindex 72c00e45b..3124a6e2c 100644--- a/apps/web/src/components/user-provider.tsx+++ b/apps/web/src/components/user-provider.tsx@@ -5,7 +5,6 @@ import React from "react";import type { UserAbility } from "@/features/user/ability";import { defineAbilityFor } from "@/features/user/ability";import { authClient } from "@/lib/auth-client";-import { LocaleSync } from "@/lib/locale/client";import { trpc } from "@/trpc/client";import { isOwner } from "@/utils/permissions";@@ -39,8 +38,3 @@ export function useUser() {};}, [user, router]);}--export function UserLocaleSync() {- const { user } = useUser();- return <LocaleSync userLocale={user?.locale} />;-}diff --git a/apps/web/src/contexts/preferences.tsx b/apps/web/src/contexts/preferences.tsxindex 79d51513d..dae3e6a4f 100644--- a/apps/web/src/contexts/preferences.tsx+++ b/apps/web/src/contexts/preferences.tsx@@ -4,10 +4,11 @@ import type { TimeFormat } from "@rallly/database";import React from "react";import { useLocalStorage } from "react-use";import * as z from "zod";-+import { TimeZoneChangeDetector } from "@/app/[locale]/timezone-change-detector";import { useRequiredContext } from "@/components/use-required-context";-import { useUser } from "@/components/user-provider";+import { LocaleSync, useLocale } from "@/lib/locale/client";import { trpc } from "@/trpc/client";+import { DayjsProvider } from "@/utils/dayjs";type Preferences = {timeZone?: string;@@ -37,7 +38,8 @@ export const PreferencesProvider = ({}: {children?: React.ReactNode;}) => {- const { user } = useUser();+ const { data: user } = trpc.user.getMe.useQuery();+ const { locale } = useLocale();const [preferences = {}, setPreferences] = useLocalStorage("rallly.preferences",{@@ -58,29 +60,49 @@ export const PreferencesProvider = ({},);- const updatePreferences = trpc.user.updatePreferences.useMutation();+ const updatePreferencesMutation = trpc.user.updatePreferences.useMutation();++ const updatePreferences = async (newPreferences: Partial<Preferences>) => {+ setPreferences({+ ...preferences,+ ...newPreferences,+ });++ if (user && !user.isGuest) {+ await updatePreferencesMutation.mutateAsync({+ timeZone: newPreferences.timeZone ?? undefined,+ timeFormat: newPreferences.timeFormat ?? undefined,+ weekStart: newPreferences.weekStart ?? undefined,+ });+ }+ };return (<PreferencesContext.Providervalue={{preferences,- updatePreferences: async (newPreferences) => {- setPreferences((prev) => ({- ...prev,- ...newPreferences,- }));-- if (user && !user.isGuest) {- await updatePreferences.mutateAsync({- timeZone: newPreferences.timeZone ?? undefined,- timeFormat: newPreferences.timeFormat ?? undefined,- weekStart: newPreferences.weekStart ?? undefined,- });- }- },+ updatePreferences,}}>- {children}+ <DayjsProvider+ config={{+ locale,+ timeZone: preferences.timeZone ?? undefined,+ localeOverrides: {+ weekStart: preferences.weekStart ?? undefined,+ timeFormat: preferences.timeFormat ?? undefined,+ },+ }}+ >+ {children}+ <TimeZoneChangeDetector+ initialTimeZone={preferences.timeZone}+ onTimeZoneChange={(timeZone) => {+ updatePreferences({ timeZone });+ }}+ />+ <LocaleSync userLocale={user?.locale} />+ </DayjsProvider></PreferencesContext.Provider>);};diff --git a/apps/web/src/utils/dayjs.tsx b/apps/web/src/utils/dayjs.tsxindex 06961d819..500719ef5 100644--- a/apps/web/src/utils/dayjs.tsx+++ b/apps/web/src/utils/dayjs.tsx@@ -21,9 +21,7 @@ import dayjsLocaleRu from "dayjs/locale/ru";import dayjsLocaleSv from "dayjs/locale/sv";import dayjsLocaleZh from "dayjs/locale/zh";import * as React from "react";-import { usePreferences } from "@/contexts/preferences";import { dayjs } from "@/lib/dayjs";-import { useLocale } from "@/lib/locale/client";import { getBrowserTimeZone } from "@/utils/date-time-utils";import { useRequiredContext } from "../components/use-required-context";@@ -150,7 +148,7 @@ export const useDayjs = () => {export const DayjsProvider: React.FunctionComponent<{children?: React.ReactNode;config?: {- locale?: SupportedLocale;+ locale?: string;timeZone?: string;localeOverrides?: {weekStart?: number;@@ -159,7 +157,8 @@ export const DayjsProvider: React.FunctionComponent<{};}> = ({ config, children }) => {const locale = config?.locale ?? "en";- const localeConfig = dayjsLocales[locale];+ const localeKey = (locale in dayjsLocales ? locale : "en") as SupportedLocale;+ const localeConfig = dayjsLocales[localeKey];const dayjsLocale = localeConfig.locale;const preferredTimeZone = React.useMemo(@@ -215,24 +214,3 @@ export const DayjsProvider: React.FunctionComponent<{</DayjsContext.Provider>);};--export const ConnectedDayjsProvider = ({- children,-}: React.PropsWithChildren) => {- const { preferences } = usePreferences();- const { locale } = useLocale();- return (- <DayjsProvider- config={{- locale: locale as SupportedLocale,- timeZone: preferences.timeZone ?? undefined,- localeOverrides: {- weekStart: preferences.weekStart ?? undefined,- timeFormat: preferences.timeFormat ?? undefined,- },- }}- >- {children}- </DayjsProvider>- );-};