Skip to content

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

💄 Show conferencing, spaces, API keys and webhooks lists in cards (#3499)

Luke Vella1eb18f4c2279
diff --git a/apps/web/src/app/[locale]/(space)/settings/api-keys/components/api-keys-list.tsx b/apps/web/src/app/[locale]/(space)/settings/api-keys/components/api-keys-list.tsx
index 6b5e8829c..97391d4a3 100644
--- a/apps/web/src/app/[locale]/(space)/settings/api-keys/components/api-keys-list.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/api-keys/components/api-keys-list.tsx
@@ -39,7 +39,7 @@ export function ApiKeysList({ apiKeys }: { apiKeys: ApiKey[] }) {
}
return (
- <StackedList>
+ <StackedList variant="plain">
{apiKeys.map((apiKey) => (
<StackedListItem key={apiKey.id}>
<div className="flex flex-1 items-center gap-4">
diff --git a/apps/web/src/app/[locale]/(space)/settings/api-keys/page.tsx b/apps/web/src/app/[locale]/(space)/settings/api-keys/page.tsx
index 9d3206b0f..11bbcf499 100644
--- a/apps/web/src/app/[locale]/(space)/settings/api-keys/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/api-keys/page.tsx
@@ -86,7 +86,7 @@ async function ApiKeysContent() {
return (
<PageSectionGroup>
<ApiUsageLimits />
- <PageSection>
+ <PageSection variant="card">
<PageSectionContent>
<ApiKeysList apiKeys={apiKeys} />
</PageSectionContent>
diff --git a/apps/web/src/app/[locale]/(space)/settings/conferencing/page.tsx b/apps/web/src/app/[locale]/(space)/settings/conferencing/page.tsx
index eb2a471a0..5732cebb0 100644
--- a/apps/web/src/app/[locale]/(space)/settings/conferencing/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/conferencing/page.tsx
@@ -55,7 +55,7 @@ export default function ConferencingPage() {
</SettingsPageDescription>
</SettingsPageHeader>
<SettingsPageContent>
- <PageSection>
+ <PageSection variant="card">
<PageSectionContent>
<Suspense fallback={<Spinner />}>
<ProviderList />
diff --git a/apps/web/src/app/[locale]/(space)/settings/spaces/components/spaces-list.tsx b/apps/web/src/app/[locale]/(space)/settings/spaces/components/spaces-list.tsx
index 4bea668dd..e206837a4 100644
--- a/apps/web/src/app/[locale]/(space)/settings/spaces/components/spaces-list.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/spaces/components/spaces-list.tsx
@@ -1,7 +1,6 @@
"use client";
import { Button } from "@rallly/ui/button";
-import { Card } from "@rallly/ui/card";
import { useDialog } from "@rallly/ui/dialog";
import {
DropdownMenu,
@@ -55,28 +54,26 @@ export function SpacesList({ spaces, currentUserId }: SpacesListProps) {
if (spaces.length === 0) {
return (
- <Card>
- <EmptyState>
- <EmptyStateIcon>
- <LayersIcon />
- </EmptyStateIcon>
- <EmptyStateTitle>
- <Trans i18nKey="noSpaces" defaults="No spaces found" />
- </EmptyStateTitle>
- <EmptyStateDescription>
- <Trans
- i18nKey="noSpacesDescription"
- defaults="You are not a member of any spaces yet"
- />
- </EmptyStateDescription>
- </EmptyState>
- </Card>
+ <EmptyState>
+ <EmptyStateIcon>
+ <LayersIcon />
+ </EmptyStateIcon>
+ <EmptyStateTitle>
+ <Trans i18nKey="noSpaces" defaults="No spaces found" />
+ </EmptyStateTitle>
+ <EmptyStateDescription>
+ <Trans
+ i18nKey="noSpacesDescription"
+ defaults="You are not a member of any spaces yet"
+ />
+ </EmptyStateDescription>
+ </EmptyState>
);
}
return (
<>
- <StackedList>
+ <StackedList variant="plain">
{spaces.map((space) => {
const isOwner = space.ownerId === currentUserId;
return (
diff --git a/apps/web/src/app/[locale]/(space)/settings/spaces/page.tsx b/apps/web/src/app/[locale]/(space)/settings/spaces/page.tsx
index 1e8847581..f2df43f7a 100644
--- a/apps/web/src/app/[locale]/(space)/settings/spaces/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/spaces/page.tsx
@@ -34,7 +34,7 @@ export default async function Page() {
</SettingsPageHeader>
<SettingsPageContent>
<PageSectionGroup>
- <PageSection>
+ <PageSection variant="card">
<SpacesList spaces={spaces} currentUserId={user.id} />
</PageSection>
</PageSectionGroup>
diff --git a/apps/web/src/app/[locale]/(space)/settings/webhooks/page.tsx b/apps/web/src/app/[locale]/(space)/settings/webhooks/page.tsx
index 56614f1c3..1866fd879 100644
--- a/apps/web/src/app/[locale]/(space)/settings/webhooks/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/webhooks/page.tsx
@@ -84,7 +84,7 @@ async function WebhooksContent() {
return (
<PageSectionGroup>
- <PageSection>
+ <PageSection variant="card">
<PageSectionContent>
<WebhooksList webhooks={webhooks} />
</PageSectionContent>
diff --git a/apps/web/src/components/stacked-list.tsx b/apps/web/src/components/stacked-list.tsx
index f08e918a2..adb985e63 100644
--- a/apps/web/src/components/stacked-list.tsx
+++ b/apps/web/src/components/stacked-list.tsx
@@ -1,21 +1,36 @@
+"use client";
+
import { cn } from "@rallly/ui";
+import React from "react";
+
+type StackedListVariant = "default" | "plain";
+const StackedListVariantContext =
+ React.createContext<StackedListVariant>("default");
+
+// "plain" drops the frame so the list can sit inside a card.
export function StackedList({
children,
className,
+ variant = "default",
}: {
children: React.ReactNode;
className?: string;
+ variant?: StackedListVariant;
}) {
return (
- <ul
- className={cn(
- "divide-y overflow-hidden rounded-xl border border-card-border bg-card/25",
- className,
- )}
- >
- {children}
- </ul>
+ <StackedListVariantContext.Provider value={variant}>
+ <ul
+ className={cn(
+ "divide-y",
+ variant === "default" &&
+ "overflow-hidden rounded-xl border border-card-border bg-card/25",
+ className,
+ )}
+ >
+ {children}
+ </ul>
+ </StackedListVariantContext.Provider>
);
}
@@ -26,10 +41,14 @@ export function StackedListItem({
children: React.ReactNode;
className?: string;
}) {
+ const variant = React.useContext(StackedListVariantContext);
return (
<li
className={cn(
- "flex items-center gap-x-6 p-4 hover:bg-card-accent",
+ "flex items-center gap-x-6",
+ variant === "default"
+ ? "p-4 hover:bg-card-accent"
+ : "py-4 first:pt-0 last:pb-0",
className,
)}
>
diff --git a/apps/web/src/features/conferencing/components/conferencing-provider-list.tsx b/apps/web/src/features/conferencing/components/conferencing-provider-list.tsx
index ef19b4cb5..de1f69654 100644
--- a/apps/web/src/features/conferencing/components/conferencing-provider-list.tsx
+++ b/apps/web/src/features/conferencing/components/conferencing-provider-list.tsx
@@ -36,12 +36,9 @@ export function ConferencingProviderList({
);
return (
- <StackedList>
+ <StackedList variant="plain">
{providers.map(({ provider, connection }) => (
- <StackedListItem
- key={provider}
- className="gap-x-4 hover:bg-transparent"
- >
+ <StackedListItem key={provider} className="gap-x-4">
<span className="shrink-0">
<ConferencingProviderIcon provider={provider} size={32} />
</span>
diff --git a/apps/web/src/features/webhook/components/webhooks-list.tsx b/apps/web/src/features/webhook/components/webhooks-list.tsx
index d9a81ae9d..2591a03d5 100644
--- a/apps/web/src/features/webhook/components/webhooks-list.tsx
+++ b/apps/web/src/features/webhook/components/webhooks-list.tsx
@@ -36,7 +36,7 @@ export function WebhooksList({ webhooks }: { webhooks: Webhook[] }) {
}
return (
- <StackedList>
+ <StackedList variant="plain">
{webhooks.map((webhook) => (
<StackedListItem key={webhook.id}>
<div className="flex min-w-0 flex-1 items-center gap-4">