Skip to content

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

Move members from settings to the main navigation (#2923)

Luke Velladc260e5efe1f
diff --git a/apps/web/public/locales/en/app.json b/apps/web/public/locales/en/app.json
index 12f824444..47cc4f30c 100644
--- a/apps/web/public/locales/en/app.json
+++ b/apps/web/public/locales/en/app.json
@@ -442,7 +442,6 @@
"memberInvitedBy": "Invited by {inviterName}",
"memberRoleDescription": "Can create and manage all scheduling tools in this space",
"members": "Members",
- "membersDescription": "Members have access to your space",
"membersInactiveAlertDescription": "These members lost access when this space's Pro subscription ended. Their seats are kept and access is restored when the space is upgraded again.",
"membersInactiveAlertTitle": "Members are inactive",
"membersSettingsDescription": "Manage space members, invite new users, and control access permissions.",
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/dashboard-home.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/dashboard-home.tsx
index c6b0c31bc..f15ba4de2 100644
--- a/apps/web/src/app/[locale]/(space)/(dashboard)/dashboard-home.tsx
+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/dashboard-home.tsx
@@ -154,7 +154,7 @@ export async function DashboardHome({
</TileTitle>
</Tile>
- <Tile render={<HoverPrefetchLink href="/settings/members" />}>
+ <Tile render={<HoverPrefetchLink href="/members" />}>
<MembersPageIcon />
<TileTitle>
<Trans
diff --git a/apps/web/src/app/[locale]/(space)/settings/members/components/invite-dropdown-menu.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/invite-dropdown-menu.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(space)/settings/members/components/invite-dropdown-menu.tsx
rename to apps/web/src/app/[locale]/(space)/(dashboard)/members/components/invite-dropdown-menu.tsx
diff --git a/apps/web/src/app/[locale]/(space)/settings/members/components/invite-member-button.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/invite-member-button.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(space)/settings/members/components/invite-member-button.tsx
rename to apps/web/src/app/[locale]/(space)/(dashboard)/members/components/invite-member-button.tsx
diff --git a/apps/web/src/app/[locale]/(space)/settings/members/components/invite-member-dialog.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/invite-member-dialog.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(space)/settings/members/components/invite-member-dialog.tsx
rename to apps/web/src/app/[locale]/(space)/(dashboard)/members/components/invite-member-dialog.tsx
diff --git a/apps/web/src/app/[locale]/(space)/settings/members/components/member-dropdown-menu.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/member-dropdown-menu.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(space)/settings/members/components/member-dropdown-menu.tsx
rename to apps/web/src/app/[locale]/(space)/(dashboard)/members/components/member-dropdown-menu.tsx
diff --git a/apps/web/src/app/[locale]/(space)/settings/members/page-client.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/members/members-page.tsx
similarity index 94%
rename from apps/web/src/app/[locale]/(space)/settings/members/page-client.tsx
rename to apps/web/src/app/[locale]/(space)/(dashboard)/members/members-page.tsx
index 56458ad77..a00a03a14 100644
--- a/apps/web/src/app/[locale]/(space)/settings/members/page-client.tsx
+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/members/members-page.tsx
@@ -13,6 +13,9 @@ import Link from "next/link";
import { IfCloudHosted, IfSelfHosted } from "@/components/environment";
import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";
import {
+ PageContainer,
+ PageContent,
+ PageHeader,
PageSection,
PageSectionContent,
PageSectionDescription,
@@ -20,14 +23,8 @@ import {
PageSectionGroup,
PageSectionHeader,
PageSectionTitle,
+ PageTitle,
} from "@/components/page-layout";
-import {
- SettingsPage,
- SettingsPageContent,
- SettingsPageDescription,
- SettingsPageHeader,
- SettingsPageTitle,
-} from "@/components/settings-layout";
import { StackedList, StackedListItem } from "@/components/stacked-list";
import { showPayWall } from "@/features/billing/client";
import { useSpace } from "@/features/space/client";
@@ -39,7 +36,7 @@ import { InviteDropdownMenu } from "./components/invite-dropdown-menu";
import { InviteMemberButton } from "./components/invite-member-button";
import { MemberDropdownMenu } from "./components/member-dropdown-menu";
-export function MembersSettingsPageClient({
+export function MembersPage({
totalSeats,
usedSeats,
}: {
@@ -53,19 +50,13 @@ export function MembersSettingsPageClient({
const hasInactiveMembers = space.data.tier === "hobby" && members.total > 1;
return (
- <SettingsPage>
- <SettingsPageHeader>
- <SettingsPageTitle>
+ <PageContainer>
+ <PageHeader>
+ <PageTitle>
<Trans i18nKey="members" defaults="Members" />
- </SettingsPageTitle>
- <SettingsPageDescription>
- <Trans
- i18nKey="membersDescription"
- defaults="Members have access to your space"
- />
- </SettingsPageDescription>
- </SettingsPageHeader>
- <SettingsPageContent>
+ </PageTitle>
+ </PageHeader>
+ <PageContent>
<PageSectionGroup>
<PageSection>
<PageSectionContent>
@@ -287,7 +278,7 @@ export function MembersSettingsPageClient({
</>
) : null}
</PageSectionGroup>
- </SettingsPageContent>
- </SettingsPage>
+ </PageContent>
+ </PageContainer>
);
}
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/members/page.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/members/page.tsx
new file mode 100644
index 000000000..26e72aa1c
--- /dev/null
+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/members/page.tsx
@@ -0,0 +1,37 @@
+import { dehydrate, HydrationBoundary } from "@tanstack/react-query";
+import type { Metadata } from "next";
+import { getSeatUsage } from "@/features/space/loaders";
+import { getTranslation } from "@/i18n/server";
+import { createPrivateSSRHelper } from "@/trpc/server/create-ssr-helper";
+import { MembersPage } from "./members-page";
+
+export default async function Page() {
+ const [seatUsage, helpers] = await Promise.all([
+ getSeatUsage(),
+ createPrivateSSRHelper(),
+ ]);
+
+ await Promise.all([
+ helpers.spaces.listMembers.prefetch(),
+ helpers.spaces.listInvites.prefetch(),
+ ]);
+
+ return (
+ <HydrationBoundary state={dehydrate(helpers.queryClient)}>
+ <MembersPage totalSeats={seatUsage.total} usedSeats={seatUsage.used} />
+ </HydrationBoundary>
+ );
+}
+
+export async function generateMetadata(): Promise<Metadata> {
+ const { t } = await getTranslation();
+ return {
+ title: t("members", {
+ defaultValue: "Members",
+ }),
+ description: t("membersSettingsDescription", {
+ defaultValue:
+ "Manage space members, invite new users, and control access permissions.",
+ }),
+ };
+}
diff --git a/apps/web/src/app/[locale]/(space)/settings/components/sidebar.tsx b/apps/web/src/app/[locale]/(space)/settings/components/sidebar.tsx
index 26c3d4ea5..1949bc0af 100644
--- a/apps/web/src/app/[locale]/(space)/settings/components/sidebar.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/components/sidebar.tsx
@@ -1,6 +1,6 @@
"use client";
-import { useFeatureFlagEnabled } from "@rallly/posthog/client";
+import { posthog, useFeatureFlagEnabled } from "@rallly/posthog/client";
import {
SidebarGroup,
SidebarGroupContent,
@@ -10,6 +10,7 @@ import {
SidebarMenuItem,
} from "@rallly/ui/sidebar";
import {
+ ArrowUpRightIcon,
BellIcon,
BoltIcon,
CalendarIcon,
@@ -23,6 +24,7 @@ import {
UsersIcon,
} from "lucide-react";
import { usePathname } from "next/navigation";
+import type React from "react";
import { HoverPrefetchLink } from "@/components/hover-prefetch-link";
import { useSpace } from "@/features/space/client";
import { useAuthedUser } from "@/features/user/client";
@@ -103,7 +105,14 @@ export function SpaceSidebarMenu() {
const pathname = usePathname();
const isBillingEnabled = useFeatureFlag("billing");
const isEventTypesEnabled = useFeatureFlag("eventTypes");
- const menuItems = [
+ const menuItems: {
+ id: string;
+ label: string;
+ icon: React.ReactNode;
+ href: string;
+ suffix?: React.ReactNode;
+ onClick?: () => void;
+ }[] = [
{
id: "general",
label: t("general", { defaultValue: "General" }),
@@ -114,7 +123,11 @@ export function SpaceSidebarMenu() {
id: "members",
label: t("members", { defaultValue: "Members" }),
icon: <UsersIcon />,
- href: "/settings/members",
+ href: "/members",
+ suffix: <ArrowUpRightIcon className="ml-auto" />,
+ onClick: () => {
+ posthog?.capture("space_settings:members_link_click");
+ },
},
...(isEventTypesEnabled
? [
@@ -147,12 +160,14 @@ export function SpaceSidebarMenu() {
<HoverPrefetchLink
href={item.href}
className="flex items-center gap-x-2"
+ onClick={item.onClick}
/>
}
isActive={pathname.startsWith(item.href)}
>
{item.icon}
{item.label}
+ {item.suffix}
</SidebarMenuButton>
</SidebarMenuItem>
))}
diff --git a/apps/web/src/app/[locale]/(space)/settings/members/page.tsx b/apps/web/src/app/[locale]/(space)/settings/members/page.tsx
index 13b8da55a..bdc092276 100644
--- a/apps/web/src/app/[locale]/(space)/settings/members/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/members/page.tsx
@@ -1,40 +1,5 @@
-import { dehydrate, HydrationBoundary } from "@tanstack/react-query";
-import type { Metadata } from "next";
-import { getSeatUsage } from "@/features/space/loaders";
-import { getTranslation } from "@/i18n/server";
-import { createPrivateSSRHelper } from "@/trpc/server/create-ssr-helper";
-import { MembersSettingsPageClient } from "./page-client";
+import { permanentRedirect } from "next/navigation";
-export default async function MembersSettingsPage() {
- const [seatUsage, helpers] = await Promise.all([
- getSeatUsage(),
- createPrivateSSRHelper(),
- ]);
-
- await Promise.all([
- helpers.spaces.listMembers.prefetch(),
- helpers.spaces.listInvites.prefetch(),
- ]);
-
- return (
- <HydrationBoundary state={dehydrate(helpers.queryClient)}>
- <MembersSettingsPageClient
- totalSeats={seatUsage.total}
- usedSeats={seatUsage.used}
- />
- </HydrationBoundary>
- );
-}
-
-export async function generateMetadata(): Promise<Metadata> {
- const { t } = await getTranslation();
- return {
- title: t("members", {
- defaultValue: "Members",
- }),
- description: t("membersSettingsDescription", {
- defaultValue:
- "Manage space members, invite new users, and control access permissions.",
- }),
- };
+export default function MembersSettingsPage() {
+ permanentRedirect("/members");
}
diff --git a/apps/web/src/features/navigation/client.tsx b/apps/web/src/features/navigation/client.tsx
index 57b12c55e..56805d61c 100644
--- a/apps/web/src/features/navigation/client.tsx
+++ b/apps/web/src/features/navigation/client.tsx
@@ -6,6 +6,7 @@ import {
CalendarDaysIcon,
CalendarIcon,
HomeIcon,
+ UsersIcon,
} from "lucide-react";
import { usePathname } from "next/navigation";
import React from "react";
@@ -41,7 +42,7 @@ export const useSpaceMenu = () => {
() => ({
sections: [
{
- id: "home",
+ id: "main",
items: [
{
id: "home",
@@ -50,12 +51,6 @@ export const useSpaceMenu = () => {
icon: HomeIcon,
isActive: pathname === "/",
},
- ],
- },
- {
- id: "content",
- title: t("content", { defaultValue: "Content" }),
- items: [
{
id: "polls",
label: t("polls", { defaultValue: "Polls" }),
@@ -81,6 +76,13 @@ export const useSpaceMenu = () => {
},
]
: []),
+ {
+ id: "members",
+ label: t("members", { defaultValue: "Members" }),
+ href: "/members",
+ icon: UsersIcon,
+ isActive: pathname === "/members",
+ },
],
},
],
diff --git a/apps/web/src/features/space/components/space-dropdown.tsx b/apps/web/src/features/space/components/space-dropdown.tsx
index b2513d72d..d11d250cc 100644
--- a/apps/web/src/features/space/components/space-dropdown.tsx
+++ b/apps/web/src/features/space/components/space-dropdown.tsx
@@ -119,7 +119,7 @@ export function SpaceDropdown({
</Icon>
<Trans i18nKey="spaceSettings" defaults="Space settings" />
</DropdownMenuItem>
- <DropdownMenuItem render={<Link href="/settings/members" />}>
+ <DropdownMenuItem render={<Link href="/members" />}>
<Icon>
<UserPlusIcon />
</Icon>
diff --git a/apps/web/tests/space-members.spec.ts b/apps/web/tests/space-members.spec.ts
index f34281f2b..49709ffb4 100644
--- a/apps/web/tests/space-members.spec.ts
+++ b/apps/web/tests/space-members.spec.ts
@@ -68,9 +68,9 @@ function mainContent(page: Page) {
return page.locator("#main-content");
}
-async function gotoMembersSettings(page: Page, email: string) {
+async function gotoMembersPage(page: Page, email: string) {
await loginWithEmail(page, { email });
- await page.goto("/settings/members");
+ await page.goto("/members");
await page.getByRole("heading", { name: "Members" }).waitFor();
}
@@ -95,7 +95,7 @@ test.describe("Space members", () => {
const owner = await createSpaceAdmin({ name: "Invite Owner", seats: 3 });
const inviteeEmail = `invitee-${runId}@example.com`;
- await gotoMembersSettings(page, owner.email);
+ await gotoMembersPage(page, owner.email);
await expect(
mainContent(page).getByText("1 of 3 seats used"),
).toBeVisible();
@@ -154,7 +154,7 @@ test.describe("Space members", () => {
},
});
- await gotoMembersSettings(page, owner.email);
+ await gotoMembersPage(page, owner.email);
const inviteRow = memberRow(page, inviteeEmail);
await expect(inviteRow).toBeVisible();
@@ -173,7 +173,7 @@ test.describe("Space members", () => {
name: "Role Member",
});
- await gotoMembersSettings(page, owner.email);
+ await gotoMembersPage(page, owner.email);
const row = memberRow(page, member.email);
await expect(row.getByText("Member", { exact: true })).toBeVisible();
@@ -191,7 +191,7 @@ test.describe("Space members", () => {
name: "Removable Member",
});
- await gotoMembersSettings(page, owner.email);
+ await gotoMembersPage(page, owner.email);
await expect(
mainContent(page).getByText("2 of 3 seats used"),
).toBeVisible();
@@ -214,7 +214,7 @@ test.describe("Space members", () => {
}) => {
const owner = await createSpaceAdmin({ name: "Full Owner", seats: 1 });
- await gotoMembersSettings(page, owner.email);
+ await gotoMembersPage(page, owner.email);
await expect(
mainContent(page).getByText("1 of 1 seats used"),