Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
🚚 Migrate legacy poll domain UI from components/ into features/poll (#2622)
Luke Vellabca2a7d74ea4
diff --git a/apps/web/biome.json b/apps/web/biome.jsonindex 00439d5ff..a26b5fb1c 100644--- a/apps/web/biome.json+++ b/apps/web/biome.json@@ -120,31 +120,8 @@},{"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/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-provider.tsx",- "src/components/visibility.tsx","src/features/billing/components/pay-wall-dialog.tsx",+ "src/features/poll/components/manage-poll.tsx","src/lib/auth.ts","src/lib/feature-flags/config.ts","src/lib/safe-action/server.ts"@@ -169,14 +146,14 @@"includes": ["src/lib/dayjs.ts","src/lib/datetime/**",- "src/components/forms/poll-options-form/**",+ "src/features/poll/components/forms/poll-options-form/**","src/components/headless-date-picker.tsx","src/**/edit-options/page.tsx","src/trpc/routers/polls.ts","src/trpc/routers/index.ts","src/app/api/private/utils/time-slots.ts","src/lib/utils/date-time-utils.ts",- "src/components/poll/manage-poll/use-csv-exporter.ts",+ "src/features/poll/components/manage-poll/use-csv-exporter.ts","src/test/setup.ts"],"linter": {diff --git a/apps/web/src/app/[locale]/(auth)/components/auth-page.tsx b/apps/web/src/app/[locale]/(auth)/components/auth-page.tsxindex 62416499e..67bdbeb93 100644--- a/apps/web/src/app/[locale]/(auth)/components/auth-page.tsx+++ b/apps/web/src/app/[locale]/(auth)/components/auth-page.tsx@@ -1,4 +1,4 @@-import { Logo } from "@/components/logo";+import { Logo } from "@/features/branding/components/logo";export function AuthPageContainer({ children }: { children: React.ReactNode }) {return (diff --git a/apps/web/src/app/[locale]/(optional-space)/new/page.tsx b/apps/web/src/app/[locale]/(optional-space)/new/page.tsxindex 389dcd120..04ebd9321 100644--- a/apps/web/src/app/[locale]/(optional-space)/new/page.tsx+++ b/apps/web/src/app/[locale]/(optional-space)/new/page.tsx@@ -10,10 +10,10 @@ import {import { BarChart2Icon } from "lucide-react";import type { Metadata } from "next";import Link from "next/link";-import { CreatePoll } from "@/components/create-poll";-import { UserDropdown } from "@/components/user-dropdown";import { BrandStyle } from "@/features/branding/components/brand-style";+import { CreatePoll } from "@/features/poll/components/create-poll";import { createSpaceDTO } from "@/features/space/data";+import { UserDropdown } from "@/features/user/components/user-dropdown";import { Trans } from "@/i18n/client";import { getTranslation } from "@/i18n/server";import { getSession } from "@/lib/auth";diff --git a/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/admin-page-loader.tsx b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/admin-page-loader.tsxindex 931d676e7..49d8898a8 100644--- a/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/admin-page-loader.tsx+++ b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/admin-page-loader.tsx@@ -1,6 +1,6 @@"use client";import dynamic from "next/dynamic";-import { PollBrandingFromContext } from "@/components/poll/poll-branding";+import { PollBrandingFromContext } from "@/features/poll/components/poll-branding";const AdminPage = dynamic(() => import("./admin-page").then((mod) => mod.AdminPage),diff --git a/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/admin-page.tsx b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/admin-page.tsxindex 9edf27a2b..9bf91a5b3 100644--- a/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/admin-page.tsx+++ b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/admin-page.tsx@@ -1,9 +1,9 @@"use client";-import Discussion from "@/components/discussion";-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 Discussion from "@/features/poll/components/discussion";+import { EventCard } from "@/features/poll/components/event-card";+import { PollFooter } from "@/features/poll/components/poll-footer";+import { ResponsiveResults } from "@/features/poll/components/responsive-results";+import { VotingForm } from "@/features/poll/components/voting-form";import { GuestPollAlert } from "./guest-poll-alert";export function AdminPage() {diff --git a/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-details/page.tsx b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-details/page.tsxindex 4d02c7c6f..cfc3fd7de 100644--- a/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-details/page.tsx+++ b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-details/page.tsx@@ -13,10 +13,9 @@ import { Form } from "@rallly/ui/form";import Link from "next/link";import { useRouter } from "next/navigation";import { useForm } from "react-hook-form";--import { PollDetailsForm } from "@/components/forms/poll-details-form";-import { useUpdatePollMutation } from "@/components/poll/mutations";-import { usePoll } from "@/components/poll-context";+import { PollDetailsForm } from "@/features/poll/components/forms/poll-details-form";+import { useUpdatePollMutation } from "@/features/poll/components/mutations";+import { usePoll } from "@/features/poll/components/poll-context";import { Trans } from "@/i18n/client";const Page = () => {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.tsxindex 9b5adbe4b..ce0a6a773 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@@ -6,14 +6,14 @@ import { Form } from "@rallly/ui/form";import Link from "next/link";import { useRouter } from "next/navigation";import { useForm } from "react-hook-form";-import PollOptionsForm from "@/components/forms/poll-options-form";import { useModalContext } from "@/components/modal/modal-provider";+import PollOptionsForm from "@/features/poll/components/forms/poll-options-form/poll-options-form";+import { useUpdatePollMutation } from "@/features/poll/components/mutations";import {filterParticipantsByVote,useParticipants,-} from "@/components/participants-provider";-import { useUpdatePollMutation } from "@/components/poll/mutations";-import { usePoll } from "@/components/poll-context";+} from "@/features/poll/components/participants-provider";+import { usePoll } from "@/features/poll/components/poll-context";import { Trans, useTranslation } from "@/i18n/client";import { dayjs } from "@/lib/dayjs";import { encodeDateOption } from "@/lib/utils/date-time-utils";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.tsxindex 3607414b4..24a8458c9 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@@ -6,10 +6,9 @@ import { Form } from "@rallly/ui/form";import Link from "next/link";import { useRouter } from "next/navigation";import { useForm } from "react-hook-form";--import { PollSettingsForm } from "@/components/forms/poll-settings";-import { useUpdatePollMutation } from "@/components/poll/mutations";import { usePoll } from "@/features/poll/client";+import { PollSettingsForm } from "@/features/poll/components/forms/poll-settings";+import { useUpdatePollMutation } from "@/features/poll/components/mutations";import { Trans } from "@/i18n/client";const Page = () => {diff --git a/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/guest-poll-alert.tsx b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/guest-poll-alert.tsxindex 1ee7bbf1f..567ae5e42 100644--- a/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/guest-poll-alert.tsx+++ b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/guest-poll-alert.tsx@@ -4,7 +4,7 @@ import { InfoIcon } from "lucide-react";import { LoginLink } from "@/components/login-link";import { RegisterLink } from "@/components/register-link";-import { useUser } from "@/components/user-provider";+import { useUser } from "@/features/user/components/user-provider";import { Trans } from "@/i18n/client";export const GuestPollAlert = () => {diff --git a/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/layout.tsx b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/layout.tsxindex 6f27776ba..2140f5623 100644--- a/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/layout.tsx+++ b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/layout.tsx@@ -4,7 +4,7 @@ import { TRPCError } from "@trpc/server";import type { Metadata } from "next";import { notFound, redirect } from "next/navigation";-import { PollLayout } from "@/components/layouts/poll-layout";+import { PollLayout } from "@/features/poll/components/poll-layout";import { createPublicSSRHelper } from "@/trpc/server/create-ssr-helper";export default async function Layout(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.tsxindex 63842196c..466b3fc7d 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@@ -13,8 +13,8 @@ import {PageSectionHeader,PageSectionTitle,} from "@/components/page-layout";-import { ProBadge } from "@/components/pro-badge";import { showPayWall, useIsFree } from "@/features/billing/client";+import { ProBadge } from "@/features/billing/components/pro-badge";import { DEFAULT_PRIMARY_COLOR } from "@/features/branding/constants";import { useSpace } from "@/features/space/client";import { Trans } from "@/i18n/client";diff --git a/apps/web/src/app/[locale]/(space)/settings/preferences/components/language-preference.tsx b/apps/web/src/app/[locale]/(space)/settings/preferences/components/language-preference.tsxindex 9a5a60a10..f61253ee6 100644--- a/apps/web/src/app/[locale]/(space)/settings/preferences/components/language-preference.tsx+++ b/apps/web/src/app/[locale]/(space)/settings/preferences/components/language-preference.tsx@@ -14,7 +14,7 @@ import { ArrowUpRight } from "lucide-react";import Link from "next/link";import { useForm } from "react-hook-form";import * as z from "zod";-import { LanguageSelect } from "@/components/poll/language-selector";+import { LanguageSelect } from "@/components/language-selector";import { Trans } from "@/i18n/client";import { useLocale } from "@/lib/locale/client";import { trpc } from "@/trpc/client";diff --git a/apps/web/src/app/[locale]/accept-invite/[inviteId]/page.tsx b/apps/web/src/app/[locale]/accept-invite/[inviteId]/page.tsxindex 351a53f38..21efc0e51 100644--- a/apps/web/src/app/[locale]/accept-invite/[inviteId]/page.tsx+++ b/apps/web/src/app/[locale]/accept-invite/[inviteId]/page.tsx@@ -1,8 +1,8 @@import { prisma } from "@rallly/database";import { Card } from "@rallly/ui/card";import { notFound } from "next/navigation";-import { Logo } from "@/components/logo";import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";+import { Logo } from "@/features/branding/components/logo";import { SpaceIcon } from "@/features/space/components/space-icon";import { Trans } from "@/i18n/client";import { getTranslation } from "@/i18n/server";diff --git a/apps/web/src/app/[locale]/e/[id]/page.tsx b/apps/web/src/app/[locale]/e/[id]/page.tsxindex 56ed9513e..02a5b2b45 100644--- a/apps/web/src/app/[locale]/e/[id]/page.tsx+++ b/apps/web/src/app/[locale]/e/[id]/page.tsx@@ -10,10 +10,10 @@ import { SpaceBranding } from "@/app/[locale]/e/[id]/components/space-branding";import { UserDropdown } from "@/app/[locale]/e/[id]/components/user-dropdown";import LogoMarkGray from "@/assets/logo-mark-gray.svg";import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";-import TruncatedLinkify from "@/components/poll/truncated-linkify";import { SessionRefresher } from "@/components/session-refresher";import { BrandStyle } from "@/features/branding/components/brand-style";import { formatLocationText } from "@/features/location/utils";+import TruncatedLinkify from "@/features/poll/components/truncated-linkify";import {EventCalendarCard,EventDate,diff --git a/apps/web/src/app/[locale]/invite/[urlId]/invite-page-loader.tsx b/apps/web/src/app/[locale]/invite/[urlId]/invite-page-loader.tsxindex 133dd6f3e..be9b32685 100644--- a/apps/web/src/app/[locale]/invite/[urlId]/invite-page-loader.tsx+++ b/apps/web/src/app/[locale]/invite/[urlId]/invite-page-loader.tsx@@ -1,6 +1,6 @@"use client";import dynamic from "next/dynamic";-import { PollBrandingFromContext } from "@/components/poll/poll-branding";+import { PollBrandingFromContext } from "@/features/poll/components/poll-branding";const InvitePage = dynamic(() => import("./invite-page").then((mod) => mod.InvitePage),diff --git a/apps/web/src/app/[locale]/invite/[urlId]/invite-page.tsx b/apps/web/src/app/[locale]/invite/[urlId]/invite-page.tsxindex e4348d9c0..a4727f14a 100644--- a/apps/web/src/app/[locale]/invite/[urlId]/invite-page.tsx+++ b/apps/web/src/app/[locale]/invite/[urlId]/invite-page.tsx@@ -2,12 +2,12 @@import { Alert, AlertDescription } from "@rallly/ui/alert";import { ArrowUpRightIcon, CrownIcon } from "lucide-react";import Link from "next/link";-import Discussion from "@/components/discussion";-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 "@/features/poll/client";+import Discussion from "@/features/poll/components/discussion";+import { EventCard } from "@/features/poll/components/event-card";+import { PollFooter } from "@/features/poll/components/poll-footer";+import { ResponsiveResults } from "@/features/poll/components/responsive-results";+import { VotingForm } from "@/features/poll/components/voting-form";import { Trans } from "@/i18n/client";import { trpc } from "@/trpc/client";diff --git a/apps/web/src/app/[locale]/invite/[urlId]/providers.tsx b/apps/web/src/app/[locale]/invite/[urlId]/providers.tsxindex 13552e19f..86683dd80 100644--- a/apps/web/src/app/[locale]/invite/[urlId]/providers.tsx+++ b/apps/web/src/app/[locale]/invite/[urlId]/providers.tsx@@ -1,7 +1,7 @@"use client";-import { LegacyPollContextProvider } from "@/components/poll/poll-context-provider";-import { VisibilityProvider } from "@/components/visibility";+import { LegacyPollContextProvider } from "@/features/poll/components/poll-context-provider";+import { VisibilityProvider } from "@/features/poll/components/visibility";export default function Providers({ children }: { children: React.ReactNode }) {return (diff --git a/apps/web/src/app/[locale]/setup/page.tsx b/apps/web/src/app/[locale]/setup/page.tsxindex da16b6d68..a879cb6e0 100644--- a/apps/web/src/app/[locale]/setup/page.tsx+++ b/apps/web/src/app/[locale]/setup/page.tsx@@ -1,6 +1,6 @@import type { Metadata } from "next";import { redirect } from "next/navigation";-import { Logo } from "@/components/logo";+import { Logo } from "@/features/branding/components/logo";import { CreateSpaceForm } from "@/features/setup/components/create-space-form";import { userHasSpaces } from "@/features/setup/utils";import { Trans } from "@/i18n/client";diff --git a/apps/web/src/components/discussion/index.ts b/apps/web/src/components/discussion/index.tsdeleted file mode 100644index 8448b7d12..000000000--- a/apps/web/src/components/discussion/index.ts+++ /dev/null@@ -1 +0,0 @@-export { default } from "./discussion";diff --git a/apps/web/src/components/forms/index.ts b/apps/web/src/components/forms/index.tsdeleted file mode 100644index 11c00f4f6..000000000--- a/apps/web/src/components/forms/index.ts+++ /dev/null@@ -1,3 +0,0 @@-export { PollDetailsForm } from "./poll-details-form";-export { default as PollOptionsForm } from "./poll-options-form/poll-options-form";-export * from "./types";diff --git a/apps/web/src/components/forms/poll-options-form/index.ts b/apps/web/src/components/forms/poll-options-form/index.tsdeleted file mode 100644index 5d4a44eae..000000000--- a/apps/web/src/components/forms/poll-options-form/index.ts+++ /dev/null@@ -1,2 +0,0 @@-export { default } from "./poll-options-form";-export * from "./types";diff --git a/apps/web/src/components/forms/poll-options-form/month-calendar/index.ts b/apps/web/src/components/forms/poll-options-form/month-calendar/index.tsdeleted file mode 100644index 36878f9a1..000000000--- a/apps/web/src/components/forms/poll-options-form/month-calendar/index.ts+++ /dev/null@@ -1 +0,0 @@-export { default } from "./month-calendar";diff --git a/apps/web/src/components/poll/language-selector.tsx b/apps/web/src/components/language-selector.tsxsimilarity index 100%rename from apps/web/src/components/poll/language-selector.tsxrename to apps/web/src/components/language-selector.tsxdiff --git a/apps/web/src/components/poll-status.tsx b/apps/web/src/components/poll-status.tsxdeleted file mode 100644index 182a7532c..000000000--- a/apps/web/src/components/poll-status.tsx+++ /dev/null@@ -1,32 +0,0 @@-import type { PollStatus } from "@rallly/database";-import { cn } from "@rallly/ui";-import { PollStatusIcon } from "@/features/poll/components/poll-status-icon";-import { Trans } from "@/i18n/client";--const PollStatusLabel = ({ status }: { status: PollStatus }) => {- switch (status) {- case "open":- return <Trans i18nKey="pollStatusOpen" defaults="Open" />;- case "closed":- return <Trans i18nKey="pollStatusClosed" defaults="Closed" />;- case "scheduled":- return <Trans i18nKey="pollStatusScheduled" defaults="Scheduled" />;- case "canceled":- return <Trans i18nKey="pollStatusCanceled" defaults="Canceled" />;- }-};--export const PollStatusBadge = ({- status,- className,-}: {- status: PollStatus;- className?: string;-}) => {- return (- <span className={cn("inline-flex items-center gap-x-2 text-sm", className)}>- <PollStatusIcon status={status} />- <PollStatusLabel status={status} />- </span>- );-};diff --git a/apps/web/src/features/billing/components/pay-wall-dialog.tsx b/apps/web/src/features/billing/components/pay-wall-dialog.tsxindex bef35166f..fe7b3a1bb 100644--- a/apps/web/src/features/billing/components/pay-wall-dialog.tsx+++ b/apps/web/src/features/billing/components/pay-wall-dialog.tsx@@ -29,7 +29,7 @@ import {} from "lucide-react";import React from "react";import { PageIcon } from "@/components/page-icons";-import { UpgradeButton } from "@/components/upgrade-button";+import { UpgradeButton } from "@/features/billing/components/upgrade-button";import type { SpaceTier } from "@/features/space/schema";import { spaceTierSchema } from "@/features/space/schema";import { Trans } from "@/i18n/client";diff --git a/apps/web/src/components/pro-badge.tsx b/apps/web/src/features/billing/components/pro-badge.tsxsimilarity index 100%rename from apps/web/src/components/pro-badge.tsxrename to apps/web/src/features/billing/components/pro-badge.tsxdiff --git a/apps/web/src/components/upgrade-button.tsx b/apps/web/src/features/billing/components/upgrade-button.tsxsimilarity index 100%rename from apps/web/src/components/upgrade-button.tsxrename to apps/web/src/features/billing/components/upgrade-button.tsxdiff --git a/apps/web/src/features/branding/components/custom-branding-prompt.tsx b/apps/web/src/features/branding/components/custom-branding-prompt.tsxindex 6fcf8cb93..b4f1b4177 100644--- a/apps/web/src/features/branding/components/custom-branding-prompt.tsx+++ b/apps/web/src/features/branding/components/custom-branding-prompt.tsx@@ -7,8 +7,8 @@ import Image from "next/image";import Link from "next/link";import React from "react";import { useLocalStorage } from "react-use";-import { useUser } from "@/components/user-provider";import { useSpace } from "@/features/space/client";+import { useUser } from "@/features/user/components/user-provider";import { Trans, useTranslation } from "@/i18n/client";import { isBusinessEmail } from "@/lib/utils/is-business-email";diff --git a/apps/web/src/components/logo.tsx b/apps/web/src/features/branding/components/logo.tsxsimilarity index 100%rename from apps/web/src/components/logo.tsxrename to apps/web/src/features/branding/components/logo.tsxdiff --git a/apps/web/src/components/add-to-calendar-button.tsx b/apps/web/src/features/calendars/components/add-to-calendar-button.tsxsimilarity index 100%rename from apps/web/src/components/add-to-calendar-button.tsxrename to apps/web/src/features/calendars/components/add-to-calendar-button.tsxdiff --git a/apps/web/src/features/poll/client.tsx b/apps/web/src/features/poll/client.tsxindex 5b875eb98..44a56b0ba 100644--- a/apps/web/src/features/poll/client.tsx+++ b/apps/web/src/features/poll/client.tsx@@ -2,7 +2,7 @@import { useParams, usePathname } from "next/navigation";import React from "react";-import { useParticipants } from "@/components/participants-provider";+import { useParticipants } from "@/features/poll/components/participants-provider";import { trpc } from "@/trpc/client";export const usePoll = () => {diff --git a/apps/web/src/components/create-poll.tsx b/apps/web/src/features/poll/components/create-poll.tsxsimilarity index 94%rename from apps/web/src/components/create-poll.tsxrename to apps/web/src/features/poll/components/create-poll.tsxindex 8703de01a..c1d03578a 100644--- a/apps/web/src/components/create-poll.tsx+++ b/apps/web/src/features/poll/components/create-poll.tsx@@ -32,12 +32,13 @@ import React from "react";import { useForm } from "react-hook-form";import useFormPersist from "react-hook-form-persist";import { useCopyToClipboard, useUnmount } from "react-use";-import { PollSettingsForm } from "@/components/forms/poll-settings";-import { useUser } from "@/components/user-provider";+import { PollDetailsForm } from "@/features/poll/components/forms/poll-details-form";+import PollOptionsForm from "@/features/poll/components/forms/poll-options-form/poll-options-form";+import { PollSettingsForm } from "@/features/poll/components/forms/poll-settings";+import type { NewEventData } from "@/features/poll/components/forms/types";+import { useUser } from "@/features/user/components/user-provider";import { Trans, useTranslation } from "@/i18n/client";import { trpc } from "@/trpc/client";-import type { NewEventData } from "./forms";-import { PollDetailsForm, PollOptionsForm } from "./forms";const required = <T,>(v: T | undefined): T => {if (!v) {diff --git a/apps/web/src/components/poll/desktop-poll.tsx b/apps/web/src/features/poll/components/desktop-poll.tsxsimilarity index 98%rename from apps/web/src/components/poll/desktop-poll.tsxrename to apps/web/src/features/poll/components/desktop-poll.tsxindex a5ac99e8e..0ae166b5a 100644--- a/apps/web/src/components/poll/desktop-poll.tsx+++ b/apps/web/src/features/poll/components/desktop-poll.tsx@@ -25,12 +25,12 @@ import {EmptyStateIcon,EmptyStateTitle,} from "@/components/empty-state";-import { useVotingForm } from "@/components/poll/voting-form";import { ScrollContainer } from "@/components/scroll-container";import { usePermissions, usePoll } from "@/features/poll/client";+import { useParticipants } from "@/features/poll/components/participants-provider";+import { useVisibleParticipants } from "@/features/poll/components/visibility";+import { useVotingForm } from "@/features/poll/components/voting-form";import { Trans, useTranslation } from "@/i18n/client";-import { useParticipants } from "../participants-provider";-import { useVisibleParticipants } from "../visibility";import ParticipantRow from "./desktop-poll/participant-row";import ParticipantRowForm from "./desktop-poll/participant-row-form";import PollHeader from "./desktop-poll/poll-header";diff --git a/apps/web/src/components/poll/desktop-poll/participant-row-form.tsx b/apps/web/src/features/poll/components/desktop-poll/participant-row-form.tsxsimilarity index 93%rename from apps/web/src/components/poll/desktop-poll/participant-row-form.tsxrename to apps/web/src/features/poll/components/desktop-poll/participant-row-form.tsxindex 0642fbc23..828ee106b 100644--- a/apps/web/src/components/poll/desktop-poll/participant-row-form.tsx+++ b/apps/web/src/features/poll/components/desktop-poll/participant-row-form.tsx@@ -6,13 +6,15 @@ import * as React from "react";import { Controller } from "react-hook-form";import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";-import { Participant, ParticipantName } from "@/components/participant";-import { useVotingForm } from "@/components/poll/voting-form";-import { YouAvatar } from "@/components/poll/you-avatar";+import {+ Participant,+ ParticipantName,+} from "@/features/poll/components/participant";+import { useOptions, usePoll } from "@/features/poll/components/poll-context";+import { useVotingForm } from "@/features/poll/components/voting-form";+import { YouAvatar } from "@/features/poll/components/you-avatar";import { Trans, useTranslation } from "@/i18n/client";import { getOptionDateTimeLabel } from "@/lib/utils/date-time-utils";--import { useOptions, usePoll } from "../../poll-context";import { VoteSelector } from "../vote-selector";export interface ParticipantRowFormProps {diff --git a/apps/web/src/components/poll/desktop-poll/participant-row.tsx b/apps/web/src/features/poll/components/desktop-poll/participant-row.tsxsimilarity index 92%rename from apps/web/src/components/poll/desktop-poll/participant-row.tsxrename to apps/web/src/features/poll/components/desktop-poll/participant-row.tsxindex 05d7b26b4..d6700b9d5 100644--- a/apps/web/src/components/poll/desktop-poll/participant-row.tsx+++ b/apps/web/src/features/poll/components/desktop-poll/participant-row.tsx@@ -8,11 +8,14 @@ import { MoreHorizontalIcon } from "lucide-react";import type * as React from "react";import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";-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 "@/features/poll/client";+import {+ Participant,+ ParticipantName,+} from "@/features/poll/components/participant";+import { ParticipantDropdown } from "@/features/poll/components/participant-dropdown";+import { usePoll } from "@/features/poll/components/poll-context";+import { useUser } from "@/features/user/components/user-provider";import { Trans, useTranslation } from "@/i18n/client";import type { Vote } from "@/trpc/client/types";diff --git a/apps/web/src/components/poll/desktop-poll/poll-header.tsx b/apps/web/src/features/poll/components/desktop-poll/poll-header.tsxsimilarity index 97%rename from apps/web/src/components/poll/desktop-poll/poll-header.tsxrename to apps/web/src/features/poll/components/desktop-poll/poll-header.tsxindex 66c4ea23e..ba3e969c7 100644--- a/apps/web/src/components/poll/desktop-poll/poll-header.tsx+++ b/apps/web/src/features/poll/components/desktop-poll/poll-header.tsx@@ -2,8 +2,8 @@ import { cn } from "@rallly/ui";import { Tooltip, TooltipContent, TooltipTrigger } from "@rallly/ui/tooltip";import { ClockIcon } from "lucide-react";import type * as React from "react";-import { ConnectedScoreSummary } from "@/components/poll/score-summary";-import { useOptions } from "@/components/poll-context";+import { useOptions } from "@/features/poll/components/poll-context";+import { ConnectedScoreSummary } from "@/features/poll/components/score-summary";import { Trans } from "@/i18n/client";const TimeRange: React.FunctionComponent<{diff --git a/apps/web/src/components/discussion/discussion.tsx b/apps/web/src/features/poll/components/discussion.tsxsimilarity index 95%rename from apps/web/src/components/discussion/discussion.tsxrename to apps/web/src/features/poll/components/discussion.tsxindex 332f0624a..851aabd34 100644--- a/apps/web/src/components/discussion/discussion.tsx+++ b/apps/web/src/features/poll/components/discussion.tsx@@ -22,16 +22,19 @@ import { MoreHorizontalIcon, TrashIcon } from "lucide-react";import * as React from "react";import { Controller, useForm } from "react-hook-form";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, useRole } from "@/features/poll/client";+import { useEditToken } from "@/features/poll/components/mutations";+import {+ Participant,+ ParticipantName,+} from "@/features/poll/components/participant";+import { useParticipants } from "@/features/poll/components/participants-provider";+import TruncatedLinkify from "@/features/poll/components/truncated-linkify";+import { useUser } from "@/features/user/components/user-provider";import { 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 TruncatedLinkify from "../poll/truncated-linkify";-import { useUser } from "../user-provider";interface CommentForm {authorName: string;diff --git a/apps/web/src/components/event-card.tsx b/apps/web/src/features/poll/components/event-card.tsxsimilarity index 93%rename from apps/web/src/components/event-card.tsxrename to apps/web/src/features/poll/components/event-card.tsxindex 80d6f872c..ba71f53fe 100644--- a/apps/web/src/components/event-card.tsx+++ b/apps/web/src/features/poll/components/event-card.tsx@@ -1,16 +1,16 @@"use client";import { Card, CardContent } from "@rallly/ui/card";import { MapPinIcon, User2Icon } from "lucide-react";+import { RandomGradientBar } from "@/components/random-gradient-bar";+import { usePoll } from "@/features/poll/client";import {EventMetaDescription,EventMetaItem,EventMetaList,EventMetaTitle,-} from "@/components/event-meta";-import TruncatedLinkify from "@/components/poll/truncated-linkify";-import VoteIcon from "@/components/poll/vote-icon";-import { RandomGradientBar } from "@/components/random-gradient-bar";-import { usePoll } from "@/features/poll/client";+} from "@/features/poll/components/event-meta";+import TruncatedLinkify from "@/features/poll/components/truncated-linkify";+import VoteIcon from "@/features/poll/components/vote-icon";import { SpaceIcon } from "@/features/space/components/space-icon";import { Trans } from "@/i18n/client";diff --git a/apps/web/src/components/event-meta.tsx b/apps/web/src/features/poll/components/event-meta.tsxsimilarity index 95%rename from apps/web/src/components/event-meta.tsxrename to apps/web/src/features/poll/components/event-meta.tsxindex 4133948e6..9fc286d47 100644--- a/apps/web/src/components/event-meta.tsx+++ b/apps/web/src/features/poll/components/event-meta.tsx@@ -1,6 +1,6 @@import { cn } from "@rallly/ui";import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";-import TruncatedLinkify from "@/components/poll/truncated-linkify";+import TruncatedLinkify from "@/features/poll/components/truncated-linkify";export function EventMetaTitle({className,diff --git a/apps/web/src/components/forms/poll-details-form.tsx b/apps/web/src/features/poll/components/forms/poll-details-form.tsxsimilarity index 100%rename from apps/web/src/components/forms/poll-details-form.tsxrename to apps/web/src/features/poll/components/forms/poll-details-form.tsxdiff --git a/apps/web/src/components/forms/poll-options-form/date-navigation-toolbar.tsx b/apps/web/src/features/poll/components/forms/poll-options-form/date-navigation-toolbar.tsxsimilarity index 100%rename from apps/web/src/components/forms/poll-options-form/date-navigation-toolbar.tsxrename to apps/web/src/features/poll/components/forms/poll-options-form/date-navigation-toolbar.tsxdiff --git a/apps/web/src/components/forms/poll-options-form/dayjs-localizer.ts b/apps/web/src/features/poll/components/forms/poll-options-form/dayjs-localizer.tssimilarity index 100%rename from apps/web/src/components/forms/poll-options-form/dayjs-localizer.tsrename to apps/web/src/features/poll/components/forms/poll-options-form/dayjs-localizer.tsdiff --git a/apps/web/src/components/forms/poll-options-form/month-calendar/month-calendar.tsx b/apps/web/src/features/poll/components/forms/poll-options-form/month-calendar/month-calendar.tsxsimilarity index 99%rename from apps/web/src/components/forms/poll-options-form/month-calendar/month-calendar.tsxrename to apps/web/src/features/poll/components/forms/poll-options-form/month-calendar/month-calendar.tsxindex 3b56fc6c7..25576ecfc 100644--- a/apps/web/src/components/forms/poll-options-form/month-calendar/month-calendar.tsx+++ b/apps/web/src/features/poll/components/forms/poll-options-form/month-calendar/month-calendar.tsx@@ -20,13 +20,15 @@ import {} from "lucide-react";import * as React from "react";import { useFormContext } from "react-hook-form";+import DateCard from "@/components/date-card";import {EmptyState,EmptyStateDescription,EmptyStateIcon,EmptyStateTitle,} from "@/components/empty-state";-import type { NewEventData } from "@/components/forms/types";+import { useHeadlessDatePicker } from "@/components/headless-date-picker";+import type { NewEventData } from "@/features/poll/components/forms/types";import { Trans, useTranslation } from "@/i18n/client";import { useDateTime, useDateTimeConfig } from "@/lib/datetime/client";import { formatDateParts } from "@/lib/datetime/format";@@ -36,8 +38,6 @@ import {getBrowserTimeZone,removeAllOptionsForDay,} from "@/lib/utils/date-time-utils";-import DateCard from "../../../date-card";-import { useHeadlessDatePicker } from "../../../headless-date-picker";import type { DateTimeOption, DateTimePickerProps } from "../types";import { formatDateWithoutTime, formatDateWithoutTz } from "../utils";import TimePicker from "./time-picker";diff --git a/apps/web/src/components/forms/poll-options-form/month-calendar/time-picker.tsx b/apps/web/src/features/poll/components/forms/poll-options-form/month-calendar/time-picker.tsxsimilarity index 100%rename from apps/web/src/components/forms/poll-options-form/month-calendar/time-picker.tsxrename to apps/web/src/features/poll/components/forms/poll-options-form/month-calendar/time-picker.tsxdiff --git a/apps/web/src/components/forms/poll-options-form/poll-options-form.tsx b/apps/web/src/features/poll/components/forms/poll-options-form/poll-options-form.tsxsimilarity index 99%rename from apps/web/src/components/forms/poll-options-form/poll-options-form.tsxrename to apps/web/src/features/poll/components/forms/poll-options-form/poll-options-form.tsxindex 201268d37..8410b8579 100644--- a/apps/web/src/components/forms/poll-options-form/poll-options-form.tsx+++ b/apps/web/src/features/poll/components/forms/poll-options-form/poll-options-form.tsx@@ -23,7 +23,7 @@ import { Trans, useTranslation } from "@/i18n/client";import { getBrowserTimeZone } from "@/lib/utils/date-time-utils";import type { NewEventData } from "../types";-import MonthCalendar from "./month-calendar";+import MonthCalendar from "./month-calendar/month-calendar";import WeekCalendar from "./week-calendar";const PollOptionsForm = ({diff --git a/apps/web/src/components/forms/poll-options-form/rbc-overrides.css b/apps/web/src/features/poll/components/forms/poll-options-form/rbc-overrides.csssimilarity index 100%rename from apps/web/src/components/forms/poll-options-form/rbc-overrides.cssrename to apps/web/src/features/poll/components/forms/poll-options-form/rbc-overrides.cssdiff --git a/apps/web/src/components/forms/poll-options-form/types.ts b/apps/web/src/features/poll/components/forms/poll-options-form/types.tssimilarity index 100%rename from apps/web/src/components/forms/poll-options-form/types.tsrename to apps/web/src/features/poll/components/forms/poll-options-form/types.tsdiff --git a/apps/web/src/components/forms/poll-options-form/utils.ts b/apps/web/src/features/poll/components/forms/poll-options-form/utils.tssimilarity index 100%rename from apps/web/src/components/forms/poll-options-form/utils.tsrename to apps/web/src/features/poll/components/forms/poll-options-form/utils.tsdiff --git a/apps/web/src/components/forms/poll-options-form/week-calendar.tsx b/apps/web/src/features/poll/components/forms/poll-options-form/week-calendar.tsxsimilarity index 100%rename from apps/web/src/components/forms/poll-options-form/week-calendar.tsxrename to apps/web/src/features/poll/components/forms/poll-options-form/week-calendar.tsxdiff --git a/apps/web/src/components/forms/poll-settings.tsx b/apps/web/src/features/poll/components/forms/poll-settings.tsxsimilarity index 96%rename from apps/web/src/components/forms/poll-settings.tsxrename to apps/web/src/features/poll/components/forms/poll-settings.tsxindex a2e5d3e30..168917ba9 100644--- a/apps/web/src/components/forms/poll-settings.tsx+++ b/apps/web/src/features/poll/components/forms/poll-settings.tsx@@ -11,9 +11,9 @@ import { Switch } from "@rallly/ui/switch";import { AtSignIcon, EyeIcon, MessageCircleIcon, VoteIcon } from "lucide-react";import type React from "react";import { useFormContext } from "react-hook-form";-import type { PollSettingsFormData } from "@/components/forms/types";-import { ProBadge } from "@/components/pro-badge";import { showPayWall, useIsFree } from "@/features/billing/client";+import { ProBadge } from "@/features/billing/components/pro-badge";+import type { PollSettingsFormData } from "@/features/poll/components/forms/types";import { Trans } from "@/i18n/client";const PollSetting = ({diff --git a/apps/web/src/components/forms/types.ts b/apps/web/src/features/poll/components/forms/types.tssimilarity index 100%rename from apps/web/src/components/forms/types.tsrename to apps/web/src/features/poll/components/forms/types.tsdiff --git a/apps/web/src/components/invite-dialog.tsx b/apps/web/src/features/poll/components/invite-dialog.tsxsimilarity index 100%rename from apps/web/src/components/invite-dialog.tsxrename to apps/web/src/features/poll/components/invite-dialog.tsxdiff --git a/apps/web/src/components/poll/manage-poll.tsx b/apps/web/src/features/poll/components/manage-poll.tsxsimilarity index 97%rename from apps/web/src/components/poll/manage-poll.tsxrename to apps/web/src/features/poll/components/manage-poll.tsxindex 7595c11f4..e43e53aec 100644--- a/apps/web/src/components/poll/manage-poll.tsx+++ b/apps/web/src/features/poll/components/manage-poll.tsx@@ -25,10 +25,10 @@ import {import Link from "next/link";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 { showPayWall, useIsFree } from "@/features/billing/client";+import { ProBadge } from "@/features/billing/components/pro-badge";import { usePoll } from "@/features/poll/client";+import { SchedulePollDialog } from "@/features/poll/components/manage-poll/schedule-poll-dialog";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/delete-poll-dialog.tsx b/apps/web/src/features/poll/components/manage-poll/delete-poll-dialog.tsxsimilarity index 100%rename from apps/web/src/components/poll/manage-poll/delete-poll-dialog.tsxrename to apps/web/src/features/poll/components/manage-poll/delete-poll-dialog.tsxdiff --git a/apps/web/src/components/poll/manage-poll/schedule-poll-dialog.tsx b/apps/web/src/features/poll/components/manage-poll/schedule-poll-dialog.tsxsimilarity index 96%rename from apps/web/src/components/poll/manage-poll/schedule-poll-dialog.tsxrename to apps/web/src/features/poll/components/manage-poll/schedule-poll-dialog.tsxindex 5314f4e1b..76b1e6e82 100644--- a/apps/web/src/components/poll/manage-poll/schedule-poll-dialog.tsx+++ b/apps/web/src/features/poll/components/manage-poll/schedule-poll-dialog.tsx@@ -23,10 +23,10 @@ import React from "react";import { useForm } from "react-hook-form";import * as z from "zod";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 "@/features/poll/client";+import { useParticipants } from "@/features/poll/components/participants-provider";+import { ConnectedScoreSummary } from "@/features/poll/components/score-summary";+import { VoteSummaryProgressBar } from "@/features/poll/components/vote-summary-progress-bar";import {EventDate,EventTimeRange,diff --git a/apps/web/src/components/poll/manage-poll/use-csv-exporter.ts b/apps/web/src/features/poll/components/manage-poll/use-csv-exporter.tssimilarity index 93%rename from apps/web/src/components/poll/manage-poll/use-csv-exporter.tsrename to apps/web/src/features/poll/components/manage-poll/use-csv-exporter.tsindex 7b46b5706..48016ed4d 100644--- a/apps/web/src/components/poll/manage-poll/use-csv-exporter.ts+++ b/apps/web/src/features/poll/components/manage-poll/use-csv-exporter.ts@@ -1,9 +1,8 @@-import { useOptions, usePoll } from "@/components/poll-context";+import { useParticipants } from "@/features/poll/components/participants-provider";+import { useOptions, usePoll } from "@/features/poll/components/poll-context";import { useTranslation } from "@/i18n/client";import { dayjs } from "@/lib/dayjs";-import { useParticipants } from "../../participants-provider";-export const useCsvExporter = () => {const { poll } = usePoll();const { options } = useOptions();diff --git a/apps/web/src/components/poll/mobile-poll.tsx b/apps/web/src/features/poll/components/mobile-poll.tsxsimilarity index 92%rename from apps/web/src/components/poll/mobile-poll.tsxrename to apps/web/src/features/poll/components/mobile-poll.tsxindex 26818343e..5180bf2ce 100644--- a/apps/web/src/components/poll/mobile-poll.tsx+++ b/apps/web/src/features/poll/components/mobile-poll.tsx@@ -17,15 +17,18 @@ import smoothscroll from "smoothscroll-polyfill";import { TimesShownIn } from "@/components/clock";import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";-import { Participant, ParticipantName } from "@/components/participant";-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 "@/features/poll/client";+import {+ Participant,+ ParticipantName,+} from "@/features/poll/components/participant";+import { ParticipantDropdown } from "@/features/poll/components/participant-dropdown";+import { useOptions, usePoll } from "@/features/poll/components/poll-context";+import { useVisibleParticipants } from "@/features/poll/components/visibility";+import { useVotingForm } from "@/features/poll/components/voting-form";+import { YouAvatar } from "@/features/poll/components/you-avatar";+import { useUser } from "@/features/user/components/user-provider";import { Trans, useTranslation } from "@/i18n/client";-import { useUser } from "../user-provider";-import { useVisibleParticipants } from "../visibility";import GroupedOptions from "./mobile-poll/grouped-options";if (typeof window !== "undefined") {diff --git a/apps/web/src/components/poll/mobile-poll/date-option.tsx b/apps/web/src/features/poll/components/mobile-poll/date-option.tsxsimilarity index 100%rename from apps/web/src/components/poll/mobile-poll/date-option.tsxrename to apps/web/src/features/poll/components/mobile-poll/date-option.tsxdiff --git a/apps/web/src/components/poll/mobile-poll/grouped-options.tsx b/apps/web/src/features/poll/components/mobile-poll/grouped-options.tsxsimilarity index 100%rename from apps/web/src/components/poll/mobile-poll/grouped-options.tsxrename to apps/web/src/features/poll/components/mobile-poll/grouped-options.tsxdiff --git a/apps/web/src/components/poll/mobile-poll/poll-option.tsx b/apps/web/src/features/poll/components/mobile-poll/poll-option.tsxsimilarity index 99%rename from apps/web/src/components/poll/mobile-poll/poll-option.tsxrename to apps/web/src/features/poll/components/mobile-poll/poll-option.tsxindex a2c86744c..803cfbeb5 100644--- a/apps/web/src/components/poll/mobile-poll/poll-option.tsx+++ b/apps/web/src/features/poll/components/mobile-poll/poll-option.tsx@@ -11,7 +11,7 @@ import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";import {filterParticipantsByVote,useParticipants,-} from "@/components/participants-provider";+} from "@/features/poll/components/participants-provider";import { useTranslation } from "@/i18n/client";import { ConnectedScoreSummary } from "../score-summary";diff --git a/apps/web/src/components/poll/mobile-poll/poll-options.tsx b/apps/web/src/features/poll/components/mobile-poll/poll-options.tsxsimilarity index 93%rename from apps/web/src/components/poll/mobile-poll/poll-options.tsxrename to apps/web/src/features/poll/components/mobile-poll/poll-options.tsxindex abd00c8f4..b8283f16e 100644--- a/apps/web/src/components/poll/mobile-poll/poll-options.tsx+++ b/apps/web/src/features/poll/components/mobile-poll/poll-options.tsx@@ -1,9 +1,9 @@import type { VoteType } from "@rallly/database";import type * as React from "react";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 { useParticipants } from "@/features/poll/components/participants-provider";+import { usePoll } from "@/features/poll/components/poll-context";+import { useVotingForm } from "@/features/poll/components/voting-form";import type { ParsedDateTimeOpton } from "@/lib/utils/date-time-utils";import { getOptionDateTimeLabel } from "@/lib/utils/date-time-utils";import DateOption from "./date-option";diff --git a/apps/web/src/components/poll/mobile-poll/time-slot-option.tsx b/apps/web/src/features/poll/components/mobile-poll/time-slot-option.tsxsimilarity index 100%rename from apps/web/src/components/poll/mobile-poll/time-slot-option.tsxrename to apps/web/src/features/poll/components/mobile-poll/time-slot-option.tsxdiff --git a/apps/web/src/components/poll/mutations.ts b/apps/web/src/features/poll/components/mutations.tssimilarity index 97%rename from apps/web/src/components/poll/mutations.tsrename to apps/web/src/features/poll/components/mutations.tsindex d3c5018f4..1f81e50b1 100644--- a/apps/web/src/components/poll/mutations.ts+++ b/apps/web/src/features/poll/components/mutations.ts@@ -1,6 +1,6 @@import { toast } from "@rallly/ui/sonner";import { useSearchParams } from "next/navigation";-import { usePoll } from "@/components/poll-context";+import { usePoll } from "@/features/poll/components/poll-context";import { useTranslation } from "@/i18n/client";import { trpc } from "@/trpc/client";import type { ParticipantForm } from "./types";diff --git a/apps/web/src/components/new-participant-modal.tsx b/apps/web/src/features/poll/components/new-participant-modal.tsxsimilarity index 96%rename from apps/web/src/components/new-participant-modal.tsxrename to apps/web/src/features/poll/components/new-participant-modal.tsxindex 995e5c7eb..c25f501c4 100644--- a/apps/web/src/components/new-participant-modal.tsx+++ b/apps/web/src/features/poll/components/new-participant-modal.tsx@@ -17,11 +17,11 @@ import { TRPCClientError } from "@trpc/client";import { useForm } from "react-hook-form";import * as z from "zod";import { usePoll } from "@/features/poll/client";+import { useAddParticipantMutation } from "@/features/poll/components/mutations";+import VoteIcon from "@/features/poll/components/vote-icon";+import { useUser } from "@/features/user/components/user-provider";import { useTranslation } from "@/i18n/client";import { useDateTimeConfig } from "@/lib/datetime/client";-import { useAddParticipantMutation } from "./poll/mutations";-import VoteIcon from "./poll/vote-icon";-import { useUser } from "./user-provider";const requiredEmailSchema = z.object({requireEmail: z.literal(true),diff --git a/apps/web/src/components/poll/notification-toggle.tsx b/apps/web/src/features/poll/components/notification-toggle.tsxsimilarity index 96%rename from apps/web/src/components/poll/notification-toggle.tsxrename to apps/web/src/features/poll/components/notification-toggle.tsxindex 8305cdb02..9e5ef63bb 100644--- a/apps/web/src/components/poll/notification-toggle.tsx+++ b/apps/web/src/features/poll/components/notification-toggle.tsx@@ -3,9 +3,8 @@import { Button } from "@rallly/ui/button";import { Tooltip, TooltipContent, TooltipTrigger } from "@rallly/ui/tooltip";import { BellIcon, BellOffIcon } from "lucide-react";--import { useUser } from "@/components/user-provider";import { usePoll } from "@/features/poll/client";+import { useUser } from "@/features/user/components/user-provider";import { Trans, useTranslation } from "@/i18n/client";import { trpc } from "@/trpc/client";diff --git a/apps/web/src/components/participant-dropdown.tsx b/apps/web/src/features/poll/components/participant-dropdown.tsxsimilarity index 99%rename from apps/web/src/components/participant-dropdown.tsxrename to apps/web/src/features/poll/components/participant-dropdown.tsxindex 6249aca6d..3afeec32b 100644--- a/apps/web/src/components/participant-dropdown.tsx+++ b/apps/web/src/features/poll/components/participant-dropdown.tsx@@ -37,7 +37,7 @@ import * as z from "zod";import {useDeleteParticipantMutation,useEditToken,-} from "@/components/poll/mutations";+} from "@/features/poll/components/mutations";import { Trans, useTranslation } from "@/i18n/client";import { useFormValidation } from "@/lib/utils/form-validation";import { trpc } from "@/trpc/client";diff --git a/apps/web/src/components/participant.tsx b/apps/web/src/features/poll/components/participant.tsxsimilarity index 100%rename from apps/web/src/components/participant.tsxrename to apps/web/src/features/poll/components/participant.tsxdiff --git a/apps/web/src/components/participants-provider.tsx b/apps/web/src/features/poll/components/participants-provider.tsxsimilarity index 100%rename from apps/web/src/components/participants-provider.tsxrename to apps/web/src/features/poll/components/participants-provider.tsxdiff --git a/apps/web/src/components/poll/poll-branding.tsx b/apps/web/src/features/poll/components/poll-branding.tsxsimilarity index 100%rename from apps/web/src/components/poll/poll-branding.tsxrename to apps/web/src/features/poll/components/poll-branding.tsxdiff --git a/apps/web/src/components/poll/poll-context-provider.tsx b/apps/web/src/features/poll/components/poll-context-provider.tsxsimilarity index 90%rename from apps/web/src/components/poll/poll-context-provider.tsxrename to apps/web/src/features/poll/components/poll-context-provider.tsxindex 74d73a6f0..60ca66235 100644--- a/apps/web/src/components/poll/poll-context-provider.tsx+++ b/apps/web/src/features/poll/components/poll-context-provider.tsx@@ -1,9 +1,9 @@import ModalProvider from "@/components/modal/modal-provider";+import { usePoll } from "@/features/poll/client";import {OptionsProvider,PollContextProvider,-} from "@/components/poll-context";-import { usePoll } from "@/features/poll/client";+} from "@/features/poll/components/poll-context";export const LegacyPollContextProvider = (props: React.PropsWithChildren) => {const poll = usePoll();diff --git a/apps/web/src/components/poll-context.test.ts b/apps/web/src/features/poll/components/poll-context.test.tssimilarity index 100%rename from apps/web/src/components/poll-context.test.tsrename to apps/web/src/features/poll/components/poll-context.test.tsdiff --git a/apps/web/src/components/poll-context.tsx b/apps/web/src/features/poll/components/poll-context.tsxsimilarity index 97%rename from apps/web/src/components/poll-context.tsxrename to apps/web/src/features/poll/components/poll-context.tsxindex 8d01733fe..06d205f45 100644--- a/apps/web/src/components/poll-context.tsx+++ b/apps/web/src/features/poll/components/poll-context.tsx@@ -1,5 +1,7 @@import type { TimeFormat, VoteType } from "@rallly/database";import React from "react";+import { useRequiredContext } from "@/components/use-required-context";+import { useParticipants } from "@/features/poll/components/participants-provider";import { useDateTimeConfig } from "@/lib/datetime/client";import {formatDateParts,@@ -12,9 +14,6 @@ import type {} from "@/lib/utils/date-time-utils";import type { GetPollApiResponse } from "@/trpc/client/types";-import { useParticipants } from "./participants-provider";-import { useRequiredContext } from "./use-required-context";-type PollContextValue = {poll: GetPollApiResponse;highScore: number;diff --git a/apps/web/src/components/poll/poll-footer.tsx b/apps/web/src/features/poll/components/poll-footer.tsxsimilarity index 100%rename from apps/web/src/components/poll/poll-footer.tsxrename to apps/web/src/features/poll/components/poll-footer.tsxdiff --git a/apps/web/src/components/layouts/poll-layout.tsx b/apps/web/src/features/poll/components/poll-layout.tsxsimilarity index 89%rename from apps/web/src/components/layouts/poll-layout.tsxrename to apps/web/src/features/poll/components/poll-layout.tsxindex b376b23de..b4154fa3d 100644--- a/apps/web/src/components/layouts/poll-layout.tsx+++ b/apps/web/src/features/poll/components/poll-layout.tsx@@ -11,11 +11,11 @@ import { BarChart2Icon } from "lucide-react";import Link from "next/link";import { useParams, usePathname } from "next/navigation";import type React from "react";-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 "@/features/poll/client";+import { InviteDialog } from "@/features/poll/components/invite-dialog";+import ManagePoll from "@/features/poll/components/manage-poll";+import { NotificationToggle } from "@/features/poll/components/notification-toggle";+import { LegacyPollContextProvider } from "@/features/poll/components/poll-context-provider";import { Trans } from "@/i18n/client";const AdminControls = () => {diff --git a/apps/web/src/components/poll/responsive-results.tsx b/apps/web/src/features/poll/components/responsive-results.tsxsimilarity index 93%rename from apps/web/src/components/poll/responsive-results.tsxrename to apps/web/src/features/poll/components/responsive-results.tsxindex 874357a80..ff6910a8e 100644--- a/apps/web/src/components/poll/responsive-results.tsx+++ b/apps/web/src/features/poll/components/responsive-results.tsx@@ -5,8 +5,6 @@ import { Card } from "@rallly/ui/card";import { CalendarIcon, LockIcon } from "lucide-react";import * as React from "react";import { createBreakpoint } from "react-use";--import { AddToCalendarButton } from "@/components/add-to-calendar-button";import {EmptyState,EmptyStateDescription,@@ -14,9 +12,10 @@ import {EmptyStateIcon,EmptyStateTitle,} from "@/components/empty-state";-import DesktopPoll from "@/components/poll/desktop-poll";-import MobilePoll from "@/components/poll/mobile-poll";+import { AddToCalendarButton } from "@/features/calendars/components/add-to-calendar-button";import { usePoll } from "@/features/poll/client";+import DesktopPoll from "@/features/poll/components/desktop-poll";+import MobilePoll from "@/features/poll/components/mobile-poll";import {EventDate,EventTimeRange,diff --git a/apps/web/src/components/poll/score-summary.tsx b/apps/web/src/features/poll/components/score-summary.tsxsimilarity index 94%rename from apps/web/src/components/poll/score-summary.tsxrename to apps/web/src/features/poll/components/score-summary.tsxindex a4bfc6200..77fc873a6 100644--- a/apps/web/src/components/poll/score-summary.tsx+++ b/apps/web/src/features/poll/components/score-summary.tsx@@ -4,9 +4,8 @@ import { AnimatePresence } from "motion/react";import * as m from "motion/react-m";import * as React from "react";import { usePrevious } from "react-use";--import { usePoll } from "@/components/poll-context";-import { IfScoresVisible } from "@/components/visibility";+import { usePoll } from "@/features/poll/components/poll-context";+import { IfScoresVisible } from "@/features/poll/components/visibility";export interface PopularityScoreProps {yesScore: number;diff --git a/apps/web/src/components/poll/truncated-linkify.tsx b/apps/web/src/features/poll/components/truncated-linkify.tsxsimilarity index 100%rename from apps/web/src/components/poll/truncated-linkify.tsxrename to apps/web/src/features/poll/components/truncated-linkify.tsxdiff --git a/apps/web/src/components/poll/types.ts b/apps/web/src/features/poll/components/types.tssimilarity index 100%rename from apps/web/src/components/poll/types.tsrename to apps/web/src/features/poll/components/types.tsdiff --git a/apps/web/src/components/visibility.tsx b/apps/web/src/features/poll/components/visibility.tsxsimilarity index 94%rename from apps/web/src/components/visibility.tsxrename to apps/web/src/features/poll/components/visibility.tsxindex a103db98a..56c380b77 100644--- a/apps/web/src/components/visibility.tsx+++ b/apps/web/src/features/poll/components/visibility.tsx@@ -2,9 +2,8 @@* Manage what the user can and cannot see on the page*/import React from "react";--import { useParticipants } from "@/components/participants-provider";import { usePermissions, usePoll } from "@/features/poll/client";+import { useParticipants } from "@/features/poll/components/participants-provider";export const IfScoresVisible = (props: React.PropsWithChildren) => {const context = React.useContext(VisibilityContext);diff --git a/apps/web/src/components/poll/vote-icon.tsx b/apps/web/src/features/poll/components/vote-icon.tsxsimilarity index 75%rename from apps/web/src/components/poll/vote-icon.tsxrename to apps/web/src/features/poll/components/vote-icon.tsxindex 503c970d3..ac95a5d24 100644--- a/apps/web/src/components/poll/vote-icon.tsx+++ b/apps/web/src/features/poll/components/vote-icon.tsx@@ -2,10 +2,10 @@ import type { VoteType } from "@rallly/database";import { cn } from "@rallly/ui";import type { VariantProps } from "class-variance-authority";import { cva } from "class-variance-authority";-import { IfNeedBeIcon } from "@/components/vote-icon/if-need-be-icon";-import { NoIcon } from "@/components/vote-icon/no-icon";-import { PendingIcon } from "@/components/vote-icon/pending-icon";-import { YesIcon } from "@/components/vote-icon/yes-icon";+import { IfNeedBeIcon } from "@/features/poll/components/vote-icon/if-need-be-icon";+import { NoIcon } from "@/features/poll/components/vote-icon/no-icon";+import { PendingIcon } from "@/features/poll/components/vote-icon/pending-icon";+import { YesIcon } from "@/features/poll/components/vote-icon/yes-icon";const iconVariants = cva("", {variants: {diff --git a/apps/web/src/components/vote-icon/if-need-be-icon.tsx b/apps/web/src/features/poll/components/vote-icon/if-need-be-icon.tsxsimilarity index 100%rename from apps/web/src/components/vote-icon/if-need-be-icon.tsxrename to apps/web/src/features/poll/components/vote-icon/if-need-be-icon.tsxdiff --git a/apps/web/src/components/vote-icon/no-icon.tsx b/apps/web/src/features/poll/components/vote-icon/no-icon.tsxsimilarity index 100%rename from apps/web/src/components/vote-icon/no-icon.tsxrename to apps/web/src/features/poll/components/vote-icon/no-icon.tsxdiff --git a/apps/web/src/components/vote-icon/pending-icon.tsx b/apps/web/src/features/poll/components/vote-icon/pending-icon.tsxsimilarity index 100%rename from apps/web/src/components/vote-icon/pending-icon.tsxrename to apps/web/src/features/poll/components/vote-icon/pending-icon.tsxdiff --git a/apps/web/src/components/vote-icon/yes-icon.tsx b/apps/web/src/features/poll/components/vote-icon/yes-icon.tsxsimilarity index 100%rename from apps/web/src/components/vote-icon/yes-icon.tsxrename to apps/web/src/features/poll/components/vote-icon/yes-icon.tsxdiff --git a/apps/web/src/components/poll/vote-selector.tsx b/apps/web/src/features/poll/components/vote-selector.tsxsimilarity index 100%rename from apps/web/src/components/poll/vote-selector.tsxrename to apps/web/src/features/poll/components/vote-selector.tsxdiff --git a/apps/web/src/components/vote-summary-progress-bar.tsx b/apps/web/src/features/poll/components/vote-summary-progress-bar.tsxsimilarity index 96%rename from apps/web/src/components/vote-summary-progress-bar.tsxrename to apps/web/src/features/poll/components/vote-summary-progress-bar.tsxindex 8583d8e75..ec466c5f5 100644--- a/apps/web/src/components/vote-summary-progress-bar.tsx+++ b/apps/web/src/features/poll/components/vote-summary-progress-bar.tsx@@ -1,6 +1,6 @@import { Tooltip, TooltipContent, TooltipTrigger } from "@rallly/ui/tooltip";-import { useParticipants } from "@/components/participants-provider";+import { useParticipants } from "@/features/poll/components/participants-provider";const ListNames = ({ participantIds }: { participantIds: string[] }) => {const { participants } = useParticipants();diff --git a/apps/web/src/components/poll/voting-form.tsx b/apps/web/src/features/poll/components/voting-form.tsxsimilarity index 95%rename from apps/web/src/components/poll/voting-form.tsxrename to apps/web/src/features/poll/components/voting-form.tsxindex 9e74d0aff..849657e69 100644--- a/apps/web/src/components/poll/voting-form.tsx+++ b/apps/web/src/features/poll/components/voting-form.tsx@@ -9,15 +9,14 @@ import {import React from "react";import { FormProvider, useForm, useFormContext } from "react-hook-form";import * as z from "zod";--import { NewParticipantForm } from "@/components/new-participant-modal";-import { useParticipants } from "@/components/participants-provider";+import { usePermissions, usePoll, useRole } from "@/features/poll/client";import {normalizeVotes,useEditToken,useUpdateParticipantMutation,-} from "@/components/poll/mutations";-import { usePermissions, usePoll, useRole } from "@/features/poll/client";+} from "@/features/poll/components/mutations";+import { NewParticipantForm } from "@/features/poll/components/new-participant-modal";+import { useParticipants } from "@/features/poll/components/participants-provider";import { Trans } from "@/i18n/client";const formSchema = z.object({diff --git a/apps/web/src/components/poll/you-avatar.tsx b/apps/web/src/features/poll/components/you-avatar.tsxsimilarity index 100%rename from apps/web/src/components/poll/you-avatar.tsxrename to apps/web/src/features/poll/components/you-avatar.tsxdiff --git a/apps/web/src/components/user-dropdown.tsx b/apps/web/src/features/user/components/user-dropdown.tsxsimilarity index 98%rename from apps/web/src/components/user-dropdown.tsxrename to apps/web/src/features/user/components/user-dropdown.tsxindex 2ae281fb0..243c71e12 100644--- a/apps/web/src/components/user-dropdown.tsx+++ b/apps/web/src/features/user/components/user-dropdown.tsx@@ -31,7 +31,7 @@ import {import Link from "next/link";import { useRouter } from "next/navigation";import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";-import { useUser } from "@/components/user-provider";+import { useUser } from "@/features/user/components/user-provider";import { Trans, useTranslation } from "@/i18n/client";import { signOut } from "@/lib/auth-client";import { useFeatureFlag } from "@/lib/feature-flags/client";diff --git a/apps/web/src/components/user-provider.tsx b/apps/web/src/features/user/components/user-provider.tsxsimilarity index 100%rename from apps/web/src/components/user-provider.tsxrename to apps/web/src/features/user/components/user-provider.tsxdiff --git a/apps/web/src/lib/utils/date-time-utils.ts b/apps/web/src/lib/utils/date-time-utils.tsindex bce17aaf1..e0f06e72c 100644--- a/apps/web/src/lib/utils/date-time-utils.ts+++ b/apps/web/src/lib/utils/date-time-utils.ts@@ -1,7 +1,7 @@import type {DateTimeOption,TimeOption,-} from "@/components/forms/poll-options-form/types";+} from "@/features/poll/components/forms/poll-options-form/types";import { dayjs } from "@/lib/dayjs";export function getBrowserTimeZone() {diff --git a/biome-plugins/no-raw-datetime-formatting.grit b/biome-plugins/no-raw-datetime-formatting.gritindex a213155db..b8f0386d3 100644--- a/biome-plugins/no-raw-datetime-formatting.grit+++ b/biome-plugins/no-raw-datetime-formatting.grit@@ -18,7 +18,7 @@ or {r".*/src/lib/datetime/.*",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".*/src/features/poll/components/manage-poll/use-csv-exporter\.ts",r".*/tests/.*"},register_diagnostic(span=$match, message="Do not format dates inline. Use the formatters in `@/lib/datetime` so locale, timezone, and hour-cycle preferences are applied consistently.")