Compare commits

..
2 Commits
Author SHA1 Message Date
DenozordecandCursor 9c00b268dc fix(ui): выровнять очередь внимания дашборда под Frame и IconTile
quality / changes (push) Successful in 8s
quality / api (push) Skipped
quality / commitlint (push) Skipped
quality / docker-check (push) Skipped
CD / update-wiki (push) Successful in 5s
quality / web (push) Successful in 1m6s
CD / quality (push) Successful in 1m21s
CD / publish (push) Successful in 2m36s
Соседние Frame-колонки как в EvoBGP вместо вложенной оболочки; compact empty через IconTile elevated; счётчики ReUI Badge.

Co-authored-by: Cursor <[email protected]>
2026-08-19 01:11:36 +07:00
Denozordec a185b3a2cb chore: update dependencies and improve wiki update process
CD / update-wiki (push) Successful in 11s
quality / commitlint (push) Skipped
quality / changes (push) Successful in 9s
quality / docker-check (push) Skipped
quality / web (push) Successful in 1m34s
quality / api (push) Successful in 1m4s
CD / quality (push) Successful in 2m52s
CD / publish (push) Successful in 54s
- Added new dependencies for @tanstack/router-cli and updated related packages in pnpm-lock.yaml.
- Modified the build script in package.json to include `tsr generate` for route generation.
- Enhanced the wiki update job in Gitea Actions to use a fallback for the GITEA_TOKEN and improved the authorization method for pushing changes.
- Updated .dockerignore to clarify generated files.

