Skip to content

Commit b81d6e6

Browse files
committed
fix(mobile): conditionally show org members back header
1 parent 6770193 commit b81d6e6

3 files changed

Lines changed: 15 additions & 8 deletions

File tree

apps/web/src/app/(main)/(public)/orgs/[slug]/members/page.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@ import {
1212
import { OrganizationSwitcher } from "@account/organizations/components/OrganizationSwitcher";
1313
import { ArrowLeft, Loader2, Settings, UserPlus } from "lucide-react";
1414
import Link from "next/link";
15-
import { useParams } from "next/navigation";
15+
import { useParams, useSearchParams } from "next/navigation";
1616
import { useEffect, useMemo } from "react";
1717

1818
export default function OrganizationPublicMembersPage() {
1919
const params = useParams();
20+
const searchParams = useSearchParams();
2021
const slug = params.slug as string;
22+
const showMobileBackHeader = searchParams.get("from") === "community-home";
2123
const authStatus = useAuthStatus();
2224
const currentUser = authStatus.user;
2325

@@ -50,7 +52,7 @@ export default function OrganizationPublicMembersPage() {
5052
if (loading) {
5153
return (
5254
<>
53-
<MobilePageHeader title="成员" />
55+
{showMobileBackHeader && <MobilePageHeader title="成员" />}
5456
<div className="max-w-6xl mx-auto px-4 lg:px-8 py-5 lg:py-6">
5557
<div className="flex items-center justify-center py-20">
5658
<Loader2 className="h-6 w-6 animate-spin text-gray-400" />
@@ -63,7 +65,7 @@ export default function OrganizationPublicMembersPage() {
6365
if (error || !organization) {
6466
return (
6567
<>
66-
<MobilePageHeader title="成员" />
68+
{showMobileBackHeader && <MobilePageHeader title="成员" />}
6769
<div className="max-w-6xl mx-auto px-4 lg:px-8 py-5 lg:py-6">
6870
<EmptyState
6971
title="加载失败"
@@ -85,7 +87,9 @@ export default function OrganizationPublicMembersPage() {
8587

8688
return (
8789
<>
88-
<MobilePageHeader title={`${organization.name} · 成员`} />
90+
{showMobileBackHeader && (
91+
<MobilePageHeader title={`${organization.name} · 成员`} />
92+
)}
8993
<div className="max-w-6xl mx-auto px-4 lg:px-8 py-5 lg:py-6">
9094
{/* Org Switcher / Back link */}
9195
{organization && currentUser ? (

apps/web/src/modules/public/organizations/components/OrganizationMobileBottomToolbar.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ export function OrganizationMobileBottomToolbar({
4444

4545
const handlePrimaryAction = () => {
4646
if (userMembership) {
47-
router.push(`/orgs/${organizationSlug}/members`);
47+
router.push(
48+
`/orgs/${organizationSlug}/members?from=community-home`,
49+
);
4850
return;
4951
}
5052

apps/web/src/modules/public/organizations/components/OrganizationPublicHomepage.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ export function OrganizationPublicHomepage({
236236
: {};
237237
const coverImageSrc = organization.coverImage ?? null;
238238
const hasCoverImage = Boolean(coverImageSrc);
239+
const membersPageHref = `/orgs/${organization.slug}/members?from=community-home`;
239240

240241
const functionalRolesErrorMessage =
241242
functionalRolesError instanceof Error
@@ -368,7 +369,7 @@ export function OrganizationPublicHomepage({
368369
{userMembership ? (
369370
<>
370371
<Link
371-
href={`/orgs/${organization.slug}/members`}
372+
href={membersPageHref}
372373
className="flex w-full items-center justify-center gap-2 bg-black dark:bg-white py-2.5 rounded-md text-sm font-bold text-white dark:text-black shadow-sm transition-colors hover:bg-gray-800 dark:hover:bg-gray-200"
373374
>
374375
<Users className="h-3.5 w-3.5" />
@@ -510,7 +511,7 @@ export function OrganizationPublicHomepage({
510511
/>
511512
{organization.membersCount > 0 && (
512513
<Link
513-
href={`/orgs/${organization.slug}/members`}
514+
href={membersPageHref}
514515
className="inline-flex items-center gap-1.5 mt-3 text-xs font-bold text-muted-foreground hover:text-black dark:hover:text-white transition-colors"
515516
>
516517
查看全部 {organization.membersCount} 位成员
@@ -637,7 +638,7 @@ export function OrganizationPublicHomepage({
637638
{userMembership ? (
638639
<>
639640
<Link
640-
href={`/orgs/${organization.slug}/members`}
641+
href={membersPageHref}
641642
className="block w-full bg-black dark:bg-white text-white dark:text-black py-2.5 rounded-md font-bold text-sm text-center shadow-sm hover:bg-gray-800 dark:hover:bg-gray-200 transition-colors"
642643
>
643644
{t("public.enterOrganization")}

0 commit comments

Comments
 (0)