From ed83f5f1ca88f30021de3e2651d9fbe67bd933a5 Mon Sep 17 00:00:00 2001 From: JzoNg Date: Tue, 11 Mar 2025 14:58:06 +0800 Subject: [PATCH] EDU badge --- web/app/account/account-page/index.tsx | 13 ++- web/app/account/avatar.tsx | 14 ++- web/app/account/header.tsx | 2 +- .../components/base/premium-badge/index.css | 2 +- .../billing/header-billing-btn/index.tsx | 60 ------------ .../header/account-dropdown/index.tsx | 98 ++++++++++--------- .../workplace-selector/index.tsx | 4 + web/app/components/header/index.tsx | 8 +- .../components/header/plan-badge/index.tsx | 12 ++- 9 files changed, 91 insertions(+), 122 deletions(-) delete mode 100644 web/app/components/billing/header-billing-btn/index.tsx diff --git a/web/app/account/account-page/index.tsx b/web/app/account/account-page/index.tsx index 16d826a7c2..30b781c606 100644 --- a/web/app/account/account-page/index.tsx +++ b/web/app/account/account-page/index.tsx @@ -1,7 +1,9 @@ 'use client' import { useState } from 'react' import { useTranslation } from 'react-i18next' - +import { + RiGraduationCapFill, +} from '@remixicon/react' import { useContext } from 'use-context-selector' import DeleteAccount from '../delete-account' import s from './index.module.css' @@ -16,6 +18,7 @@ import { ToastContext } from '@/app/components/base/toast' import AppIcon from '@/app/components/base/app-icon' import { IS_CE_EDITION } from '@/config' import Input from '@/app/components/base/input' +import PremiumBadge from '@/app/components/base/premium-badge' const titleClassName = ` system-sm-semibold text-text-secondary @@ -135,7 +138,13 @@ export default function AccountPage() {
-

{userProfile.name}

+

+ {userProfile.name} + + + EDU + +

{userProfile.email}

diff --git a/web/app/account/avatar.tsx b/web/app/account/avatar.tsx index bd9cbec4c4..c3568a66a5 100644 --- a/web/app/account/avatar.tsx +++ b/web/app/account/avatar.tsx @@ -2,13 +2,17 @@ import { useTranslation } from 'react-i18next' import { Fragment } from 'react' import { useRouter } from 'next/navigation' +import { + RiGraduationCapFill, +} from '@remixicon/react' import { Menu, Transition } from '@headlessui/react' import Avatar from '@/app/components/base/avatar' import { logout } from '@/service/common' import { useAppContext } from '@/context/app-context' import { LogOut01 } from '@/app/components/base/icons/src/vender/line/general' +import PremiumBadge from '@/app/components/base/premium-badge' -export interface IAppSelector { +export type IAppSelector = { isMobile: boolean } @@ -68,7 +72,13 @@ export default function AppSelector() {
-
{userProfile.name}
+
+ {userProfile.name} + + + EDU + +
{userProfile.email}
diff --git a/web/app/account/header.tsx b/web/app/account/header.tsx index 694533e5ab..006e82372b 100644 --- a/web/app/account/header.tsx +++ b/web/app/account/header.tsx @@ -22,7 +22,7 @@ const Header = () => {

{t('common.account.account')}

-
+