This commit improves the build process and ensures smoother updates to the wiki documentation.
2026-08-19 01:00:24 +07:00
12 changed files with 465 additions and 247 deletions
+1
View File
@@ -22,6 +22,7 @@ node_modules
**/node_modules **/node_modules
**/dist **/dist
**/.turbo **/.turbo
# Генерируется `tsr generate` в `web` build (tsc идёт до Vite-плагина).
apps/web/src/routeTree.gen.ts apps/web/src/routeTree.gen.ts
apps/web/playwright-report apps/web/playwright-report
apps/web/test-results apps/web/test-results
+1 -1
View File
@@ -35,7 +35,7 @@ Runner: `ubuntu-latest`, Docker для **docker-check** (PR) и **publish** (CD)
Повтор упавшего **publish** (тег уже есть, bake нет): detect берёт `v*` на `HEAD` и всё равно пушит образы. Подробнее: [docs/releasing.md](../docs/releasing.md#перезапуск-упавшего-job-publish). Повтор упавшего **publish** (тег уже есть, bake нет): detect берёт `v*` на `HEAD` и всё равно пушит образы. Подробнее: [docs/releasing.md](../docs/releasing.md#перезапуск-упавшего-job-publish).
Job **update-wiki** идёт **параллельно** publish (не блокирует образы): при diff `docs/Home.md` копирует файл в wiki-репозиторий (`GITEA_TOKEN`). Job **update-wiki** идёт **параллельно** publish (не блокирует образы): при diff `docs/Home.md` копирует файл в wiki-репозиторий. Clone/push идут с `Authorization: Basic oauth2:<token>` — после clone git вырезает токен из `origin`, без header Gitea отвечает `Repository not found` (часто на внутреннем `GITEA_INSTANCE_URL` раннера). Секрет: **`GITEA_TOKEN`**, fallback **`ACTIONS_PAT`**.
### Секреты ### Секреты
+21 -7
View File
@@ -37,21 +37,35 @@ jobs:
else else
echo "changed=true" >> "$GITHUB_OUTPUT" echo "changed=true" >> "$GITHUB_OUTPUT"
fi fi
- name: Clone Wiki repository
if: steps.check_changes.outputs.changed == 'true'
run: |
WIKI_URL=$(echo "${{ github.server_url }}/${{ github.repository }}.wiki.git" | sed -e "s|://|://gitea-actions:${{ secrets.GITEA_TOKEN }}@|")
git clone "${WIKI_URL}" cfdm.wiki
- name: Update and push Wiki content - name: Update and push Wiki content
if: steps.check_changes.outputs.changed == 'true' if: steps.check_changes.outputs.changed == 'true'
env:
WIKI_TOKEN: ${{ secrets.GITEA_TOKEN || secrets.ACTIONS_PAT }}
SERVER_URL: ${{ gitea.server_url }}
REPO: ${{ gitea.repository }}
run: | run: |
set -euo pipefail
if [ -z "${WIKI_TOKEN:-}" ]; then
echo "GITEA_TOKEN / ACTIONS_PAT is empty — cannot push wiki"
exit 1
fi
# runner GITEA_INSTANCE_URL часто внутренний (http://192.168.x.x:3000).
# git после clone вырезает userinfo из origin → push без токена даёт 404
# «Repository not found». Authorization header переживает insteadOf/sanitize.
WIKI_URL="${SERVER_URL}/${REPO}.wiki.git"
AUTH_HEADER="Authorization: Basic $(printf '%s' "oauth2:${WIKI_TOKEN}" | base64 | tr -d '\n')"
git -c http.extraHeader="${AUTH_HEADER}" clone "${WIKI_URL}" cfdm.wiki
cp docs/Home.md cfdm.wiki/Home.md cp docs/Home.md cfdm.wiki/Home.md
cd cfdm.wiki cd cfdm.wiki
git config user.name "Gitea Actions" git config user.name "Gitea Actions"
git config user.email "actions@gitea" git config user.email "actions@gitea"
git add Home.md git add Home.md
git diff --staged --quiet || git commit -m "docs: Update Wiki from main repository" if git diff --staged --quiet; then
git push echo "Wiki Home.md already up to date"
exit 0
fi
git commit -m "docs: Update Wiki from main repository"
git -c http.extraHeader="${AUTH_HEADER}" push origin HEAD
publish: publish:
needs: [quality] needs: [quality]
+2 -1
View File
@@ -5,7 +5,7 @@
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
"build": "tsc -b && vite build", "build": "tsr generate && tsc -b && vite build",
"test": "vitest run", "test": "vitest run",
"lint": "eslint .", "lint": "eslint .",
"preview": "vite preview" "preview": "vite preview"
@@ -42,6 +42,7 @@
}, },
"devDependencies": { "devDependencies": {
"@eslint/js": "^10.0.1", "@eslint/js": "^10.0.1",
"@tanstack/router-cli": "^1.167.31",
"@types/node": "^24.12.3", "@types/node": "^24.12.3",
"@types/react": "^19.2.14", "@types/react": "^19.2.14",
"@types/react-dom": "^19.2.3", "@types/react-dom": "^19.2.3",
+15 -5
View File
@@ -1,5 +1,6 @@
import { InboxIcon, type LucideIcon } from 'lucide-react' import { InboxIcon, type LucideIcon } from 'lucide-react'
import { IconStack } from '@/components/reui/icon-stack' import { IconStack } from '@/components/reui/icon-stack'
import { IconTile } from '@/components/reui/icon-tile'
import { import {
Empty, Empty,
EmptyContent, EmptyContent,
@@ -46,20 +47,29 @@ export function EmptyState({
!centered && className, !centered && className,
)} )}
> >
<EmptyHeader className="gap-5 text-center"> <EmptyHeader className={cn('text-center', stackedIcon ? 'gap-5' : 'gap-3')}>
<EmptyMedia className="mb-0"> <EmptyMedia className="mb-0">
{stackedIcon ? ( {stackedIcon ? (
<IconStack aria-hidden="true" className="h-14 w-12"> <IconStack aria-hidden="true" className="h-14 w-12">
<Icon strokeWidth={1.9} aria-hidden="true" className="size-5" /> <Icon strokeWidth={1.9} aria-hidden="true" className="size-5" />
</IconStack> </IconStack>
) : ( ) : (
<span className="bg-muted text-muted-foreground flex size-10 items-center justify-center rounded-lg [&_svg]:size-5"> <IconTile
<Icon aria-hidden="true" /> variant="elevated"
</span> className="size-10.5 text-muted-foreground"
aria-hidden="true"
>
<Icon />
</IconTile>
)} )}
</EmptyMedia> </EmptyMedia>
<div className="flex flex-col items-center gap-2"> <div className="flex flex-col items-center gap-2">
<EmptyTitle className="text-base font-semibold tracking-tight"> <EmptyTitle
className={cn(
'font-semibold tracking-tight',
stackedIcon ? 'text-base' : 'text-sm',
)}
>
{title} {title}
</EmptyTitle> </EmptyTitle>
{description ? ( {description ? (
@@ -0,0 +1,95 @@
import type { ReactNode } from 'react'
import type { LucideIcon } from 'lucide-react'
import { EmptyState } from '@/components/empty-state'
import { Badge } from '@/components/reui/badge'
import {
Frame,
FrameHeader,
FramePanel,
FrameTitle,
} from '@/components/reui/frame'
import { IconTile } from '@/components/reui/icon-tile'
import { cn } from '@cfdm/ui/lib/utils'
/**
* Sibling Frame columns for dashboard attention queue.
* Preview: https://reui.io/preview/base/dashboard-1 · https://reui.io/preview/base/stats-12
* Docs: https://reui.io/docs/components/base/frame · https://reui.io/docs/components/base/icon-tile
*/
export interface AttentionQueueColumn {
id: string
title: string
icon: LucideIcon
iconClassName?: string
count: number
countVariant?: 'destructive' | 'warning' | 'secondary' | 'destructive-light' | 'warning-light'
emptyTitle: string
emptyDescription: string
emptyAction?: ReactNode
children: ReactNode
}
interface AttentionQueueProps {
columns: AttentionQueueColumn[]
className?: string
}
const DEFAULT_ICON_CLASS = 'text-muted-foreground [&_svg]:text-current'
export function AttentionQueue({ columns, className }: AttentionQueueProps) {
return (
<div
className={cn(
'grid min-w-0 items-start gap-2 @3xl:grid-cols-3',
className,
)}
>
{columns.map((column) => {
const Icon = column.icon
const isEmpty = column.count === 0
return (
<Frame key={column.id} dense spacing="sm" className="min-w-0 w-full">
<FrameHeader>
<div className="flex min-w-0 items-center gap-2">
<IconTile
variant="elevated"
size="sm"
className={cn(DEFAULT_ICON_CLASS, column.iconClassName)}
aria-hidden="true"
>
<Icon />
</IconTile>
<FrameTitle className="min-w-0 truncate">{column.title}</FrameTitle>
{column.count > 0 ? (
<Badge
size="sm"
variant={column.countVariant ?? 'secondary'}
className="tabular-nums"
>
{column.count}
</Badge>
) : null}
</div>
</FrameHeader>
<FramePanel className="min-w-0">
{isEmpty ? (
<div className="flex min-h-28 items-center justify-center py-4">
<EmptyState
icon={Icon}
title={column.emptyTitle}
description={column.emptyDescription}
action={column.emptyAction}
centered={false}
stackedIcon={false}
/>
</div>
) : (
column.children
)}
</FramePanel>
</Frame>
)
})}
</div>
)
}
@@ -13,6 +13,7 @@ export {
type OpsKpiCard, type OpsKpiCard,
} from './kpi-stat-grid' } from './kpi-stat-grid'
export { QuickActionGrid, type QuickActionItem } from './quick-action-grid' export { QuickActionGrid, type QuickActionItem } from './quick-action-grid'
export { AttentionQueue, type AttentionQueueColumn } from './attention-queue'
export { OpsDashboard } from './ops-dashboard' export { OpsDashboard } from './ops-dashboard'
export { KanbanBoard, KanbanBoardSkeleton, type KanbanBoardProps, type KanbanColumnConfig } from './kanban-board' export { KanbanBoard, KanbanBoardSkeleton, type KanbanBoardProps, type KanbanColumnConfig } from './kanban-board'
export { DetailPanel, type DetailMetricCard } from './detail-panel' export { DetailPanel, type DetailMetricCard } from './detail-panel'
@@ -1,11 +1,4 @@
import type { ReactNode } from 'react' import type { ReactNode } from 'react'
import {
Frame,
FrameDescription,
FrameHeader,
FramePanel,
FrameTitle,
} from '@/components/reui/frame'
import { Skeleton } from '@cfdm/ui/components/skeleton' import { Skeleton } from '@cfdm/ui/components/skeleton'
import { KpiStatGrid, type KpiStatCard } from './kpi-stat-grid' import { KpiStatGrid, type KpiStatCard } from './kpi-stat-grid'
@@ -17,10 +10,18 @@ interface OpsDashboardProps {
afterKpi?: ReactNode afterKpi?: ReactNode
charts: ReactNode charts: ReactNode
queue: ReactNode queue: ReactNode
queueTitle?: string
queueDescription?: string
isLoading?: boolean isLoading?: boolean
} }
/** Denser stack for KPI / charts / queue. PageHeader lives outside via PageShell. */ /**
* Ops dashboard: KPI → optional Quick Actions → charts → queue.
* Queue is a sibling Frame grid — never wrap Frames inside another Frame.
* @see https://reui.io/preview/base/dashboard-1
* @see https://reui.io/preview/base/stats-12
* @see https://reui.io/docs/components/base/frame
*/
const rootClassName = const rootClassName =
'text-foreground @container flex w-full flex-col gap-2 md:gap-3' 'text-foreground @container flex w-full flex-col gap-2 md:gap-3'
@@ -32,7 +33,11 @@ function OpsDashboardSkeleton() {
<Skeleton className="h-64 w-full rounded-xl" /> <Skeleton className="h-64 w-full rounded-xl" />
<Skeleton className="h-64 w-full rounded-xl" /> <Skeleton className="h-64 w-full rounded-xl" />
</div> </div>
<Skeleton className="h-48 w-full rounded-xl" /> <div className="grid gap-2 @3xl:grid-cols-3">
<Skeleton className="h-40 w-full rounded-xl" />
<Skeleton className="h-40 w-full rounded-xl" />
<Skeleton className="h-40 w-full rounded-xl" />
</div>
</div> </div>
) )
} }
@@ -42,6 +47,8 @@ export function OpsDashboard({
afterKpi, afterKpi,
charts, charts,
queue, queue,
queueTitle = 'Требуют внимания',
queueDescription = 'Проблемы health-check, истекающие сертификаты и домены без группы',
isLoading = false, isLoading = false,
}: OpsDashboardProps) { }: OpsDashboardProps) {
if (isLoading) { if (isLoading) {
@@ -63,16 +70,16 @@ export function OpsDashboard({
{charts} {charts}
</section> </section>
<section aria-label="Требуют внимания"> <section aria-label={queueTitle} className="flex min-w-0 flex-col gap-2">
<Frame dense spacing="sm" className="w-full"> <div className="flex min-w-0 flex-col gap-1">
<FrameHeader> <h2 className="text-sm font-semibold tracking-tight">{queueTitle}</h2>
<FrameTitle>Требуют внимания</FrameTitle> {queueDescription ? (
<FrameDescription> <p className="text-muted-foreground max-w-prose text-sm">
Проблемы health-check, истекающие сертификаты и домены без группы {queueDescription}
</FrameDescription> </p>
</FrameHeader> ) : null}
<FramePanel>{queue}</FramePanel> </div>
</Frame> {queue}
</section> </section>
</div> </div>
) )
+77 -77
View File
@@ -9,44 +9,39 @@
// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.
import { Route as rootRouteImport } from './routes/__root' import { Route as rootRouteImport } from './routes/__root'
import { Route as LoginRouteImport } from './routes/login'
import { Route as AuthRouteImport } from './routes/_auth' import { Route as AuthRouteImport } from './routes/_auth'
import { Route as LoginRouteImport } from './routes/login'
import { Route as AuthIndexRouteImport } from './routes/_auth/index' import { Route as AuthIndexRouteImport } from './routes/_auth/index'
import { Route as AuthCallbackRouteImport } from './routes/auth.callback'
import { Route as AuthServicesRouteImport } from './routes/_auth/services'
import { Route as AuthGroupsRouteImport } from './routes/_auth/groups'
import { Route as AuthCertificatesRouteImport } from './routes/_auth/certificates' import { Route as AuthCertificatesRouteImport } from './routes/_auth/certificates'
import { Route as AuthGroupsRouteImport } from './routes/_auth/groups'
import { Route as AuthServicesRouteImport } from './routes/_auth/services'
import { Route as AuthSettingsRouteRouteImport } from './routes/_auth/settings/route' import { Route as AuthSettingsRouteRouteImport } from './routes/_auth/settings/route'
import { Route as AuthSettingsIndexRouteImport } from './routes/_auth/settings/index' import { Route as AuthCallbackRouteImport } from './routes/auth.callback'
import { Route as AuthDomainsIndexRouteImport } from './routes/_auth/domains/index' import { Route as AuthDomainsIndexRouteImport } from './routes/_auth/domains/index'
import { Route as AuthSettingsIntegrationsRouteImport } from './routes/_auth/settings/integrations'
import { Route as AuthSettingsAppearanceRouteImport } from './routes/_auth/settings/appearance'
import { Route as AuthGroupsGroupIdRouteImport } from './routes/_auth/groups/$groupId' import { Route as AuthGroupsGroupIdRouteImport } from './routes/_auth/groups/$groupId'
import { Route as AuthSettingsIndexRouteImport } from './routes/_auth/settings/index'
import { Route as AuthSettingsAppearanceRouteImport } from './routes/_auth/settings/appearance'
import { Route as AuthSettingsIntegrationsRouteImport } from './routes/_auth/settings/integrations'
import { Route as AuthDomainsDomainIdIndexRouteImport } from './routes/_auth/domains/$domainId/index' import { Route as AuthDomainsDomainIdIndexRouteImport } from './routes/_auth/domains/$domainId/index'
import { Route as AuthDomainsDomainIdDnsRouteImport } from './routes/_auth/domains/$domainId/dns' import { Route as AuthDomainsDomainIdDnsRouteImport } from './routes/_auth/domains/$domainId/dns'
const AuthRoute = AuthRouteImport.update({
id: '/_auth',
getParentRoute: () => rootRouteImport,
} as any)
const LoginRoute = LoginRouteImport.update({ const LoginRoute = LoginRouteImport.update({
id: '/login', id: '/login',
path: '/login', path: '/login',
getParentRoute: () => rootRouteImport, getParentRoute: () => rootRouteImport,
} as any) } as any)
const AuthRoute = AuthRouteImport.update({
id: '/_auth',
getParentRoute: () => rootRouteImport,
} as any)
const AuthIndexRoute = AuthIndexRouteImport.update({ const AuthIndexRoute = AuthIndexRouteImport.update({
id: '/', id: '/',
path: '/', path: '/',
getParentRoute: () => AuthRoute, getParentRoute: () => AuthRoute,
} as any) } as any)
const AuthCallbackRoute = AuthCallbackRouteImport.update({ const AuthCertificatesRoute = AuthCertificatesRouteImport.update({
id: '/auth/callback', id: '/certificates',
path: '/auth/callback', path: '/certificates',
getParentRoute: () => rootRouteImport,
} as any)
const AuthServicesRoute = AuthServicesRouteImport.update({
id: '/services',
path: '/services',
getParentRoute: () => AuthRoute, getParentRoute: () => AuthRoute,
} as any) } as any)
const AuthGroupsRoute = AuthGroupsRouteImport.update({ const AuthGroupsRoute = AuthGroupsRouteImport.update({
@@ -54,9 +49,9 @@ const AuthGroupsRoute = AuthGroupsRouteImport.update({
path: '/groups', path: '/groups',
getParentRoute: () => AuthRoute, getParentRoute: () => AuthRoute,
} as any) } as any)
const AuthCertificatesRoute = AuthCertificatesRouteImport.update({ const AuthServicesRoute = AuthServicesRouteImport.update({
id: '/certificates', id: '/services',
path: '/certificates', path: '/services',
getParentRoute: () => AuthRoute, getParentRoute: () => AuthRoute,
} as any) } as any)
const AuthSettingsRouteRoute = AuthSettingsRouteRouteImport.update({ const AuthSettingsRouteRoute = AuthSettingsRouteRouteImport.update({
@@ -64,32 +59,37 @@ const AuthSettingsRouteRoute = AuthSettingsRouteRouteImport.update({
path: '/settings', path: '/settings',
getParentRoute: () => AuthRoute, getParentRoute: () => AuthRoute,
} as any) } as any)
const AuthSettingsIndexRoute = AuthSettingsIndexRouteImport.update({ const AuthCallbackRoute = AuthCallbackRouteImport.update({
id: '/', id: '/auth/callback',
path: '/', path: '/auth/callback',
getParentRoute: () => AuthSettingsRouteRoute, getParentRoute: () => rootRouteImport,
} as any) } as any)
const AuthDomainsIndexRoute = AuthDomainsIndexRouteImport.update({ const AuthDomainsIndexRoute = AuthDomainsIndexRouteImport.update({
id: '/domains/', id: '/domains/',
path: '/domains/', path: '/domains/',
getParentRoute: () => AuthRoute, getParentRoute: () => AuthRoute,
} as any) } as any)
const AuthGroupsGroupIdRoute = AuthGroupsGroupIdRouteImport.update({
id: '/$groupId',
path: '/$groupId',
getParentRoute: () => AuthGroupsRoute,
} as any)
const AuthSettingsIndexRoute = AuthSettingsIndexRouteImport.update({
id: '/',
path: '/',
getParentRoute: () => AuthSettingsRouteRoute,
} as any)
const AuthSettingsAppearanceRoute = AuthSettingsAppearanceRouteImport.update({
id: '/appearance',
path: '/appearance',
getParentRoute: () => AuthSettingsRouteRoute,
} as any)
const AuthSettingsIntegrationsRoute = const AuthSettingsIntegrationsRoute =
AuthSettingsIntegrationsRouteImport.update({ AuthSettingsIntegrationsRouteImport.update({
id: '/integrations', id: '/integrations',
path: '/integrations', path: '/integrations',
getParentRoute: () => AuthSettingsRouteRoute, getParentRoute: () => AuthSettingsRouteRoute,
} as any) } as any)
const AuthSettingsAppearanceRoute = AuthSettingsAppearanceRouteImport.update({
id: '/appearance',
path: '/appearance',
getParentRoute: () => AuthSettingsRouteRoute,
} as any)
const AuthGroupsGroupIdRoute = AuthGroupsGroupIdRouteImport.update({
id: '/$groupId',
path: '/$groupId',
getParentRoute: () => AuthGroupsRoute,
} as any)
const AuthDomainsDomainIdIndexRoute = const AuthDomainsDomainIdIndexRoute =
AuthDomainsDomainIdIndexRouteImport.update({ AuthDomainsDomainIdIndexRouteImport.update({
id: '/domains/$domainId/', id: '/domains/$domainId/',
@@ -210,13 +210,6 @@ export interface RootRouteChildren {
declare module '@tanstack/react-router' { declare module '@tanstack/react-router' {
interface FileRoutesByPath { interface FileRoutesByPath {
'/login': {
id: '/login'
path: '/login'
fullPath: '/login'
preLoaderRoute: typeof LoginRouteImport
parentRoute: typeof rootRouteImport
}
'/_auth': { '/_auth': {
id: '/_auth' id: '/_auth'
path: '' path: ''
@@ -224,6 +217,13 @@ declare module '@tanstack/react-router' {
preLoaderRoute: typeof AuthRouteImport preLoaderRoute: typeof AuthRouteImport
parentRoute: typeof rootRouteImport parentRoute: typeof rootRouteImport
} }
'/login': {
id: '/login'
path: '/login'
fullPath: '/login'
preLoaderRoute: typeof LoginRouteImport
parentRoute: typeof rootRouteImport
}
'/_auth/': { '/_auth/': {
id: '/_auth/' id: '/_auth/'
path: '/' path: '/'
@@ -231,18 +231,11 @@ declare module '@tanstack/react-router' {
preLoaderRoute: typeof AuthIndexRouteImport preLoaderRoute: typeof AuthIndexRouteImport
parentRoute: typeof AuthRoute parentRoute: typeof AuthRoute
} }
'/auth/callback': { '/_auth/certificates': {
id: '/auth/callback' id: '/_auth/certificates'
path: '/auth/callback' path: '/certificates'
fullPath: '/auth/callback' fullPath: '/certificates'
preLoaderRoute: typeof AuthCallbackRouteImport preLoaderRoute: typeof AuthCertificatesRouteImport
parentRoute: typeof rootRouteImport
}
'/_auth/services': {
id: '/_auth/services'
path: '/services'
fullPath: '/services'
preLoaderRoute: typeof AuthServicesRouteImport
parentRoute: typeof AuthRoute parentRoute: typeof AuthRoute
} }
'/_auth/groups': { '/_auth/groups': {
@@ -252,11 +245,11 @@ declare module '@tanstack/react-router' {
preLoaderRoute: typeof AuthGroupsRouteImport preLoaderRoute: typeof AuthGroupsRouteImport
parentRoute: typeof AuthRoute parentRoute: typeof AuthRoute
} }
'/_auth/certificates': { '/_auth/services': {
id: '/_auth/certificates' id: '/_auth/services'
path: '/certificates' path: '/services'
fullPath: '/certificates' fullPath: '/services'
preLoaderRoute: typeof AuthCertificatesRouteImport preLoaderRoute: typeof AuthServicesRouteImport
parentRoute: typeof AuthRoute parentRoute: typeof AuthRoute
} }
'/_auth/settings': { '/_auth/settings': {
@@ -266,12 +259,12 @@ declare module '@tanstack/react-router' {
preLoaderRoute: typeof AuthSettingsRouteRouteImport preLoaderRoute: typeof AuthSettingsRouteRouteImport
parentRoute: typeof AuthRoute parentRoute: typeof AuthRoute
} }
'/_auth/settings/': { '/auth/callback': {
id: '/_auth/settings/' id: '/auth/callback'
path: '/' path: '/auth/callback'
fullPath: '/settings/' fullPath: '/auth/callback'
preLoaderRoute: typeof AuthSettingsIndexRouteImport preLoaderRoute: typeof AuthCallbackRouteImport
parentRoute: typeof AuthSettingsRouteRoute parentRoute: typeof rootRouteImport
} }
'/_auth/domains/': { '/_auth/domains/': {
id: '/_auth/domains/' id: '/_auth/domains/'
@@ -280,11 +273,18 @@ declare module '@tanstack/react-router' {
preLoaderRoute: typeof AuthDomainsIndexRouteImport preLoaderRoute: typeof AuthDomainsIndexRouteImport
parentRoute: typeof AuthRoute parentRoute: typeof AuthRoute
} }
'/_auth/settings/integrations': { '/_auth/groups/$groupId': {
id: '/_auth/settings/integrations' id: '/_auth/groups/$groupId'
path: '/integrations' path: '/$groupId'
fullPath: '/settings/integrations' fullPath: '/groups/$groupId'
preLoaderRoute: typeof AuthSettingsIntegrationsRouteImport preLoaderRoute: typeof AuthGroupsGroupIdRouteImport
parentRoute: typeof AuthGroupsRoute
}
'/_auth/settings/': {
id: '/_auth/settings/'
path: '/'
fullPath: '/settings/'
preLoaderRoute: typeof AuthSettingsIndexRouteImport
parentRoute: typeof AuthSettingsRouteRoute parentRoute: typeof AuthSettingsRouteRoute
} }
'/_auth/settings/appearance': { '/_auth/settings/appearance': {
@@ -294,12 +294,12 @@ declare module '@tanstack/react-router' {
preLoaderRoute: typeof AuthSettingsAppearanceRouteImport preLoaderRoute: typeof AuthSettingsAppearanceRouteImport
parentRoute: typeof AuthSettingsRouteRoute parentRoute: typeof AuthSettingsRouteRoute
} }
'/_auth/groups/$groupId': { '/_auth/settings/integrations': {
id: '/_auth/groups/$groupId' id: '/_auth/settings/integrations'
path: '/$groupId' path: '/integrations'
fullPath: '/groups/$groupId' fullPath: '/settings/integrations'
preLoaderRoute: typeof AuthGroupsGroupIdRouteImport preLoaderRoute: typeof AuthSettingsIntegrationsRouteImport
parentRoute: typeof AuthGroupsRoute parentRoute: typeof AuthSettingsRouteRoute
} }
'/_auth/domains/$domainId/': { '/_auth/domains/$domainId/': {
id: '/_auth/domains/$domainId/' id: '/_auth/domains/$domainId/'
+157 -134
View File
@@ -19,12 +19,12 @@ import {
} from '@/queries' } from '@/queries'
import { PageShell } from '@/components/page-shell' import { PageShell } from '@/components/page-shell'
import { PageHeader } from '@/components/page-header' import { PageHeader } from '@/components/page-header'
import { EmptyState } from '@/components/empty-state'
import { import {
CertStatusChart, CertStatusChart,
GroupDomainsChart, GroupDomainsChart,
OpsDashboard, OpsDashboard,
QuickActionGrid, QuickActionGrid,
AttentionQueue,
type KpiStatCard, type KpiStatCard,
type QuickActionItem, type QuickActionItem,
} from '@/components/reui-kit' } from '@/components/reui-kit'
@@ -32,10 +32,12 @@ import { HealthCheckBadge } from '@/components/health-check-badge'
import { StatusBadge } from '@/components/status-badge' import { StatusBadge } from '@/components/status-badge'
import { import {
Item, Item,
ItemActions,
ItemContent, ItemContent,
ItemGroup, ItemGroup,
ItemTitle, ItemTitle,
} from '@cfdm/ui/components/item' } from '@cfdm/ui/components/item'
import { Button } from '@cfdm/ui/components/button'
import { formatRelative } from '@/lib/format' import { formatRelative } from '@/lib/format'
import { DEBUG_BUILD_STAMP, debugAgentLog } from '@/lib/debug-agent-log' import { DEBUG_BUILD_STAMP, debugAgentLog } from '@/lib/debug-agent-log'
import { api } from '@/lib/api-client' import { api } from '@/lib/api-client'
@@ -300,143 +302,164 @@ function DashboardPage() {
</> </>
} }
queue={ queue={
<div className="grid gap-3 lg:grid-cols-3"> <AttentionQueue
<div className="flex flex-col gap-2"> columns={[
<div className="flex items-center gap-2"> {
<ActivityIcon id: 'health',
className="text-destructive size-4 shrink-0" title: 'Проблемы health-check',
aria-hidden="true" icon: ActivityIcon,
/> iconClassName: 'text-destructive [&_svg]:text-current',
<h3 className="text-sm font-semibold">Проблемы health-check</h3> count: attentionCount,
{attentionCount > 0 ? ( countVariant: 'destructive-light',
<span className="text-muted-foreground text-xs tabular-nums"> emptyTitle: 'Нет проблем',
({attentionCount}) emptyDescription: 'Нет сервисов со статусом Down или Slow',
</span> emptyAction: (
) : null} <Button
</div> variant="outline"
{attentionServices.length === 0 ? ( size="sm"
<div className="flex min-h-24 items-center justify-center py-4"> nativeButton={false}
<EmptyState render={<Link to="/services" />}
title="Нет проблем" >
description="Нет сервисов со статусом Down или Slow" К сервисам
centered={false} </Button>
stackedIcon={false} ),
/> children: (
</div> <ItemGroup className="gap-2">
) : ( {attentionServices.map((service) => (
<ItemGroup className="gap-2"> <Item key={service.id} variant="outline" size="sm">
{attentionServices.map((service) => ( <ItemContent className="min-w-0 gap-1">
<Item key={service.id} variant="outline" size="sm"> <ItemTitle className="truncate font-medium">
<ItemContent className="flex flex-row items-center justify-between gap-2">
<ItemTitle className="truncate font-medium">
<Link
to="/services"
className="hover:underline"
>
{service.name} {service.name}
</Link> </ItemTitle>
</ItemTitle> </ItemContent>
<HealthCheckBadge <ItemActions>
status={ <HealthCheckBadge
(service.health_status as status={
| 'up' (service.health_status as
| 'down' | 'up'
| 'degraded' | 'down'
| 'unknown') ?? 'unknown' | 'degraded'
} | 'unknown') ?? 'unknown'
latencyMs={service.health_latency_ms} }
size="xs" latencyMs={service.health_latency_ms}
/> size="xs"
</ItemContent> />
</Item> <Button
))} variant="outline"
</ItemGroup> size="sm"
)} nativeButton={false}
</div> render={
<div className="flex flex-col gap-2"> <Link
<div className="flex items-center gap-2"> to="/services"
<AlertTriangleIcon search={{ serviceId: service.id }}
className="text-warning size-4 shrink-0" />
aria-hidden="true" }
/> >
<h3 className="text-sm font-semibold">Истекающие сертификаты</h3> Открыть
{expiringCerts.length > 0 ? ( </Button>
<span className="text-muted-foreground text-xs tabular-nums"> </ItemActions>
({expiringCerts.length}) </Item>
</span> ))}
) : null} </ItemGroup>
</div> ),
{expiringCerts.length === 0 ? ( },
<div className="flex min-h-24 items-center justify-center py-4"> {
<EmptyState id: 'certs',
title="Нет истечений" title: 'Истекающие сертификаты',
description="В пределах 14 дней истечений нет" icon: AlertTriangleIcon,
centered={false} iconClassName: 'text-warning [&_svg]:text-current',
stackedIcon={false} count: expiringCerts.length,
/> countVariant: 'warning-light',
</div> emptyTitle: 'Нет истечений',
) : ( emptyDescription: 'В пределах 14 дней истечений нет',
<ItemGroup className="gap-2"> emptyAction: (
{expiringCerts.map(({ cert, ts }) => ( <Button
<Item key={cert.id} variant="outline" size="sm"> variant="outline"
<ItemContent className="flex flex-row items-center justify-between gap-2"> size="sm"
<ItemTitle className="truncate font-medium">{cert.hostname}</ItemTitle> nativeButton={false}
<div className="flex shrink-0 items-center gap-2"> render={<Link to="/certificates" />}
<StatusBadge status={cert.status} /> >
К сертификатам
</Button>
),
children: (
<ItemGroup className="gap-2">
{expiringCerts.map(({ cert, ts }) => (
<Item key={cert.id} variant="outline" size="sm">
<ItemContent className="min-w-0 gap-1">
<ItemTitle className="truncate font-medium">
{cert.hostname}
</ItemTitle>
<span className="text-muted-foreground text-xs tabular-nums"> <span className="text-muted-foreground text-xs tabular-nums">
{formatRelative(new Date(ts).toISOString())} {formatRelative(new Date(ts).toISOString())}
</span> </span>
</div> </ItemContent>
</ItemContent> <ItemActions>
</Item> <StatusBadge status={cert.status} />
))} <Button
</ItemGroup> variant="outline"
)} size="sm"
</div> nativeButton={false}
<div className="flex flex-col gap-2"> render={<Link to="/certificates" />}
<div className="flex items-center gap-2"> >
<FolderTreeIcon Открыть
className="text-muted-foreground size-4 shrink-0" </Button>
aria-hidden="true" </ItemActions>
/> </Item>
<h3 className="text-sm font-semibold">Домены без группы</h3> ))}
{ungroupedCount > 0 ? ( </ItemGroup>
<span className="text-muted-foreground text-xs tabular-nums"> ),
({ungroupedCount}) },
</span> {
) : null} id: 'ungrouped',
</div> title: 'Домены без группы',
{ungroupedDomains.length === 0 ? ( icon: FolderTreeIcon,
<div className="flex min-h-24 items-center justify-center py-4"> iconClassName: 'text-info [&_svg]:text-current',
<EmptyState count: ungroupedCount,
title="Всё сгруппировано" countVariant: 'warning-light',
description="Все домены в группах" emptyTitle: 'Всё сгруппировано',
centered={false} emptyDescription: 'Все домены в группах',
stackedIcon={false} emptyAction: (
/> <Button
</div> variant="outline"
) : ( size="sm"
<ItemGroup className="gap-2"> nativeButton={false}
{ungroupedDomains.map((domain) => ( render={<Link to="/domains" />}
<Item key={domain.id} variant="outline" size="sm"> >
<ItemContent className="flex flex-row items-center justify-between gap-2"> К доменам
<ItemTitle className="truncate font-medium"> </Button>
{domain.zone_name} ),
</ItemTitle> children: (
<Link <ItemGroup className="gap-2">
to="/domains/$domainId" {ungroupedDomains.map((domain) => (
params={{ domainId: String(domain.id) }} <Item key={domain.id} variant="outline" size="sm">
className="text-primary text-xs font-medium hover:underline" <ItemContent className="min-w-0">
> <ItemTitle className="truncate font-medium">
Открыть {domain.zone_name}
</Link> </ItemTitle>
</ItemContent> </ItemContent>
</Item> <ItemActions>
))} <Button
</ItemGroup> variant="outline"
)} size="sm"
</div> nativeButton={false}
</div> render={
<Link
to="/domains/$domainId"
params={{ domainId: String(domain.id) }}
/>
}
>
Открыть
</Button>
</ItemActions>
</Item>
))}
</ItemGroup>
),
},
]}
/>
} }
/> />
</PageShell> </PageShell>
+1 -1
View File
@@ -51,7 +51,7 @@ Workflows: [.gitea/workflows/ci.yaml](../.gitea/workflows/ci.yaml), [.gitea/work
Fallback для **git tag**: `gitea.token`, если PAT недоступен. Push образов в Container Registry — **только `ACTIONS_PAT`** (у job token Gitea нет права packages). Fallback для **git tag**: `gitea.token`, если PAT недоступен. Push образов в Container Registry — **только `ACTIONS_PAT`** (у job token Gitea нет права packages).
Wiki: секрет **`GITEA_TOKEN`** для clone/push `*.wiki.git`. Wiki: секрет **`GITEA_TOKEN`** (fallback `ACTIONS_PAT`) для clone/push `*.wiki.git`. Push идёт с HTTP `Authorization`, потому что git после clone вырезает токен из remote URL.
## Источник правды для версии ## Источник правды для версии
+68 -2
View File
@@ -206,6 +206,9 @@ importers:
'@eslint/js': '@eslint/js':
specifier: ^10.0.1 specifier: ^10.0.1
version: 10.0.1([email protected]([email protected])) version: 10.0.1([email protected]([email protected]))
'@tanstack/router-cli':
specifier: ^1.167.31
version: 1.167.31
'@types/node': '@types/node':
specifier: ^24.12.3 specifier: ^24.12.3
version: 24.13.2 version: 24.13.2
@@ -596,11 +599,11 @@ packages:
'@esbuild-kit/[email protected]': '@esbuild-kit/[email protected]':
resolution: {integrity: sha512-sPRAnw9CdSsRmEtnsl2WXWdyquogVpB3yZ3dgwJfe8zrOzTsV7cJvmwrKVa+0ma5BoiGJ+BoqkMvawbayKUsqQ==} resolution: {integrity: sha512-sPRAnw9CdSsRmEtnsl2WXWdyquogVpB3yZ3dgwJfe8zrOzTsV7cJvmwrKVa+0ma5BoiGJ+BoqkMvawbayKUsqQ==}
deprecated: 'Merged into tsx: https://tsx.is' deprecated: 'Merged into tsx: https://tsx.hirok.io'
'@esbuild-kit/[email protected]': '@esbuild-kit/[email protected]':
resolution: {integrity: sha512-FxEMIkJKnodyA1OaCUoEvbYRkoZlLZ4d/eXFu9Fh8CbBBgP5EmZxrfTRyN0qpXZ4vOvqnE5YdRdcrmUUXuU+dA==} resolution: {integrity: sha512-FxEMIkJKnodyA1OaCUoEvbYRkoZlLZ4d/eXFu9Fh8CbBBgP5EmZxrfTRyN0qpXZ4vOvqnE5YdRdcrmUUXuU+dA==}
deprecated: 'Merged into tsx: https://tsx.is' deprecated: 'Merged into tsx: https://tsx.hirok.io'
'@esbuild/[email protected]': '@esbuild/[email protected]':
resolution: {integrity: sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==} resolution: {integrity: sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==}
@@ -2284,6 +2287,10 @@ packages:
resolution: {integrity: sha512-79pf/RkhteYZTRgcR4F9kbk84P2N8rugQJswxfIqovlbRiT3yI7eBE+5QorIrZaOKktsgzRlXh1l/du/xpl4iA==} resolution: {integrity: sha512-79pf/RkhteYZTRgcR4F9kbk84P2N8rugQJswxfIqovlbRiT3yI7eBE+5QorIrZaOKktsgzRlXh1l/du/xpl4iA==}
engines: {node: '>=20.19'} engines: {node: '>=20.19'}
'@tanstack/[email protected]':
resolution: {integrity: sha512-DR9t6lfLVdrjgCwpglrR9DR7Ok8/HlXjcOE+goWXF3zyuLUO/ug7vMbSFxTqrQTtbRghJfyhmIZ0S6LhPIy44w==}
engines: {node: '>=20.19'}
'@tanstack/[email protected]': '@tanstack/[email protected]':
resolution: {integrity: sha512-cQetA74EB+seWySv1TTKr828TnP0u39m6LykwDXIo84SNortpDkp30TMEjkqtYCNP9c40uT/iwl6MLiufEt0Ow==} resolution: {integrity: sha512-cQetA74EB+seWySv1TTKr828TnP0u39m6LykwDXIo84SNortpDkp30TMEjkqtYCNP9c40uT/iwl6MLiufEt0Ow==}
@@ -2318,14 +2325,27 @@ packages:
react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
'@tanstack/[email protected]':
resolution: {integrity: sha512-/jjZzcwOdBpcLIXRYsmHzFlchbd3esBD6m9bmeoY8l9mVkv/NZOhfx1h/mEn6nETkpxBT4y3pTJ0Ave2EoYXnQ==}
engines: {node: '>=20.19'}
hasBin: true
'@tanstack/[email protected]': '@tanstack/[email protected]':
resolution: {integrity: sha512-+NOwEj1kO/6IGmpHRIZHasYxYWpyBQGNIZAST9aNrk9Q3YlU9SgqVnl1pbLa9qAKfeNdXQIRve0RQb/0kyDeDA==} resolution: {integrity: sha512-+NOwEj1kO/6IGmpHRIZHasYxYWpyBQGNIZAST9aNrk9Q3YlU9SgqVnl1pbLa9qAKfeNdXQIRve0RQb/0kyDeDA==}
engines: {node: '>=20.19'} engines: {node: '>=20.19'}
'@tanstack/[email protected]':
resolution: {integrity: sha512-w74Al2ar8UKx3Xp4ICTxIZD2Vmd6N9Yn4xH8ILq40gI5UqlxzjPPYoR5l2+5cmv9XCWZehxw7saIofmZpf1G4w==}
engines: {node: '>=20.19'}
'@tanstack/[email protected]': '@tanstack/[email protected]':
resolution: {integrity: sha512-xtB9tB2Ws0tWR6Pi7nc3Qk9IYgoh1mQCKWjHqIl9tf6BNUpKoqniJoPAQ4+LGrK8FeZYU0o0p/qlZEyj9FAulA==} resolution: {integrity: sha512-xtB9tB2Ws0tWR6Pi7nc3Qk9IYgoh1mQCKWjHqIl9tf6BNUpKoqniJoPAQ4+LGrK8FeZYU0o0p/qlZEyj9FAulA==}
engines: {node: '>=20.19'} engines: {node: '>=20.19'}
'@tanstack/[email protected]':
resolution: {integrity: sha512-xgk+8BCKzAoIONVJPeyyzLRKhb9W0PNWJepPIjx5gRU36+FDZUMNeZ/gjyOBZ4EzQgrUOCPs4/Vkr8JcnuRLLA==}
engines: {node: '>=20.19'}
'@tanstack/[email protected]': '@tanstack/[email protected]':
resolution: {integrity: sha512-MofS28/axfnfnhOD2RSgJEaU882aX5RsAzhGz5Vc4XhAmvCjy919u9JrNs4QsTWFbTD1P7IJ8WFlFVsrg0pStg==} resolution: {integrity: sha512-MofS28/axfnfnhOD2RSgJEaU882aX5RsAzhGz5Vc4XhAmvCjy919u9JrNs4QsTWFbTD1P7IJ8WFlFVsrg0pStg==}
engines: {node: '>=20.19'} engines: {node: '>=20.19'}
@@ -4875,10 +4895,20 @@ packages:
peerDependencies: peerDependencies:
seroval: ^1.0 seroval: ^1.0
[email protected]:
resolution: {integrity: sha512-TfxuUjlbBESzUOWdTkTKqvSmav0ABym+itetDXLK6mDz8SmrpdI30aF8RTXE8Bvq+tH/1yIDkvy3W0lfQb1ipQ==}
engines: {node: '>=10'}
peerDependencies:
seroval: ^1.0
[email protected]: [email protected]:
resolution: {integrity: sha512-46uFvgrXTVxZcUorgSSRZ4y+ieqLLQRMlG4bnCZKW3qI6BZm7Rg4ntMW4p1mILEEBZWrFlcpp0AyIIlM6jD9iw==} resolution: {integrity: sha512-46uFvgrXTVxZcUorgSSRZ4y+ieqLLQRMlG4bnCZKW3qI6BZm7Rg4ntMW4p1mILEEBZWrFlcpp0AyIIlM6jD9iw==}
engines: {node: '>=10'} engines: {node: '>=10'}
[email protected]:
resolution: {integrity: sha512-mPT+SD2TrlB6wvte1KkYOYUkubaTbd6pZ/6Kk3C9nxzrHmCZyhxOO7XGAeL7f+yLKZglzGtM9odUVvg/EhO+vQ==}
engines: {node: '>=10'}
[email protected]: [email protected]:
resolution: {integrity: sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==} resolution: {integrity: sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==}
@@ -7288,6 +7318,8 @@ snapshots:
'@tanstack/[email protected]': {} '@tanstack/[email protected]': {}
'@tanstack/[email protected]': {}
'@tanstack/[email protected]': {} '@tanstack/[email protected]': {}
'@tanstack/[email protected]([email protected])': '@tanstack/[email protected]([email protected])':
@@ -7323,6 +7355,14 @@ snapshots:
react: 19.2.7 react: 19.2.7
react-dom: 19.2.7([email protected]) react-dom: 19.2.7([email protected])
'@tanstack/[email protected]':
dependencies:
'@tanstack/router-generator': 1.167.31
chokidar: 5.0.0
yargs: 17.7.3
transitivePeerDependencies:
- supports-color
'@tanstack/[email protected]': '@tanstack/[email protected]':
dependencies: dependencies:
'@tanstack/history': 1.162.0 '@tanstack/history': 1.162.0
@@ -7330,6 +7370,13 @@ snapshots:
seroval: 1.5.4 seroval: 1.5.4
seroval-plugins: 1.5.4([email protected]) seroval-plugins: 1.5.4([email protected])
'@tanstack/[email protected]':
dependencies:
'@tanstack/history': 1.162.1
cookie-es: 3.1.1
seroval: 1.6.2
seroval-plugins: 1.6.2([email protected])
'@tanstack/[email protected]': '@tanstack/[email protected]':
dependencies: dependencies:
'@babel/types': 7.29.7 '@babel/types': 7.29.7
@@ -7343,6 +7390,19 @@ snapshots:
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
'@tanstack/[email protected]':
dependencies:
'@babel/types': 7.29.7
'@tanstack/router-core': 1.171.25
'@tanstack/router-utils': 1.162.2
'@tanstack/virtual-file-routes': 1.162.0
jiti: 2.7.0
magic-string: 0.30.21
prettier: 3.8.4
zod: 4.4.3
transitivePeerDependencies:
- supports-color
'@tanstack/[email protected](@tanstack/[email protected]([email protected]([email protected]))([email protected]))([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected]))': '@tanstack/[email protected](@tanstack/[email protected]([email protected]([email protected]))([email protected]))([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected]))':
dependencies: dependencies:
'@babel/core': 7.29.7 '@babel/core': 7.29.7
@@ -9829,8 +9889,14 @@ snapshots:
dependencies: dependencies:
seroval: 1.5.4 seroval: 1.5.4
[email protected]([email protected]):
dependencies:
seroval: 1.6.2
[email protected]: {} [email protected]: {}
[email protected]: {}
[email protected]: {} [email protected]: {}
[email protected]: {} [email protected]: {}