Skip to content

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

🚚 Dissolve stray shared-code homes: utils/, contexts/, app/components/ (#2559)

Luke Vellac55c5a18a117
diff --git a/apps/web/biome.json b/apps/web/biome.json
index e3b80565c..d45002abf 100644
--- a/apps/web/biome.json
+++ b/apps/web/biome.json
@@ -18,6 +18,10 @@
{
"group": ["@/app", "@/app/**"],
"message": "Only files inside app/ may import from app/. Routes are thin adapters; shared code belongs in features/, components/, or lib/. Existing violations are on the migration allowlist (see overrides in apps/web/biome.json)."
+ },
+ {
+ "group": ["@/utils", "@/utils/**"],
+ "message": "src/utils is dissolved (RAL-1286). Generic helpers live in @/lib/utils, infrastructure in @/lib, domain code in the owning feature."
}
]
}
@@ -46,6 +50,10 @@
{
"group": ["@/app", "@/app/**"],
"message": "Only files inside app/ may import from app/. Routes are thin adapters; shared code belongs in features/, components/, or lib/."
+ },
+ {
+ "group": ["@/utils", "@/utils/**"],
+ "message": "src/utils is dissolved (RAL-1286). Generic helpers live in @/lib/utils, infrastructure in @/lib, domain code in the owning feature."
}
]
}
@@ -74,6 +82,34 @@
{
"group": ["@/app", "@/app/**"],
"message": "Only files inside app/ may import from app/. Routes are thin adapters; shared code belongs in features/, components/, or lib/."
+ },
+ {
+ "group": ["@/utils", "@/utils/**"],
+ "message": "src/utils is dissolved (RAL-1286). Generic helpers live in @/lib/utils, infrastructure in @/lib, domain code in the owning feature."
+ }
+ ]
+ }
+ }
+ }
+ }
+ }
+ },
+ {
+ "includes": ["src/app/**"],
+ "linter": {
+ "rules": {
+ "style": {
+ "noRestrictedImports": {
+ "level": "error",
+ "options": {
+ "paths": {
+ "dayjs": "Use the formatters in `@/lib/datetime` for display. dayjs is only allowed in files on the migration allowlist (see overrides in biome.json).",
+ "@/lib/dayjs": "Use the formatters in `@/lib/datetime` for display. dayjs is only allowed in files on the migration allowlist (see overrides in biome.json)."
+ },
+ "patterns": [
+ {
+ "group": ["@/utils", "@/utils/**"],
+ "message": "src/utils is dissolved (RAL-1286). Generic helpers live in @/lib/utils, infrastructure in @/lib, domain code in the owning feature."
}
]
}
@@ -85,20 +121,31 @@
{
"includes": [
"src/components/add-to-calendar-button.tsx",
+ "src/components/discussion/discussion.tsx",
"src/components/event-card.tsx",
"src/components/forms/poll-settings.tsx",
+ "src/components/invite-dialog.tsx",
+ "src/components/layouts/poll-layout.tsx",
"src/components/logo.tsx",
"src/components/nav-user.tsx",
+ "src/components/new-participant-modal.tsx",
"src/components/poll-status.tsx",
+ "src/components/poll/desktop-poll.tsx",
+ "src/components/poll/desktop-poll/participant-row.tsx",
"src/components/poll/manage-poll.tsx",
"src/components/poll/manage-poll/schedule-poll-dialog.tsx",
+ "src/components/poll/mobile-poll.tsx",
+ "src/components/poll/notification-toggle.tsx",
"src/components/poll/poll-branding.tsx",
+ "src/components/poll/poll-context-provider.tsx",
"src/components/poll/poll-footer.tsx",
"src/components/poll/responsive-results.tsx",
+ "src/components/poll/voting-form.tsx",
"src/components/pro-badge.tsx",
"src/components/upgrade-button.tsx",
"src/components/user-dropdown.tsx",
"src/components/user-provider.tsx",
+ "src/components/visibility.tsx",
"src/features/billing/components/pay-wall-dialog.tsx",
"src/features/navigation/command-menu/command-menu.tsx",
"src/features/quick-create/quick-create-widget.tsx",
@@ -132,7 +179,7 @@
"src/trpc/routers/polls.ts",
"src/trpc/routers/index.ts",
"src/app/api/private/utils/time-slots.ts",
- "src/utils/date-time-utils.ts",
+ "src/lib/utils/date-time-utils.ts",
"src/components/poll/manage-poll/use-csv-exporter.ts",
"src/test/setup.ts"
],
diff --git a/apps/web/src/app/[locale]/(auth)/components/link-with-redirect-to.tsx b/apps/web/src/app/[locale]/(auth)/components/link-with-redirect-to.tsx
index aeee3a0e8..64d855c31 100644
--- a/apps/web/src/app/[locale]/(auth)/components/link-with-redirect-to.tsx
+++ b/apps/web/src/app/[locale]/(auth)/components/link-with-redirect-to.tsx
@@ -2,7 +2,7 @@
import Link from "next/link";
import { useSearchParams } from "next/navigation";
-import { validateRedirectUrl } from "@/utils/redirect";
+import { validateRedirectUrl } from "@/lib/utils/redirect";
export function LinkWithRedirectTo({
href,
diff --git a/apps/web/src/app/[locale]/(auth)/login/components/login-email-form.tsx b/apps/web/src/app/[locale]/(auth)/login/components/login-email-form.tsx
index 62e5c70fd..09035ce38 100644
--- a/apps/web/src/app/[locale]/(auth)/login/components/login-email-form.tsx
+++ b/apps/web/src/app/[locale]/(auth)/login/components/login-email-form.tsx
@@ -19,8 +19,8 @@ import * as z from "zod";
import { setVerificationEmail } from "@/app/[locale]/(auth)/login/actions";
import { Trans, useTranslation } from "@/i18n/client";
import { authClient } from "@/lib/auth-client";
+import { validateRedirectUrl } from "@/lib/utils/redirect";
import { trpc } from "@/trpc/client";
-import { validateRedirectUrl } from "@/utils/redirect";
function useLoginWithEmailSchema() {
const { t } = useTranslation();
diff --git a/apps/web/src/app/[locale]/(auth)/login/components/login-with-oidc.tsx b/apps/web/src/app/[locale]/(auth)/login/components/login-with-oidc.tsx
index fb1ee4ea0..c3267c35a 100644
--- a/apps/web/src/app/[locale]/(auth)/login/components/login-with-oidc.tsx
+++ b/apps/web/src/app/[locale]/(auth)/login/components/login-with-oidc.tsx
@@ -3,7 +3,7 @@ import { Button } from "@rallly/ui/button";
import { Trans } from "@/i18n/client";
import { authClient } from "@/lib/auth-client";
-import { validateRedirectUrl } from "@/utils/redirect";
+import { validateRedirectUrl } from "@/lib/utils/redirect";
export function LoginWithOIDC({
name,
diff --git a/apps/web/src/app/[locale]/(auth)/login/components/oidc-auto-sign-in.tsx b/apps/web/src/app/[locale]/(auth)/login/components/oidc-auto-sign-in.tsx
index e99e092b7..b82e1173e 100644
--- a/apps/web/src/app/[locale]/(auth)/login/components/oidc-auto-sign-in.tsx
+++ b/apps/web/src/app/[locale]/(auth)/login/components/oidc-auto-sign-in.tsx
@@ -5,7 +5,7 @@ import useMount from "react-use/lib/useMount";
import { Spinner } from "@/components/spinner";
import { Trans } from "@/i18n/client";
import { authClient } from "@/lib/auth-client";
-import { validateRedirectUrl } from "@/utils/redirect";
+import { validateRedirectUrl } from "@/lib/utils/redirect";
export function OIDCAutoSignIn() {
const searchParams = useSearchParams();
diff --git a/apps/web/src/app/[locale]/(auth)/login/components/sso-provider.tsx b/apps/web/src/app/[locale]/(auth)/login/components/sso-provider.tsx
index f88fd5097..f43ce006e 100644
--- a/apps/web/src/app/[locale]/(auth)/login/components/sso-provider.tsx
+++ b/apps/web/src/app/[locale]/(auth)/login/components/sso-provider.tsx
@@ -6,7 +6,7 @@ import Image from "next/image";
import { Trans, useTranslation } from "@/i18n/client";
import { authClient } from "@/lib/auth-client";
-import { validateRedirectUrl } from "@/utils/redirect";
+import { validateRedirectUrl } from "@/lib/utils/redirect";
function SSOImage({ provider }: { provider: string }) {
if (provider === "google") {
diff --git a/apps/web/src/app/[locale]/(auth)/login/page.tsx b/apps/web/src/app/[locale]/(auth)/login/page.tsx
index a8ebd5d7c..cabf0f636 100644
--- a/apps/web/src/app/[locale]/(auth)/login/page.tsx
+++ b/apps/web/src/app/[locale]/(auth)/login/page.tsx
@@ -2,10 +2,10 @@ import type { Metadata } from "next";
import { Trans } from "react-i18next/TransWithoutContext";
import { OIDCAutoSignIn } from "@/app/[locale]/(auth)/login/components/oidc-auto-sign-in";
import { env } from "@/env";
+import { getRegistrationEnabled } from "@/features/instance-settings/data";
import { getTranslation } from "@/i18n/server";
import { authLib, redirectIfLoggedIn } from "@/lib/auth";
import { isFeatureEnabled } from "@/lib/feature-flags/server";
-import { getRegistrationEnabled } from "@/utils/get-registration-enabled";
import {
AuthPageContainer,
AuthPageContent,
diff --git a/apps/web/src/app/[locale]/(auth)/login/verify/components/otp-form.tsx b/apps/web/src/app/[locale]/(auth)/login/verify/components/otp-form.tsx
index 5b5bf7bcd..479242a73 100644
--- a/apps/web/src/app/[locale]/(auth)/login/verify/components/otp-form.tsx
+++ b/apps/web/src/app/[locale]/(auth)/login/verify/components/otp-form.tsx
@@ -18,7 +18,7 @@ import * as z from "zod";
import { InputOTP } from "@/components/input-otp";
import { Trans, useTranslation } from "@/i18n/client";
import { authClient } from "@/lib/auth-client";
-import { validateRedirectUrl } from "@/utils/redirect";
+import { validateRedirectUrl } from "@/lib/utils/redirect";
const otpFormSchema = z.object({
otp: z.string().length(6),
diff --git a/apps/web/src/app/[locale]/(auth)/register/components/register-name-form.tsx b/apps/web/src/app/[locale]/(auth)/register/components/register-name-form.tsx
index c30cd6d67..dd918d4a3 100644
--- a/apps/web/src/app/[locale]/(auth)/register/components/register-name-form.tsx
+++ b/apps/web/src/app/[locale]/(auth)/register/components/register-name-form.tsx
@@ -21,8 +21,8 @@ import { PasswordInput } from "@/components/password-input";
import { PasswordStrengthMeter } from "@/features/auth/components/password-strength-meter";
import { Trans, useTranslation } from "@/i18n/client";
import { authClient } from "@/lib/auth-client";
-import { getBrowserTimeZone } from "@/utils/date-time-utils";
-import { validateRedirectUrl } from "@/utils/redirect";
+import { getBrowserTimeZone } from "@/lib/utils/date-time-utils";
+import { validateRedirectUrl } from "@/lib/utils/redirect";
import { useRegisterNameFormSchema } from "./schema";
const turnstileSiteKey = process.env.NEXT_PUBLIC_TURNSTILE_SITE_KEY;
diff --git a/apps/web/src/app/[locale]/(auth)/register/components/schema.ts b/apps/web/src/app/[locale]/(auth)/register/components/schema.ts
index cb1483612..a85847949 100644
--- a/apps/web/src/app/[locale]/(auth)/register/components/schema.ts
+++ b/apps/web/src/app/[locale]/(auth)/register/components/schema.ts
@@ -1,7 +1,7 @@
import * as z from "zod";
import { usePasswordValidationSchema } from "@/features/auth/schema";
import { useTranslation } from "@/i18n/client";
-import { isValidName } from "@/utils/is-valid-name";
+import { isValidName } from "@/lib/utils/is-valid-name";
export const useRegisterNameFormSchema = () => {
const { t } = useTranslation();
diff --git a/apps/web/src/app/[locale]/(auth)/register/page.tsx b/apps/web/src/app/[locale]/(auth)/register/page.tsx
index b8ecbc8ec..904238c7c 100644
--- a/apps/web/src/app/[locale]/(auth)/register/page.tsx
+++ b/apps/web/src/app/[locale]/(auth)/register/page.tsx
@@ -1,9 +1,9 @@
import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { Trans } from "react-i18next/TransWithoutContext";
+import { getRegistrationEnabled } from "@/features/instance-settings/data";
import { getTranslation } from "@/i18n/server";
import { redirectIfLoggedIn } from "@/lib/auth";
-import { getRegistrationEnabled } from "@/utils/get-registration-enabled";
import {
AuthPageContainer,
AuthPageContent,
diff --git a/apps/web/src/app/[locale]/(auth)/reset-password/components/reset-password-form.tsx b/apps/web/src/app/[locale]/(auth)/reset-password/components/reset-password-form.tsx
index 1597ecaad..e0a1d6ac2 100644
--- a/apps/web/src/app/[locale]/(auth)/reset-password/components/reset-password-form.tsx
+++ b/apps/web/src/app/[locale]/(auth)/reset-password/components/reset-password-form.tsx
@@ -18,7 +18,7 @@ import { PasswordStrengthMeter } from "@/features/auth/components/password-stren
import { usePasswordValidationSchema } from "@/features/auth/schema";
import { Trans } from "@/i18n/client";
import { authClient } from "@/lib/auth-client";
-import { validateRedirectUrl } from "@/utils/redirect";
+import { validateRedirectUrl } from "@/lib/utils/redirect";
function useResetPasswordSchema() {
const passwordValidation = usePasswordValidationSchema();
diff --git a/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-options/page.tsx b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-options/page.tsx
index 2a69d39f3..9b5adbe4b 100644
--- a/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-options/page.tsx
+++ b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-options/page.tsx
@@ -16,7 +16,7 @@ import { useUpdatePollMutation } from "@/components/poll/mutations";
import { usePoll } from "@/components/poll-context";
import { Trans, useTranslation } from "@/i18n/client";
import { dayjs } from "@/lib/dayjs";
-import { encodeDateOption } from "@/utils/date-time-utils";
+import { encodeDateOption } from "@/lib/utils/date-time-utils";
const convertOptionToString = (
option: { startTime: Date; duration: number },
diff --git a/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-settings/page.tsx b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-settings/page.tsx
index 032dc1d0e..3607414b4 100644
--- a/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-settings/page.tsx
+++ b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-settings/page.tsx
@@ -9,7 +9,7 @@ import { useForm } from "react-hook-form";
import { PollSettingsForm } from "@/components/forms/poll-settings";
import { useUpdatePollMutation } from "@/components/poll/mutations";
-import { usePoll } from "@/contexts/poll";
+import { usePoll } from "@/features/poll/client";
import { Trans } from "@/i18n/client";
const Page = () => {
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/calendar/calendar-page.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/calendar/calendar-page.tsx
index 9c071cab3..bc6a52764 100644
--- a/apps/web/src/app/[locale]/(space)/(dashboard)/calendar/calendar-page.tsx
+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/calendar/calendar-page.tsx
@@ -6,7 +6,7 @@ import {
PageHeader,
PageHeaderContent,
PageTitle,
-} from "@/app/components/page-layout";
+} from "@/components/page-layout";
import { Trans } from "@/i18n/client";
export function CalendarPage() {
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/dashboard-home.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/dashboard-home.tsx
index 3bcc96e50..64ae9b041 100644
--- a/apps/web/src/app/[locale]/(space)/(dashboard)/dashboard-home.tsx
+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/dashboard-home.tsx
@@ -1,6 +1,7 @@
"use client";
import { Tile, TileDescription, TileGrid, TileTitle } from "@rallly/ui/tile";
+import { HoverPrefetchLink } from "@/components/hover-prefetch-link";
import {
BillingPageIcon,
CreatePageIcon,
@@ -8,18 +9,17 @@ import {
MembersPageIcon,
PollPageIcon,
SettingsPageIcon,
-} from "@/app/components/page-icons";
+} from "@/components/page-icons";
import {
PageContainer,
PageContent,
PageHeader,
PageTitle,
-} from "@/app/components/page-layout";
-import { HoverPrefetchLink } from "@/components/hover-prefetch-link";
+} from "@/components/page-layout";
import { Trans } from "@/i18n/client";
import { IfFeatureEnabled, useFeatureFlag } from "@/lib/feature-flags/client";
+import { getBrowserTimeZone } from "@/lib/utils/date-time-utils";
import { trpc } from "@/trpc/client";
-import { getBrowserTimeZone } from "@/utils/date-time-utils";
import { PasswordSetupAlert } from "./password-setup-alert";
export function DashboardHome() {
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/events/events-infinite-list.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/events/events-infinite-list.tsx
index 61c3812ff..fe8d55f8f 100644
--- a/apps/web/src/app/[locale]/(space)/(dashboard)/events/events-infinite-list.tsx
+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/events/events-infinite-list.tsx
@@ -8,8 +8,8 @@ import { StackedList, StackedListItem } from "@/components/stacked-list";
import { ScheduledEventListItem } from "@/features/scheduled-event/components/scheduled-event-list";
import type { Status } from "@/features/scheduled-event/schema";
import { Trans } from "@/i18n/client";
+import { getBrowserTimeZone } from "@/lib/utils/date-time-utils";
import { trpc } from "@/trpc/client";
-import { getBrowserTimeZone } from "@/utils/date-time-utils";
interface EventsInfiniteListProps {
status?: Status;
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/events/events-page.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/events/events-page.tsx
index 8d86a7f0c..864eed066 100644
--- a/apps/web/src/app/[locale]/(space)/(dashboard)/events/events-page.tsx
+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/events/events-page.tsx
@@ -4,14 +4,6 @@ import { CalendarIcon } from "lucide-react";
import dynamic from "next/dynamic";
import { useSearchParams } from "next/navigation";
import type React from "react";
-import {
- PageContainer,
- PageContent,
- PageHeader,
- PageSkeleton,
- PageTitle,
-} from "@/app/components/page-layout";
-import { SearchInput } from "@/app/components/search-input";
import {
EmptyState,
EmptyStateDescription,
@@ -19,6 +11,14 @@ import {
EmptyStateTitle,
} from "@/components/empty-state";
import { MemberSelector } from "@/components/member-selector";
+import {
+ PageContainer,
+ PageContent,
+ PageHeader,
+ PageSkeleton,
+ PageTitle,
+} from "@/components/page-layout";
+import { SearchInput } from "@/components/search-input";
import type { Status } from "@/features/scheduled-event/schema";
import { Trans, useTranslation } from "@/i18n/client";
import { trpc } from "@/trpc/client";
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/events/page.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/events/page.tsx
index 3c89c26ea..15441c569 100644
--- a/apps/web/src/app/[locale]/(space)/(dashboard)/events/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/events/page.tsx
@@ -1,8 +1,8 @@
import { dehydrate, HydrationBoundary } from "@tanstack/react-query";
import type { Metadata } from "next";
import { getTranslation } from "@/i18n/server";
+import { getBrowserTimeZone } from "@/lib/utils/date-time-utils";
import { createPrivateSSRHelper } from "@/trpc/server/create-ssr-helper";
-import { getBrowserTimeZone } from "@/utils/date-time-utils";
import { EventsPage } from "./events-page";
import { eventsSearchParamsSchema } from "./schema";
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/loading.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/loading.tsx
index 4d560572d..a455890c7 100644
--- a/apps/web/src/app/[locale]/(space)/(dashboard)/loading.tsx
+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/loading.tsx
@@ -1,4 +1,4 @@
-import { PageSkeleton } from "@/app/components/page-layout";
+import { PageSkeleton } from "@/components/page-layout";
import { RouterLoadingIndicator } from "@/components/router-loading-indicator";
export default function Loading() {
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/page.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/page.tsx
index 8e549032f..df8251bec 100644
--- a/apps/web/src/app/[locale]/(space)/(dashboard)/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/page.tsx
@@ -1,8 +1,8 @@
import { dehydrate, HydrationBoundary } from "@tanstack/react-query";
import type { Metadata } from "next";
import { getTranslation } from "@/i18n/server";
+import { getBrowserTimeZone } from "@/lib/utils/date-time-utils";
import { createPrivateSSRHelper } from "@/trpc/server/create-ssr-helper";
-import { getBrowserTimeZone } from "@/utils/date-time-utils";
import { DashboardHome } from "./dashboard-home";
export default async function Page() {
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/polls/polls-page.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/polls/polls-page.tsx
index 9a0d863b4..182295ee5 100644
--- a/apps/web/src/app/[locale]/(space)/(dashboard)/polls/polls-page.tsx
+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/polls/polls-page.tsx
@@ -4,15 +4,6 @@ import { buttonVariants } from "@rallly/ui";
import { InboxIcon, PlusIcon } from "lucide-react";
import Link from "next/link";
import { useSearchParams } from "next/navigation";
-import {
- PageContainer,
- PageContent,
- PageHeader,
- PageHeaderActions,
- PageHeaderContent,
- PageTitle,
-} from "@/app/components/page-layout";
-import { SearchInput } from "@/app/components/search-input";
import {
EmptyState,
EmptyStateDescription,
@@ -21,6 +12,15 @@ import {
EmptyStateTitle,
} from "@/components/empty-state";
import { MemberSelector } from "@/components/member-selector";
+import {
+ PageContainer,
+ PageContent,
+ PageHeader,
+ PageHeaderActions,
+ PageHeaderContent,
+ PageTitle,
+} from "@/components/page-layout";
+import { SearchInput } from "@/components/search-input";
import { PollsInfiniteList } from "@/features/poll/components/polls-infinite-list";
import { Trans, useTranslation } from "@/i18n/client";
import { trpc } from "@/trpc/client";
diff --git a/apps/web/src/app/[locale]/(space)/layout.tsx b/apps/web/src/app/[locale]/(space)/layout.tsx
index 84be2baa3..f73564d5f 100644
--- a/apps/web/src/app/[locale]/(space)/layout.tsx
+++ b/apps/web/src/app/[locale]/(space)/layout.tsx
@@ -8,8 +8,8 @@ import { getLocale } from "@/i18n/server/get-locale";
import { DateTimeProvider } from "@/lib/datetime/client";
import { LocaleSync } from "@/lib/locale/client";
import { getPathname } from "@/lib/pathname";
+import { buildSafeRedirectUrl } from "@/lib/utils/redirect";
import { createPrivateSSRHelper } from "@/trpc/server/create-ssr-helper";
-import { buildSafeRedirectUrl } from "@/utils/redirect";
export default async function Layout({
children,
diff --git a/apps/web/src/app/[locale]/(space)/settings/api-keys/page.tsx b/apps/web/src/app/[locale]/(space)/settings/api-keys/page.tsx
index f72f9a15d..39dc282b7 100644
--- a/apps/web/src/app/[locale]/(space)/settings/api-keys/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/api-keys/page.tsx
@@ -5,14 +5,14 @@ import {
PageSection,
PageSectionContent,
PageSectionGroup,
-} from "@/app/components/page-layout";
+} from "@/components/page-layout";
import {
SettingsPage,
SettingsPageContent,
SettingsPageDescription,
SettingsPageHeader,
SettingsPageTitle,
-} from "@/app/components/settings-layout";
+} from "@/components/settings-layout";
import { Trans } from "@/i18n/client";
import { getTranslation } from "@/i18n/server";
import { createPrivateSSRHelper } from "@/trpc/server/create-ssr-helper";
diff --git a/apps/web/src/app/[locale]/(space)/settings/billing/page-client.tsx b/apps/web/src/app/[locale]/(space)/settings/billing/page-client.tsx
index 9a26333f2..5ac13c92b 100644
--- a/apps/web/src/app/[locale]/(space)/settings/billing/page-client.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/billing/page-client.tsx
@@ -14,6 +14,12 @@ import {
ShieldXIcon,
} from "lucide-react";
import { useSearchParams } from "next/navigation";
+import {
+ EmptyState,
+ EmptyStateDescription,
+ EmptyStateIcon,
+ EmptyStateTitle,
+} from "@/components/empty-state";
import {
PageSection,
PageSectionContent,
@@ -22,20 +28,14 @@ import {
PageSectionGroup,
PageSectionHeader,
PageSectionTitle,
-} from "@/app/components/page-layout";
+} from "@/components/page-layout";
import {
SettingsPage,
SettingsPageContent,
SettingsPageDescription,
SettingsPageHeader,
SettingsPageTitle,
-} from "@/app/components/settings-layout";
-import {
- EmptyState,
- EmptyStateDescription,
- EmptyStateIcon,
- EmptyStateTitle,
-} from "@/components/empty-state";
+} from "@/components/settings-layout";
import { openCustomerPortalAction } from "@/features/billing/actions";
import { SubscriptionStatusLabel } from "@/features/billing/components/subscription-status-label";
import { showPayWall } from "@/features/billing/paywall-store";
diff --git a/apps/web/src/app/[locale]/(space)/settings/calendars/page.tsx b/apps/web/src/app/[locale]/(space)/settings/calendars/page.tsx
index bbdbbf0a9..436a65004 100644
--- a/apps/web/src/app/[locale]/(space)/settings/calendars/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/calendars/page.tsx
@@ -8,14 +8,14 @@ import {
PageSectionDivider,
PageSectionHeader,
PageSectionTitle,
-} from "@/app/components/page-layout";
+} from "@/components/page-layout";
import {
SettingsPage,
SettingsPageContent,
SettingsPageDescription,
SettingsPageHeader,
SettingsPageTitle,
-} from "@/app/components/settings-layout";
+} from "@/components/settings-layout";
import { Trans } from "@/i18n/client";
import { getTranslation } from "@/i18n/server";
import { isFeatureEnabled } from "@/lib/feature-flags/server";
diff --git a/apps/web/src/app/[locale]/(space)/settings/event-types/event-types-settings-page.tsx b/apps/web/src/app/[locale]/(space)/settings/event-types/event-types-settings-page.tsx
index ff0995010..ba8c8e2f3 100644
--- a/apps/web/src/app/[locale]/(space)/settings/event-types/event-types-settings-page.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/event-types/event-types-settings-page.tsx
@@ -23,13 +23,6 @@ import {
Trash2Icon,
} from "lucide-react";
import React from "react";
-import {
- SettingsPage,
- SettingsPageContent,
- SettingsPageDescription,
- SettingsPageHeader,
- SettingsPageTitle,
-} from "@/app/components/settings-layout";
import {
EmptyState,
EmptyStateDescription,
@@ -39,6 +32,13 @@ import {
} from "@/components/empty-state";
import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";
import { RandomGradientBar } from "@/components/random-gradient-bar";
+import {
+ SettingsPage,
+ SettingsPageContent,
+ SettingsPageDescription,
+ SettingsPageHeader,
+ SettingsPageTitle,
+} from "@/components/settings-layout";
import { CreateEventTypeDialog } from "@/features/event-types/components/create-event-type-dialog";
import { DeleteEventTypeDialog } from "@/features/event-types/components/delete-event-type-dialog";
import { EditEventTypeDialog } from "@/features/event-types/components/edit-event-type-dialog";
diff --git a/apps/web/src/app/[locale]/(space)/settings/general/components/custom-branding-section.tsx b/apps/web/src/app/[locale]/(space)/settings/general/components/custom-branding-section.tsx
index 85f4d8f75..18ce01ed4 100644
--- a/apps/web/src/app/[locale]/(space)/settings/general/components/custom-branding-section.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/general/components/custom-branding-section.tsx
@@ -12,7 +12,7 @@ import {
PageSectionDescription,
PageSectionHeader,
PageSectionTitle,
-} from "@/app/components/page-layout";
+} from "@/components/page-layout";
import { ProBadge } from "@/components/pro-badge";
import { useIsFree } from "@/features/billing/client";
import { showPayWall } from "@/features/billing/paywall-store";
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 2e621c607..39cb62b98 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
@@ -10,14 +10,14 @@ import {
PageSectionGroup,
PageSectionHeader,
PageSectionTitle,
-} from "@/app/components/page-layout";
+} from "@/components/page-layout";
import {
SettingsPage,
SettingsPageContent,
SettingsPageDescription,
SettingsPageHeader,
SettingsPageTitle,
-} from "@/app/components/settings-layout";
+} from "@/components/settings-layout";
import { useSpace } from "@/features/space/client";
import { Trans } from "@/i18n/client";
import { trpc } from "@/trpc/client";
diff --git a/apps/web/src/app/[locale]/(space)/settings/members/page-client.tsx b/apps/web/src/app/[locale]/(space)/settings/members/page-client.tsx
index f9a696067..2dbccce60 100644
--- a/apps/web/src/app/[locale]/(space)/settings/members/page-client.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/members/page-client.tsx
@@ -4,6 +4,8 @@ import { Alert, AlertDescription } from "@rallly/ui/alert";
import { Badge } from "@rallly/ui/badge";
import { InfoIcon } from "lucide-react";
import Link from "next/link";
+import { IfCloudHosted, IfSelfHosted } from "@/components/environment";
+import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";
import {
PageSection,
PageSectionContent,
@@ -12,17 +14,15 @@ import {
PageSectionGroup,
PageSectionHeader,
PageSectionTitle,
-} from "@/app/components/page-layout";
+} from "@/components/page-layout";
import {
SettingsPage,
SettingsPageContent,
SettingsPageDescription,
SettingsPageHeader,
SettingsPageTitle,
-} from "@/app/components/settings-layout";
-import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";
+} from "@/components/settings-layout";
import { StackedList, StackedListItem } from "@/components/stacked-list";
-import { IfCloudHosted, IfSelfHosted } from "@/contexts/environment";
import { SpaceRole } from "@/features/space/components/space-role";
import { Trans } from "@/i18n/client";
import { trpc } from "@/trpc/client";
diff --git a/apps/web/src/app/[locale]/(space)/settings/notifications/notifications-page.tsx b/apps/web/src/app/[locale]/(space)/settings/notifications/notifications-page.tsx
index 6dff3b286..f1cb0aebd 100644
--- a/apps/web/src/app/[locale]/(space)/settings/notifications/notifications-page.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/notifications/notifications-page.tsx
@@ -8,7 +8,7 @@ import {
PageSectionGroup,
PageSectionHeader,
PageSectionTitle,
-} from "@/app/components/page-layout";
+} from "@/components/page-layout";
import { Trans } from "@/i18n/client";
import { trpc } from "@/trpc/client";
diff --git a/apps/web/src/app/[locale]/(space)/settings/notifications/page.tsx b/apps/web/src/app/[locale]/(space)/settings/notifications/page.tsx
index e8e4925a1..a9107aa09 100644
--- a/apps/web/src/app/[locale]/(space)/settings/notifications/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/notifications/page.tsx
@@ -7,7 +7,7 @@ import {
SettingsPageDescription,
SettingsPageHeader,
SettingsPageTitle,
-} from "@/app/components/settings-layout";
+} from "@/components/settings-layout";
import { Trans } from "@/i18n/client";
import { getTranslation } from "@/i18n/server";
import { createPrivateSSRHelper } from "@/trpc/server/create-ssr-helper";
diff --git a/apps/web/src/app/[locale]/(space)/settings/preferences/components/date-time-preferences.tsx b/apps/web/src/app/[locale]/(space)/settings/preferences/components/date-time-preferences.tsx
index 467c36e1d..2dbdf9eac 100644
--- a/apps/web/src/app/[locale]/(space)/settings/preferences/components/date-time-preferences.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/preferences/components/date-time-preferences.tsx
@@ -27,7 +27,7 @@ import { useDateTime } from "@/lib/datetime/client";
import { getLocaleDefaults } from "@/lib/datetime/locales";
import { useLocale } from "@/lib/locale/client";
import { useSafeAction } from "@/lib/safe-action/client";
-import { getBrowserTimeZone } from "@/utils/date-time-utils";
+import { getBrowserTimeZone } from "@/lib/utils/date-time-utils";
const formSchema = z.object({
timeFormat: z.enum(["hours12", "hours24"]),
diff --git a/apps/web/src/app/[locale]/(space)/settings/preferences/page.tsx b/apps/web/src/app/[locale]/(space)/settings/preferences/page.tsx
index 292690c92..42e944bd2 100644
--- a/apps/web/src/app/[locale]/(space)/settings/preferences/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/preferences/page.tsx
@@ -11,19 +11,19 @@ import {
PageSectionGroup,
PageSectionHeader,
PageSectionTitle,
-} from "@/app/components/page-layout";
+} from "@/components/page-layout";
import {
SettingsPage,
SettingsPageContent,
SettingsPageDescription,
SettingsPageHeader,
SettingsPageTitle,
-} from "@/app/components/settings-layout";
+} from "@/components/settings-layout";
import { getCurrentUser } from "@/features/user/data";
import { Trans } from "@/i18n/client";
import { getTranslation } from "@/i18n/server";
import { getPathname } from "@/lib/pathname";
-import { buildSafeRedirectUrl } from "@/utils/redirect";
+import { buildSafeRedirectUrl } from "@/lib/utils/redirect";
export default async function Page() {
const user = await getCurrentUser();
diff --git a/apps/web/src/app/[locale]/(space)/settings/profile/profile-page.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/profile-page.tsx
index f5448f396..ea865e622 100644
--- a/apps/web/src/app/[locale]/(space)/settings/profile/profile-page.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/profile/profile-page.tsx
@@ -10,14 +10,14 @@ import {
PageSectionGroup,
PageSectionHeader,
PageSectionTitle,
-} from "@/app/components/page-layout";
+} from "@/components/page-layout";
import {
SettingsPage,
SettingsPageContent,
SettingsPageDescription,
SettingsPageHeader,
SettingsPageTitle,
-} from "@/app/components/settings-layout";
+} from "@/components/settings-layout";
import { Trans } from "@/i18n/client";
import { DeleteAccountDialog } from "./delete-account-dialog";
import { ProfileEmailAddress } from "./profile-email-address";
diff --git a/apps/web/src/app/[locale]/(space)/settings/security/page.tsx b/apps/web/src/app/[locale]/(space)/settings/security/page.tsx
index de5670a63..e2a26a22e 100644
--- a/apps/web/src/app/[locale]/(space)/settings/security/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/security/page.tsx
@@ -9,14 +9,14 @@ import {
PageSectionGroup,
PageSectionHeader,
PageSectionTitle,
-} from "@/app/components/page-layout";
+} from "@/components/page-layout";
import {
SettingsPage,
SettingsPageContent,
SettingsPageDescription,
SettingsPageHeader,
SettingsPageTitle,
-} from "@/app/components/settings-layout";
+} from "@/components/settings-layout";
import { getUserHasPassword } from "@/features/user/queries";
import { Trans } from "@/i18n/client";
import { getTranslation } from "@/i18n/server";
diff --git a/apps/web/src/app/[locale]/(space)/settings/spaces/page.tsx b/apps/web/src/app/[locale]/(space)/settings/spaces/page.tsx
index f68006841..28e4c96e8 100644
--- a/apps/web/src/app/[locale]/(space)/settings/spaces/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/spaces/page.tsx
@@ -1,14 +1,14 @@
import type { Metadata } from "next";
import type { Params } from "@/app/[locale]/types";
-import { PageSection, PageSectionGroup } from "@/app/components/page-layout";
+import { PageSection, PageSectionGroup } from "@/components/page-layout";
import {
SettingsPage,
SettingsPageContent,
SettingsPageDescription,
SettingsPageHeader,
SettingsPageTitle,
-} from "@/app/components/settings-layout";
+} from "@/components/settings-layout";
import { Trans } from "@/i18n/client";
import { getTranslation } from "@/i18n/server";
import { createPrivateSSRHelper } from "@/trpc/server/create-ssr-helper";
diff --git a/apps/web/src/app/[locale]/admin-setup/actions.ts b/apps/web/src/app/[locale]/admin-setup/actions.ts
index 13e4803e2..e72e2eb66 100644
--- a/apps/web/src/app/[locale]/admin-setup/actions.ts
+++ b/apps/web/src/app/[locale]/admin-setup/actions.ts
@@ -2,9 +2,9 @@
import { prisma } from "@rallly/database";
import { redirect } from "next/navigation";
-import { AppError } from "@/lib/errors";
+import { isInitialAdmin } from "@/features/setup/utils";
+import { AppError } from "@/lib/errors/app-error";
import { authActionClient } from "@/lib/safe-action/server";
-import { isInitialAdmin } from "@/utils/is-initial-admin";
export const makeMeAdminAction = authActionClient
.metadata({ actionName: "make_admin" })
diff --git a/apps/web/src/app/[locale]/admin-setup/page.tsx b/apps/web/src/app/[locale]/admin-setup/page.tsx
index 448490cae..288a3c43f 100644
--- a/apps/web/src/app/[locale]/admin-setup/page.tsx
+++ b/apps/web/src/app/[locale]/admin-setup/page.tsx
@@ -10,10 +10,10 @@ import {
EmptyStateIcon,
EmptyStateTitle,
} from "@/components/empty-state";
+import { isInitialAdmin } from "@/features/setup/utils";
import { Trans } from "@/i18n/client";
import { getTranslation } from "@/i18n/server";
import { createPrivateSSRHelper } from "@/trpc/server/create-ssr-helper";
-import { isInitialAdmin } from "@/utils/is-initial-admin";
import { MakeMeAdminButton } from "./make-me-admin-button";
export default async function AdminSetupPage() {
diff --git a/apps/web/src/app/[locale]/control-panel/branding/page.tsx b/apps/web/src/app/[locale]/control-panel/branding/page.tsx
index aa80429d0..a6ab28a46 100644
--- a/apps/web/src/app/[locale]/control-panel/branding/page.tsx
+++ b/apps/web/src/app/[locale]/control-panel/branding/page.tsx
@@ -10,14 +10,14 @@ import {
PageSectionGroup,
PageSectionHeader,
PageSectionTitle,
-} from "@/app/components/page-layout";
+} from "@/components/page-layout";
import {
SettingsPage,
SettingsPageContent,
SettingsPageDescription,
SettingsPageHeader,
SettingsPageTitle,
-} from "@/app/components/settings-layout";
+} from "@/components/settings-layout";
import { getCustomBrandingConfig } from "@/features/branding/queries";
import { loadInstanceLicense } from "@/features/licensing/data";
import { Trans } from "@/i18n/client";
diff --git a/apps/web/src/app/[locale]/control-panel/license/page.tsx b/apps/web/src/app/[locale]/control-panel/license/page.tsx
index 814d21054..913aae903 100644
--- a/apps/web/src/app/[locale]/control-panel/license/page.tsx
+++ b/apps/web/src/app/[locale]/control-panel/license/page.tsx
@@ -17,14 +17,6 @@ import {
ShoppingBagIcon,
} from "lucide-react";
import type { Metadata } from "next";
-import { PageSection } from "@/app/components/page-layout";
-import {
- SettingsPage,
- SettingsPageContent,
- SettingsPageDescription,
- SettingsPageHeader,
- SettingsPageTitle,
-} from "@/app/components/settings-layout";
import {
DescriptionList,
DescriptionListTitle,
@@ -37,6 +29,14 @@ import {
EmptyStateIcon,
EmptyStateTitle,
} from "@/components/empty-state";
+import { PageSection } from "@/components/page-layout";
+import {
+ SettingsPage,
+ SettingsPageContent,
+ SettingsPageDescription,
+ SettingsPageHeader,
+ SettingsPageTitle,
+} from "@/components/settings-layout";
import { LicenseKeyForm } from "@/features/licensing/components/license-key-form";
import { RefreshLicenseButton } from "@/features/licensing/components/refresh-license-button";
import { RemoveLicenseButton } from "@/features/licensing/components/remove-license-button";
diff --git a/apps/web/src/app/[locale]/control-panel/page.tsx b/apps/web/src/app/[locale]/control-panel/page.tsx
index ef1676847..601934b0c 100644
--- a/apps/web/src/app/[locale]/control-panel/page.tsx
+++ b/apps/web/src/app/[locale]/control-panel/page.tsx
@@ -10,13 +10,13 @@ import {
} from "lucide-react";
import type { Metadata } from "next";
import Link from "next/link";
-import { PageIcon } from "@/app/components/page-icons";
+import { PageIcon } from "@/components/page-icons";
import {
SettingsPage,
SettingsPageContent,
SettingsPageHeader,
SettingsPageTitle,
-} from "@/app/components/settings-layout";
+} from "@/components/settings-layout";
import { DEFAULT_SEAT_LIMIT } from "@/features/licensing/constants";
import { loadInstanceLicense } from "@/features/licensing/data";
import { getUserCount } from "@/features/user/queries";
diff --git a/apps/web/src/app/[locale]/control-panel/settings/page.tsx b/apps/web/src/app/[locale]/control-panel/settings/page.tsx
index e85751ebf..7a2c468cc 100644
--- a/apps/web/src/app/[locale]/control-panel/settings/page.tsx
+++ b/apps/web/src/app/[locale]/control-panel/settings/page.tsx
@@ -5,14 +5,14 @@ import {
PageSectionGroup,
PageSectionHeader,
PageSectionTitle,
-} from "@/app/components/page-layout";
+} from "@/components/page-layout";
import {
SettingsPage,
SettingsPageContent,
SettingsPageDescription,
SettingsPageHeader,
SettingsPageTitle,
-} from "@/app/components/settings-layout";
+} from "@/components/settings-layout";
import { getInstanceSettings } from "@/features/instance-settings/queries";
import { Trans } from "@/i18n/client";
import { InstanceSettingsForm } from "./instance-settings-form";
diff --git a/apps/web/src/app/[locale]/control-panel/users/page.tsx b/apps/web/src/app/[locale]/control-panel/users/page.tsx
index f9af016d6..85ad8756a 100644
--- a/apps/web/src/app/[locale]/control-panel/users/page.tsx
+++ b/apps/web/src/app/[locale]/control-panel/users/page.tsx
@@ -4,13 +4,6 @@ import { prisma } from "@rallly/database";
import { UsersIcon } from "lucide-react";
import type { Metadata } from "next";
import * as z from "zod";
-import {
- SettingsPage,
- SettingsPageContent,
- SettingsPageDescription,
- SettingsPageHeader,
- SettingsPageTitle,
-} from "@/app/components/settings-layout";
import {
EmptyState,
EmptyStateDescription,
@@ -18,6 +11,13 @@ import {
EmptyStateTitle,
} from "@/components/empty-state";
import { Pagination } from "@/components/pagination";
+import {
+ SettingsPage,
+ SettingsPageContent,
+ SettingsPageDescription,
+ SettingsPageHeader,
+ SettingsPageTitle,
+} from "@/components/settings-layout";
import { StackedList } from "@/components/stacked-list";
import { defineAbilityFor } from "@/features/user/ability";
import { Trans } from "@/i18n/client";
diff --git a/apps/web/src/app/[locale]/control-panel/users/user-search-input.tsx b/apps/web/src/app/[locale]/control-panel/users/user-search-input.tsx
index 0420ebb04..40e0a74a7 100644
--- a/apps/web/src/app/[locale]/control-panel/users/user-search-input.tsx
+++ b/apps/web/src/app/[locale]/control-panel/users/user-search-input.tsx
@@ -1,6 +1,6 @@
"use client";
-import { SearchInput } from "@/app/components/search-input";
+import { SearchInput } from "@/components/search-input";
import { useTranslation } from "@/i18n/client";
export function UserSearchInput() {
diff --git a/apps/web/src/app/[locale]/control-panel/version-tile.tsx b/apps/web/src/app/[locale]/control-panel/version-tile.tsx
index 3daf3a6bb..b1c2ef484 100644
--- a/apps/web/src/app/[locale]/control-panel/version-tile.tsx
+++ b/apps/web/src/app/[locale]/control-panel/version-tile.tsx
@@ -2,11 +2,11 @@
import { Tile, TileDescription, TileTitle } from "@rallly/ui/tile";
import { DownloadIcon } from "lucide-react";
-import { PageIcon } from "@/app/components/page-icons";
+import { PageIcon } from "@/components/page-icons";
import { Spinner } from "@/components/spinner";
import { Trans } from "@/i18n/client";
+import { appVersion } from "@/lib/constants";
import { trpc } from "@/trpc/client";
-import { appVersion } from "@/utils/constants";
const RELEASES_URL = "https://github.com/lukevella/rallly/releases";
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 4cc00ee0b..e4348d9c0 100644
--- a/apps/web/src/app/[locale]/invite/[urlId]/invite-page.tsx
+++ b/apps/web/src/app/[locale]/invite/[urlId]/invite-page.tsx
@@ -7,7 +7,7 @@ import { EventCard } from "@/components/event-card";
import { PollFooter } from "@/components/poll/poll-footer";
import { ResponsiveResults } from "@/components/poll/responsive-results";
import { VotingForm } from "@/components/poll/voting-form";
-import { usePoll } from "@/contexts/poll";
+import { usePoll } from "@/features/poll/client";
import { Trans } from "@/i18n/client";
import { trpc } from "@/trpc/client";
diff --git a/apps/web/src/app/[locale]/invite/[urlId]/page.tsx b/apps/web/src/app/[locale]/invite/[urlId]/page.tsx
index 92c1376ac..12baa7bdb 100644
--- a/apps/web/src/app/[locale]/invite/[urlId]/page.tsx
+++ b/apps/web/src/app/[locale]/invite/[urlId]/page.tsx
@@ -5,7 +5,7 @@ import type { Metadata } from "next";
import { notFound } from "next/navigation";
import { cache } from "react";
import { SessionRefresher } from "@/components/session-refresher";
-import { PermissionProvider } from "@/contexts/permissions";
+import { PermissionProvider } from "@/features/poll/client";
import { getLocale } from "@/i18n/server/get-locale";
import { DeviceDateTimeProvider } from "@/lib/datetime/device";
import { getDeviceDateTimeConfig } from "@/lib/datetime/server";
diff --git a/apps/web/src/app/api/better-auth/[...all]/route.ts b/apps/web/src/app/api/better-auth/[...all]/route.ts
index d850ac461..68a0cf8c8 100644
--- a/apps/web/src/app/api/better-auth/[...all]/route.ts
+++ b/apps/web/src/app/api/better-auth/[...all]/route.ts
@@ -1,6 +1,6 @@
import { toNextJsHandler } from "better-auth/next-js";
+import { withPostHog } from "@/features/analytics/posthog";
import { authLib } from "@/lib/auth";
-import { withPostHog } from "@/utils/posthog";
const { POST: authPost, GET: authGet } = toNextJsHandler(authLib);
diff --git a/apps/web/src/app/api/event/[...route]/route.ts b/apps/web/src/app/api/event/[...route]/route.ts
index efdefdb54..ec21ac249 100644
--- a/apps/web/src/app/api/event/[...route]/route.ts
+++ b/apps/web/src/app/api/event/[...route]/route.ts
@@ -8,7 +8,7 @@ import { parseConferencing } from "@/features/conferencing/data";
import { getConferencingUri } from "@/features/conferencing/utils";
import { parseLocation } from "@/features/location/data";
import { formatLocationText } from "@/features/location/utils";
-import { createIcsEvent } from "@/utils/ics";
+import { createIcsEvent } from "@/lib/utils/ics";
const app = new Hono().basePath("/api/event");
diff --git a/apps/web/src/app/api/licensing/v1/[...route]/route.ts b/apps/web/src/app/api/licensing/v1/[...route]/route.ts
index 6bb7aaa8a..b93ab64fb 100644
--- a/apps/web/src/app/api/licensing/v1/[...route]/route.ts
+++ b/apps/web/src/app/api/licensing/v1/[...route]/route.ts
@@ -20,7 +20,7 @@ import {
createLicenseInputSchema,
validateLicenseKeyInputSchema,
} from "@/features/licensing/schema";
-import { isSelfHosted } from "@/utils/constants";
+import { isSelfHosted } from "@/lib/constants";
const app = new Hono().basePath("/api/licensing/v1");
diff --git a/apps/web/src/app/api/private/schemas.ts b/apps/web/src/app/api/private/schemas.ts
index ad3ccd281..e15cf9faf 100644
--- a/apps/web/src/app/api/private/schemas.ts
+++ b/apps/web/src/app/api/private/schemas.ts
@@ -1,5 +1,5 @@
import { z } from "@hono/zod-openapi";
-import { timezoneSchema } from "@/utils/timezone-schema";
+import { timezoneSchema } from "@/lib/utils/timezone-schema";
export const dateSchema = z.iso.date().openapi({
description: "Date in YYYY-MM-DD format",
diff --git a/apps/web/src/app/api/private/utils/api-key.ts b/apps/web/src/app/api/private/utils/api-key.ts
index f89a39a1f..ce809da7f 100644
--- a/apps/web/src/app/api/private/utils/api-key.ts
+++ b/apps/web/src/app/api/private/utils/api-key.ts
@@ -11,7 +11,7 @@ import {
isLegacyApiKeyHash,
verifyApiKey,
} from "@/features/api-keys/api-key";
-import { isSelfHosted } from "@/utils/constants";
+import { isSelfHosted } from "@/lib/constants";
import { apiError } from "./poll";
const LAST_USED_AT_WRITE_INTERVAL_MS = 60_000;
diff --git a/apps/web/src/app/api/storage/[...key]/route.ts b/apps/web/src/app/api/storage/[...key]/route.ts
index 26e31456e..6eed5ebee 100644
--- a/apps/web/src/app/api/storage/[...key]/route.ts
+++ b/apps/web/src/app/api/storage/[...key]/route.ts
@@ -4,9 +4,9 @@ import type { NextRequest } from "next/server";
import { NextResponse } from "next/server";
import { env } from "@/env";
+import { isSelfHosted } from "@/lib/constants";
import { verifyUploadToken } from "@/lib/storage/image-upload";
import { getS3Client } from "@/lib/storage/s3";
-import { isSelfHosted } from "@/utils/constants";
const logger = createLogger("api/storage");
diff --git a/apps/web/src/app/api/stripe/webhook/route.ts b/apps/web/src/app/api/stripe/webhook/route.ts
index 812ee17bc..16d16c2e5 100644
--- a/apps/web/src/app/api/stripe/webhook/route.ts
+++ b/apps/web/src/app/api/stripe/webhook/route.ts
@@ -3,8 +3,8 @@ import { stripe } from "@rallly/billing";
import * as Sentry from "@sentry/nextjs";
import type { NextRequest } from "next/server";
import { NextResponse } from "next/server";
-import { isSelfHosted } from "@/utils/constants";
-import { withPostHog } from "@/utils/posthog";
+import { withPostHog } from "@/features/analytics/posthog";
+import { isSelfHosted } from "@/lib/constants";
import { getEventHandler } from "./handlers";
const handler = async (request: NextRequest) => {
diff --git a/apps/web/src/app/api/trpc/[trpc]/route.ts b/apps/web/src/app/api/trpc/[trpc]/route.ts
index a718258bf..d7367e710 100644
--- a/apps/web/src/app/api/trpc/[trpc]/route.ts
+++ b/apps/web/src/app/api/trpc/[trpc]/route.ts
@@ -4,11 +4,11 @@ import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
import { getHTTPStatusCodeFromError } from "@trpc/server/http";
import { ipAddress } from "@vercel/functions";
import type { NextRequest } from "next/server";
+import { withPostHog } from "@/features/analytics/posthog";
import { getSession } from "@/lib/auth";
import { getLocaleFromRequest } from "@/lib/locale/server";
import type { TRPCContext } from "@/trpc/context";
import { appRouter } from "@/trpc/routers";
-import { withPostHog } from "@/utils/posthog";
const handler = async (req: NextRequest) => {
const session = await getSession();
diff --git a/apps/web/src/app/api/updates/route.ts b/apps/web/src/app/api/updates/route.ts
index ee096636f..dacaae7f8 100644
--- a/apps/web/src/app/api/updates/route.ts
+++ b/apps/web/src/app/api/updates/route.ts
@@ -4,8 +4,8 @@ import type { NextRequest } from "next/server";
import { after, NextResponse } from "next/server";
import * as z from "zod";
import { createCache } from "@/lib/cache";
+import { isSelfHosted } from "@/lib/constants";
import { createRatelimit } from "@/lib/rate-limit";
-import { isSelfHosted } from "@/utils/constants";
const logger = createLogger("api/updates");
diff --git a/apps/web/src/components/discussion/discussion.tsx b/apps/web/src/components/discussion/discussion.tsx
index 8690ec030..332f0624a 100644
--- a/apps/web/src/components/discussion/discussion.tsx
+++ b/apps/web/src/components/discussion/discussion.tsx
@@ -25,12 +25,11 @@ import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";
import { Participant, ParticipantName } from "@/components/participant";
import { useParticipants } from "@/components/participants-provider";
import { useEditToken } from "@/components/poll/mutations";
-import { usePoll } from "@/contexts/poll";
-import { useRole } from "@/contexts/role";
+import { usePoll, useRole } from "@/features/poll/client";
import { Trans, useTranslation } from "@/i18n/client";
import { RelativeTime } from "@/lib/datetime/relative-time";
+import { requiredString } from "@/lib/utils/form-validation";
import { trpc } from "@/trpc/client";
-import { requiredString } from "../../utils/form-validation";
import TruncatedLinkify from "../poll/truncated-linkify";
import { useUser } from "../user-provider";
diff --git a/apps/web/src/contexts/environment.tsx b/apps/web/src/components/environment.tsx
similarity index 100%
rename from apps/web/src/contexts/environment.tsx
rename to apps/web/src/components/environment.tsx
diff --git a/apps/web/src/components/event-card.tsx b/apps/web/src/components/event-card.tsx
index 150a7cee7..80d6f872c 100644
--- a/apps/web/src/components/event-card.tsx
+++ b/apps/web/src/components/event-card.tsx
@@ -10,7 +10,7 @@ import {
import TruncatedLinkify from "@/components/poll/truncated-linkify";
import VoteIcon from "@/components/poll/vote-icon";
import { RandomGradientBar } from "@/components/random-gradient-bar";
-import { usePoll } from "@/contexts/poll";
+import { usePoll } from "@/features/poll/client";
import { SpaceIcon } from "@/features/space/components/space-icon";
import { Trans } from "@/i18n/client";
diff --git a/apps/web/src/components/forms/poll-details-form.tsx b/apps/web/src/components/forms/poll-details-form.tsx
index a39cb3557..0d3b29ad0 100644
--- a/apps/web/src/components/forms/poll-details-form.tsx
+++ b/apps/web/src/components/forms/poll-details-form.tsx
@@ -4,7 +4,7 @@ import { Textarea } from "@rallly/ui/textarea";
import { useFormContext } from "react-hook-form";
import { Trans, useTranslation } from "@/i18n/client";
-import { useFormValidation } from "@/utils/form-validation";
+import { useFormValidation } from "@/lib/utils/form-validation";
import type { NewEventData } from "./types";
diff --git a/apps/web/src/components/forms/poll-options-form/month-calendar/month-calendar.tsx b/apps/web/src/components/forms/poll-options-form/month-calendar/month-calendar.tsx
index 3b9d236ea..3b56fc6c7 100644
--- a/apps/web/src/components/forms/poll-options-form/month-calendar/month-calendar.tsx
+++ b/apps/web/src/components/forms/poll-options-form/month-calendar/month-calendar.tsx
@@ -35,7 +35,7 @@ import {
expectTimeOption,
getBrowserTimeZone,
removeAllOptionsForDay,
-} from "../../../../utils/date-time-utils";
+} from "@/lib/utils/date-time-utils";
import DateCard from "../../../date-card";
import { useHeadlessDatePicker } from "../../../headless-date-picker";
import type { DateTimeOption, DateTimePickerProps } from "../types";
diff --git a/apps/web/src/components/forms/poll-options-form/poll-options-form.tsx b/apps/web/src/components/forms/poll-options-form/poll-options-form.tsx
index 7ab47744f..201268d37 100644
--- a/apps/web/src/components/forms/poll-options-form/poll-options-form.tsx
+++ b/apps/web/src/components/forms/poll-options-form/poll-options-form.tsx
@@ -21,7 +21,7 @@ import { useFormContext } from "react-hook-form";
import { TimeZoneSelect } from "@/components/time-zone-picker/time-zone-select";
import { Trans, useTranslation } from "@/i18n/client";
-import { getBrowserTimeZone } from "../../../utils/date-time-utils";
+import { getBrowserTimeZone } from "@/lib/utils/date-time-utils";
import type { NewEventData } from "../types";
import MonthCalendar from "./month-calendar";
import WeekCalendar from "./week-calendar";
diff --git a/apps/web/src/components/invite-dialog.tsx b/apps/web/src/components/invite-dialog.tsx
index 14f26ef11..c42c504f9 100644
--- a/apps/web/src/components/invite-dialog.tsx
+++ b/apps/web/src/components/invite-dialog.tsx
@@ -14,7 +14,7 @@ import Link from "next/link";
import React from "react";
import { useCopyToClipboard } from "react-use";
-import { usePoll } from "@/contexts/poll";
+import { usePoll } from "@/features/poll/client";
import { Trans } from "@/i18n/client";
export function CopyInviteLinkButton() {
diff --git a/apps/web/src/components/layouts/poll-layout.tsx b/apps/web/src/components/layouts/poll-layout.tsx
index b44562158..b376b23de 100644
--- a/apps/web/src/components/layouts/poll-layout.tsx
+++ b/apps/web/src/components/layouts/poll-layout.tsx
@@ -15,7 +15,7 @@ import { InviteDialog } from "@/components/invite-dialog";
import ManagePoll from "@/components/poll/manage-poll";
import { NotificationToggle } from "@/components/poll/notification-toggle";
import { LegacyPollContextProvider } from "@/components/poll/poll-context-provider";
-import { usePoll } from "@/contexts/poll";
+import { usePoll } from "@/features/poll/client";
import { Trans } from "@/i18n/client";
const AdminControls = () => {
diff --git a/apps/web/src/components/new-participant-modal.tsx b/apps/web/src/components/new-participant-modal.tsx
index f0860fbd5..995e5c7eb 100644
--- a/apps/web/src/components/new-participant-modal.tsx
+++ b/apps/web/src/components/new-participant-modal.tsx
@@ -16,7 +16,7 @@ import { Label } from "@rallly/ui/label";
import { TRPCClientError } from "@trpc/client";
import { useForm } from "react-hook-form";
import * as z from "zod";
-import { usePoll } from "@/contexts/poll";
+import { usePoll } from "@/features/poll/client";
import { useTranslation } from "@/i18n/client";
import { useDateTimeConfig } from "@/lib/datetime/client";
import { useAddParticipantMutation } from "./poll/mutations";
diff --git a/apps/web/src/components/optimized-avatar-image.tsx b/apps/web/src/components/optimized-avatar-image.tsx
index 0c06ecf45..f9d58de69 100644
--- a/apps/web/src/components/optimized-avatar-image.tsx
+++ b/apps/web/src/components/optimized-avatar-image.tsx
@@ -2,7 +2,7 @@ import { cn } from "@rallly/ui";
import { Avatar, AvatarFallback, AvatarImage } from "@rallly/ui/avatar";
import { Icon } from "@rallly/ui/icon";
import { UserIcon } from "lucide-react";
-import { resolveStorageUrl } from "@/utils/storage";
+import { resolveStorageUrl } from "@/lib/storage/resolve-storage-url";
export function OptimizedAvatarImage({
size = "md",
diff --git a/apps/web/src/app/components/page-icons.tsx b/apps/web/src/components/page-icons.tsx
similarity index 100%
rename from apps/web/src/app/components/page-icons.tsx
rename to apps/web/src/components/page-icons.tsx
diff --git a/apps/web/src/app/components/page-layout.tsx b/apps/web/src/components/page-layout.tsx
similarity index 100%
rename from apps/web/src/app/components/page-layout.tsx
rename to apps/web/src/components/page-layout.tsx
diff --git a/apps/web/src/components/participant-dropdown.tsx b/apps/web/src/components/participant-dropdown.tsx
index 6ab3aa13a..6249aca6d 100644
--- a/apps/web/src/components/participant-dropdown.tsx
+++ b/apps/web/src/components/participant-dropdown.tsx
@@ -39,8 +39,8 @@ import {
useEditToken,
} from "@/components/poll/mutations";
import { Trans, useTranslation } from "@/i18n/client";
+import { useFormValidation } from "@/lib/utils/form-validation";
import { trpc } from "@/trpc/client";
-import { useFormValidation } from "@/utils/form-validation";
export const ParticipantDropdown = ({
participant,
diff --git a/apps/web/src/components/poll-context.tsx b/apps/web/src/components/poll-context.tsx
index a038b7a9b..74fbbe290 100644
--- a/apps/web/src/components/poll-context.tsx
+++ b/apps/web/src/components/poll-context.tsx
@@ -8,11 +8,11 @@ import {
formatDateTime,
formatDuration,
} from "@/lib/datetime/format";
-import type { GetPollApiResponse } from "@/trpc/client/types";
import type {
ParsedDateOption,
ParsedTimeSlotOption,
-} from "@/utils/date-time-utils";
+} from "@/lib/utils/date-time-utils";
+import type { GetPollApiResponse } from "@/trpc/client/types";
import { useParticipants } from "./participants-provider";
import { useRequiredContext } from "./use-required-context";
diff --git a/apps/web/src/components/poll/desktop-poll.tsx b/apps/web/src/components/poll/desktop-poll.tsx
index 839be9f4f..3fda47232 100644
--- a/apps/web/src/components/poll/desktop-poll.tsx
+++ b/apps/web/src/components/poll/desktop-poll.tsx
@@ -27,8 +27,7 @@ import {
} from "@/components/empty-state";
import { useVotingForm } from "@/components/poll/voting-form";
import { ScrollContainer } from "@/components/scroll-container";
-import { usePermissions } from "@/contexts/permissions";
-import { usePoll } from "@/contexts/poll";
+import { usePermissions, usePoll } from "@/features/poll/client";
import { Trans, useTranslation } from "@/i18n/client";
import { useParticipants } from "../participants-provider";
import { useVisibleParticipants } from "../visibility";
diff --git a/apps/web/src/components/poll/desktop-poll/participant-row.tsx b/apps/web/src/components/poll/desktop-poll/participant-row.tsx
index 272142608..05d7b26b4 100644
--- a/apps/web/src/components/poll/desktop-poll/participant-row.tsx
+++ b/apps/web/src/components/poll/desktop-poll/participant-row.tsx
@@ -12,7 +12,7 @@ import { Participant, ParticipantName } from "@/components/participant";
import { ParticipantDropdown } from "@/components/participant-dropdown";
import { usePoll } from "@/components/poll-context";
import { useUser } from "@/components/user-provider";
-import { usePermissions } from "@/contexts/permissions";
+import { usePermissions } from "@/features/poll/client";
import { Trans, useTranslation } from "@/i18n/client";
import type { Vote } from "@/trpc/client/types";
diff --git a/apps/web/src/components/poll/manage-poll.tsx b/apps/web/src/components/poll/manage-poll.tsx
index 6c42ea5be..8de6c1b2c 100644
--- a/apps/web/src/components/poll/manage-poll.tsx
+++ b/apps/web/src/components/poll/manage-poll.tsx
@@ -27,9 +27,9 @@ import * as React from "react";
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";
import { useIsFree } from "@/features/billing/client";
import { showPayWall } from "@/features/billing/paywall-store";
+import { usePoll } from "@/features/poll/client";
import { Trans } from "@/i18n/client";
import { trpc } from "@/trpc/client";
import { DeletePollDialog } from "./manage-poll/delete-poll-dialog";
diff --git a/apps/web/src/components/poll/manage-poll/schedule-poll-dialog.tsx b/apps/web/src/components/poll/manage-poll/schedule-poll-dialog.tsx
index e864673d7..1610a16a3 100644
--- a/apps/web/src/components/poll/manage-poll/schedule-poll-dialog.tsx
+++ b/apps/web/src/components/poll/manage-poll/schedule-poll-dialog.tsx
@@ -26,7 +26,7 @@ import { DateIconInner } from "@/components/date-icon";
import { useParticipants } from "@/components/participants-provider";
import { ConnectedScoreSummary } from "@/components/poll/score-summary";
import { VoteSummaryProgressBar } from "@/components/vote-summary-progress-bar";
-import { usePoll } from "@/contexts/poll";
+import { usePoll } from "@/features/poll/client";
import {
EventDate,
EventTimeRange,
diff --git a/apps/web/src/components/poll/mobile-poll.tsx b/apps/web/src/components/poll/mobile-poll.tsx
index 3fb62dcb3..f2b93b883 100644
--- a/apps/web/src/components/poll/mobile-poll.tsx
+++ b/apps/web/src/components/poll/mobile-poll.tsx
@@ -22,7 +22,7 @@ import { ParticipantDropdown } from "@/components/participant-dropdown";
import { useVotingForm } from "@/components/poll/voting-form";
import { YouAvatar } from "@/components/poll/you-avatar";
import { useOptions, usePoll } from "@/components/poll-context";
-import { usePermissions } from "@/contexts/permissions";
+import { usePermissions } from "@/features/poll/client";
import { Trans, useTranslation } from "@/i18n/client";
import { useUser } from "../user-provider";
import { useVisibleParticipants } from "../visibility";
diff --git a/apps/web/src/components/poll/mobile-poll/grouped-options.tsx b/apps/web/src/components/poll/mobile-poll/grouped-options.tsx
index be1567ef2..03714ac56 100644
--- a/apps/web/src/components/poll/mobile-poll/grouped-options.tsx
+++ b/apps/web/src/components/poll/mobile-poll/grouped-options.tsx
@@ -2,7 +2,7 @@ import { cn } from "@rallly/ui";
import { groupBy } from "lodash";
import type * as React from "react";
-import type { ParsedDateTimeOpton } from "@/utils/date-time-utils";
+import type { ParsedDateTimeOpton } from "@/lib/utils/date-time-utils";
import PollOptions from "./poll-options";
diff --git a/apps/web/src/components/poll/mobile-poll/poll-options.tsx b/apps/web/src/components/poll/mobile-poll/poll-options.tsx
index 7b8b974b6..4a52eab2a 100644
--- a/apps/web/src/components/poll/mobile-poll/poll-options.tsx
+++ b/apps/web/src/components/poll/mobile-poll/poll-options.tsx
@@ -4,7 +4,7 @@ import { Controller } from "react-hook-form";
import { useParticipants } from "@/components/participants-provider";
import { useVotingForm } from "@/components/poll/voting-form";
import { usePoll } from "@/components/poll-context";
-import type { ParsedDateTimeOpton } from "@/utils/date-time-utils";
+import type { ParsedDateTimeOpton } from "@/lib/utils/date-time-utils";
import DateOption from "./date-option";
import TimeSlotOption from "./time-slot-option";
diff --git a/apps/web/src/components/poll/notification-toggle.tsx b/apps/web/src/components/poll/notification-toggle.tsx
index ebec3a34c..c43e1ad1b 100644
--- a/apps/web/src/components/poll/notification-toggle.tsx
+++ b/apps/web/src/components/poll/notification-toggle.tsx
@@ -10,7 +10,7 @@ import {
import { BellIcon, BellOffIcon } from "lucide-react";
import { useUser } from "@/components/user-provider";
-import { usePoll } from "@/contexts/poll";
+import { usePoll } from "@/features/poll/client";
import { Trans, useTranslation } from "@/i18n/client";
import { trpc } from "@/trpc/client";
diff --git a/apps/web/src/components/poll/poll-branding.tsx b/apps/web/src/components/poll/poll-branding.tsx
index 8923a0c14..489d6fcc0 100644
--- a/apps/web/src/components/poll/poll-branding.tsx
+++ b/apps/web/src/components/poll/poll-branding.tsx
@@ -1,7 +1,7 @@
"use client";
-import { usePoll } from "@/contexts/poll";
import { BrandStyle } from "@/features/branding/brand-style";
+import { usePoll } from "@/features/poll/client";
export function PollBrandingFromContext() {
const poll = usePoll();
diff --git a/apps/web/src/components/poll/poll-context-provider.tsx b/apps/web/src/components/poll/poll-context-provider.tsx
index 688f79a58..74d73a6f0 100644
--- a/apps/web/src/components/poll/poll-context-provider.tsx
+++ b/apps/web/src/components/poll/poll-context-provider.tsx
@@ -3,7 +3,7 @@ import {
OptionsProvider,
PollContextProvider,
} from "@/components/poll-context";
-import { usePoll } from "@/contexts/poll";
+import { usePoll } from "@/features/poll/client";
export const LegacyPollContextProvider = (props: React.PropsWithChildren) => {
const poll = usePoll();
diff --git a/apps/web/src/components/poll/responsive-results.tsx b/apps/web/src/components/poll/responsive-results.tsx
index bd3a78f68..874357a80 100644
--- a/apps/web/src/components/poll/responsive-results.tsx
+++ b/apps/web/src/components/poll/responsive-results.tsx
@@ -16,7 +16,7 @@ import {
} from "@/components/empty-state";
import DesktopPoll from "@/components/poll/desktop-poll";
import MobilePoll from "@/components/poll/mobile-poll";
-import { usePoll } from "@/contexts/poll";
+import { usePoll } from "@/features/poll/client";
import {
EventDate,
EventTimeRange,
diff --git a/apps/web/src/components/poll/voting-form.tsx b/apps/web/src/components/poll/voting-form.tsx
index d46f554d6..9e74d0aff 100644
--- a/apps/web/src/components/poll/voting-form.tsx
+++ b/apps/web/src/components/poll/voting-form.tsx
@@ -17,9 +17,7 @@ import {
useEditToken,
useUpdateParticipantMutation,
} from "@/components/poll/mutations";
-import { usePermissions } from "@/contexts/permissions";
-import { usePoll } from "@/contexts/poll";
-import { useRole } from "@/contexts/role";
+import { usePermissions, usePoll, useRole } from "@/features/poll/client";
import { Trans } from "@/i18n/client";
const formSchema = z.object({
diff --git a/apps/web/src/app/components/redirect.tsx b/apps/web/src/components/redirect.tsx
similarity index 100%
rename from apps/web/src/app/components/redirect.tsx
rename to apps/web/src/components/redirect.tsx
diff --git a/apps/web/src/app/components/search-input.tsx b/apps/web/src/components/search-input.tsx
similarity index 100%
rename from apps/web/src/app/components/search-input.tsx
rename to apps/web/src/components/search-input.tsx
diff --git a/apps/web/src/app/components/settings-layout.tsx b/apps/web/src/components/settings-layout.tsx
similarity index 100%
rename from apps/web/src/app/components/settings-layout.tsx
rename to apps/web/src/components/settings-layout.tsx
diff --git a/apps/web/src/components/time-zone-picker/timezone-data.ts b/apps/web/src/components/time-zone-picker/timezone-data.ts
index 5c992301e..80a7acd80 100644
--- a/apps/web/src/components/time-zone-picker/timezone-data.ts
+++ b/apps/web/src/components/time-zone-picker/timezone-data.ts
@@ -1,4 +1,4 @@
-import { normalizeLegacyIanaId } from "@/utils/timezone-schema";
+import { normalizeLegacyIanaId } from "@/lib/utils/timezone-schema";
export function getAllTimezoneIds(): string[] {
return Intl.supportedValuesOf("timeZone");
diff --git a/apps/web/src/components/user-provider.tsx b/apps/web/src/components/user-provider.tsx
index 3d7fe1d59..8ba6916a4 100644
--- a/apps/web/src/components/user-provider.tsx
+++ b/apps/web/src/components/user-provider.tsx
@@ -5,8 +5,8 @@ import React from "react";
import type { UserAbility } from "@/features/user/ability";
import { defineAbilityFor } from "@/features/user/ability";
import { authClient } from "@/lib/auth-client";
+import { isOwner } from "@/lib/utils/permissions";
import { trpc } from "@/trpc/client";
-import { isOwner } from "@/utils/permissions";
export function useUser() {
const [user] = trpc.user.getMe.useSuspenseQuery();
diff --git a/apps/web/src/components/visibility.tsx b/apps/web/src/components/visibility.tsx
index b4411978e..a103db98a 100644
--- a/apps/web/src/components/visibility.tsx
+++ b/apps/web/src/components/visibility.tsx
@@ -4,8 +4,7 @@
import React from "react";
import { useParticipants } from "@/components/participants-provider";
-import { usePermissions } from "@/contexts/permissions";
-import { usePoll } from "@/contexts/poll";
+import { usePermissions, usePoll } from "@/features/poll/client";
export const IfScoresVisible = (props: React.PropsWithChildren) => {
const context = React.useContext(VisibilityContext);
diff --git a/apps/web/src/contexts/poll.tsx b/apps/web/src/contexts/poll.tsx
deleted file mode 100644
index 58bd52594..000000000
--- a/apps/web/src/contexts/poll.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import { useParams } from "next/navigation";
-
-import { trpc } from "@/trpc/client";
-
-export const usePoll = () => {
- const params = useParams<{ urlId: string }>();
- const [poll] = trpc.polls.get.useSuspenseQuery({
- urlId: params?.urlId as string,
- });
-
- return poll;
-};
diff --git a/apps/web/src/contexts/role.tsx b/apps/web/src/contexts/role.tsx
deleted file mode 100644
index fba7d6017..000000000
--- a/apps/web/src/contexts/role.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import { usePathname } from "next/navigation";
-
-export const useRole = () => {
- const pathname = usePathname();
- return pathname?.includes("/poll") ? "admin" : "participant";
-};
diff --git a/apps/web/src/emails/branding.ts b/apps/web/src/emails/branding.ts
index 859e3ee58..07bd2224d 100644
--- a/apps/web/src/emails/branding.ts
+++ b/apps/web/src/emails/branding.ts
@@ -1,7 +1,7 @@
import type { EmailBranding } from "@rallly/emails";
import { getInstanceBrandingConfig } from "@/features/branding/queries";
-import { resolveStorageUrl } from "@/utils/storage";
+import { resolveStorageUrl } from "@/lib/storage/resolve-storage-url";
/**
* Branding for emails that represent the instance/product (auth, billing,
diff --git a/apps/web/src/features/analytics/posthog.ts b/apps/web/src/features/analytics/posthog.ts
index e47bafc8d..36b0be151 100644
--- a/apps/web/src/features/analytics/posthog.ts
+++ b/apps/web/src/features/analytics/posthog.ts
@@ -1,4 +1,6 @@
import { PostHog } from "@rallly/posthog/server";
+import type { NextRequest } from "next/server";
+import { after } from "next/server";
import { env } from "@/env";
let instance: PostHog | undefined;
@@ -14,3 +16,18 @@ export function posthog() {
return instance;
}
+
+export function withPostHog(
+ handler: (req: NextRequest) => Promise<Response>,
+): (req: NextRequest) => Promise<Response> {
+ return async (req: NextRequest) => {
+ try {
+ return await handler(req);
+ } finally {
+ const ph = posthog();
+ if (ph) {
+ after(() => ph.flush());
+ }
+ }
+ };
+}
diff --git a/apps/web/src/features/billing/actions.ts b/apps/web/src/features/billing/actions.ts
index cdc7db30b..1b386192b 100644
--- a/apps/web/src/features/billing/actions.ts
+++ b/apps/web/src/features/billing/actions.ts
@@ -11,9 +11,9 @@ import type {
SubscriptionCheckoutMetadata,
SubscriptionMetadata,
} from "@/features/subscription/schema";
-import { AppError } from "@/lib/errors";
+import { AppError } from "@/lib/errors/app-error";
import { authActionClient } from "@/lib/safe-action/server";
-import { validateRedirectUrl } from "@/utils/redirect";
+import { validateRedirectUrl } from "@/lib/utils/redirect";
const returnPathSchema = z
.string()
diff --git a/apps/web/src/features/billing/components/pay-wall-dialog.tsx b/apps/web/src/features/billing/components/pay-wall-dialog.tsx
index 0d2db7fc4..ce0bc18f1 100644
--- a/apps/web/src/features/billing/components/pay-wall-dialog.tsx
+++ b/apps/web/src/features/billing/components/pay-wall-dialog.tsx
@@ -28,7 +28,7 @@ import {
UserPlusIcon,
} from "lucide-react";
import React from "react";
-import { PageIcon } from "@/app/components/page-icons";
+import { PageIcon } from "@/components/page-icons";
import { UpgradeButton } from "@/components/upgrade-button";
import type { SpaceTier } from "@/features/space/schema";
import { spaceTierSchema } from "@/features/space/schema";
diff --git a/apps/web/src/features/billing/constants.ts b/apps/web/src/features/billing/constants.ts
index 36a186b8c..9dd0bf58a 100644
--- a/apps/web/src/features/billing/constants.ts
+++ b/apps/web/src/features/billing/constants.ts
@@ -1,4 +1,4 @@
-import { isSelfHosted } from "@/utils/constants";
+import { isSelfHosted } from "@/lib/constants";
export const isBillingEnabled = !isSelfHosted;
diff --git a/apps/web/src/features/branding/color.ts b/apps/web/src/features/branding/color.ts
index f3152d301..907cb90d6 100644
--- a/apps/web/src/features/branding/color.ts
+++ b/apps/web/src/features/branding/color.ts
@@ -1,4 +1,4 @@
-import { adjustColorForContrast, getForegroundColor } from "@/utils/color";
+import { adjustColorForContrast, getForegroundColor } from "@/lib/utils/color";
import { DARK_MODE_BACKGROUND, LIGHT_MODE_BACKGROUND } from "./constants";
export function getPrimaryColorVars(primaryColor: string) {
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 72b0fb713..6fcf8cb93 100644
--- a/apps/web/src/features/branding/components/custom-branding-prompt.tsx
+++ b/apps/web/src/features/branding/components/custom-branding-prompt.tsx
@@ -10,7 +10,7 @@ import { useLocalStorage } from "react-use";
import { useUser } from "@/components/user-provider";
import { useSpace } from "@/features/space/client";
import { Trans, useTranslation } from "@/i18n/client";
-import { isBusinessEmail } from "@/utils/is-business-email";
+import { isBusinessEmail } from "@/lib/utils/is-business-email";
export function CustomBrandingPrompt() {
const { t } = useTranslation();
diff --git a/apps/web/src/features/branding/queries.ts b/apps/web/src/features/branding/queries.ts
index 02967c80f..a81ce0b73 100644
--- a/apps/web/src/features/branding/queries.ts
+++ b/apps/web/src/features/branding/queries.ts
@@ -3,9 +3,9 @@ import "server-only";
import { cache } from "react";
import { env } from "@/env";
import { loadInstanceLicense } from "@/features/licensing/data";
+import { isSelfHosted } from "@/lib/constants";
import { isMaintenanceModeEnabled } from "@/lib/maintenance";
-import { getForegroundColor } from "@/utils/color";
-import { isSelfHosted } from "@/utils/constants";
+import { getForegroundColor } from "@/lib/utils/color";
import type { BrandingConfig } from "./client";
import { getPrimaryColorVars } from "./color";
import {
diff --git a/apps/web/src/features/developer/data.ts b/apps/web/src/features/developer/data.ts
index 7300540a3..6b5995eba 100644
--- a/apps/web/src/features/developer/data.ts
+++ b/apps/web/src/features/developer/data.ts
@@ -1,6 +1,6 @@
import { posthog } from "@/features/analytics/posthog";
import type { SpaceTier } from "@/features/space/schema";
-import { isSelfHosted } from "@/utils/constants";
+import { isSelfHosted } from "@/lib/constants";
/**
* Determines if a user has access to API features (API keys, developer tools)
diff --git a/apps/web/src/features/feedback/components/feedback-dialog.tsx b/apps/web/src/features/feedback/components/feedback-dialog.tsx
index 3aeff613a..d3e00ab4f 100644
--- a/apps/web/src/features/feedback/components/feedback-dialog.tsx
+++ b/apps/web/src/features/feedback/components/feedback-dialog.tsx
@@ -16,8 +16,8 @@ import { CheckCircle2Icon } from "lucide-react";
import { useForm } from "react-hook-form";
import { Trans } from "@/i18n/client";
+import { isSelfHosted } from "@/lib/constants";
import { trpc } from "@/trpc/client";
-import { isSelfHosted } from "@/utils/constants";
import { feedbackSchema } from "../schema";
export function FeedbackDialog(props: DialogProps) {
diff --git a/apps/web/src/features/feedback/constants.ts b/apps/web/src/features/feedback/constants.ts
index 406d8472c..a667fcaa9 100644
--- a/apps/web/src/features/feedback/constants.ts
+++ b/apps/web/src/features/feedback/constants.ts
@@ -1,3 +1,3 @@
-import { isSelfHosted } from "@/utils/constants";
+import { isSelfHosted } from "@/lib/constants";
export const isFeedbackEnabled = !isSelfHosted;
diff --git a/apps/web/src/utils/get-registration-enabled.ts b/apps/web/src/features/instance-settings/data.ts
similarity index 100%
rename from apps/web/src/utils/get-registration-enabled.ts
rename to apps/web/src/features/instance-settings/data.ts
diff --git a/apps/web/src/features/licensing/actions.ts b/apps/web/src/features/licensing/actions.ts
index 992a72689..b79853833 100644
--- a/apps/web/src/features/licensing/actions.ts
+++ b/apps/web/src/features/licensing/actions.ts
@@ -5,7 +5,7 @@ import { createLogger } from "@rallly/logger";
import { updateTag } from "next/cache";
import { INSTANCE_LICENSE_TAG } from "@/features/licensing/constants";
import { validateLicenseKeyInputSchema } from "@/features/licensing/schema";
-import { AppError } from "@/lib/errors";
+import { AppError } from "@/lib/errors/app-error";
import { adminActionClient } from "@/lib/safe-action/server";
import { licenseManager } from "./server";
diff --git a/apps/web/src/features/licensing/components/license-limit-warning.tsx b/apps/web/src/features/licensing/components/license-limit-warning.tsx
index 7f15bb98e..ac9a2d3cf 100644
--- a/apps/web/src/features/licensing/components/license-limit-warning.tsx
+++ b/apps/web/src/features/licensing/components/license-limit-warning.tsx
@@ -3,7 +3,7 @@ import { DEFAULT_SEAT_LIMIT } from "@/features/licensing/constants";
import { loadInstanceLicense } from "@/features/licensing/data";
import { getUserCount } from "@/features/user/queries";
import { Trans } from "@/i18n/client";
-import { isSelfHosted } from "@/utils/constants";
+import { isSelfHosted } from "@/lib/constants";
export async function LicenseLimitWarning() {
if (!isSelfHosted) {
diff --git a/apps/web/src/features/licensing/data.ts b/apps/web/src/features/licensing/data.ts
index 55a3fc5b4..f420657bf 100644
--- a/apps/web/src/features/licensing/data.ts
+++ b/apps/web/src/features/licensing/data.ts
@@ -5,7 +5,7 @@ import {
DEFAULT_SEAT_LIMIT,
INSTANCE_LICENSE_TAG,
} from "@/features/licensing/constants";
-import { isSelfHosted } from "@/utils/constants";
+import { isSelfHosted } from "@/lib/constants";
export function getInstanceLicense() {
return prisma.instanceLicense.findFirst({
diff --git a/apps/web/src/features/licensing/lib/licensing-manager.ts b/apps/web/src/features/licensing/lib/licensing-manager.ts
index 7dc6865d1..23b509d24 100644
--- a/apps/web/src/features/licensing/lib/licensing-manager.ts
+++ b/apps/web/src/features/licensing/lib/licensing-manager.ts
@@ -1,5 +1,5 @@
import { createLogger } from "@rallly/logger";
-import { AppError } from "@/lib/errors";
+import { AppError } from "@/lib/errors/app-error";
import type {
CreateLicenseInput,
ValidateLicenseInputKeySchema,
diff --git a/apps/web/src/features/navigation/command-menu/command-menu.tsx b/apps/web/src/features/navigation/command-menu/command-menu.tsx
index 1cd2955ae..20fb7bb0d 100644
--- a/apps/web/src/features/navigation/command-menu/command-menu.tsx
+++ b/apps/web/src/features/navigation/command-menu/command-menu.tsx
@@ -19,7 +19,7 @@ import {
PollPageIcon,
PreferencesPageIcon,
ProfilePageIcon,
-} from "@/app/components/page-icons";
+} from "@/components/page-icons";
import { Trans, useTranslation } from "@/i18n/client";
import { CommandGlobalShortcut } from "./command-global-shortcut";
diff --git a/apps/web/src/contexts/permissions.tsx b/apps/web/src/features/poll/client.tsx
similarity index 80%
rename from apps/web/src/contexts/permissions.tsx
rename to apps/web/src/features/poll/client.tsx
index 074fd46cf..5b875eb98 100644
--- a/apps/web/src/contexts/permissions.tsx
+++ b/apps/web/src/features/poll/client.tsx
@@ -1,11 +1,24 @@
"use client";
+import { useParams, usePathname } from "next/navigation";
import React from "react";
import { useParticipants } from "@/components/participants-provider";
-import { usePoll } from "@/contexts/poll";
-import { useRole } from "@/contexts/role";
import { trpc } from "@/trpc/client";
+export const usePoll = () => {
+ const params = useParams<{ urlId: string }>();
+ const [poll] = trpc.polls.get.useSuspenseQuery({
+ urlId: params?.urlId as string,
+ });
+
+ return poll;
+};
+
+export const useRole = () => {
+ const pathname = usePathname();
+ return pathname?.includes("/poll") ? "admin" : "participant";
+};
+
const PermissionsContext = React.createContext<{
impersonatedUserId: string | null;
}>({
diff --git a/apps/web/src/features/quick-create/constants.ts b/apps/web/src/features/quick-create/constants.ts
index 7098cdba2..c5e4ccb51 100644
--- a/apps/web/src/features/quick-create/constants.ts
+++ b/apps/web/src/features/quick-create/constants.ts
@@ -1,4 +1,4 @@
-import { isSelfHosted } from "@/utils/constants";
+import { isSelfHosted } from "@/lib/constants";
export const isQuickCreateEnabled =
!isSelfHosted && process.env.QUICK_CREATE_ENABLED === "true";
diff --git a/apps/web/src/features/quick-create/quick-create-widget.tsx b/apps/web/src/features/quick-create/quick-create-widget.tsx
index 8fd921b03..78722041d 100644
--- a/apps/web/src/features/quick-create/quick-create-widget.tsx
+++ b/apps/web/src/features/quick-create/quick-create-widget.tsx
@@ -3,7 +3,7 @@ import { CheckIcon, PlusIcon, ZapIcon } from "lucide-react";
import Link from "next/link";
import { Trans } from "react-i18next/TransWithoutContext";
-import { PollPageIcon } from "@/app/components/page-icons";
+import { PollPageIcon } from "@/components/page-icons";
import { getGuestPolls } from "@/features/quick-create/lib/get-guest-polls";
import { getTranslation } from "@/i18n/server";
diff --git a/apps/web/src/features/scheduled-event/actions.ts b/apps/web/src/features/scheduled-event/actions.ts
index 774a45127..64b067cfb 100644
--- a/apps/web/src/features/scheduled-event/actions.ts
+++ b/apps/web/src/features/scheduled-event/actions.ts
@@ -12,7 +12,7 @@ import {
isEventFull,
} from "@/features/scheduled-event/registration";
import { authLib, getSession } from "@/lib/auth";
-import { AppError } from "@/lib/errors";
+import { AppError } from "@/lib/errors/app-error";
import { actionClient, authActionClient } from "@/lib/safe-action/server";
// Re-validates the registration gate server-side — never trust that the client
diff --git a/apps/web/src/features/setup/utils.ts b/apps/web/src/features/setup/utils.ts
index 11067c84e..3266be24a 100644
--- a/apps/web/src/features/setup/utils.ts
+++ b/apps/web/src/features/setup/utils.ts
@@ -1,5 +1,14 @@
+import "server-only";
+
import { prisma } from "@rallly/database";
+export function isInitialAdmin(email: string) {
+ return (
+ process.env.INITIAL_ADMIN_EMAIL &&
+ email.toLowerCase() === process.env.INITIAL_ADMIN_EMAIL.toLowerCase()
+ );
+}
+
export const userHasSpaces = async (userId: string): Promise<boolean> => {
const spaceCount = await prisma.spaceMember.count({
where: {
diff --git a/apps/web/src/features/space/actions.ts b/apps/web/src/features/space/actions.ts
index 3fde034c0..0a3c6cc57 100644
--- a/apps/web/src/features/space/actions.ts
+++ b/apps/web/src/features/space/actions.ts
@@ -4,7 +4,7 @@ import { prisma } from "@rallly/database";
import * as z from "zod";
import { posthog } from "@/features/analytics/posthog";
import { setActiveSpace } from "@/features/user/mutations";
-import { AppError } from "@/lib/errors";
+import { AppError } from "@/lib/errors/app-error";
import { authActionClient } from "@/lib/safe-action/server";
export const setActiveSpaceAction = authActionClient
diff --git a/apps/web/src/features/space/components/space-icon.tsx b/apps/web/src/features/space/components/space-icon.tsx
index 34b222b15..d001493aa 100644
--- a/apps/web/src/features/space/components/space-icon.tsx
+++ b/apps/web/src/features/space/components/space-icon.tsx
@@ -1,7 +1,7 @@
"use client";
import { Avatar, AvatarFallback, AvatarImage } from "@rallly/ui/avatar";
-import { resolveStorageUrl } from "@/utils/storage";
+import { resolveStorageUrl } from "@/lib/storage/resolve-storage-url";
type SpaceIconProps = {
name: string;
diff --git a/apps/web/src/features/space/data.ts b/apps/web/src/features/space/data.ts
index ae5211460..e6f6733e2 100644
--- a/apps/web/src/features/space/data.ts
+++ b/apps/web/src/features/space/data.ts
@@ -7,7 +7,7 @@ import { prisma } from "@rallly/database";
import type { MemberDTO } from "@/features/space/member/types";
import type { SpaceDTO } from "@/features/space/types";
import { fromDBRole } from "@/features/space/utils";
-import { isSelfHosted } from "@/utils/constants";
+import { isSelfHosted } from "@/lib/constants";
function createMemberDTO(member: {
id: string;
diff --git a/apps/web/src/features/space/mutations.ts b/apps/web/src/features/space/mutations.ts
index 1aef2d6c0..6dccdb736 100644
--- a/apps/web/src/features/space/mutations.ts
+++ b/apps/web/src/features/space/mutations.ts
@@ -1,7 +1,7 @@
import type { SpaceTier } from "@rallly/database";
import { prisma } from "@rallly/database";
import { createSpaceDTO } from "@/features/space/data";
-import { isSelfHosted } from "@/utils/constants";
+import { isSelfHosted } from "@/lib/constants";
export async function createSpace({
name = "Personal",
diff --git a/apps/web/src/features/space/utils.ts b/apps/web/src/features/space/utils.ts
index 7cbf6b78a..d02707e45 100644
--- a/apps/web/src/features/space/utils.ts
+++ b/apps/web/src/features/space/utils.ts
@@ -4,8 +4,8 @@ import { getSpaceSubscription } from "@/features/billing/data";
import { cached_getInstanceLicense } from "@/features/licensing/data";
import type { LicenseType } from "@/features/licensing/schema";
import type { MemberRole } from "@/features/space/schema";
-import { AppError } from "@/lib/errors";
-import { isSelfHosted } from "@/utils/constants";
+import { isSelfHosted } from "@/lib/constants";
+import { AppError } from "@/lib/errors/app-error";
const logger = createLogger("space/utils");
diff --git a/apps/web/src/features/user/actions.ts b/apps/web/src/features/user/actions.ts
index 120571507..c9873646d 100644
--- a/apps/web/src/features/user/actions.ts
+++ b/apps/web/src/features/user/actions.ts
@@ -6,7 +6,7 @@ import * as z from "zod";
import { updateUserImage, updateUserName } from "@/features/user/mutations";
import authLib from "@/lib/auth";
import { timeFormatSchema, weekStartSchema } from "@/lib/datetime/schema";
-import { AppError } from "@/lib/errors";
+import { AppError } from "@/lib/errors/app-error";
import {
adminActionClient,
authActionClient,
@@ -16,7 +16,7 @@ import {
deleteImageFromS3,
getImageUploadUrl,
} from "@/lib/storage/image-upload";
-import { timezoneSchema } from "@/utils/timezone-schema";
+import { timezoneSchema } from "@/lib/utils/timezone-schema";
export const updateUserNameAction = authActionClient
.metadata({ actionName: "update_user_name" })
diff --git a/apps/web/src/features/user/components/timezone-mismatch-dialog.test.tsx b/apps/web/src/features/user/components/timezone-mismatch-dialog.test.tsx
index 1c0eb8b3f..349e2e5f8 100644
--- a/apps/web/src/features/user/components/timezone-mismatch-dialog.test.tsx
+++ b/apps/web/src/features/user/components/timezone-mismatch-dialog.test.tsx
@@ -8,7 +8,7 @@ import { act, render, screen } from "@/test/test-utils";
import { TimeZoneMismatchDialog } from "./timezone-mismatch-dialog";
let mockTimeZone = "America/New_York";
-vi.mock("@/utils/date-time-utils", () => ({
+vi.mock("@/lib/utils/date-time-utils", () => ({
getBrowserTimeZone: () => mockTimeZone,
}));
diff --git a/apps/web/src/lib/auth.ts b/apps/web/src/lib/auth.ts
index ff20c5c67..3fa528f6b 100644
--- a/apps/web/src/lib/auth.ts
+++ b/apps/web/src/lib/auth.ts
@@ -34,7 +34,7 @@ import { getTranslation } from "@/i18n/server";
import { getLocale } from "@/i18n/server/get-locale";
import { hostOnlyCookieCleanup } from "@/lib/auth-plugins/host-only-cookie-cleanup";
import { redis } from "@/lib/kv";
-import { getValueByPath } from "@/utils/get-value-by-path";
+import { getValueByPath } from "@/lib/utils/get-value-by-path";
const kv = redis;
diff --git a/apps/web/src/utils/constants.ts b/apps/web/src/lib/constants.ts
similarity index 100%
rename from apps/web/src/utils/constants.ts
rename to apps/web/src/lib/constants.ts
diff --git a/apps/web/src/lib/datetime/client.tsx b/apps/web/src/lib/datetime/client.tsx
index cd5b6ca32..cae5549f0 100644
--- a/apps/web/src/lib/datetime/client.tsx
+++ b/apps/web/src/lib/datetime/client.tsx
@@ -11,7 +11,7 @@ import {
import { getLocaleDefaults, getWeekdayNames } from "@/lib/datetime/locales";
import type { DateInput, TimeFormat } from "@/lib/datetime/types";
import { normalizeTimeZone } from "@/lib/datetime/utils";
-import { getBrowserTimeZone } from "@/utils/date-time-utils";
+import { getBrowserTimeZone } from "@/lib/utils/date-time-utils";
type DateTimeConfig = {
locale: string;
diff --git a/apps/web/src/lib/datetime/timezone-sync.tsx b/apps/web/src/lib/datetime/timezone-sync.tsx
index b5b40cbb8..c7398478f 100644
--- a/apps/web/src/lib/datetime/timezone-sync.tsx
+++ b/apps/web/src/lib/datetime/timezone-sync.tsx
@@ -3,7 +3,7 @@
import Cookies from "js-cookie";
import React from "react";
import { TIME_ZONE_COOKIE_NAME } from "@/lib/datetime/constants";
-import { getBrowserTimeZone } from "@/utils/date-time-utils";
+import { getBrowserTimeZone } from "@/lib/utils/date-time-utils";
type TimeZoneChange = {
previousTimeZone: string;
diff --git a/apps/web/src/lib/errors.ts b/apps/web/src/lib/errors/app-error.ts
similarity index 100%
rename from apps/web/src/lib/errors.ts
rename to apps/web/src/lib/errors/app-error.ts
diff --git a/apps/web/src/lib/maintenance-server.ts b/apps/web/src/lib/maintenance-server.ts
index b04a5e562..0bf275fa5 100644
--- a/apps/web/src/lib/maintenance-server.ts
+++ b/apps/web/src/lib/maintenance-server.ts
@@ -1,7 +1,7 @@
import "server-only";
import { cookies } from "next/headers";
-import { AppError } from "@/lib/errors";
+import { AppError } from "@/lib/errors/app-error";
import {
isMaintenanceModeEnabled,
isValidBypassCookie,
diff --git a/apps/web/src/lib/oauth/server.ts b/apps/web/src/lib/oauth/server.ts
index 711d1c638..fe271bf35 100644
--- a/apps/web/src/lib/oauth/server.ts
+++ b/apps/web/src/lib/oauth/server.ts
@@ -8,7 +8,7 @@ import { Hono } from "hono";
import { getCookie, setCookie } from "hono/cookie";
import { handle } from "hono/vercel";
import * as z from "zod";
-import { validateRedirectUrl } from "@/utils/redirect";
+import { validateRedirectUrl } from "@/lib/utils/redirect";
import type { CreateOAuthOptions } from "./types";
const logger = createLogger("oauth");
diff --git a/apps/web/src/lib/safe-action/client.ts b/apps/web/src/lib/safe-action/client.ts
index 67a5671d2..790d8af72 100644
--- a/apps/web/src/lib/safe-action/client.ts
+++ b/apps/web/src/lib/safe-action/client.ts
@@ -3,7 +3,7 @@ import { toast } from "@rallly/ui/sonner";
import { useRouter } from "next/navigation";
import { useAction } from "next-safe-action/hooks";
import { useTranslation } from "@/i18n/client";
-import type { AppErrorCode } from "@/lib/errors";
+import type { AppErrorCode } from "@/lib/errors/app-error";
export const useSafeAction: typeof useAction = (action, options) => {
const { t } = useTranslation();
diff --git a/apps/web/src/lib/safe-action/server.ts b/apps/web/src/lib/safe-action/server.ts
index e50720c1f..08dad8f3e 100644
--- a/apps/web/src/lib/safe-action/server.ts
+++ b/apps/web/src/lib/safe-action/server.ts
@@ -6,7 +6,7 @@ import * as z from "zod";
import { defineAbilityFor } from "@/features/user/ability";
import { getCurrentUser } from "@/features/user/data";
import { signOut } from "@/lib/auth";
-import { AppError } from "@/lib/errors";
+import { AppError } from "@/lib/errors/app-error";
import { InvalidSessionError } from "@/lib/errors/invalid-session-error";
import { assertAppAvailable } from "@/lib/maintenance-server";
import type { Duration } from "@/lib/rate-limit";
diff --git a/apps/web/src/lib/storage/image-upload.ts b/apps/web/src/lib/storage/image-upload.ts
index c47b8be73..cf05ea3d7 100644
--- a/apps/web/src/lib/storage/image-upload.ts
+++ b/apps/web/src/lib/storage/image-upload.ts
@@ -3,8 +3,8 @@ import crypto from "node:crypto";
import { DeleteObjectCommand, PutObjectCommand } from "@aws-sdk/client-s3";
import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
import { env } from "@/env";
-import { AppError } from "@/lib/errors";
-import { isSelfHosted } from "@/utils/constants";
+import { isSelfHosted } from "@/lib/constants";
+import { AppError } from "@/lib/errors/app-error";
import { getS3Client } from "./s3";
const UPLOAD_TOKEN_TTL_SECONDS = 3600;
diff --git a/apps/web/src/utils/storage.ts b/apps/web/src/lib/storage/resolve-storage-url.ts
similarity index 100%
rename from apps/web/src/utils/storage.ts
rename to apps/web/src/lib/storage/resolve-storage-url.ts
diff --git a/apps/web/src/lib/storage/upload-client.ts b/apps/web/src/lib/storage/upload-client.ts
index ed9e13408..323a8ac77 100644
--- a/apps/web/src/lib/storage/upload-client.ts
+++ b/apps/web/src/lib/storage/upload-client.ts
@@ -1,4 +1,4 @@
-import { AppError } from "@/lib/errors";
+import { AppError } from "@/lib/errors/app-error";
export interface UploadImageParams {
file: File;
diff --git a/apps/web/src/utils/color.ts b/apps/web/src/lib/utils/color.ts
similarity index 100%
rename from apps/web/src/utils/color.ts
rename to apps/web/src/lib/utils/color.ts
diff --git a/apps/web/src/utils/date-time-utils.test.ts b/apps/web/src/lib/utils/date-time-utils.test.ts
similarity index 100%
rename from apps/web/src/utils/date-time-utils.test.ts
rename to apps/web/src/lib/utils/date-time-utils.test.ts
diff --git a/apps/web/src/utils/date-time-utils.ts b/apps/web/src/lib/utils/date-time-utils.ts
similarity index 95%
rename from apps/web/src/utils/date-time-utils.ts
rename to apps/web/src/lib/utils/date-time-utils.ts
index 9aaf8bfa7..797af116b 100644
--- a/apps/web/src/utils/date-time-utils.ts
+++ b/apps/web/src/lib/utils/date-time-utils.ts
@@ -1,9 +1,8 @@
-import { dayjs } from "@/lib/dayjs";
-
import type {
DateTimeOption,
TimeOption,
-} from "../components/forms/poll-options-form/types";
+} from "@/components/forms/poll-options-form/types";
+import { dayjs } from "@/lib/dayjs";
export function getBrowserTimeZone() {
return dayjs.tz.guess();
diff --git a/apps/web/src/utils/form-validation.ts b/apps/web/src/lib/utils/form-validation.ts
similarity index 100%
rename from apps/web/src/utils/form-validation.ts
rename to apps/web/src/lib/utils/form-validation.ts
diff --git a/apps/web/src/utils/get-value-by-path.test.ts b/apps/web/src/lib/utils/get-value-by-path.test.ts
similarity index 100%
rename from apps/web/src/utils/get-value-by-path.test.ts
rename to apps/web/src/lib/utils/get-value-by-path.test.ts
diff --git a/apps/web/src/utils/get-value-by-path.ts b/apps/web/src/lib/utils/get-value-by-path.ts
similarity index 100%
rename from apps/web/src/utils/get-value-by-path.ts
rename to apps/web/src/lib/utils/get-value-by-path.ts
diff --git a/apps/web/src/utils/gravatar.ts b/apps/web/src/lib/utils/gravatar.ts
similarity index 93%
rename from apps/web/src/utils/gravatar.ts
rename to apps/web/src/lib/utils/gravatar.ts
index 63f0632ec..f0f6fdcd9 100644
--- a/apps/web/src/utils/gravatar.ts
+++ b/apps/web/src/lib/utils/gravatar.ts
@@ -1,5 +1,5 @@
import { createHash } from "node:crypto";
-import { isSelfHosted } from "@/utils/constants";
+import { isSelfHosted } from "@/lib/constants";
/**
* Builds a Gravatar URL for an email address. Returns `null` when no email is
diff --git a/apps/web/src/utils/ics.test.ts b/apps/web/src/lib/utils/ics.test.ts
similarity index 100%
rename from apps/web/src/utils/ics.test.ts
rename to apps/web/src/lib/utils/ics.test.ts
diff --git a/apps/web/src/utils/ics.ts b/apps/web/src/lib/utils/ics.ts
similarity index 100%
rename from apps/web/src/utils/ics.ts
rename to apps/web/src/lib/utils/ics.ts
diff --git a/apps/web/src/utils/is-business-email.ts b/apps/web/src/lib/utils/is-business-email.ts
similarity index 100%
rename from apps/web/src/utils/is-business-email.ts
rename to apps/web/src/lib/utils/is-business-email.ts
diff --git a/apps/web/src/utils/is-valid-name.ts b/apps/web/src/lib/utils/is-valid-name.ts
similarity index 100%
rename from apps/web/src/utils/is-valid-name.ts
rename to apps/web/src/lib/utils/is-valid-name.ts
diff --git a/apps/web/src/utils/local-storage.ts b/apps/web/src/lib/utils/local-storage.ts
similarity index 100%
rename from apps/web/src/utils/local-storage.ts
rename to apps/web/src/lib/utils/local-storage.ts
diff --git a/apps/web/src/utils/permissions.ts b/apps/web/src/lib/utils/permissions.ts
similarity index 100%
rename from apps/web/src/utils/permissions.ts
rename to apps/web/src/lib/utils/permissions.ts
diff --git a/apps/web/src/utils/redirect.ts b/apps/web/src/lib/utils/redirect.ts
similarity index 100%
rename from apps/web/src/utils/redirect.ts
rename to apps/web/src/lib/utils/redirect.ts
diff --git a/apps/web/src/utils/timezone-schema.ts b/apps/web/src/lib/utils/timezone-schema.ts
similarity index 100%
rename from apps/web/src/utils/timezone-schema.ts
rename to apps/web/src/lib/utils/timezone-schema.ts
diff --git a/apps/web/src/trpc/routers/billing.ts b/apps/web/src/trpc/routers/billing.ts
index a45513f75..ac5024760 100644
--- a/apps/web/src/trpc/routers/billing.ts
+++ b/apps/web/src/trpc/routers/billing.ts
@@ -7,7 +7,7 @@ import {
getActiveSpaceForUser,
getSpaceSeatCount,
} from "@/features/space/data";
-import { isSelfHosted } from "@/utils/constants";
+import { isSelfHosted } from "@/lib/constants";
import { publicProcedure, router, spaceOwnerProcedure } from "../trpc";
export const billing = router({
diff --git a/apps/web/src/trpc/routers/events.ts b/apps/web/src/trpc/routers/events.ts
index 756777395..35e368132 100644
--- a/apps/web/src/trpc/routers/events.ts
+++ b/apps/web/src/trpc/routers/events.ts
@@ -14,7 +14,7 @@ import { formatEventDateTime } from "@/features/scheduled-event/utils";
import { defineAbilityForMember } from "@/features/space/member/ability";
import { timeZoneSchema } from "@/lib/datetime/schema";
import { normalizeTimeZone } from "@/lib/datetime/utils";
-import { createIcsEvent } from "@/utils/ics";
+import { createIcsEvent } from "@/lib/utils/ics";
import { router, spaceProcedure } from "../trpc";
export const events = router({
diff --git a/apps/web/src/trpc/routers/polls.ts b/apps/web/src/trpc/routers/polls.ts
index bae816131..eef034d62 100644
--- a/apps/web/src/trpc/routers/polls.ts
+++ b/apps/web/src/trpc/routers/polls.ts
@@ -17,7 +17,7 @@ import { hasPollAdminAccess } from "@/features/poll/query";
import { formatEventDateTime } from "@/features/scheduled-event/utils";
import { getActiveSpaceForUser } from "@/features/space/data";
import { dayjs } from "@/lib/dayjs";
-import { createIcsEvent } from "@/utils/ics";
+import { createIcsEvent } from "@/lib/utils/ics";
import {
createRateLimitMiddleware,
possiblyPublicProcedure,
diff --git a/apps/web/src/trpc/routers/polls/participants.ts b/apps/web/src/trpc/routers/polls/participants.ts
index 8c6eb662d..726a26ad8 100644
--- a/apps/web/src/trpc/routers/polls/participants.ts
+++ b/apps/web/src/trpc/routers/polls/participants.ts
@@ -11,7 +11,7 @@ import { getInstanceBranding, getSpaceBranding } from "@/emails/branding";
import { posthog } from "@/features/analytics/posthog";
import { getNotificationRecipient } from "@/features/notifications/queries";
import { hasPollAdminAccess } from "@/features/poll/query";
-import { getGravatarUrl } from "@/utils/gravatar";
+import { getGravatarUrl } from "@/lib/utils/gravatar";
import {
createRateLimitMiddleware,
publicProcedure,
diff --git a/apps/web/src/trpc/routers/system.ts b/apps/web/src/trpc/routers/system.ts
index 392928b5e..c53f8e87f 100644
--- a/apps/web/src/trpc/routers/system.ts
+++ b/apps/web/src/trpc/routers/system.ts
@@ -2,7 +2,7 @@ import { prisma } from "@rallly/database";
import * as z from "zod";
import { env } from "@/env";
import { createCache } from "@/lib/cache";
-import { appVersion } from "@/utils/constants";
+import { appVersion } from "@/lib/constants";
import { adminProcedure, router } from "../trpc";
const upstreamSchema = z.object({
diff --git a/apps/web/src/trpc/server/create-ssr-helper.ts b/apps/web/src/trpc/server/create-ssr-helper.ts
index 9c16c510b..791ab1751 100644
--- a/apps/web/src/trpc/server/create-ssr-helper.ts
+++ b/apps/web/src/trpc/server/create-ssr-helper.ts
@@ -2,11 +2,11 @@ import { createServerSideHelpers } from "@trpc/react-query/server";
import { notFound, redirect } from "next/navigation";
import { cache } from "react";
import superjson from "superjson";
+import { isInitialAdmin } from "@/features/setup/utils";
import { getSession } from "@/lib/auth";
import { InvalidSessionError } from "@/lib/errors/invalid-session-error";
import { getPathname } from "@/lib/pathname";
-import { isInitialAdmin } from "@/utils/is-initial-admin";
-import { buildSafeRedirectUrl } from "@/utils/redirect";
+import { buildSafeRedirectUrl } from "@/lib/utils/redirect";
import type { TRPCContext } from "../context";
import { appRouter } from "../routers";
diff --git a/apps/web/src/trpc/trpc.ts b/apps/web/src/trpc/trpc.ts
index 80b9c1d97..03c34dabf 100644
--- a/apps/web/src/trpc/trpc.ts
+++ b/apps/web/src/trpc/trpc.ts
@@ -5,10 +5,10 @@ import { isQuickCreateEnabled } from "@/features/quick-create";
import { getActiveSpaceForUser } from "@/features/space/data";
import { createUserDTO } from "@/features/user/data";
import { signOut } from "@/lib/auth";
-import { AppError } from "@/lib/errors";
+import { isSelfHosted } from "@/lib/constants";
+import { AppError } from "@/lib/errors/app-error";
import { isMaintenanceActiveForRequest } from "@/lib/maintenance-server";
import { createRatelimit } from "@/lib/rate-limit";
-import { isSelfHosted } from "@/utils/constants";
import type { TRPCContext } from "./context";
const t = initTRPC.context<TRPCContext>().create({
diff --git a/apps/web/src/utils/is-initial-admin.ts b/apps/web/src/utils/is-initial-admin.ts
deleted file mode 100644
index 14753c9c8..000000000
--- a/apps/web/src/utils/is-initial-admin.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import "server-only";
-
-export function isInitialAdmin(email: string) {
- return (
- process.env.INITIAL_ADMIN_EMAIL &&
- email.toLowerCase() === process.env.INITIAL_ADMIN_EMAIL.toLowerCase()
- );
-}
diff --git a/apps/web/src/utils/posthog.ts b/apps/web/src/utils/posthog.ts
deleted file mode 100644
index f19c5ea74..000000000
--- a/apps/web/src/utils/posthog.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import type { NextRequest } from "next/server";
-import { after } from "next/server";
-import { posthog } from "@/features/analytics/posthog";
-
-export function withPostHog(
- handler: (req: NextRequest) => Promise<Response>,
-): (req: NextRequest) => Promise<Response> {
- return async (req: NextRequest) => {
- try {
- return await handler(req);
- } finally {
- const ph = posthog();
- if (ph) {
- after(() => ph.flush());
- }
- }
- };
-}
diff --git a/biome-plugins/no-raw-datetime-formatting.grit b/biome-plugins/no-raw-datetime-formatting.grit
index 3d691073c..a213155db 100644
--- a/biome-plugins/no-raw-datetime-formatting.grit
+++ b/biome-plugins/no-raw-datetime-formatting.grit
@@ -16,7 +16,7 @@ or {
} where {
$filename <: not or {
r".*/src/lib/datetime/.*",
- r".*/src/utils/timezone-schema\.ts",
+ r".*/src/lib/utils/timezone-schema\.ts",
r".*/src/components/time-zone-picker/timezone-utils\.ts",
r".*/src/components/poll/manage-poll/use-csv-exporter\.ts",
r".*/tests/.*"