Skip to content

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

✨ Add space settings (#1875)

Luke Vella3a310785d250
diff --git a/CLAUDE.md b/CLAUDE.md
index 981da8b4d..9d188d2ec 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -150,4 +150,5 @@ See `.env.development` for complete development defaults.
- i18next for internationalization
- Translation files in `public/locales/[lang]/`
- Crowdin integration for translation management
-- Use `pnpm i18n:scan` to extract new translation keys
\ No newline at end of file
+- Use `pnpm i18n:scan` to extract new translation keys
+- **IMPORTANT**: When TypeScript errors occur for missing i18n keys, run `pnpm i18n:scan` instead of manually adding keys. This command automatically scans the codebase for `Trans` components and generates the necessary translation entries.
\ No newline at end of file
diff --git a/apps/web/public/locales/en/app.json b/apps/web/public/locales/en/app.json
index bab9c49ff..8a79c111b 100644
--- a/apps/web/public/locales/en/app.json
+++ b/apps/web/public/locales/en/app.json
@@ -440,5 +440,17 @@
"inviteCanceledSuccess": "Invite canceled successfully",
"inviteCanceledError": "Failed to cancel invite",
"pendingInvites": "Pending Invites",
- "memberInvitedBy": "Invited by {inviterName}"
+ "memberInvitedBy": "Invited by {inviterName}",
+ "updatingSpace": "Updating space...",
+ "spaceUpdatedSuccess": "Space updated successfully",
+ "spaceUpdatedError": "Failed to update space",
+ "generalSettings": "General Settings",
+ "spaceInformation": "Space Information",
+ "spaceInformationDescription": "Update your space name and basic settings.",
+ "general": "General",
+ "generalSettingsDescription": "Manage your space settings, including name, description, and other general preferences.",
+ "membersDescription": "Members have access to your space",
+ "pendingInvitesDescription": "Invite other users to share your space.",
+ "membersSettingsDescription": "Manage space members, invite new users, and control access permissions.",
+ "spaceNamePlaceholder": "My Team"
}
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/components/sidebar/space-sidebar-menu.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/components/sidebar/space-sidebar-menu.tsx
index fe6d1a493..5b1b471e6 100644
--- a/apps/web/src/app/[locale]/(space)/(dashboard)/components/sidebar/space-sidebar-menu.tsx
+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/components/sidebar/space-sidebar-menu.tsx
@@ -10,12 +10,10 @@ import {
SidebarMenuItem,
} from "@rallly/ui/sidebar";
import Link from "next/link";
-import { usePathname } from "next/navigation";
import { useSpaceMenu } from "@/features/navigation/config";
export function SpaceSidebarMenu() {
const { config } = useSpaceMenu();
- const pathname = usePathname();
return (
<>
{config.sections.map((section) => {
@@ -29,10 +27,7 @@ export function SpaceSidebarMenu() {
{section.items.map((item) => {
return (
<SidebarMenuItem key={item.id}>
- <SidebarMenuButton
- asChild
- isActive={pathname === item.href}
- >
+ <SidebarMenuButton asChild isActive={item.isActive}>
<Link href={item.href}>
<Icon>
<item.icon />
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/layout.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/layout.tsx
index 3488fafed..eb322cb5a 100644
--- a/apps/web/src/app/[locale]/(space)/(dashboard)/layout.tsx
+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/layout.tsx
@@ -1,6 +1,7 @@
import { SidebarInset } from "@rallly/ui/sidebar";
+import type { Metadata } from "next";
import { redirect } from "next/navigation";
-import { requireUser } from "@/auth/data";
+import { requireSpace, requireUser } from "@/auth/data";
import { LicenseLimitWarning } from "@/features/licensing/components/license-limit-warning";
import { CommandMenu } from "@/features/navigation/command-menu";
import { isUserOnboarded } from "@/features/setup/utils";
@@ -31,3 +32,13 @@ export default async function Layout({
</SpaceSidebarProvider>
);
}
+
+export async function generateMetadata(): Promise<Metadata> {
+ const space = await requireSpace();
+ return {
+ title: {
+ template: `%s | ${space.name} | Rallly`,
+ default: space.name,
+ },
+ };
+}
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/header.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/header.tsx
deleted file mode 100644
index 4cefc5a10..000000000
--- a/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/header.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-"use client";
-
-import { Button } from "@rallly/ui/button";
-import { useDialog } from "@rallly/ui/dialog";
-import { Icon } from "@rallly/ui/icon";
-import { toast } from "@rallly/ui/sonner";
-import { UserPlusIcon } from "lucide-react";
-import {
- PageHeader,
- PageHeaderActions,
- PageTitle,
-} from "@/app/components/page-layout";
-import { PayWallDialog } from "@/components/pay-wall-dialog";
-import { Trans } from "@/components/trans";
-import { useSpace } from "@/features/space/client";
-import { useTranslation } from "@/i18n/client";
-import { InviteMemberDialog } from "./invite-member-dialog";
-
-export function MembersHeader() {
- const { t } = useTranslation();
- const inviteMemberDialog = useDialog();
- const payWallDialog = useDialog();
- const space = useSpace();
- return (
- <>
- <PageHeader>
- <PageTitle>
- <Trans i18nKey="members" defaults="Members" />
- </PageTitle>
- <PageHeaderActions>
- <Button
- variant="primary"
- onClick={() => {
- if (
- space.getMemberAbility().cannot("create", "SpaceMemberInvite")
- ) {
- toast.error(
- t("adminRoleRequired", {
- defaultValue:
- "You need to be an admin to perform this action",
- }),
- );
- } else if (space.getAbility().cannot("invite", "Member")) {
- payWallDialog.trigger();
- } else {
- inviteMemberDialog.trigger();
- }
- }}
- >
- <Icon>
- <UserPlusIcon />
- </Icon>
- <Trans i18nKey="inviteMember" defaults="Invite member" />
- </Button>
- </PageHeaderActions>
- </PageHeader>
- <PayWallDialog {...payWallDialog.dialogProps} />
- <InviteMemberDialog {...inviteMemberDialog.dialogProps} />
- </>
- );
-}
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/settings/components/settings-tabs.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/settings/components/settings-tabs.tsx
new file mode 100644
index 000000000..42cf856f8
--- /dev/null
+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/settings/components/settings-tabs.tsx
@@ -0,0 +1,29 @@
+"use client";
+
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@rallly/ui/page-tabs";
+import Link from "next/link";
+import { useSelectedLayoutSegments } from "next/navigation";
+import { Trans } from "@/components/trans";
+
+export function SettingsTabs({ children }: { children: React.ReactNode }) {
+ const segments = useSelectedLayoutSegments();
+ const activeTab = segments[0] || "general";
+
+ return (
+ <Tabs value={activeTab} className="w-full">
+ <TabsList>
+ <TabsTrigger value="general" asChild>
+ <Link href="/settings/general">
+ <Trans i18nKey="general" defaults="General" />
+ </Link>
+ </TabsTrigger>
+ <TabsTrigger value="members" asChild>
+ <Link href="/settings/members">
+ <Trans i18nKey="members" defaults="Members" />
+ </Link>
+ </TabsTrigger>
+ </TabsList>
+ <TabsContent value={activeTab}>{children}</TabsContent>
+ </Tabs>
+ );
+}
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/settings/general/components/space-settings-form.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/settings/general/components/space-settings-form.tsx
new file mode 100644
index 000000000..f7bcbcc79
--- /dev/null
+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/settings/general/components/space-settings-form.tsx
@@ -0,0 +1,103 @@
+"use client";
+
+import { zodResolver } from "@hookform/resolvers/zod";
+import { Button } from "@rallly/ui/button";
+import {
+ Form,
+ FormControl,
+ FormField,
+ FormItem,
+ FormLabel,
+ FormMessage,
+} from "@rallly/ui/form";
+import { Input } from "@rallly/ui/input";
+import { toast } from "@rallly/ui/sonner";
+import { useForm } from "react-hook-form";
+import { z } from "zod";
+import { Trans } from "@/components/trans";
+import { updateSpaceAction } from "@/features/space/actions";
+import type { SpaceDTO } from "@/features/space/types";
+import { useTranslation } from "@/i18n/client";
+import { useSafeAction } from "@/lib/safe-action/client";
+
+const spaceSettingsSchema = z.object({
+ name: z
+ .string()
+ .min(1, "Space name is required")
+ .max(100, "Space name must be less than 100 characters"),
+});
+
+type SpaceSettingsData = z.infer<typeof spaceSettingsSchema>;
+
+interface SpaceSettingsFormProps {
+ space: SpaceDTO;
+}
+
+export function SpaceSettingsForm({ space }: SpaceSettingsFormProps) {
+ const { t } = useTranslation();
+ const updateSpace = useSafeAction(updateSpaceAction);
+
+ const form = useForm<SpaceSettingsData>({
+ resolver: zodResolver(spaceSettingsSchema),
+ defaultValues: {
+ name: space.name,
+ },
+ });
+
+ const onSubmit = async (data: SpaceSettingsData) => {
+ toast.promise(
+ updateSpace.executeAsync({
+ name: data.name,
+ }),
+ {
+ loading: t("updatingSpace", { defaultValue: "Updating space..." }),
+ success: t("spaceUpdatedSuccess", {
+ defaultValue: "Space updated successfully",
+ }),
+ error: t("spaceUpdatedError", {
+ defaultValue: "Failed to update space",
+ }),
+ },
+ );
+
+ form.reset(data);
+ };
+
+ return (
+ <Form {...form}>
+ <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
+ <FormField
+ control={form.control}
+ name="name"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>
+ <Trans i18nKey="name" defaults="Name" />
+ </FormLabel>
+ <FormControl>
+ <Input
+ className="w-72"
+ placeholder={t("spaceNamePlaceholder", {
+ defaultValue: "My Team",
+ })}
+ {...field}
+ />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ <div>
+ <Button
+ type="submit"
+ disabled={
+ updateSpace.status === "executing" || !form.formState.isDirty
+ }
+ >
+ <Trans i18nKey="save" defaults="Save" />
+ </Button>
+ </div>
+ </form>
+ </Form>
+ );
+}
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/settings/general/page.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/settings/general/page.tsx
new file mode 100644
index 000000000..136cf9f73
--- /dev/null
+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/settings/general/page.tsx
@@ -0,0 +1,54 @@
+import { TabsContent } from "@rallly/ui/page-tabs";
+import type { Metadata } from "next";
+import {
+ PageContent,
+ PageSection,
+ PageSectionContent,
+ PageSectionDescription,
+ PageSectionHeader,
+ PageSectionTitle,
+} from "@/app/components/page-layout";
+import { requireSpace } from "@/auth/data";
+import { Trans } from "@/components/trans";
+import { getTranslation } from "@/i18n/server";
+import { SpaceSettingsForm } from "./components/space-settings-form";
+
+export default async function GeneralSettingsPage() {
+ const space = await requireSpace();
+
+ return (
+ <TabsContent value="general">
+ <PageContent className="space-y-6">
+ <PageSection>
+ <PageSectionHeader>
+ <PageSectionTitle>
+ <Trans i18nKey="spaceInformation" defaults="Space Information" />
+ </PageSectionTitle>
+ <PageSectionDescription>
+ <Trans
+ i18nKey="spaceInformationDescription"
+ defaults="Update your space name and basic settings."
+ />
+ </PageSectionDescription>
+ </PageSectionHeader>
+ <PageSectionContent>
+ <SpaceSettingsForm space={space} />
+ </PageSectionContent>
+ </PageSection>
+ </PageContent>
+ </TabsContent>
+ );
+}
+
+export async function generateMetadata(): Promise<Metadata> {
+ const { t } = await getTranslation();
+ return {
+ title: t("generalSettings", {
+ defaultValue: "General Settings",
+ }),
+ description: t("generalSettingsDescription", {
+ defaultValue:
+ "Manage your space settings, including name, description, and other general preferences.",
+ }),
+ };
+}
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/settings/layout.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/settings/layout.tsx
new file mode 100644
index 000000000..5ef7a7a3e
--- /dev/null
+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/settings/layout.tsx
@@ -0,0 +1,33 @@
+import { notFound } from "next/navigation";
+import {
+ PageContainer,
+ PageContent,
+ PageHeader,
+ PageTitle,
+} from "@/app/components/page-layout";
+import { Trans } from "@/components/trans";
+import { isSpacesEnabled } from "@/features/space/constants";
+import { SettingsTabs } from "./components/settings-tabs";
+
+export default function SettingsLayout({
+ children,
+}: {
+ children: React.ReactNode;
+}) {
+ if (!isSpacesEnabled) {
+ return notFound();
+ }
+
+ return (
+ <PageContainer>
+ <PageHeader>
+ <PageTitle>
+ <Trans i18nKey="settings" defaults="Settings" />
+ </PageTitle>
+ </PageHeader>
+ <PageContent>
+ <SettingsTabs>{children}</SettingsTabs>
+ </PageContent>
+ </PageContainer>
+ );
+}
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/settings/members/components/header.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/settings/members/components/header.tsx
new file mode 100644
index 000000000..4a2396ce8
--- /dev/null
+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/settings/members/components/header.tsx
@@ -0,0 +1,45 @@
+"use client";
+
+import { Button } from "@rallly/ui/button";
+import { useDialog } from "@rallly/ui/dialog";
+import { Icon } from "@rallly/ui/icon";
+import { toast } from "@rallly/ui/sonner";
+import { UserPlusIcon } from "lucide-react";
+import { PayWallDialog } from "@/components/pay-wall-dialog";
+import { Trans } from "@/components/trans";
+import { useSpace } from "@/features/space/client";
+import { useTranslation } from "@/i18n/client";
+import { InviteMemberDialog } from "./invite-member-dialog";
+
+export function InviteMemberButton() {
+ const { t } = useTranslation();
+ const inviteMemberDialog = useDialog();
+ const payWallDialog = useDialog();
+ const space = useSpace();
+ return (
+ <>
+ <Button
+ onClick={() => {
+ if (space.getMemberAbility().cannot("create", "SpaceMemberInvite")) {
+ toast.error(
+ t("adminRoleRequired", {
+ defaultValue: "You need to be an admin to perform this action",
+ }),
+ );
+ } else if (space.getAbility().cannot("invite", "Member")) {
+ payWallDialog.trigger();
+ } else {
+ inviteMemberDialog.trigger();
+ }
+ }}
+ >
+ <Icon>
+ <UserPlusIcon />
+ </Icon>
+ <Trans i18nKey="inviteMember" defaults="Invite member" />
+ </Button>
+ <PayWallDialog {...payWallDialog.dialogProps} />
+ <InviteMemberDialog {...inviteMemberDialog.dialogProps} />
+ </>
+ );
+}
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/invite-dropdown-menu.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/settings/members/components/invite-dropdown-menu.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(space)/(dashboard)/members/components/invite-dropdown-menu.tsx
rename to apps/web/src/app/[locale]/(space)/(dashboard)/settings/members/components/invite-dropdown-menu.tsx
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/invite-member-dialog.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/settings/members/components/invite-member-dialog.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(space)/(dashboard)/members/components/invite-member-dialog.tsx
rename to apps/web/src/app/[locale]/(space)/(dashboard)/settings/members/components/invite-member-dialog.tsx
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/member-dropdown-menu.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/settings/members/components/member-dropdown-menu.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(space)/(dashboard)/members/components/member-dropdown-menu.tsx
rename to apps/web/src/app/[locale]/(space)/(dashboard)/settings/members/components/member-dropdown-menu.tsx
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/members/components/tabs.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/settings/members/components/tabs.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/(space)/(dashboard)/members/components/tabs.tsx
rename to apps/web/src/app/[locale]/(space)/(dashboard)/settings/members/components/tabs.tsx
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/members/page.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/settings/members/page.tsx
similarity index 65%
rename from apps/web/src/app/[locale]/(space)/(dashboard)/members/page.tsx
rename to apps/web/src/app/[locale]/(space)/(dashboard)/settings/members/page.tsx
index bc5582039..67feeeb85 100644
--- a/apps/web/src/app/[locale]/(space)/(dashboard)/members/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/settings/members/page.tsx
@@ -1,33 +1,40 @@
import { Badge } from "@rallly/ui/badge";
import type { Metadata } from "next";
-import { notFound } from "next/navigation";
-import { InviteDropdownMenu } from "@/app/[locale]/(space)/(dashboard)/members/components/invite-dropdown-menu";
-import { MemberDropdownMenu } from "@/app/[locale]/(space)/(dashboard)/members/components/member-dropdown-menu";
-import { PageContainer, PageContent } from "@/app/components/page-layout";
+import { InviteMemberButton } from "@/app/[locale]/(space)/(dashboard)/settings/members/components/header";
+import {
+ PageSection,
+ PageSectionContent,
+ PageSectionDescription,
+ PageSectionHeader,
+ PageSectionTitle,
+} from "@/app/components/page-layout";
import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";
import { StackedList, StackedListItem } from "@/components/stacked-list";
import { Trans } from "@/components/trans";
import { SpaceRole } from "@/features/space/components/space-role";
-import { isSpacesEnabled } from "@/features/space/constants";
import { loadInvites, loadMembers } from "@/features/space/data";
import { getTranslation } from "@/i18n/server";
-import { MembersHeader } from "./components/header";
-
-export default async function MembersPage() {
- if (!isSpacesEnabled) {
- return notFound();
- }
+import { InviteDropdownMenu } from "./components/invite-dropdown-menu";
+import { MemberDropdownMenu } from "./components/member-dropdown-menu";
+export default async function MembersSettingsPage() {
const [members, invites] = await Promise.all([loadMembers(), loadInvites()]);
return (
- <PageContainer>
- <MembersHeader />
- <PageContent className="space-y-6">
- <section className="flex flex-col gap-4">
- <h2 className="font-medium">
+ <div className="space-y-8">
+ <PageSection>
+ <PageSectionHeader>
+ <PageSectionTitle>
<Trans i18nKey="members" />
- </h2>
+ </PageSectionTitle>
+ <PageSectionDescription>
+ <Trans
+ i18nKey="membersDescription"
+ defaults="Members have access to your space"
+ />
+ </PageSectionDescription>
+ </PageSectionHeader>
+ <PageSectionContent>
<StackedList>
{members.data.map((member) => (
<StackedListItem key={member.id}>
@@ -60,12 +67,22 @@ export default async function MembersPage() {
</StackedListItem>
))}
</StackedList>
- </section>
- {invites.length > 0 && (
- <section className="flex flex-col gap-4">
- <h2 className="font-medium">
- <Trans i18nKey="pendingInvites" defaults="Pending Invites" />
- </h2>
+ </PageSectionContent>
+ </PageSection>
+ <PageSection>
+ <PageSectionHeader>
+ <PageSectionTitle>
+ <Trans i18nKey="pendingInvites" defaults="Pending Invites" />
+ </PageSectionTitle>
+ <PageSectionDescription>
+ <Trans
+ i18nKey="pendingInvitesDescription"
+ defaults="Invite other users to share your space."
+ />
+ </PageSectionDescription>
+ </PageSectionHeader>
+ <PageSectionContent>
+ {invites.length > 0 ? (
<StackedList>
{invites.map((invite) => (
<StackedListItem key={invite.id}>
@@ -93,10 +110,11 @@ export default async function MembersPage() {
</StackedListItem>
))}
</StackedList>
- </section>
- )}
- </PageContent>
- </PageContainer>
+ ) : null}
+ <InviteMemberButton />
+ </PageSectionContent>
+ </PageSection>
+ </div>
);
}
@@ -106,5 +124,9 @@ export async function generateMetadata(): Promise<Metadata> {
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)/(dashboard)/members/schema.ts b/apps/web/src/app/[locale]/(space)/(dashboard)/settings/members/schema.ts
similarity index 100%
rename from apps/web/src/app/[locale]/(space)/(dashboard)/members/schema.ts
rename to apps/web/src/app/[locale]/(space)/(dashboard)/settings/members/schema.ts
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/settings/page.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/settings/page.tsx
new file mode 100644
index 000000000..a6a00437e
--- /dev/null
+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/settings/page.tsx
@@ -0,0 +1 @@
+export { default } from "./general/page";
diff --git a/apps/web/src/app/[locale]/layout.tsx b/apps/web/src/app/[locale]/layout.tsx
index 5646b2356..8b7756b09 100644
--- a/apps/web/src/app/[locale]/layout.tsx
+++ b/apps/web/src/app/[locale]/layout.tsx
@@ -5,7 +5,7 @@ import { PostHogIdentify, PostHogProvider } from "@rallly/posthog/client";
import { Toaster } from "@rallly/ui/sonner";
import { TooltipProvider } from "@rallly/ui/tooltip";
import { domAnimation, LazyMotion } from "motion/react";
-import type { Viewport } from "next";
+import type { Metadata, Viewport } from "next";
import { Inter } from "next/font/google";
import type React from "react";
@@ -116,3 +116,12 @@ export default async function Root({
</html>
);
}
+
+export async function generateMetadata(): Promise<Metadata> {
+ return {
+ title: {
+ template: "%s | Rallly",
+ default: "Rallly",
+ },
+ };
+}
diff --git a/apps/web/src/app/components/page-layout.tsx b/apps/web/src/app/components/page-layout.tsx
index 7a53816ab..5e99cf85d 100644
--- a/apps/web/src/app/components/page-layout.tsx
+++ b/apps/web/src/app/components/page-layout.tsx
@@ -25,7 +25,7 @@ export function PageTitle({
return (
<h1
className={cn(
- "flex items-center gap-3 truncate font-bold text-foreground text-xl leading-none tracking-tight",
+ "flex items-center gap-3 truncate font-semibold text-foreground text-lg tracking-tight",
className,
)}
>
@@ -73,14 +73,6 @@ export function PageHeaderActions({
);
}
-export function PageSection({ children }: { children?: React.ReactNode }) {
- return <div className="space-y-4 md:space-y-6">{children}</div>;
-}
-
-export function PageSectionTitle({ children }: { children?: React.ReactNode }) {
- return <h2 className="text-muted-foreground text-sm">{children}</h2>;
-}
-
export function PageContent({
children,
className,
@@ -124,3 +116,67 @@ export function PageSkeleton() {
</PageContainer>
);
}
+
+export function PageSection({
+ children,
+ className,
+}: {
+ children?: React.ReactNode;
+ className?: string;
+}) {
+ return (
+ <section
+ className={cn("grid gap-6 lg:grid-cols-[320px_1fr] lg:gap-8", className)}
+ >
+ {children}
+ </section>
+ );
+}
+
+export function PageSectionHeader({
+ children,
+ className,
+}: {
+ children?: React.ReactNode;
+ className?: string;
+}) {
+ return <div className={cn(className)}>{children}</div>;
+}
+
+export function PageSectionTitle({
+ children,
+ className,
+}: {
+ children?: React.ReactNode;
+ className?: string;
+}) {
+ return (
+ <h2 className={cn("font-medium text-base text-foreground", className)}>
+ {children}
+ </h2>
+ );
+}
+
+export function PageSectionDescription({
+ children,
+ className,
+}: {
+ children?: React.ReactNode;
+ className?: string;
+}) {
+ return (
+ <p className={cn("mt-2 text-muted-foreground text-sm", className)}>
+ {children}
+ </p>
+ );
+}
+
+export function PageSectionContent({
+ children,
+ className,
+}: {
+ children?: React.ReactNode;
+ className?: string;
+}) {
+ return <div className={cn("space-y-4", className)}>{children}</div>;
+}
diff --git a/apps/web/src/components/settings-group.tsx b/apps/web/src/components/settings-group.tsx
index 3bc5cb900..feaf5c058 100644
--- a/apps/web/src/components/settings-group.tsx
+++ b/apps/web/src/components/settings-group.tsx
@@ -1,9 +1,5 @@
export function SettingsGroup({ children }: { children: React.ReactNode }) {
- return (
- <div className="flex flex-col gap-6 rounded-lg border p-6 lg:flex-row">
- {children}
- </div>
- );
+ return <div className="flex flex-col gap-6 lg:flex-row">{children}</div>;
}
export function SettingsGroupHeader({
@@ -19,7 +15,7 @@ export function SettingsGroupTitle({
}: {
children: React.ReactNode;
}) {
- return <h2 className="font-semibold text-base">{children}</h2>;
+ return <h2 className="font-medium text-sm">{children}</h2>;
}
export function SettingsGroupDescription({
diff --git a/apps/web/src/features/navigation/config.tsx b/apps/web/src/features/navigation/config.tsx
index ffc9ee0b0..4f7b7051c 100644
--- a/apps/web/src/features/navigation/config.tsx
+++ b/apps/web/src/features/navigation/config.tsx
@@ -1,7 +1,12 @@
"use client";
import type { LucideIcon } from "lucide-react";
-import { BarChart2Icon, CalendarIcon, HomeIcon, UsersIcon } from "lucide-react";
+import {
+ BarChart2Icon,
+ CalendarIcon,
+ HomeIcon,
+ SettingsIcon,
+} from "lucide-react";
import { usePathname } from "next/navigation";
import React from "react";
import { isSpacesEnabled } from "@/features/space/constants";
@@ -73,11 +78,11 @@ export const useSpaceMenu = () => {
title: t("manage", { defaultValue: "Manage" }),
items: [
{
- id: "members",
- label: t("members", { defaultValue: "Members" }),
- href: "/members",
- icon: UsersIcon,
- isActive: pathname === "/members",
+ id: "settings",
+ label: t("settings", { defaultValue: "Settings" }),
+ href: "/settings",
+ icon: SettingsIcon,
+ isActive: pathname.startsWith("/settings"),
},
],
},
diff --git a/apps/web/src/features/space/actions.ts b/apps/web/src/features/space/actions.ts
index 205bc0b69..88751bd6b 100644
--- a/apps/web/src/features/space/actions.ts
+++ b/apps/web/src/features/space/actions.ts
@@ -413,3 +413,37 @@ export const cancelInviteAction = spaceActionClient
where: { id: parsedInput.inviteId },
});
});
+
+export const updateSpaceAction = spaceActionClient
+ .metadata({
+ actionName: "space_update",
+ })
+ .inputSchema(
+ z.object({
+ name: z.string().min(1).max(100),
+ }),
+ )
+ .action(async ({ ctx, parsedInput }) => {
+ if (
+ ctx
+ .getMemberAbility()
+ .cannot(
+ "update",
+ subject("Space", { id: ctx.space.id, ownerId: ctx.space.ownerId }),
+ )
+ ) {
+ throw new AppError({
+ code: "FORBIDDEN",
+ message: "You do not have permission to update this space",
+ });
+ }
+
+ await prisma.space.update({
+ where: {
+ id: ctx.space.id,
+ },
+ data: {
+ name: parsedInput.name,
+ },
+ });
+ });
diff --git a/apps/web/src/features/space/components/space-dropdown.tsx b/apps/web/src/features/space/components/space-dropdown.tsx
index c77232927..2c583c3ac 100644
--- a/apps/web/src/features/space/components/space-dropdown.tsx
+++ b/apps/web/src/features/space/components/space-dropdown.tsx
@@ -78,7 +78,7 @@ export function SpaceDropdown({
<Trans i18nKey="createSpace" defaults="Create Space" />
</DropdownMenuItem>
<DropdownMenuItem asChild>
- <Link href="/settings">
+ <Link href="/settings/general">
<Icon>
<SettingsIcon />
</Icon>
diff --git a/apps/web/src/features/space/member/ability.ts b/apps/web/src/features/space/member/ability.ts
index 040a84d41..e3f988cc7 100644
--- a/apps/web/src/features/space/member/ability.ts
+++ b/apps/web/src/features/space/member/ability.ts
@@ -23,6 +23,10 @@ type Subject = Subjects<{
Subscription: {
spaceId: string;
};
+ Space: {
+ id: string;
+ ownerId: string;
+ };
}>;
export type MemberAbility = PureAbility<[Action, Subject], PrismaQuery>;
@@ -70,6 +74,7 @@ function defineSpaceAdminRules(
can("read", "Subscription", {
spaceId: ctx.space.id,
});
+ can("update", "Space", { id: ctx.space.id });
can(["create", "delete"], "SpaceMemberInvite");
can(["update", "delete"], "SpaceMember", { spaceId: ctx.space.id });
cannot(["delete", "update"], "SpaceMember", {
diff --git a/packages/ui/src/button.tsx b/packages/ui/src/button.tsx
index cad4ba092..03f3c0be1 100644
--- a/packages/ui/src/button.tsx
+++ b/packages/ui/src/button.tsx
@@ -19,7 +19,8 @@ const buttonVariants = cva(
"border-primary bg-primary text-white hover:bg-primary-500 focus-visible:ring-offset-1 disabled:border-transparent disabled:bg-gray-400",
destructive:
"border-destructive bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90 focus-visible:ring-offset-1 active:bg-destructive",
- default: "bg-white hover:bg-gray-50 focus-visible:ring-offset-1",
+ default:
+ "bg-gray-50 hover:bg-gray-100 focus-visible:ring-offset-1 active:bg-gray-200",
secondary:
"border-secondary bg-secondary text-secondary-foreground hover:bg-secondary/80 focus-visible:ring-offset-1",
ghost:
diff --git a/packages/ui/src/page-tabs.tsx b/packages/ui/src/page-tabs.tsx
index 9efc9935c..bd5830763 100644
--- a/packages/ui/src/page-tabs.tsx
+++ b/packages/ui/src/page-tabs.tsx
@@ -42,7 +42,7 @@ const TabsContent = React.forwardRef<
<TabsPrimitive.Content
ref={ref}
className={cn(
- "mt-4 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
+ "mt-8 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
className,
)}
{...props}