Skip to content

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

🚚 Rename space feature (#1855)

Luke Vella4c7e2eaad98b
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 a39b6f0de..50d3566df 100644
--- a/apps/web/src/app/[locale]/(space)/account/billing/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/account/billing/page.tsx
@@ -29,7 +29,7 @@ import {
} from "@/components/empty-state";
import { PayWallDialog } from "@/components/pay-wall-dialog";
import { Trans } from "@/components/trans";
-import { loadPaymentMethods, loadSubscription } from "@/features/spaces/data";
+import { loadPaymentMethods, loadSubscription } from "@/features/space/data";
import { getTranslation } from "@/i18n/server";
import { isFeatureEnabled } from "@/lib/feature-flags/server";
import { FormattedDateTime } from "@/lib/timezone/client/formatted-date-time";
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 ae0cbc03d..1c2cb1cf1 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
@@ -16,10 +16,10 @@ import { LogoLink } from "@/app/components/logo-link";
import { loadCurrentUserSpace } from "@/auth/data";
import { Trans } from "@/components/trans";
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 { SpaceDropdown } from "@/features/space/components/space-dropdown";
+import { SpaceIcon } from "@/features/space/components/space-icon";
+import { isSpacesEnabled } from "@/features/space/constants";
+import { loadSpaces } from "@/features/space/data";
import { UpgradeButton } from "../upgrade-button";
import { NavUser } from "./nav-user";
diff --git a/apps/web/src/app/[locale]/(space)/layout.tsx b/apps/web/src/app/[locale]/(space)/layout.tsx
index 73b3b4c62..65227c45e 100644
--- a/apps/web/src/app/[locale]/(space)/layout.tsx
+++ b/apps/web/src/app/[locale]/(space)/layout.tsx
@@ -7,7 +7,7 @@ import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";
import { LicenseLimitWarning } from "@/features/licensing/components/license-limit-warning";
import { CommandMenu } from "@/features/navigation/command-menu";
import { isUserOnboarded } from "@/features/setup/utils";
-import { SpaceProvider } from "@/features/spaces/client";
+import { SpaceProvider } from "@/features/space/client";
import { AbilityProvider } from "@/lib/ability-manager/client";
import { TimezoneProvider } from "@/lib/timezone/client/context";
import { SpaceSidebar } from "./components/sidebar/space-sidebar";
diff --git a/apps/web/src/app/[locale]/(space)/members/components/header.tsx b/apps/web/src/app/[locale]/(space)/members/components/header.tsx
index fb1816898..25f122580 100644
--- a/apps/web/src/app/[locale]/(space)/members/components/header.tsx
+++ b/apps/web/src/app/[locale]/(space)/members/components/header.tsx
@@ -14,7 +14,7 @@ import {
import { SearchInput } from "@/app/components/search-input";
import { PayWallDialog } from "@/components/pay-wall-dialog";
import { Trans } from "@/components/trans";
-import { useSpace } from "@/features/spaces/client";
+import { useSpace } from "@/features/space/client";
import { useTranslation } from "@/i18n/client";
import { useAbility } from "@/lib/ability-manager/client";
diff --git a/apps/web/src/app/[locale]/(space)/members/components/invite-member-dialog.tsx b/apps/web/src/app/[locale]/(space)/members/components/invite-member-dialog.tsx
index db0130d84..fa61933d1 100644
--- a/apps/web/src/app/[locale]/(space)/members/components/invite-member-dialog.tsx
+++ b/apps/web/src/app/[locale]/(space)/members/components/invite-member-dialog.tsx
@@ -30,9 +30,9 @@ import { toast } from "@rallly/ui/sonner";
import { useForm } from "react-hook-form";
import { z } from "zod";
import { Trans } from "@/components/trans";
-import { inviteMemberAction } from "@/features/spaces/actions";
-import { SpaceRole } from "@/features/spaces/components/space-role";
-import { spaceMemberRoleSchema } from "@/features/spaces/schema";
+import { inviteMemberAction } from "@/features/space/actions";
+import { SpaceRole } from "@/features/space/components/space-role";
+import { spaceMemberRoleSchema } from "@/features/space/schema";
import { useTranslation } from "@/i18n/client";
import { useSafeAction } from "@/lib/safe-action/client";
diff --git a/apps/web/src/app/[locale]/(space)/members/components/tabs.tsx b/apps/web/src/app/[locale]/(space)/members/components/tabs.tsx
index d4a193e51..22a49ed14 100644
--- a/apps/web/src/app/[locale]/(space)/members/components/tabs.tsx
+++ b/apps/web/src/app/[locale]/(space)/members/components/tabs.tsx
@@ -5,7 +5,7 @@ import {
PageTabsTrigger,
} from "@/app/components/page-tabs";
import { Trans } from "@/components/trans";
-import type { SpaceMemberRole } from "@/features/spaces/schema";
+import type { SpaceMemberRole } from "@/features/space/schema";
export const MembersTabs = ({
value = "all",
diff --git a/apps/web/src/app/[locale]/(space)/members/page.tsx b/apps/web/src/app/[locale]/(space)/members/page.tsx
index 2b6b06f5e..3a6471a56 100644
--- a/apps/web/src/app/[locale]/(space)/members/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/members/page.tsx
@@ -15,9 +15,9 @@ 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 { SpaceRole } from "@/features/spaces/components/space-role";
-import { isSpacesEnabled } from "@/features/spaces/constants";
-import { loadMembers } from "@/features/spaces/data";
+import { SpaceRole } from "@/features/space/components/space-role";
+import { isSpacesEnabled } from "@/features/space/constants";
+import { loadMembers } from "@/features/space/data";
import { getTranslation } from "@/i18n/server";
import { searchParamsSchema } from "./schema";
diff --git a/apps/web/src/app/[locale]/accept-invite/[inviteId]/components/accept-invite-button.tsx b/apps/web/src/app/[locale]/accept-invite/[inviteId]/components/accept-invite-button.tsx
index 8a9338965..1273e5afa 100644
--- a/apps/web/src/app/[locale]/accept-invite/[inviteId]/components/accept-invite-button.tsx
+++ b/apps/web/src/app/[locale]/accept-invite/[inviteId]/components/accept-invite-button.tsx
@@ -4,7 +4,7 @@ import { Button } from "@rallly/ui/button";
import { toast } from "@rallly/ui/sonner";
import { useRouter } from "next/navigation";
import { Trans } from "@/components/trans";
-import { acceptInviteAction } from "@/features/spaces/actions";
+import { acceptInviteAction } from "@/features/space/actions";
import { useTranslation } from "@/i18n/client";
import { useSafeAction } from "@/lib/safe-action/client";
diff --git a/apps/web/src/app/[locale]/accept-invite/[inviteId]/page.tsx b/apps/web/src/app/[locale]/accept-invite/[inviteId]/page.tsx
index f74400ddb..d26228e19 100644
--- a/apps/web/src/app/[locale]/accept-invite/[inviteId]/page.tsx
+++ b/apps/web/src/app/[locale]/accept-invite/[inviteId]/page.tsx
@@ -4,7 +4,7 @@ import { FullLogoLink } from "@/app/components/full-logo-link";
import { loadCurrentUser } from "@/auth/data";
import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";
import { Trans } from "@/components/trans";
-import { SpaceIcon } from "@/features/spaces/components/space-icon";
+import { SpaceIcon } from "@/features/space/components/space-icon";
import { getTranslation } from "@/i18n/server";
import { AcceptInviteButton } from "./components/accept-invite-button";
import { SignOutButton } from "./components/sign-out-button";
diff --git a/apps/web/src/auth/data.ts b/apps/web/src/auth/data.ts
index 7f8f5ca94..143cd46bc 100644
--- a/apps/web/src/auth/data.ts
+++ b/apps/web/src/auth/data.ts
@@ -4,7 +4,7 @@ import { prisma } from "@rallly/database";
import { headers } from "next/headers";
import { notFound, redirect } from "next/navigation";
import { cache } from "react";
-import { createSpaceDTO } from "@/features/spaces/data";
+import { createSpaceDTO } from "@/features/space/data";
import { createUserDTO } from "@/features/user/data";
import { AppError } from "@/lib/errors";
import { auth } from "@/next-auth";
diff --git a/apps/web/src/features/spaces/ability.ts b/apps/web/src/features/space/ability.ts
similarity index 100%
rename from apps/web/src/features/spaces/ability.ts
rename to apps/web/src/features/space/ability.ts
diff --git a/apps/web/src/features/spaces/actions.ts b/apps/web/src/features/space/actions.ts
similarity index 98%
rename from apps/web/src/features/spaces/actions.ts
rename to apps/web/src/features/space/actions.ts
index 06d49e7a7..8bcbf4190 100644
--- a/apps/web/src/features/spaces/actions.ts
+++ b/apps/web/src/features/space/actions.ts
@@ -5,8 +5,8 @@ import { accessibleBy } from "@casl/prisma";
import { prisma } from "@rallly/database";
import { absoluteUrl } from "@rallly/utils/absolute-url";
import { z } from "zod";
-import { spaceMemberRoleSchema } from "@/features/spaces/schema";
-import { toDBRole } from "@/features/spaces/utils";
+import { spaceMemberRoleSchema } from "@/features/space/schema";
+import { toDBRole } from "@/features/space/utils";
import { setActiveSpace } from "@/features/user/mutations";
import { AppError } from "@/lib/errors";
import { authActionClient, spaceActionClient } from "@/lib/safe-action/server";
diff --git a/apps/web/src/features/spaces/client.tsx b/apps/web/src/features/space/client.tsx
similarity index 93%
rename from apps/web/src/features/spaces/client.tsx
rename to apps/web/src/features/space/client.tsx
index a7cf30ba7..2a7bebb24 100644
--- a/apps/web/src/features/spaces/client.tsx
+++ b/apps/web/src/features/space/client.tsx
@@ -1,7 +1,7 @@
"use client";
import React from "react";
-import type { SpaceDTO } from "@/features/spaces/data";
+import type { SpaceDTO } from "@/features/space/data";
import type { SpaceAbility } from "./ability";
import { defineAbilityForSpace } from "./ability";
diff --git a/apps/web/src/features/spaces/components/create-space-dialog.tsx b/apps/web/src/features/space/components/create-space-dialog.tsx
similarity index 98%
rename from apps/web/src/features/spaces/components/create-space-dialog.tsx
rename to apps/web/src/features/space/components/create-space-dialog.tsx
index d090c780f..5e9a2a258 100644
--- a/apps/web/src/features/spaces/components/create-space-dialog.tsx
+++ b/apps/web/src/features/space/components/create-space-dialog.tsx
@@ -23,7 +23,7 @@ import { toast } from "@rallly/ui/sonner";
import { useForm } from "react-hook-form";
import { z } from "zod";
import { Trans } from "@/components/trans";
-import { createSpaceAction } from "@/features/spaces/actions";
+import { createSpaceAction } from "@/features/space/actions";
import { useTranslation } from "@/i18n/client";
import { useSafeAction } from "@/lib/safe-action/client";
diff --git a/apps/web/src/features/spaces/components/space-dropdown.tsx b/apps/web/src/features/space/components/space-dropdown.tsx
similarity index 97%
rename from apps/web/src/features/spaces/components/space-dropdown.tsx
rename to apps/web/src/features/space/components/space-dropdown.tsx
index eb92c3c77..10e81acab 100644
--- a/apps/web/src/features/spaces/components/space-dropdown.tsx
+++ b/apps/web/src/features/space/components/space-dropdown.tsx
@@ -16,7 +16,7 @@ import { CirclePlusIcon, SettingsIcon } from "lucide-react";
import Link from "next/link";
import { ProBadge } from "@/components/pro-badge";
import { Trans } from "@/components/trans";
-import { setActiveSpaceAction } from "@/features/spaces/actions";
+import { setActiveSpaceAction } from "@/features/space/actions";
import { useSafeAction } from "@/lib/safe-action/client";
import { CreateSpaceDialog } from "./create-space-dialog";
import { SpaceIcon } from "./space-icon";
diff --git a/apps/web/src/features/spaces/components/space-icon.tsx b/apps/web/src/features/space/components/space-icon.tsx
similarity index 100%
rename from apps/web/src/features/spaces/components/space-icon.tsx
rename to apps/web/src/features/space/components/space-icon.tsx
diff --git a/apps/web/src/features/spaces/components/space-role.tsx b/apps/web/src/features/space/components/space-role.tsx
similarity index 82%
rename from apps/web/src/features/spaces/components/space-role.tsx
rename to apps/web/src/features/space/components/space-role.tsx
index e330bb3fe..e1ac816f1 100644
--- a/apps/web/src/features/spaces/components/space-role.tsx
+++ b/apps/web/src/features/space/components/space-role.tsx
@@ -1,7 +1,7 @@
"use client";
import { Trans } from "@/components/trans";
-import type { SpaceMemberRole } from "@/features/spaces/schema";
+import type { SpaceMemberRole } from "@/features/space/schema";
export const SpaceRole = ({ role }: { role: SpaceMemberRole }) => {
switch (role) {
diff --git a/apps/web/src/features/spaces/constants.ts b/apps/web/src/features/space/constants.ts
similarity index 100%
rename from apps/web/src/features/spaces/constants.ts
rename to apps/web/src/features/space/constants.ts
diff --git a/apps/web/src/features/spaces/data.ts b/apps/web/src/features/space/data.ts
similarity index 97%
rename from apps/web/src/features/spaces/data.ts
rename to apps/web/src/features/space/data.ts
index e2492d4dd..7838d03e7 100644
--- a/apps/web/src/features/spaces/data.ts
+++ b/apps/web/src/features/space/data.ts
@@ -6,8 +6,8 @@ import type {
import { prisma } from "@rallly/database";
import { cache } from "react";
import { loadCurrentUser, loadCurrentUserSpace } from "@/auth/data";
-import type { SpaceMemberRole } from "@/features/spaces/schema";
-import { fromDBRole, toDBRole } from "@/features/spaces/utils";
+import type { SpaceMemberRole } from "@/features/space/schema";
+import { fromDBRole, toDBRole } from "@/features/space/utils";
import { defineAbilityFor } from "@/lib/ability-manager";
import { AppError } from "@/lib/errors";
import { isSelfHosted } from "@/utils/constants";
diff --git a/apps/web/src/features/spaces/mutations.ts b/apps/web/src/features/space/mutations.ts
similarity index 100%
rename from apps/web/src/features/spaces/mutations.ts
rename to apps/web/src/features/space/mutations.ts
diff --git a/apps/web/src/features/spaces/schema.ts b/apps/web/src/features/space/schema.ts
similarity index 100%
rename from apps/web/src/features/spaces/schema.ts
rename to apps/web/src/features/space/schema.ts
diff --git a/apps/web/src/features/spaces/utils.ts b/apps/web/src/features/space/utils.ts
similarity index 87%
rename from apps/web/src/features/spaces/utils.ts
rename to apps/web/src/features/space/utils.ts
index 4667c8385..17c5583d5 100644
--- a/apps/web/src/features/spaces/utils.ts
+++ b/apps/web/src/features/space/utils.ts
@@ -1,5 +1,5 @@
import type { SpaceMemberRole as PrismaSpaceMemberRole } from "@prisma/client";
-import type { SpaceMemberRole } from "@/features/spaces/schema";
+import type { SpaceMemberRole } from "@/features/space/schema";
export const toDBRole = (role: SpaceMemberRole): PrismaSpaceMemberRole => {
switch (role) {