Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

♻️ Move UserProvider and user hooks into features/user/client.tsx (#2696)

Luke Vella5188e419d712
diff --git a/apps/web/src/app/[locale]/(optional-space)/layout.tsx b/apps/web/src/app/[locale]/(optional-space)/layout.tsx
index 9ebb4d3dd..a25f1260f 100644
--- a/apps/web/src/app/[locale]/(optional-space)/layout.tsx
+++ b/apps/web/src/app/[locale]/(optional-space)/layout.tsx
@@ -2,7 +2,7 @@ import { dehydrate, HydrationBoundary } from "@tanstack/react-query";
import { SessionRefresher } from "@/components/session-refresher";
import { PayWall } from "@/features/billing/components/pay-wall";
import { isQuickCreateEnabled } from "@/features/quick-create/constants";
-import { UserProvider } from "@/features/user/components/user-provider";
+import { UserProvider } from "@/features/user/client";
import { getLocale } from "@/i18n/server/get-locale";
import { getSession } from "@/lib/auth";
import { DeviceDateTimeProvider } from "@/lib/datetime/device";
diff --git a/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/guest-poll-alert.tsx b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/guest-poll-alert.tsx
index 567ae5e42..9c92d1580 100644
--- a/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/guest-poll-alert.tsx
+++ b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/guest-poll-alert.tsx
@@ -4,7 +4,7 @@ import { InfoIcon } from "lucide-react";
import { LoginLink } from "@/components/login-link";
import { RegisterLink } from "@/components/register-link";
-import { useUser } from "@/features/user/components/user-provider";
+import { useUser } from "@/features/user/client";
import { Trans } from "@/i18n/client";
export const GuestPollAlert = () => {
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/components/control-panel-menu-item.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/components/control-panel-menu-item.tsx
index 663070a63..4229a20df 100644
--- a/apps/web/src/app/[locale]/(space)/(dashboard)/components/control-panel-menu-item.tsx
+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/components/control-panel-menu-item.tsx
@@ -3,7 +3,7 @@
import { SidebarMenuButton, SidebarMenuItem } from "@rallly/ui/sidebar";
import { GaugeIcon } from "lucide-react";
import Link from "next/link";
-import { useUser } from "@/features/user/components/user-provider";
+import { useUser } from "@/features/user/client";
import { Trans } from "@/i18n/client";
export function ControlPanelMenuItem() {
diff --git a/apps/web/src/app/[locale]/(space)/layout.tsx b/apps/web/src/app/[locale]/(space)/layout.tsx
index ddb19be74..0cc9547c9 100644
--- a/apps/web/src/app/[locale]/(space)/layout.tsx
+++ b/apps/web/src/app/[locale]/(space)/layout.tsx
@@ -2,8 +2,8 @@ import { SessionRefresher } from "@/components/session-refresher";
import { PayWall } from "@/features/billing/components/pay-wall";
import { SpaceProvider } from "@/features/space/client";
import { getActiveSpace } from "@/features/space/data";
+import { UserProvider } from "@/features/user/client";
import { TimeZoneMismatchDialog } from "@/features/user/components/timezone-mismatch-dialog";
-import { UserProvider } from "@/features/user/components/user-provider";
import { getLocale } from "@/i18n/server/get-locale";
import { getSession } from "@/lib/auth";
import { DateTimeProvider } from "@/lib/datetime/client";
diff --git a/apps/web/src/app/[locale]/(space)/settings/components/sidebar.tsx b/apps/web/src/app/[locale]/(space)/settings/components/sidebar.tsx
index db167d1dd..b8767d972 100644
--- a/apps/web/src/app/[locale]/(space)/settings/components/sidebar.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/components/sidebar.tsx
@@ -26,7 +26,7 @@ import {
import { usePathname } from "next/navigation";
import { HoverPrefetchLink } from "@/components/hover-prefetch-link";
import { useSpace } from "@/features/space/client";
-import { useAuthedUser } from "@/features/user/components/user-provider";
+import { useAuthedUser } from "@/features/user/client";
import { Trans, useTranslation } from "@/i18n/client";
import { useFeatureFlag } from "@/lib/feature-flags/client";
diff --git a/apps/web/src/app/[locale]/(space)/settings/general/page-client.tsx b/apps/web/src/app/[locale]/(space)/settings/general/page-client.tsx
index a018341a1..74f22837e 100644
--- a/apps/web/src/app/[locale]/(space)/settings/general/page-client.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/general/page-client.tsx
@@ -19,7 +19,7 @@ import {
SettingsPageTitle,
} from "@/components/settings-layout";
import { useSpace } from "@/features/space/client";
-import { useAuthedUser } from "@/features/user/components/user-provider";
+import { useAuthedUser } from "@/features/user/client";
import { Trans } from "@/i18n/client";
import { CustomBrandingSection } from "./components/custom-branding-section";
import { DeleteSpaceButton } from "./components/delete-space-button";
diff --git a/apps/web/src/app/[locale]/(space)/settings/profile/delete-account-dialog.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/delete-account-dialog.tsx
index a8e179897..2ef1962ad 100644
--- a/apps/web/src/app/[locale]/(space)/settings/profile/delete-account-dialog.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/profile/delete-account-dialog.tsx
@@ -14,7 +14,7 @@ import { Form, FormField, FormItem, FormMessage } from "@rallly/ui/form";
import { Input } from "@rallly/ui/input";
import { useForm } from "react-hook-form";
-import { useAuthedUser } from "@/features/user/components/user-provider";
+import { useAuthedUser } from "@/features/user/client";
import { Trans, useTranslation } from "@/i18n/client";
import { trpc } from "@/trpc/client";
diff --git a/apps/web/src/app/[locale]/(space)/settings/profile/profile-email-address.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/profile-email-address.tsx
index e8daf4583..62c13358f 100644
--- a/apps/web/src/app/[locale]/(space)/settings/profile/profile-email-address.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/profile/profile-email-address.tsx
@@ -18,7 +18,7 @@ import React from "react";
import { useForm } from "react-hook-form";
import * as z from "zod";
import { InputOTP } from "@/components/input-otp";
-import { useAuthedUser } from "@/features/user/components/user-provider";
+import { useAuthedUser } from "@/features/user/client";
import { Trans, useTranslation } from "@/i18n/client";
import { authClient } from "@/lib/auth-client";
diff --git a/apps/web/src/app/[locale]/(space)/settings/profile/profile-settings.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/profile-settings.tsx
index f749905b7..90dd93cb8 100644
--- a/apps/web/src/app/[locale]/(space)/settings/profile/profile-settings.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/profile/profile-settings.tsx
@@ -14,7 +14,7 @@ import { useForm } from "react-hook-form";
import * as z from "zod";
import { updateUserNameAction } from "@/features/user/actions";
-import { useAuthedUser } from "@/features/user/components/user-provider";
+import { useAuthedUser } from "@/features/user/client";
import { Trans } from "@/i18n/client";
import { useSafeAction } from "@/lib/safe-action/client";
diff --git a/apps/web/src/app/[locale]/control-panel/layout.tsx b/apps/web/src/app/[locale]/control-panel/layout.tsx
index 876769c33..e92a70bc6 100644
--- a/apps/web/src/app/[locale]/control-panel/layout.tsx
+++ b/apps/web/src/app/[locale]/control-panel/layout.tsx
@@ -4,7 +4,7 @@ import { GaugeIcon } from "lucide-react";
import type { Metadata } from "next";
import { LicenseLimitWarning } from "@/features/licensing/components/license-limit-warning";
import { CommandMenu } from "@/features/navigation/components/command-menu";
-import { UserProvider } from "@/features/user/components/user-provider";
+import { UserProvider } from "@/features/user/client";
import { Trans } from "@/i18n/client";
import { getTranslation } from "@/i18n/server";
import { getLocale } from "@/i18n/server/get-locale";
diff --git a/apps/web/src/app/[locale]/invite/[urlId]/invite-page.tsx b/apps/web/src/app/[locale]/invite/[urlId]/invite-page.tsx
index 02a6956c7..a689f12c6 100644
--- a/apps/web/src/app/[locale]/invite/[urlId]/invite-page.tsx
+++ b/apps/web/src/app/[locale]/invite/[urlId]/invite-page.tsx
@@ -8,7 +8,7 @@ import { EventCard } from "@/features/poll/components/event-card";
import { PollFooter } from "@/features/poll/components/poll-footer";
import { ResponsiveResults } from "@/features/poll/components/responsive-results";
import { VotingForm } from "@/features/poll/components/voting-form";
-import { useUser } from "@/features/user/components/user-provider";
+import { useUser } from "@/features/user/client";
import { Trans } from "@/i18n/client";
const GoToApp = () => {
diff --git a/apps/web/src/app/[locale]/invite/[urlId]/page.tsx b/apps/web/src/app/[locale]/invite/[urlId]/page.tsx
index 1615dea5e..b0b088f6c 100644
--- a/apps/web/src/app/[locale]/invite/[urlId]/page.tsx
+++ b/apps/web/src/app/[locale]/invite/[urlId]/page.tsx
@@ -6,7 +6,7 @@ import { notFound } from "next/navigation";
import { cache } from "react";
import { SessionRefresher } from "@/components/session-refresher";
import { PermissionProvider } from "@/features/poll/client";
-import { UserProvider } from "@/features/user/components/user-provider";
+import { UserProvider } from "@/features/user/client";
import { getLocale } from "@/i18n/server/get-locale";
import { getSession } from "@/lib/auth";
import { DeviceDateTimeProvider } from "@/lib/datetime/device";
diff --git a/apps/web/src/features/billing/components/upgrade-button.tsx b/apps/web/src/features/billing/components/upgrade-button.tsx
index eb592925b..dc9aaf296 100644
--- a/apps/web/src/features/billing/components/upgrade-button.tsx
+++ b/apps/web/src/features/billing/components/upgrade-button.tsx
@@ -4,7 +4,7 @@ import { usePathname, useRouter } from "next/navigation";
import type React from "react";
import { upgradeToProAction } from "@/features/billing/actions";
-import { useUser } from "@/features/user/components/user-provider";
+import { useUser } from "@/features/user/client";
import { Trans } from "@/i18n/client";
import { useSafeAction } from "@/lib/safe-action/client";
diff --git a/apps/web/src/features/branding/components/custom-branding-prompt.tsx b/apps/web/src/features/branding/components/custom-branding-prompt.tsx
index b4f1b4177..f063a59a0 100644
--- a/apps/web/src/features/branding/components/custom-branding-prompt.tsx
+++ b/apps/web/src/features/branding/components/custom-branding-prompt.tsx
@@ -8,7 +8,7 @@ import Link from "next/link";
import React from "react";
import { useLocalStorage } from "react-use";
import { useSpace } from "@/features/space/client";
-import { useUser } from "@/features/user/components/user-provider";
+import { useUser } from "@/features/user/client";
import { Trans, useTranslation } from "@/i18n/client";
import { isBusinessEmail } from "@/lib/utils/is-business-email";
diff --git a/apps/web/src/features/poll/client.tsx b/apps/web/src/features/poll/client.tsx
index a39f93c6d..a7b534696 100644
--- a/apps/web/src/features/poll/client.tsx
+++ b/apps/web/src/features/poll/client.tsx
@@ -3,7 +3,7 @@ import { useParams, usePathname } from "next/navigation";
import React from "react";
import { useParticipants } from "@/features/poll/components/participants-provider";
-import { useUser } from "@/features/user/components/user-provider";
+import { useUser } from "@/features/user/client";
import { trpc } from "@/trpc/client";
export const usePoll = () => {
diff --git a/apps/web/src/features/poll/components/create-poll.tsx b/apps/web/src/features/poll/components/create-poll.tsx
index 7d3e21ba6..eef806da5 100644
--- a/apps/web/src/features/poll/components/create-poll.tsx
+++ b/apps/web/src/features/poll/components/create-poll.tsx
@@ -36,7 +36,7 @@ import { PollDetailsForm } from "@/features/poll/components/forms/poll-details-f
import PollOptionsForm from "@/features/poll/components/forms/poll-options-form/poll-options-form";
import { PollSettingsForm } from "@/features/poll/components/forms/poll-settings";
import type { NewEventData } from "@/features/poll/components/forms/types";
-import { useUser } from "@/features/user/components/user-provider";
+import { useUser } from "@/features/user/client";
import { Trans, useTranslation } from "@/i18n/client";
import { trpc } from "@/trpc/client";
diff --git a/apps/web/src/features/poll/components/desktop-poll/participant-row.tsx b/apps/web/src/features/poll/components/desktop-poll/participant-row.tsx
index d6700b9d5..3461cc44d 100644
--- a/apps/web/src/features/poll/components/desktop-poll/participant-row.tsx
+++ b/apps/web/src/features/poll/components/desktop-poll/participant-row.tsx
@@ -15,7 +15,7 @@ import {
} from "@/features/poll/components/participant";
import { ParticipantDropdown } from "@/features/poll/components/participant-dropdown";
import { usePoll } from "@/features/poll/components/poll-context";
-import { useUser } from "@/features/user/components/user-provider";
+import { useUser } from "@/features/user/client";
import { Trans, useTranslation } from "@/i18n/client";
import type { Vote } from "@/trpc/client/types";
diff --git a/apps/web/src/features/poll/components/discussion.tsx b/apps/web/src/features/poll/components/discussion.tsx
index 9076c6c6d..61f93c936 100644
--- a/apps/web/src/features/poll/components/discussion.tsx
+++ b/apps/web/src/features/poll/components/discussion.tsx
@@ -30,7 +30,7 @@ import {
} from "@/features/poll/components/participant";
import { useParticipants } from "@/features/poll/components/participants-provider";
import TruncatedLinkify from "@/features/poll/components/truncated-linkify";
-import { useUser } from "@/features/user/components/user-provider";
+import { useUser } from "@/features/user/client";
import { Trans, useTranslation } from "@/i18n/client";
import { RelativeTime } from "@/lib/datetime/relative-time";
import { requiredString } from "@/lib/utils/form-validation";
diff --git a/apps/web/src/features/poll/components/mobile-poll.tsx b/apps/web/src/features/poll/components/mobile-poll.tsx
index 5180bf2ce..26dc1b443 100644
--- a/apps/web/src/features/poll/components/mobile-poll.tsx
+++ b/apps/web/src/features/poll/components/mobile-poll.tsx
@@ -27,7 +27,7 @@ import { useOptions, usePoll } from "@/features/poll/components/poll-context";
import { useVisibleParticipants } from "@/features/poll/components/visibility";
import { useVotingForm } from "@/features/poll/components/voting-form";
import { YouAvatar } from "@/features/poll/components/you-avatar";
-import { useUser } from "@/features/user/components/user-provider";
+import { useUser } from "@/features/user/client";
import { Trans, useTranslation } from "@/i18n/client";
import GroupedOptions from "./mobile-poll/grouped-options";
diff --git a/apps/web/src/features/poll/components/new-participant-modal.tsx b/apps/web/src/features/poll/components/new-participant-modal.tsx
index c25f501c4..9491b0310 100644
--- a/apps/web/src/features/poll/components/new-participant-modal.tsx
+++ b/apps/web/src/features/poll/components/new-participant-modal.tsx
@@ -19,7 +19,7 @@ import * as z from "zod";
import { usePoll } from "@/features/poll/client";
import { useAddParticipantMutation } from "@/features/poll/components/mutations";
import VoteIcon from "@/features/poll/components/vote-icon";
-import { useUser } from "@/features/user/components/user-provider";
+import { useUser } from "@/features/user/client";
import { useTranslation } from "@/i18n/client";
import { useDateTimeConfig } from "@/lib/datetime/client";
diff --git a/apps/web/src/features/poll/components/notification-toggle.tsx b/apps/web/src/features/poll/components/notification-toggle.tsx
index 9e5ef63bb..a854df0d1 100644
--- a/apps/web/src/features/poll/components/notification-toggle.tsx
+++ b/apps/web/src/features/poll/components/notification-toggle.tsx
@@ -4,7 +4,7 @@ import { Button } from "@rallly/ui/button";
import { Tooltip, TooltipContent, TooltipTrigger } from "@rallly/ui/tooltip";
import { BellIcon, BellOffIcon } from "lucide-react";
import { usePoll } from "@/features/poll/client";
-import { useUser } from "@/features/user/components/user-provider";
+import { useUser } from "@/features/user/client";
import { Trans, useTranslation } from "@/i18n/client";
import { trpc } from "@/trpc/client";
diff --git a/apps/web/src/features/space/client.tsx b/apps/web/src/features/space/client.tsx
index 2033f0911..adee6bd63 100644
--- a/apps/web/src/features/space/client.tsx
+++ b/apps/web/src/features/space/client.tsx
@@ -5,7 +5,7 @@ import React from "react";
import { getPrimaryColorVars } from "@/features/branding/utils";
import { defineAbilityForMember } from "@/features/space/member/ability";
import type { SpaceDTO } from "@/features/space/types";
-import { useAuthedUser } from "@/features/user/components/user-provider";
+import { useAuthedUser } from "@/features/user/client";
import { defineAbilityForSpace } from "./ability";
const SpaceContext = React.createContext<SpaceDTO | null>(null);
diff --git a/apps/web/src/features/user/components/user-provider.tsx b/apps/web/src/features/user/client.tsx
similarity index 100%
rename from apps/web/src/features/user/components/user-provider.tsx
rename to apps/web/src/features/user/client.tsx
diff --git a/apps/web/src/features/user/components/nav-user.tsx b/apps/web/src/features/user/components/nav-user.tsx
index 2d2e10adb..b63b8a471 100644
--- a/apps/web/src/features/user/components/nav-user.tsx
+++ b/apps/web/src/features/user/components/nav-user.tsx
@@ -30,7 +30,7 @@ import { useRouter } from "next/navigation";
import React from "react";
import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";
import { RouterLoadingIndicator } from "@/components/router-loading-indicator";
-import { useUser } from "@/features/user/components/user-provider";
+import { useUser } from "@/features/user/client";
import { Trans } from "@/i18n/client";
import { signOut } from "@/lib/auth-client";
import { useTheme } from "@/lib/theme";
diff --git a/apps/web/src/features/user/components/user-dropdown.tsx b/apps/web/src/features/user/components/user-dropdown.tsx
index 198fe5b6c..3e436f729 100644
--- a/apps/web/src/features/user/components/user-dropdown.tsx
+++ b/apps/web/src/features/user/components/user-dropdown.tsx
@@ -30,7 +30,7 @@ import {
import Link from "next/link";
import { useRouter } from "next/navigation";
import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";
-import { useUser } from "@/features/user/components/user-provider";
+import { useUser } from "@/features/user/client";
import { Trans, useTranslation } from "@/i18n/client";
import { signOut } from "@/lib/auth-client";
import { useFeatureFlag } from "@/lib/feature-flags/client";