Skip to content

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

♻️ Move data files into features (#1847)

Luke Vella43a947992b51
diff --git a/apps/web/src/app/[locale]/(space)/account/billing/page.tsx b/apps/web/src/app/[locale]/(space)/account/billing/page.tsx
index e1ecc59b8..2abfb06ae 100644
--- a/apps/web/src/app/[locale]/(space)/account/billing/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/account/billing/page.tsx
@@ -29,9 +29,9 @@ import {
} from "@/components/empty-state";
import { PayWallDialog } from "@/components/pay-wall-dialog";
import { Trans } from "@/components/trans";
-import { loadPaymentMethods, loadSubscription } from "@/data/space";
-import { FormattedDateTime } from "@/features/timezone/client/formatted-date-time";
+import { loadPaymentMethods, loadSubscription } from "@/features/spaces/data";
import { getTranslation } from "@/i18n/server";
+import { FormattedDateTime } from "@/lib/timezone/client/formatted-date-time";
import { isSelfHosted } from "@/utils/constants";
import {
SettingsContent,
diff --git a/apps/web/src/app/[locale]/(space)/account/profile/actions.ts b/apps/web/src/app/[locale]/(space)/account/profile/actions.ts
index e733fbb1d..4a2ed9339 100644
--- a/apps/web/src/app/[locale]/(space)/account/profile/actions.ts
+++ b/apps/web/src/app/[locale]/(space)/account/profile/actions.ts
@@ -2,8 +2,8 @@
import { subject } from "@casl/ability";
import { prisma } from "@rallly/database";
-import { authActionClient } from "@/features/safe-action/server";
import { AppError } from "@/lib/errors";
+import { authActionClient } from "@/lib/safe-action/server";
import { signOut } from "@/next-auth";
export const deleteCurrentUserAction = authActionClient
diff --git a/apps/web/src/app/[locale]/(space)/account/profile/delete-account-dialog.tsx b/apps/web/src/app/[locale]/(space)/account/profile/delete-account-dialog.tsx
index e05889369..30c843af3 100644
--- a/apps/web/src/app/[locale]/(space)/account/profile/delete-account-dialog.tsx
+++ b/apps/web/src/app/[locale]/(space)/account/profile/delete-account-dialog.tsx
@@ -15,8 +15,8 @@ import { Input } from "@rallly/ui/input";
import { useForm } from "react-hook-form";
import { Trans } from "@/components/trans";
-import { useSafeAction } from "@/features/safe-action/client";
import { useTranslation } from "@/i18n/client";
+import { useSafeAction } from "@/lib/safe-action/client";
import { deleteCurrentUserAction } from "./actions";
export function DeleteAccountDialog({
diff --git a/apps/web/src/app/[locale]/(space)/account/profile/profile-picture.tsx b/apps/web/src/app/[locale]/(space)/account/profile/profile-picture.tsx
index 0f05f0da0..a77cd3674 100644
--- a/apps/web/src/app/[locale]/(space)/account/profile/profile-picture.tsx
+++ b/apps/web/src/app/[locale]/(space)/account/profile/profile-picture.tsx
@@ -8,8 +8,8 @@ import { z } from "zod";
import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";
import { Trans } from "@/components/trans";
import { useUser } from "@/components/user-provider";
-import { useFeatureFlag } from "@/features/feature-flags/client";
import { useTranslation } from "@/i18n/client";
+import { useFeatureFlag } from "@/lib/feature-flags/client";
import { trpc } from "@/trpc/client";
const allowedMimeTypes = z.enum(["image/jpeg", "image/png"]);
diff --git a/apps/web/src/app/[locale]/(space)/components/sidebar/space-sidebar.tsx b/apps/web/src/app/[locale]/(space)/components/sidebar/space-sidebar.tsx
index 1203fb999..ae0cbc03d 100644
--- a/apps/web/src/app/[locale]/(space)/components/sidebar/space-sidebar.tsx
+++ b/apps/web/src/app/[locale]/(space)/components/sidebar/space-sidebar.tsx
@@ -15,11 +15,11 @@ import { SpaceSidebarMenu } from "@/app/[locale]/(space)/components/sidebar/spac
import { LogoLink } from "@/app/components/logo-link";
import { loadCurrentUserSpace } from "@/auth/data";
import { Trans } from "@/components/trans";
-import { loadSpaces } from "@/data/space";
import { FeedbackToggle } from "@/features/feedback/components/feedback-toggle";
import { SpaceDropdown } from "@/features/spaces/components/space-dropdown";
import { SpaceIcon } from "@/features/spaces/components/space-icon";
import { isSpacesEnabled } from "@/features/spaces/constants";
+import { loadSpaces } from "@/features/spaces/data";
import { UpgradeButton } from "../upgrade-button";
import { NavUser } from "./nav-user";
diff --git a/apps/web/src/app/[locale]/(space)/events/page.tsx b/apps/web/src/app/[locale]/(space)/events/page.tsx
index d63bf5bb8..923954b07 100644
--- a/apps/web/src/app/[locale]/(space)/events/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/events/page.tsx
@@ -17,8 +17,8 @@ import {
import { Pagination } from "@/components/pagination";
import { StackedList, StackedListItem } from "@/components/stacked-list";
import { Trans } from "@/components/trans";
-import { loadScheduledEvents } from "@/data/event";
import { ScheduledEventListItem } from "@/features/scheduled-event/components/scheduled-event-list";
+import { loadScheduledEvents } from "@/features/scheduled-event/data";
import type { Status } from "@/features/scheduled-event/schema";
import { statusSchema } from "@/features/scheduled-event/schema";
import { getTranslation } from "@/i18n/server";
diff --git a/apps/web/src/app/[locale]/(space)/layout.tsx b/apps/web/src/app/[locale]/(space)/layout.tsx
index 49387dc70..bdb302c4d 100644
--- a/apps/web/src/app/[locale]/(space)/layout.tsx
+++ b/apps/web/src/app/[locale]/(space)/layout.tsx
@@ -4,11 +4,11 @@ import Link from "next/link";
import { redirect } from "next/navigation";
import { loadCurrentUserSpace } from "@/auth/data";
import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";
-import { AbilityProvider } from "@/features/ability-manager/client";
import { LicenseLimitWarning } from "@/features/licensing/components/license-limit-warning";
import { CommandMenu } from "@/features/navigation/command-menu";
import { isUserOnboarded } from "@/features/setup/utils";
-import { TimezoneProvider } from "@/features/timezone/client/context";
+import { AbilityProvider } from "@/lib/ability-manager/client";
+import { TimezoneProvider } from "@/lib/timezone/client/context";
import { SpaceSidebar } from "./components/sidebar/space-sidebar";
import { SpaceSidebarProvider } from "./components/sidebar/space-sidebar-provider";
import { TopBar, TopBarLeft, TopBarRight } from "./components/top-bar";
diff --git a/apps/web/src/app/[locale]/(space)/members/page.tsx b/apps/web/src/app/[locale]/(space)/members/page.tsx
index 12d988134..2ee6e0bac 100644
--- a/apps/web/src/app/[locale]/(space)/members/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/members/page.tsx
@@ -13,8 +13,8 @@ import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";
import { Pagination } from "@/components/pagination";
import { StackedList, StackedListItem } from "@/components/stacked-list";
import { Trans } from "@/components/trans";
-import { loadMembers } from "@/data/space";
import { SpaceRole } from "@/features/spaces/components/space-role";
+import { loadMembers } from "@/features/spaces/data";
import { getTranslation } from "@/i18n/server";
import { searchParamsSchema } from "./schema";
diff --git a/apps/web/src/app/[locale]/(space)/page.tsx b/apps/web/src/app/[locale]/(space)/page.tsx
index 723f3ae36..7c225e5a8 100644
--- a/apps/web/src/app/[locale]/(space)/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/page.tsx
@@ -16,15 +16,15 @@ import {
PageHeader,
PageTitle,
} from "@/app/components/page-layout";
+import { loadCurrentUserSpace } from "@/auth/data";
import { Trans } from "@/components/trans";
import { IfCloudHosted } from "@/contexts/environment";
-import { loadUpcomingEventsCount } from "@/data/event";
-import { loadActiveSpace } from "@/data/space";
+import { loadUpcomingEventsCount } from "@/features/scheduled-event/data";
import { getTranslation } from "@/i18n/server";
import { FeedbackAlert } from "./feedback-alert";
async function loadData() {
- const space = await loadActiveSpace();
+ const { space } = await loadCurrentUserSpace();
const [livePollCount, upcomingEventCount] = await Promise.all([
prisma.poll.count({
diff --git a/apps/web/src/app/[locale]/(space)/polls/page.tsx b/apps/web/src/app/[locale]/(space)/polls/page.tsx
index 26bbdf5a3..6503169f9 100644
--- a/apps/web/src/app/[locale]/(space)/polls/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/polls/page.tsx
@@ -22,8 +22,8 @@ import {
} from "@/components/empty-state";
import { Pagination } from "@/components/pagination";
import { Trans } from "@/components/trans";
-import { loadPolls } from "@/data/poll";
import { PollList, PollListItem } from "@/features/poll/components/poll-list";
+import { loadPolls } from "@/features/poll/data";
import { getTranslation } from "@/i18n/server";
import { SearchInput } from "../../../components/search-input";
diff --git a/apps/web/src/app/[locale]/admin-setup/actions.ts b/apps/web/src/app/[locale]/admin-setup/actions.ts
index 717eefeea..108880ee3 100644
--- a/apps/web/src/app/[locale]/admin-setup/actions.ts
+++ b/apps/web/src/app/[locale]/admin-setup/actions.ts
@@ -3,8 +3,8 @@
import { subject } from "@casl/ability";
import { prisma } from "@rallly/database";
import { redirect } from "next/navigation";
-import { authActionClient } from "@/features/safe-action/server";
import { AppError } from "@/lib/errors";
+import { authActionClient } from "@/lib/safe-action/server";
export const makeMeAdminAction = authActionClient
.metadata({ actionName: "make_admin" })
diff --git a/apps/web/src/app/[locale]/admin-setup/make-me-admin-button.tsx b/apps/web/src/app/[locale]/admin-setup/make-me-admin-button.tsx
index 7fc937c39..978847e58 100644
--- a/apps/web/src/app/[locale]/admin-setup/make-me-admin-button.tsx
+++ b/apps/web/src/app/[locale]/admin-setup/make-me-admin-button.tsx
@@ -2,7 +2,7 @@
import { Button } from "@rallly/ui/button";
import { Trans } from "@/components/trans";
-import { useSafeAction } from "@/features/safe-action/client";
+import { useSafeAction } from "@/lib/safe-action/client";
import { makeMeAdminAction } from "./actions";
export function MakeMeAdminButton() {
diff --git a/apps/web/src/app/[locale]/admin-setup/page.tsx b/apps/web/src/app/[locale]/admin-setup/page.tsx
index 35eb1c44f..1bfb3f23c 100644
--- a/apps/web/src/app/[locale]/admin-setup/page.tsx
+++ b/apps/web/src/app/[locale]/admin-setup/page.tsx
@@ -13,8 +13,8 @@ import {
EmptyStateTitle,
} from "@/components/empty-state";
import { Trans } from "@/components/trans";
-import { defineAbilityFor } from "@/features/ability-manager";
import { getTranslation } from "@/i18n/server";
+import { defineAbilityFor } from "@/lib/ability-manager";
import { MakeMeAdminButton } from "./make-me-admin-button";
export default async function AdminSetupPage() {
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 50a6c9ba5..dfeaeb3bf 100644
--- a/apps/web/src/app/[locale]/control-panel/license/page.tsx
+++ b/apps/web/src/app/[locale]/control-panel/license/page.tsx
@@ -26,9 +26,9 @@ import {
FullWidthLayoutTitle,
} from "@/components/full-width-layout";
import { Trans } from "@/components/trans";
-import { loadInstanceLicense } from "@/data/instance-license";
import { LicenseKeyForm } from "@/features/licensing/components/license-key-form";
import { RemoveLicenseButton } from "@/features/licensing/components/remove-license-button";
+import { loadInstanceLicense } from "@/features/licensing/data";
import { getTranslation } from "@/i18n/server";
async function loadData() {
diff --git a/apps/web/src/app/[locale]/control-panel/page.tsx b/apps/web/src/app/[locale]/control-panel/page.tsx
index 50e840e48..eb6a873ed 100644
--- a/apps/web/src/app/[locale]/control-panel/page.tsx
+++ b/apps/web/src/app/[locale]/control-panel/page.tsx
@@ -20,7 +20,7 @@ import {
FullWidthLayoutTitle,
} from "@/components/full-width-layout";
import { Trans } from "@/components/trans";
-import { loadInstanceLicense } from "@/data/instance-license";
+import { loadInstanceLicense } from "@/features/licensing/data";
async function loadData() {
const [userCount, license] = await Promise.all([
diff --git a/apps/web/src/app/[locale]/control-panel/settings/actions.ts b/apps/web/src/app/[locale]/control-panel/settings/actions.ts
index f8317b807..92a6aab48 100644
--- a/apps/web/src/app/[locale]/control-panel/settings/actions.ts
+++ b/apps/web/src/app/[locale]/control-panel/settings/actions.ts
@@ -4,7 +4,7 @@ import { prisma } from "@rallly/database";
import { revalidateTag } from "next/cache";
import { instanceSettingsTag } from "@/features/instance-settings/constants";
import { instanceSettingsSchema } from "@/features/instance-settings/schema";
-import { adminActionClient } from "@/features/safe-action/server";
+import { adminActionClient } from "@/lib/safe-action/server";
export const updateInstanceSettingsAction = adminActionClient
.metadata({
diff --git a/apps/web/src/app/[locale]/control-panel/settings/instance-settings-form.tsx b/apps/web/src/app/[locale]/control-panel/settings/instance-settings-form.tsx
index 5ebbe41f1..8f4d169aa 100644
--- a/apps/web/src/app/[locale]/control-panel/settings/instance-settings-form.tsx
+++ b/apps/web/src/app/[locale]/control-panel/settings/instance-settings-form.tsx
@@ -28,8 +28,8 @@ import {
import { Trans } from "@/components/trans";
import type { InstanceSettings } from "@/features/instance-settings/schema";
import { instanceSettingsSchema } from "@/features/instance-settings/schema";
-import { useSafeAction } from "@/features/safe-action/client";
import { useTranslation } from "@/i18n/client";
+import { useSafeAction } from "@/lib/safe-action/client";
import { updateInstanceSettingsAction } from "./actions";
export function InstanceSettingsForm({
diff --git a/apps/web/src/app/[locale]/control-panel/users/dialogs/delete-user-dialog.tsx b/apps/web/src/app/[locale]/control-panel/users/dialogs/delete-user-dialog.tsx
index b04a95d45..493cc625e 100644
--- a/apps/web/src/app/[locale]/control-panel/users/dialogs/delete-user-dialog.tsx
+++ b/apps/web/src/app/[locale]/control-panel/users/dialogs/delete-user-dialog.tsx
@@ -23,9 +23,9 @@ import { Input } from "@rallly/ui/input";
import { useForm } from "react-hook-form";
import { z } from "zod";
import { Trans } from "@/components/trans";
-import { useSafeAction } from "@/features/safe-action/client";
import { deleteUserAction } from "@/features/user/actions";
import { useTranslation } from "@/i18n/client";
+import { useSafeAction } from "@/lib/safe-action/client";
const useSchema = (email: string) => {
const { t } = useTranslation();
diff --git a/apps/web/src/app/[locale]/control-panel/users/user-row.tsx b/apps/web/src/app/[locale]/control-panel/users/user-row.tsx
index 856268cb1..7bc10c7fa 100644
--- a/apps/web/src/app/[locale]/control-panel/users/user-row.tsx
+++ b/apps/web/src/app/[locale]/control-panel/users/user-row.tsx
@@ -21,9 +21,9 @@ import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";
import { StackedListItem } from "@/components/stacked-list";
import { Trans } from "@/components/trans";
import { useUser } from "@/components/user-provider";
-import { useSafeAction } from "@/features/safe-action/client";
import { changeRoleAction } from "@/features/user/actions";
import { userRoleSchema } from "@/features/user/schema";
+import { useSafeAction } from "@/lib/safe-action/client";
import { DeleteUserDialog } from "./dialogs/delete-user-dialog";
export function UserRow({
diff --git a/apps/web/src/app/[locale]/layout.tsx b/apps/web/src/app/[locale]/layout.tsx
index 5b3c3020c..f1fdcd909 100644
--- a/apps/web/src/app/[locale]/layout.tsx
+++ b/apps/web/src/app/[locale]/layout.tsx
@@ -12,12 +12,12 @@ import type React from "react";
import { TimeZoneChangeDetector } from "@/app/[locale]/timezone-change-detector";
import { UserProvider } from "@/components/user-provider";
import { PreferencesProvider } from "@/contexts/preferences";
-import { FeatureFlagsProvider } from "@/features/feature-flags/client";
-import { isStorageEnabled } from "@/features/storage";
-import { TimezoneProvider } from "@/features/timezone/client/context";
import { getUser } from "@/features/user/queries";
import { I18nProvider } from "@/i18n/client";
import { getLocale } from "@/i18n/server/get-locale";
+import { FeatureFlagsProvider } from "@/lib/feature-flags/client";
+import { isStorageEnabled } from "@/lib/storage";
+import { TimezoneProvider } from "@/lib/timezone/client/context";
import { auth } from "@/next-auth";
import { TRPCProvider } from "@/trpc/client/provider";
import { ConnectedDayjsProvider } from "@/utils/dayjs";
diff --git a/apps/web/src/app/api/auth/[...nextauth]/route.ts b/apps/web/src/app/api/auth/[...nextauth]/route.ts
index 7b2b2bcb8..76810f7cd 100644
--- a/apps/web/src/app/api/auth/[...nextauth]/route.ts
+++ b/apps/web/src/app/api/auth/[...nextauth]/route.ts
@@ -1,5 +1,5 @@
import type { NextRequest } from "next/server";
-import { rateLimit } from "@/features/rate-limit";
+import { rateLimit } from "@/lib/rate-limit";
import { handlers } from "@/next-auth";
import { withPosthog } from "@/utils/posthog";
diff --git a/apps/web/src/app/api/storage/[...key]/route.ts b/apps/web/src/app/api/storage/[...key]/route.ts
index d36cb025f..7b072f6d9 100644
--- a/apps/web/src/app/api/storage/[...key]/route.ts
+++ b/apps/web/src/app/api/storage/[...key]/route.ts
@@ -3,7 +3,7 @@ import type { NextRequest } from "next/server";
import { NextResponse } from "next/server";
import { env } from "@/env";
-import { getS3Client } from "@/features/storage/s3";
+import { getS3Client } from "@/lib/storage/s3";
async function getAvatar(key: string) {
const s3Client = getS3Client();
diff --git a/apps/web/src/auth/data.ts b/apps/web/src/auth/data.ts
index a732e2626..4c92c8b51 100644
--- a/apps/web/src/auth/data.ts
+++ b/apps/web/src/auth/data.ts
@@ -3,8 +3,8 @@ import "server-only";
import { prisma } from "@rallly/database";
import { notFound, redirect } from "next/navigation";
import { cache } from "react";
-import { createSpaceDTO } from "@/data/space";
-import { createUserDTO } from "@/data/user";
+import { createSpaceDTO } from "@/features/spaces/data";
+import { createUserDTO } from "@/features/user/data";
import { AppError } from "@/lib/errors";
import { auth } from "@/next-auth";
diff --git a/apps/web/src/auth/helpers/merge-user.ts b/apps/web/src/auth/helpers/merge-user.ts
index 3716c669f..d57f97f9d 100644
--- a/apps/web/src/auth/helpers/merge-user.ts
+++ b/apps/web/src/auth/helpers/merge-user.ts
@@ -2,7 +2,7 @@ import { accessibleBy } from "@casl/prisma";
import { prisma } from "@rallly/database";
import { posthog } from "@rallly/posthog/server";
import * as Sentry from "@sentry/nextjs";
-import { defineAbilityFor } from "@/features/ability-manager";
+import { defineAbilityFor } from "@/lib/ability-manager";
const getActiveSpaceForUser = async ({ userId }: { userId: string }) => {
const user = await prisma.user.findUnique({
diff --git a/apps/web/src/auth/queries.ts b/apps/web/src/auth/queries.ts
index de581cd45..59ffea18b 100644
--- a/apps/web/src/auth/queries.ts
+++ b/apps/web/src/auth/queries.ts
@@ -1,6 +1,6 @@
import { redirect } from "next/navigation";
-import { defineAbilityFor } from "@/features/ability-manager";
import { getUser } from "@/features/user/queries";
+import { defineAbilityFor } from "@/lib/ability-manager";
import { auth } from "@/next-auth";
export const requireUserAbility = async () => {
diff --git a/apps/web/src/components/new-participant-modal.tsx b/apps/web/src/components/new-participant-modal.tsx
index a44b416a1..a2efbc71b 100644
--- a/apps/web/src/components/new-participant-modal.tsx
+++ b/apps/web/src/components/new-participant-modal.tsx
@@ -11,8 +11,8 @@ import { useForm } from "react-hook-form";
import z from "zod";
import { usePoll } from "@/contexts/poll";
-import { useTimezone } from "@/features/timezone";
import { useTranslation } from "@/i18n/client";
+import { useTimezone } from "@/lib/timezone/client/context";
import { useAddParticipantMutation } from "./poll/mutations";
import VoteIcon from "./poll/vote-icon";
import { useUser } from "./user-provider";
diff --git a/apps/web/src/features/feedback/actions.ts b/apps/web/src/features/feedback/actions.ts
index 06f0721db..64bd59bbd 100644
--- a/apps/web/src/features/feedback/actions.ts
+++ b/apps/web/src/features/feedback/actions.ts
@@ -4,7 +4,7 @@ import { feedbackSchema } from "@/features/feedback/schema";
import {
authActionClient,
createRateLimitMiddleware,
-} from "@/features/safe-action/server";
+} from "@/lib/safe-action/server";
import { getEmailClient } from "@/utils/emails";
export const submitFeedbackAction = authActionClient
diff --git a/apps/web/src/features/feedback/components/feedback-toggle.tsx b/apps/web/src/features/feedback/components/feedback-toggle.tsx
index add09a8cf..1bf74a39c 100644
--- a/apps/web/src/features/feedback/components/feedback-toggle.tsx
+++ b/apps/web/src/features/feedback/components/feedback-toggle.tsx
@@ -24,7 +24,7 @@ import { useForm } from "react-hook-form";
import { Trans } from "@/components/trans";
-import { useSafeAction } from "@/features/safe-action/client";
+import { useSafeAction } from "@/lib/safe-action/client";
import { isSelfHosted } from "@/utils/constants";
import { submitFeedbackAction } from "../actions";
import type { Feedback } from "../schema";
diff --git a/apps/web/src/features/licensing/actions.ts b/apps/web/src/features/licensing/actions.ts
index 88e1e1afb..ca0868538 100644
--- a/apps/web/src/features/licensing/actions.ts
+++ b/apps/web/src/features/licensing/actions.ts
@@ -1,7 +1,7 @@
"use server";
import { prisma } from "@rallly/database";
-import { adminActionClient } from "@/features/safe-action/server";
+import { adminActionClient } from "@/lib/safe-action/server";
export const removeInstanceLicenseAction = adminActionClient
.metadata({
diff --git a/apps/web/src/features/licensing/actions/validate-license.ts b/apps/web/src/features/licensing/actions/validate-license.ts
index 135466dc8..deeb50b10 100644
--- a/apps/web/src/features/licensing/actions/validate-license.ts
+++ b/apps/web/src/features/licensing/actions/validate-license.ts
@@ -1,7 +1,7 @@
"use server";
import { prisma } from "@rallly/database";
-import { rateLimit } from "@/features/rate-limit";
+import { rateLimit } from "@/lib/rate-limit";
import { licenseManager } from "../server";
export async function validateLicenseKey(key: string) {
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 72748acd6..a82a65628 100644
--- a/apps/web/src/features/licensing/components/license-limit-warning.tsx
+++ b/apps/web/src/features/licensing/components/license-limit-warning.tsx
@@ -1,6 +1,6 @@
import Link from "next/link";
import { Trans } from "@/components/trans";
-import { loadInstanceLicense } from "@/data/instance-license";
+import { loadInstanceLicense } from "@/features/licensing/data";
import { getUserCount } from "@/features/user/queries";
import { isSelfHosted } from "@/utils/constants";
diff --git a/apps/web/src/features/licensing/components/remove-license-button.tsx b/apps/web/src/features/licensing/components/remove-license-button.tsx
index dd55b5b25..1fece22eb 100644
--- a/apps/web/src/features/licensing/components/remove-license-button.tsx
+++ b/apps/web/src/features/licensing/components/remove-license-button.tsx
@@ -16,7 +16,7 @@ import { Icon } from "@rallly/ui/icon";
import { XIcon } from "lucide-react";
import { useTransition } from "react";
import { Trans } from "@/components/trans";
-import { useSafeAction } from "@/features/safe-action/client";
+import { useSafeAction } from "@/lib/safe-action/client";
import { removeInstanceLicenseAction } from "../actions";
export function RemoveLicenseButton() {
diff --git a/apps/web/src/data/instance-license.ts b/apps/web/src/features/licensing/data.ts
similarity index 100%
rename from apps/web/src/data/instance-license.ts
rename to apps/web/src/features/licensing/data.ts
diff --git a/apps/web/src/data/poll.ts b/apps/web/src/features/poll/data.ts
similarity index 95%
rename from apps/web/src/data/poll.ts
rename to apps/web/src/features/poll/data.ts
index 826ef9bbe..ffab1bcb9 100644
--- a/apps/web/src/data/poll.ts
+++ b/apps/web/src/features/poll/data.ts
@@ -1,7 +1,7 @@
import type { PollStatus, Prisma } from "@rallly/database";
import { prisma } from "@rallly/database";
import { cache } from "react";
-import { loadActiveSpace } from "@/data/space";
+import { loadCurrentUserSpace } from "@/auth/data";
type PollFilters = {
status?: PollStatus;
@@ -12,7 +12,7 @@ type PollFilters = {
export const loadPolls = cache(
async ({ status, page = 1, pageSize = 10, q }: PollFilters) => {
- const space = await loadActiveSpace();
+ const { space } = await loadCurrentUserSpace();
// Build the where clause based on filters
const where: Prisma.PollWhereInput = {
diff --git a/apps/web/src/features/scheduled-event/actions.ts b/apps/web/src/features/scheduled-event/actions.ts
index 92318642e..8f59794d0 100644
--- a/apps/web/src/features/scheduled-event/actions.ts
+++ b/apps/web/src/features/scheduled-event/actions.ts
@@ -2,8 +2,8 @@
import { subject } from "@casl/ability";
import { prisma } from "@rallly/database";
import { z } from "zod";
-import { spaceActionClient } from "@/features/safe-action/server";
import { AppError } from "@/lib/errors";
+import { spaceActionClient } from "@/lib/safe-action/server";
import { getEmailClient } from "@/utils/emails";
import { formatEventDateTime } from "./utils";
diff --git a/apps/web/src/features/scheduled-event/components/scheduled-event-list.tsx b/apps/web/src/features/scheduled-event/components/scheduled-event-list.tsx
index 9cd807f42..6c971a9e6 100644
--- a/apps/web/src/features/scheduled-event/components/scheduled-event-list.tsx
+++ b/apps/web/src/features/scheduled-event/components/scheduled-event-list.tsx
@@ -14,8 +14,8 @@ import { MoreHorizontalIcon, XIcon } from "lucide-react";
import { ParticipantAvatarBar } from "@/components/participant-avatar-bar";
import { StackedList } from "@/components/stacked-list";
import { Trans } from "@/components/trans";
-import { useSafeAction } from "@/features/safe-action/client";
-import { FormattedDateTime } from "@/features/timezone/client/formatted-date-time";
+import { useSafeAction } from "@/lib/safe-action/client";
+import { FormattedDateTime } from "@/lib/timezone/client/formatted-date-time";
import { cancelEventAction } from "../actions";
export const ScheduledEventList = StackedList;
diff --git a/apps/web/src/data/event.ts b/apps/web/src/features/scheduled-event/data.ts
similarity index 93%
rename from apps/web/src/data/event.ts
rename to apps/web/src/features/scheduled-event/data.ts
index fd6086e24..2561085f9 100644
--- a/apps/web/src/data/event.ts
+++ b/apps/web/src/features/scheduled-event/data.ts
@@ -3,8 +3,8 @@ import { prisma } from "@rallly/database";
import dayjs from "dayjs";
import utc from "dayjs/plugin/utc";
import { cache } from "react";
-import { loadActiveSpace } from "@/data/space";
-import type { Status } from "../features/scheduled-event/schema";
+import { loadCurrentUserSpace } from "@/auth/data";
+import type { Status } from "./schema";
dayjs.extend(utc);
@@ -62,7 +62,7 @@ export const loadScheduledEvents = cache(
page?: number;
pageSize?: number;
}) => {
- const space = await loadActiveSpace();
+ const { space } = await loadCurrentUserSpace();
const where = getEventsWhereInput({
spaceId: space.id,
status,
@@ -120,7 +120,7 @@ export const loadScheduledEvents = cache(
);
export const loadUpcomingEventsCount = cache(async () => {
- const space = await loadActiveSpace();
+ const { space } = await loadCurrentUserSpace();
return prisma.scheduledEvent.count({
where: getEventsWhereInput({
spaceId: space.id,
diff --git a/apps/web/src/features/setup/actions.ts b/apps/web/src/features/setup/actions.ts
index 428e15aa9..10f30012d 100644
--- a/apps/web/src/features/setup/actions.ts
+++ b/apps/web/src/features/setup/actions.ts
@@ -2,7 +2,7 @@
import { prisma } from "@rallly/database";
import { redirect } from "next/navigation";
-import { authActionClient } from "@/features/safe-action/server";
+import { authActionClient } from "@/lib/safe-action/server";
import { setupSchema } from "./schema";
export const completeSetupAction = authActionClient
diff --git a/apps/web/src/features/setup/components/setup-form.tsx b/apps/web/src/features/setup/components/setup-form.tsx
index 43a4761b3..cbf18b766 100644
--- a/apps/web/src/features/setup/components/setup-form.tsx
+++ b/apps/web/src/features/setup/components/setup-form.tsx
@@ -16,9 +16,9 @@ import { useForm } from "react-hook-form";
import { LanguageSelect } from "@/components/poll/language-selector";
import { TimeZoneSelect } from "@/components/time-zone-picker/time-zone-select";
import { Trans } from "@/components/trans";
-import { useSafeAction } from "@/features/safe-action/client";
-import { useTimezone } from "@/features/timezone";
import { useTranslation } from "@/i18n/client";
+import { useSafeAction } from "@/lib/safe-action/client";
+import { useTimezone } from "@/lib/timezone";
import { completeSetupAction } from "../actions";
import type { SetupFormValues } from "../schema";
diff --git a/apps/web/src/features/spaces/actions.ts b/apps/web/src/features/spaces/actions.ts
index 80d960380..ad7aee144 100644
--- a/apps/web/src/features/spaces/actions.ts
+++ b/apps/web/src/features/spaces/actions.ts
@@ -4,12 +4,9 @@ import { subject } from "@casl/ability";
import { accessibleBy } from "@casl/prisma";
import { prisma } from "@rallly/database";
import { z } from "zod";
-import {
- authActionClient,
- spaceActionClient,
-} from "@/features/safe-action/server";
import { spaceMemberRoleSchema } from "@/features/spaces/schema";
import { AppError } from "@/lib/errors";
+import { authActionClient, spaceActionClient } from "@/lib/safe-action/server";
export const setActiveSpaceAction = authActionClient
.inputSchema(
@@ -145,7 +142,7 @@ export const inviteMemberAction = spaceActionClient
role: spaceMemberRoleSchema,
}),
)
- .action(async ({ ctx, parsedInput }) => {
+ .action(async ({ ctx }) => {
if (ctx.ability.cannot("invite", "SpaceMember")) {
throw new AppError({
code: "FORBIDDEN",
diff --git a/apps/web/src/features/spaces/components/new-space-dialog.tsx b/apps/web/src/features/spaces/components/new-space-dialog.tsx
index 2eaa5f89e..a6b689fed 100644
--- a/apps/web/src/features/spaces/components/new-space-dialog.tsx
+++ b/apps/web/src/features/spaces/components/new-space-dialog.tsx
@@ -23,9 +23,9 @@ import { toast } from "@rallly/ui/sonner";
import { useForm } from "react-hook-form";
import { z } from "zod";
import { Trans } from "@/components/trans";
-import { useSafeAction } from "@/features/safe-action/client";
import { createSpaceAction } from "@/features/spaces/actions";
import { useTranslation } from "@/i18n/client";
+import { useSafeAction } from "@/lib/safe-action/client";
const newSpaceFormSchema = z.object({
name: z.string().min(1).max(100),
diff --git a/apps/web/src/features/spaces/components/space-dropdown.tsx b/apps/web/src/features/spaces/components/space-dropdown.tsx
index fa345af1b..b32a2a947 100644
--- a/apps/web/src/features/spaces/components/space-dropdown.tsx
+++ b/apps/web/src/features/spaces/components/space-dropdown.tsx
@@ -16,8 +16,8 @@ import { CirclePlusIcon, SettingsIcon } from "lucide-react";
import Link from "next/link";
import { ProBadge } from "@/components/pro-badge";
import { Trans } from "@/components/trans";
-import { useSafeAction } from "@/features/safe-action/client";
import { setActiveSpaceAction } from "@/features/spaces/actions";
+import { useSafeAction } from "@/lib/safe-action/client";
import { NewSpaceDialog } from "./new-space-dialog";
import { SpaceIcon } from "./space-icon";
diff --git a/apps/web/src/data/space.ts b/apps/web/src/features/spaces/data.ts
similarity index 78%
rename from apps/web/src/data/space.ts
rename to apps/web/src/features/spaces/data.ts
index 9fc28252f..5377a1fb8 100644
--- a/apps/web/src/data/space.ts
+++ b/apps/web/src/features/spaces/data.ts
@@ -5,10 +5,10 @@ import type {
} from "@rallly/database";
import { prisma } from "@rallly/database";
import { cache } from "react";
-import { loadCurrentUser } from "@/auth/data";
-import { defineAbilityFor } from "@/features/ability-manager";
+import { loadCurrentUser, loadCurrentUserSpace } from "@/auth/data";
import type { SpaceMemberRole } from "@/features/spaces/schema";
import { fromDBRole, toDBRole } from "@/features/spaces/utils";
+import { defineAbilityFor } from "@/lib/ability-manager";
import { AppError } from "@/lib/errors";
import { isSelfHosted } from "@/utils/constants";
@@ -113,36 +113,8 @@ export const loadSpace = cache(async ({ id }: { id: string }) => {
return space;
});
-const loadDefaultSpace = cache(async () => {
- const user = await loadCurrentUser();
- const spaces = await loadSpaces();
- const defaultSpace = spaces.find((space) => space.ownerId === user.id);
-
- if (!defaultSpace) {
- throw new Error(`User ${user.id} does not have access to any spaces`);
- }
-
- return defaultSpace;
-});
-
-export const loadActiveSpace = cache(async () => {
- const user = await loadCurrentUser();
-
- if (user.activeSpaceId) {
- try {
- return await loadSpace({ id: user.activeSpaceId });
- } catch {
- console.warn(
- `User ${user.id} has an active space ID ${user.activeSpaceId} that does not exist or is no longer accessible`,
- );
- }
- }
-
- return await loadDefaultSpace();
-});
-
export const loadSubscription = cache(async () => {
- const space = await loadActiveSpace();
+ const { space } = await loadCurrentUserSpace();
const subscription = await prisma.subscription.findUnique({
where: {
spaceId: space.id,
@@ -198,7 +170,7 @@ export const loadMembers = cache(
q?: string;
role?: "all" | SpaceMemberRole;
}) => {
- const space = await loadActiveSpace();
+ const { space } = await loadCurrentUserSpace();
const whereClause: Prisma.SpaceMemberWhereInput = {
spaceId: space.id,
@@ -269,32 +241,3 @@ export const loadMembers = cache(
};
},
);
-
-export const getDefaultSpace = async (userId: string) => {
- const space = await prisma.space.findFirst({
- where: {
- ownerId: userId,
- },
- select: {
- id: true,
- name: true,
- ownerId: true,
- subscription: {
- select: {
- active: true,
- },
- },
- members: {
- where: {
- userId,
- },
- select: {
- role: true,
- userId: true,
- },
- },
- },
- });
-
- return space;
-};
diff --git a/apps/web/src/features/user/actions.ts b/apps/web/src/features/user/actions.ts
index faf28d350..f2a85ad3a 100644
--- a/apps/web/src/features/user/actions.ts
+++ b/apps/web/src/features/user/actions.ts
@@ -2,8 +2,8 @@
import { subject } from "@casl/ability";
import { prisma } from "@rallly/database";
import { z } from "zod";
-import { adminActionClient } from "@/features/safe-action/server";
import { AppError } from "@/lib/errors";
+import { adminActionClient } from "@/lib/safe-action/server";
export const changeRoleAction = adminActionClient
.metadata({ actionName: "change_role" })
diff --git a/apps/web/src/data/user.ts b/apps/web/src/features/user/data.ts
similarity index 100%
rename from apps/web/src/data/user.ts
rename to apps/web/src/features/user/data.ts
diff --git a/apps/web/src/features/ability-manager/ability.ts b/apps/web/src/lib/ability-manager/ability.ts
similarity index 99%
rename from apps/web/src/features/ability-manager/ability.ts
rename to apps/web/src/lib/ability-manager/ability.ts
index 458c7f0b3..8082d664c 100644
--- a/apps/web/src/features/ability-manager/ability.ts
+++ b/apps/web/src/lib/ability-manager/ability.ts
@@ -150,6 +150,7 @@ function defineUserRules(
) {
const { can } = builder;
+ // Initial admin setup
if (user.email === process.env.INITIAL_ADMIN_EMAIL) {
can("update", "User", ["role"], { id: user.id });
}
diff --git a/apps/web/src/features/ability-manager/client.tsx b/apps/web/src/lib/ability-manager/client.tsx
similarity index 86%
rename from apps/web/src/features/ability-manager/client.tsx
rename to apps/web/src/lib/ability-manager/client.tsx
index ee10559ac..967663640 100644
--- a/apps/web/src/features/ability-manager/client.tsx
+++ b/apps/web/src/lib/ability-manager/client.tsx
@@ -5,8 +5,8 @@ import type {
AppAbility,
AppContext,
UserContext,
-} from "@/features/ability-manager/ability";
-import { defineAbilityFor } from "@/features/ability-manager/ability";
+} from "@/lib/ability-manager/ability";
+import { defineAbilityFor } from "@/lib/ability-manager/ability";
export const AbilityContext = React.createContext<AppAbility>({} as AppAbility);
export const Can = createContextualCan(AbilityContext.Consumer);
diff --git a/apps/web/src/features/ability-manager/index.ts b/apps/web/src/lib/ability-manager/index.ts
similarity index 100%
rename from apps/web/src/features/ability-manager/index.ts
rename to apps/web/src/lib/ability-manager/index.ts
diff --git a/apps/web/src/features/feature-flags/client.tsx b/apps/web/src/lib/feature-flags/client.tsx
similarity index 100%
rename from apps/web/src/features/feature-flags/client.tsx
rename to apps/web/src/lib/feature-flags/client.tsx
diff --git a/apps/web/src/features/feature-flags/types.ts b/apps/web/src/lib/feature-flags/types.ts
similarity index 100%
rename from apps/web/src/features/feature-flags/types.ts
rename to apps/web/src/lib/feature-flags/types.ts
diff --git a/apps/web/src/features/rate-limit/constants.ts b/apps/web/src/lib/rate-limit/constants.ts
similarity index 100%
rename from apps/web/src/features/rate-limit/constants.ts
rename to apps/web/src/lib/rate-limit/constants.ts
diff --git a/apps/web/src/features/rate-limit/index.ts b/apps/web/src/lib/rate-limit/index.ts
similarity index 100%
rename from apps/web/src/features/rate-limit/index.ts
rename to apps/web/src/lib/rate-limit/index.ts
diff --git a/apps/web/src/features/safe-action/client.ts b/apps/web/src/lib/safe-action/client.ts
similarity index 100%
rename from apps/web/src/features/safe-action/client.ts
rename to apps/web/src/lib/safe-action/client.ts
diff --git a/apps/web/src/features/safe-action/server.ts b/apps/web/src/lib/safe-action/server.ts
similarity index 94%
rename from apps/web/src/features/safe-action/server.ts
rename to apps/web/src/lib/safe-action/server.ts
index bb457c48b..39277a1ff 100644
--- a/apps/web/src/features/safe-action/server.ts
+++ b/apps/web/src/lib/safe-action/server.ts
@@ -5,10 +5,10 @@ import { waitUntil } from "@vercel/functions";
import { createMiddleware, createSafeActionClient } from "next-safe-action";
import z from "zod";
import { getCurrentUser, getCurrentUserSpace } from "@/auth/data";
-import { defineAbilityFor } from "@/features/ability-manager";
-import type { Duration } from "@/features/rate-limit";
-import { rateLimit } from "@/features/rate-limit";
+import { defineAbilityFor } from "@/lib/ability-manager";
import { AppError } from "@/lib/errors";
+import type { Duration } from "@/lib/rate-limit";
+import { rateLimit } from "@/lib/rate-limit";
const posthogMiddleware = createMiddleware<{
ctx: { user: { id: string } };
diff --git a/apps/web/src/features/storage/index.ts b/apps/web/src/lib/storage/index.ts
similarity index 100%
rename from apps/web/src/features/storage/index.ts
rename to apps/web/src/lib/storage/index.ts
diff --git a/apps/web/src/features/storage/s3.ts b/apps/web/src/lib/storage/s3.ts
similarity index 100%
rename from apps/web/src/features/storage/s3.ts
rename to apps/web/src/lib/storage/s3.ts
diff --git a/apps/web/src/features/timezone/client/calendar-date.tsx b/apps/web/src/lib/timezone/client/calendar-date.tsx
similarity index 93%
rename from apps/web/src/features/timezone/client/calendar-date.tsx
rename to apps/web/src/lib/timezone/client/calendar-date.tsx
index dc024539a..fb70d8634 100644
--- a/apps/web/src/features/timezone/client/calendar-date.tsx
+++ b/apps/web/src/lib/timezone/client/calendar-date.tsx
@@ -4,9 +4,8 @@ import dayjs from "dayjs";
import calendar from "dayjs/plugin/calendar";
import localizedFormat from "dayjs/plugin/localizedFormat";
import timezone from "dayjs/plugin/timezone";
-
-import { useTimezone } from "@/features/timezone/client/context";
import { useTranslation } from "@/i18n/client";
+import { useTimezone } from "@/lib/timezone/client/context";
dayjs.extend(calendar);
dayjs.extend(localizedFormat);
diff --git a/apps/web/src/features/timezone/client/context.tsx b/apps/web/src/lib/timezone/client/context.tsx
similarity index 100%
rename from apps/web/src/features/timezone/client/context.tsx
rename to apps/web/src/lib/timezone/client/context.tsx
diff --git a/apps/web/src/features/timezone/client/formatted-date-time.tsx b/apps/web/src/lib/timezone/client/formatted-date-time.tsx
similarity index 93%
rename from apps/web/src/features/timezone/client/formatted-date-time.tsx
rename to apps/web/src/lib/timezone/client/formatted-date-time.tsx
index 0fcabdd99..00d6a3028 100644
--- a/apps/web/src/features/timezone/client/formatted-date-time.tsx
+++ b/apps/web/src/lib/timezone/client/formatted-date-time.tsx
@@ -4,7 +4,7 @@ import type { ConfigType } from "dayjs";
import dayjs from "dayjs";
import * as React from "react";
-import { useFormattedDateTime } from "@/features/timezone/hooks/use-formatted-date-time";
+import { useFormattedDateTime } from "@/lib/timezone/hooks/use-formatted-date-time";
interface FormattedDateTimeProps extends React.HTMLAttributes<HTMLSpanElement> {
/** The date/time to format (Accepts Date, ISO string, Unix timestamp, Dayjs object). */
diff --git a/apps/web/src/features/timezone/formatted-date-time-server.tsx b/apps/web/src/lib/timezone/formatted-date-time-server.tsx
similarity index 100%
rename from apps/web/src/features/timezone/formatted-date-time-server.tsx
rename to apps/web/src/lib/timezone/formatted-date-time-server.tsx
diff --git a/apps/web/src/features/timezone/hooks/use-formatted-date-time.ts b/apps/web/src/lib/timezone/hooks/use-formatted-date-time.ts
similarity index 96%
rename from apps/web/src/features/timezone/hooks/use-formatted-date-time.ts
rename to apps/web/src/lib/timezone/hooks/use-formatted-date-time.ts
index 3d6041c54..1b83f075c 100644
--- a/apps/web/src/features/timezone/hooks/use-formatted-date-time.ts
+++ b/apps/web/src/lib/timezone/hooks/use-formatted-date-time.ts
@@ -1,7 +1,7 @@
import type { ConfigType } from "dayjs";
import dayjs from "dayjs";
-import { useTimezone } from "@/features/timezone/client/context";
+import { useTimezone } from "@/lib/timezone/client/context";
interface UseFormattedDateTimeOptions {
/** A dayjs format string (e.g., "YYYY-MM-DD HH:mm", "h:mm A"). Defaults to a locale-aware format. */
diff --git a/apps/web/src/features/timezone/index.ts b/apps/web/src/lib/timezone/index.ts
similarity index 100%
rename from apps/web/src/features/timezone/index.ts
rename to apps/web/src/lib/timezone/index.ts
diff --git a/apps/web/src/features/timezone/utils.ts b/apps/web/src/lib/timezone/utils.ts
similarity index 100%
rename from apps/web/src/features/timezone/utils.ts
rename to apps/web/src/lib/timezone/utils.ts
diff --git a/apps/web/src/trpc/routers/user.ts b/apps/web/src/trpc/routers/user.ts
index e9c13929d..8cb4b63f2 100644
--- a/apps/web/src/trpc/routers/user.ts
+++ b/apps/web/src/trpc/routers/user.ts
@@ -7,7 +7,7 @@ import { waitUntil } from "@vercel/functions";
import { z } from "zod";
import { env } from "@/env";
-import { getS3Client } from "@/features/storage/s3";
+import { getS3Client } from "@/lib/storage/s3";
import { createToken } from "@/utils/session";
import {