From 377db2284f47691ff897b631c11e82b844eeaf21 Mon Sep 17 00:00:00 2001
From: eric <xiaoshuang.eric@gmail.com>
Date: Fri, 4 Sep 2026 07:12:04 -0500
Subject: [PATCH] Move chat and notifications out of Connect into top-right
 icons.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 frontend/src/app/changelog/page.tsx |  9 ++++++++-
 frontend/src/app/globals.css        |  1 +
 frontend/src/app/profile/page.tsx   | 13 ++-----------
 frontend/src/components/Footer.tsx  |  3 +--
 frontend/src/components/Navbar.tsx  | 19 +++++++++++++++----
 5 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/frontend/src/app/changelog/page.tsx b/frontend/src/app/changelog/page.tsx
index d40cfa1..bfb912b 100644
--- a/frontend/src/app/changelog/page.tsx
+++ b/frontend/src/app/changelog/page.tsx
@@ -8,12 +8,19 @@ export const metadata: Metadata = {
 };
 
 const LOGS = [
+  {
+    date: "2026-09-04",
+    tag: "导航精简",
+    items: [
+      "私信与通知移出 Connect 菜单/页脚/个人中心快捷入口，统一用右上角 ✉️ / 🔔 图标进入",
+    ],
+  },
   {
     date: "2026-09-04",
     tag: "活动报名 · Connect 数据",
     items: [
       "报名成功 toast：线上/混合直达直播间，线下引导导出日历；报名确认写入通知箱",
-      "个人中心新增 Connect 数据条（喜欢我的 / 互相喜欢 / 私信 / 已报名），可点进对应页面",
+      "个人中心新增 Connect 数据条（喜欢我的 / 互相喜欢 / 已报名），可点进对应页面",
     ],
   },
   {
diff --git a/frontend/src/app/globals.css b/frontend/src/app/globals.css
index 8110f25..8c55d76 100644
--- a/frontend/src/app/globals.css
+++ b/frontend/src/app/globals.css
@@ -2781,6 +2781,7 @@ img { max-width: 100%; display: block; }
 
 .profile-connect-stats {
   margin-bottom: 0;
+  grid-template-columns: repeat(3, 1fr);
 }
 
 .profile-stat-card {
diff --git a/frontend/src/app/profile/page.tsx b/frontend/src/app/profile/page.tsx
index 0729cfc..0075636 100644
--- a/frontend/src/app/profile/page.tsx
+++ b/frontend/src/app/profile/page.tsx
@@ -60,7 +60,7 @@ export default function ProfilePage() {
   const [stats, setStats] = useState<ProfileStats | null>(null);
   const [favoriteDests, setFavoriteDests] = useState<Destination[]>([]);
   const [rsvps, setRsvps] = useState<Meetup[]>([]);
-  const [connect, setConnect] = useState({ likes: 0, matches: 0, chats: 0 });
+  const [connect, setConnect] = useState({ likes: 0, matches: 0 });
   const [trip, setTrip] = useState<TripItem[]>([]);
   const [meta, setMeta] = useState<PlanMeta | null>(null);
   const [loading, setLoading] = useState(true);
@@ -113,11 +113,9 @@ export default function ProfilePage() {
       Promise.all([
         api.getMatchLikesReceived(token).catch(() => []),
         api.getMutualMatches(token).catch(() => ({ items: [] })),
-        api.getConversations(token).catch(() => []),
-      ]).then(([likes, matches, chats]) => ({
+      ]).then(([likes, matches]) => ({
         likes: likes.length,
         matches: matches.items?.length ?? 0,
-        chats: chats.length,
       })),
     ]).then(([s, f, v, myMeetups, connectStats]) => {
       setStats(s);
@@ -244,11 +242,6 @@ export default function ProfilePage() {
               <strong>{connect.matches}</strong>
               <span>{t.profile.statMatches}</span>
             </Link>
-            <Link href="/chat" className="profile-stat-card profile-stat-link">
-              <span className="stat-emoji">✉️</span>
-              <strong>{connect.chats}</strong>
-              <span>{t.profile.statChats}</span>
-            </Link>
             <Link href="/meetups" className="profile-stat-card profile-stat-link">
               <span className="stat-emoji">🎉</span>
               <strong>{rsvps.length}</strong>
@@ -439,8 +432,6 @@ export default function ProfilePage() {
             <Link href="/next-stop" className="quick-card">{t.profile.qNext}</Link>
             <Link href="/meetups" className="quick-card">{t.profile.qMeetups}</Link>
             <Link href="/dating" className="quick-card">{t.profile.qDating}</Link>
-            <Link href="/chat" className="quick-card">{t.profile.qChat}</Link>
-            <Link href="/notifications" className="quick-card">{t.profile.qNotif}</Link>
             <Link href="/join" className="quick-card">{vip ? t.profile.qVipMember : t.profile.qVip}</Link>
             <Link href="/digital" className="quick-card">{t.profile.qDigital}</Link>
             <Link href="/ai" className="quick-card">{t.profile.qAi}</Link>
diff --git a/frontend/src/components/Footer.tsx b/frontend/src/components/Footer.tsx
index 57b0680..cb4aa0c 100644
--- a/frontend/src/components/Footer.tsx
+++ b/frontend/src/components/Footer.tsx
@@ -54,7 +54,7 @@ export default function Footer() {
             <Link href="/meetups">{t.footer.meetups}</Link>
             <Link href="/community">{t.footer.community}</Link>
             <Link href="/dating">{t.footer.dating}</Link>
-            <Link href="/chat">{t.footer.chat}</Link>
+            <Link href="/join">{t.footer.join}</Link>
           </div>
           <div className="footer-links">
             <h4>{t.footer.grow}</h4>
@@ -64,7 +64,6 @@ export default function Footer() {
             <Link href="/submit">{t.submit.tag}</Link>
             <Link href="/feedback">{t.nav.feedback}</Link>
             <Link href="/tools">{t.footer.toolkit}</Link>
-            <Link href="/join">{t.footer.join}</Link>
           </div>
           <div className="footer-links">
             <h4>{t.footer.account}</h4>
diff --git a/frontend/src/components/Navbar.tsx b/frontend/src/components/Navbar.tsx
index aa55e2b..edd83f9 100644
--- a/frontend/src/components/Navbar.tsx
+++ b/frontend/src/components/Navbar.tsx
@@ -57,8 +57,6 @@ export default function Navbar() {
     { href: "/meetups", label: t.nav.meetups, section: "meetups" },
     { href: "/community", label: t.nav.community, section: "community" },
     { href: "/dating", label: t.nav.dating, section: "dating" },
-    { href: "/chat", label: t.nav.chat, section: "chat" },
-    { href: "/notifications", label: t.nav.notifications, section: "notifications" },
     { href: "/join", label: t.nav.join, section: "join" },
   ];
 
@@ -142,7 +140,6 @@ export default function Navbar() {
     if (l.href.startsWith("/#")) return isHome && active === l.section;
     if (l.href === "/book") return pathname.startsWith("/book");
     if (l.href === "/digital") return pathname.startsWith("/digital");
-    if (l.href === "/chat") return pathname.startsWith("/chat");
     if (l.href === "/dating") return pathname.startsWith("/dating");
     if (l.href === "/meetups") return pathname.startsWith("/meetups");
     if (l.href === "/community") return pathname.startsWith("/community");
@@ -228,7 +225,7 @@ export default function Navbar() {
           </div>
         </nav>
 
-        {/* Right chrome: language / theme / notifications — always top-right */}
+        {/* Right chrome: language / theme / chat / notifications — always top-right */}
         <div className="nav-utils" aria-label="preferences">
           <button type="button" className="nav-lang-btn" onClick={toggleLocale} aria-label={t.nav.lang}>
             {locale === "zh" ? "EN" : "中文"}
@@ -236,6 +233,20 @@ export default function Navbar() {
           <button type="button" className="nav-cta" onClick={toggleTheme} aria-label={t.nav.theme}>
             <span className="theme-icon">{theme === "dark" ? "🌙" : "☀️"}</span>
           </button>
+          {user ? (
+            <Link href="/chat" className="nav-notify" aria-label={t.nav.chat}>
+              ✉️
+            </Link>
+          ) : (
+            <Link
+              href={`/login?next=${encodeURIComponent("/chat")}`}
+              className="nav-notify nav-notify-guest"
+              aria-label={t.nav.chat}
+              title={t.nav.login}
+            >
+              ✉️
+            </Link>
+          )}
           {user ? (
             <Link href="/notifications" className="nav-notify" aria-label={t.nav.notifications}>
               🔔{unread > 0 && <em className="nav-notify-badge">{unread}</em>}