From 2d17ccc7a7939e2413a5ed201ccab039703d3000 Mon Sep 17 00:00:00 2001 From: mortezaei Date: Sat, 31 Oct 2026 17:30:42 +0330 Subject: [PATCH 1/2] feat(topbar): add CRM support portal (Report Issues) button next to language switcher --- src/components/layout/Topbar.tsx | 27 +++++++++++- src/features/support/supportPortal.ts | 63 +++++++++++++++++++++++++++ src/locales/ar.json | 1 + src/locales/en.json | 1 + src/locales/fa.json | 1 + 5 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 src/features/support/supportPortal.ts diff --git a/src/components/layout/Topbar.tsx b/src/components/layout/Topbar.tsx index 0f19fc4..0a93eb4 100644 --- a/src/components/layout/Topbar.tsx +++ b/src/components/layout/Topbar.tsx @@ -1,15 +1,19 @@ import React, { useMemo } from 'react' import { useLocation } from 'react-router-dom' import { SidebarTrigger } from '@/components/ui/sidebar' +import { Button } from '@/components/ui/button' import ThemeToggle from '@/components/layout/ThemeToggle' import ServerHealthTrigger from '@/components/layout/ServerHealthTrigger' import LanguageSwitcher from '@/components/layout/LanguageSwitcher' import { getNavigationConfig } from '@/config/navigation' +import { useSupportPortalUrl } from '@/features/support/supportPortal' import { useTranslation } from '@/i18n' +import { Ic } from '@/icons' export default function Topbar() { const { pathname } = useLocation() const { t } = useTranslation() + const supportPortalUrl = useSupportPortalUrl() const navConfig = useMemo(() => getNavigationConfig(t), [t]) @@ -56,11 +60,32 @@ export default function Topbar() { - {/* ابزارهای هدر: انتخابگر زبان، وضعیت اتصال سرور، سوئیچ تم */} + {/* ابزارهای هدر: انتخابگر زبان، گزارش مشکلات، وضعیت اتصال سرور، سوئیچ تم */}
{/* انتخابگر زبان سه گانه (فارسی، عربی، انگلیسی) */} + {/* دکمه گزارش مشکلات (پرتال پشتیبانی CRM) */} + + {/* نشانگر وضعیت اتصال سرور */} diff --git a/src/features/support/supportPortal.ts b/src/features/support/supportPortal.ts new file mode 100644 index 0000000..344978d --- /dev/null +++ b/src/features/support/supportPortal.ts @@ -0,0 +1,63 @@ +import { useMemo } from 'react' +import { useThemeStore } from '@/stores/theme' + +export const AQILA_SUPPORT_PORTAL_TOKEN = '76cb859c-24e3-4309-9d99-504ac2e49268' +export const AQILA_SUPPORT_PORTAL_BASE_URL = `https://teamby.nwhco.ir/portal/${AQILA_SUPPORT_PORTAL_TOKEN}` +export const FALLBACK_PRIMARY = '#d09460' + +function isValidHex(value: string): boolean { + return /^#?([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$/.test(value.trim()) +} + +function toCleanSixDigitHex(raw: string): string { + let clean = raw.trim().replace(/^#/, '') + if (clean.length === 3) { + clean = clean + .split('') + .map((c) => c + c) + .join('') + } + return clean.toLowerCase() +} + +export function resolveSupportPortalPrimaryHex(): string { + const candidates = [ + typeof document !== 'undefined' + ? document.documentElement.style.getPropertyValue('--primary').trim() || + getComputedStyle(document.documentElement).getPropertyValue('--primary').trim() + : undefined, + FALLBACK_PRIMARY, + ] + + for (const candidate of candidates) { + if (candidate && isValidHex(candidate)) { + return toCleanSixDigitHex(candidate) + } + } + + return toCleanSixDigitHex(FALLBACK_PRIMARY) +} + +export function buildAqilaSupportPortalUrl(options: { + primaryHex: string + theme: 'light' | 'dark' +}): string { + const url = new URL(AQILA_SUPPORT_PORTAL_BASE_URL) + url.searchParams.set('primary', toCleanSixDigitHex(options.primaryHex)) + url.searchParams.set('theme', options.theme) + return url.toString() +} + +/** + * Returns the live TeamBy Support Portal URL parameterized with the active + * Aqila Panel color palette and light/dark mode. + */ +export function useSupportPortalUrl(): string { + const isDark = useThemeStore((s) => s.isDark) + const theme: 'light' | 'dark' = isDark ? 'dark' : 'light' + + return useMemo(() => { + const primaryHex = resolveSupportPortalPrimaryHex() + return buildAqilaSupportPortalUrl({ primaryHex, theme }) + }, [theme]) +} diff --git a/src/locales/ar.json b/src/locales/ar.json index 7e6ec2b..a1aa3f4 100644 --- a/src/locales/ar.json +++ b/src/locales/ar.json @@ -51,6 +51,7 @@ "theme": "المظهر", "language": "اللغة", "selectLanguage": "اختر لغة النظام", + "reportIssues": "الإبلاغ عن المشاكل", "search": "بحث..." }, "auth": { diff --git a/src/locales/en.json b/src/locales/en.json index 29bb256..bb6bd34 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -51,6 +51,7 @@ "theme": "Theme", "language": "Language", "selectLanguage": "Select System Language", + "reportIssues": "Report Issues", "search": "Search..." }, "auth": { diff --git a/src/locales/fa.json b/src/locales/fa.json index 8d266f1..70b6868 100644 --- a/src/locales/fa.json +++ b/src/locales/fa.json @@ -51,6 +51,7 @@ "theme": "تغییر تم", "language": "تغییر زبان", "selectLanguage": "انتخاب زبان سامانه", + "reportIssues": "گزارش مشکلات", "search": "جستجو..." }, "auth": { From 6b1d5e554ae71413eb2ad592ab85f661d6dff1b4 Mon Sep 17 00:00:00 2001 From: mortezaei Date: Sat, 31 Oct 2026 17:31:59 +0330 Subject: [PATCH 2/2] fix(topbar): use buttonVariants directly on anchor tag for support portal link --- src/components/layout/Topbar.tsx | 36 +++++++++++++++----------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/src/components/layout/Topbar.tsx b/src/components/layout/Topbar.tsx index 0a93eb4..ed10a45 100644 --- a/src/components/layout/Topbar.tsx +++ b/src/components/layout/Topbar.tsx @@ -1,7 +1,7 @@ import React, { useMemo } from 'react' import { useLocation } from 'react-router-dom' import { SidebarTrigger } from '@/components/ui/sidebar' -import { Button } from '@/components/ui/button' +import { buttonVariants } from '@/components/ui/button' import ThemeToggle from '@/components/layout/ThemeToggle' import ServerHealthTrigger from '@/components/layout/ServerHealthTrigger' import LanguageSwitcher from '@/components/layout/LanguageSwitcher' @@ -9,6 +9,7 @@ import { getNavigationConfig } from '@/config/navigation' import { useSupportPortalUrl } from '@/features/support/supportPortal' import { useTranslation } from '@/i18n' import { Ic } from '@/icons' +import { cn } from '@/lib/utils' export default function Topbar() { const { pathname } = useLocation() @@ -66,25 +67,22 @@ export default function Topbar() { {/* دکمه گزارش مشکلات (پرتال پشتیبانی CRM) */} - + + + {t('topbar.reportIssues')} + + {/* نشانگر وضعیت اتصال سرور */}