@@ -121,134 +584,26 @@ export default async function CharacterPage({
<{character.guildName}>
)}
+ {realmName && {realmName}}
{achievementPoints.toLocaleString(locale)}
-
-
-
{t('specialization')}
-
-
+
-
-
-
-
- {specs.primary.name}
- {specs.primary.dist.join(' / ')}
-
- {specs.secondary ? (
- <>
-
-
-
-
-
- ) : (
- N/A
- )}
- {specs.secondary.name}
- {specs.secondary.dist.join(' / ')}
-
+
diff --git a/web-next/app/[locale]/armory/guild/[guid]/page.tsx b/web-next/app/[locale]/armory/guild/[guid]/page.tsx
index 8e50c3f..06c3c0a 100644
--- a/web-next/app/[locale]/armory/guild/[guid]/page.tsx
+++ b/web-next/app/[locale]/armory/guild/[guid]/page.tsx
@@ -1,54 +1,248 @@
import { notFound } from 'next/navigation'
import { getTranslations, setRequestLocale } from 'next-intl/server'
import { Link } from '@/i18n/navigation'
-import { getGuild } from '@/lib/armory'
-import { raceName, className, classColor } from '@/lib/wow-data'
+import {
+ getGuildInfo,
+ getGuildRoster,
+ getGuildRecentAchievements,
+ getRealmName,
+ getGuildAchievementOverview,
+ getGuildRoleBreakdown,
+} from '@/lib/armory'
+import { getSession } from '@/lib/session'
+import { isGuildMemberByAccount } from '@/lib/armory'
+import { className, classColor } from '@/lib/wow-data'
+import { wowheadIcon } from '@/lib/wowhead'
import { PageShell } from '@/components/PageShell'
+import { ArmoryGuildRoster } from '@/components/ArmoryGuildRoster'
+import { ArmoryAchievements } from '@/components/ArmoryAchievements'
export const dynamic = 'force-dynamic'
+const PAGE_SIZE = 25
export default async function GuildPage({
params,
+ searchParams,
}: {
params: Promise<{ locale: string; guid: string }>
+ searchParams: Promise<{ tab?: string }>
}) {
const { locale, guid } = await params
+ const { tab } = await searchParams
setRequestLocale(locale)
const t = await getTranslations('Armory')
- const guild = await getGuild(Number(guid))
- if (!guild) notFound()
+ const guildId = Number(guid)
+ const info = await getGuildInfo(guildId)
+ if (!info) notFound()
+
+ const isLogros = tab === 'logros'
+ const emblemHue = (info.emblem.bg * 7) % 360
return (
-
+ {t('level')}
+
+ {character.level >= MAX_LEVEL ? `${character.level} (MAX)` : character.level}
+
- )}
-
- {talents && talents.total > 0 && (
-
-
- )}
-
- {activityData.entries.length > 0 && (
- {t('talents')}
-
-
- )}
-
- {t('recentActivity')}
-
-
-
-
- {t('stats')}
- {stats ? ( -
- {statRows.map((r) => (
-
- ) : (
-
- {r.label}
- {r.value}
-
- ))}
- {t('statsPending')}
- )} -
-
+
+ {t('professions')}
- {professions.length ? ( -
- {professions.map((p) => (
-
- ) : (
-
-
- {p.name}
- {p.rank ? {p.rank} : null}
-
-
- {p.value}
- / {p.max}
-
-
- ))}
- {t('noProfessions')}
- )} +
+
+
+
← {t('backToArmory')}
-
- {guild.members.length} {t('members')}
- {guild.leaderName && (
- <>
- {' · '}
- {t('leader')}: {guild.leaderName}
-
- )}
+ {/* Cabecera de hermandad */}
+ (null)
+ const [entries, setEntries] = useState([])
+ const [total, setTotal] = useState(0)
+ const [page, setPage] = useState(1)
+ const [loading, setLoading] = useState(false)
+ const pages = Math.max(1, Math.ceil(total / PAGE_SIZE))
+
+ const open = async (c: AchCat, p = 1) => {
+ setCat(c)
+ setPage(p)
+ setLoading(true)
+ try {
+ const res = await fetch(`${apiPath}?${idKey}=${guid}&cat=${c.id}&page=${p}&locale=${locale}`)
+ const data = await res.json()
+ setEntries(Array.isArray(data.entries) ? data.entries : [])
+ setTotal(Number(data.total) || 0)
+ } catch {
+ setEntries([])
+ } finally {
+ setLoading(false)
+ }
+ }
+
+ const goto = (p: number) => {
+ if (!cat || p < 1 || p > pages || p === page || loading) return
+ open(cat, p)
+ }
+
+ const fmtDate = (unix: number) => {
+ if (!unix) return ''
+ const d = new Date(unix * 1000)
+ if (Number.isNaN(d.getTime())) return ''
+ return d.toLocaleDateString(locale, { day: '2-digit', month: '2-digit', year: 'numeric' })
+ }
+
+ // ---- Vista detalle de una categoría ----
+ if (cat) {
+ const from = Math.max(1, page - 2)
+ const to = Math.min(pages, page + 2)
+ const nums: number[] = []
+ for (let p = from; p <= to; p++) nums.push(p)
+ return (
+ (initial)
const [total, setTotal] = useState(initialTotal)
const [page, setPage] = useState(1)
- const [q, setQ] = useState('')
+ const [qid, setQid] = useState('')
+ const [qname, setQname] = useState('')
const [loading, setLoading] = useState(false)
const pages = Math.max(1, Math.ceil(total / pageSize))
- const load = async (p: number, query: string) => {
+ const load = async (p: number, id: string, name: string) => {
setLoading(true)
try {
const res = await fetch(
- `/api/armory/activity?guid=${guid}&page=${p}&q=${encodeURIComponent(query)}&locale=${locale}`,
+ `/api/armory/activity?guid=${guid}&page=${p}&id=${encodeURIComponent(id)}&name=${encodeURIComponent(name)}&locale=${locale}`,
)
const data = await res.json()
setEntries(Array.isArray(data.entries) ? data.entries : [])
@@ -49,7 +59,6 @@ export function ArmoryActivity({
}
}
- // Búsqueda en tiempo real (con retardo para no consultar en cada tecla).
const skip = useRef(true)
useEffect(() => {
if (skip.current) {
@@ -58,21 +67,22 @@ export function ArmoryActivity({
}
const t = setTimeout(() => {
setPage(1)
- load(1, q)
+ load(1, qid, qname)
}, 300)
return () => clearTimeout(t)
// eslint-disable-next-line react-hooks/exhaustive-deps
- }, [q])
+ }, [qid, qname])
const goto = (p: number) => {
if (p < 1 || p > pages || p === page || loading) return
setPage(p)
- load(p, q)
+ load(p, qid, qname)
}
const fmt = (ts: number) => {
const d = new Date(ts * 1000)
- return `${String(d.getDate()).padStart(2, '0')}.${String(d.getMonth() + 1).padStart(2, '0')}.${d.getFullYear()}`
+ const p = (n: number) => String(n).padStart(2, '0')
+ return `${p(d.getDate())}/${p(d.getMonth() + 1)}/${d.getFullYear()} ${p(d.getHours())}:${p(d.getMinutes())}`
}
const win = 2
@@ -81,44 +91,57 @@ export function ArmoryActivity({
const nums: number[] = []
for (let p = from; p <= to; p++) nums.push(p)
+ const countLine = labels.countLine
+ .replace('{total}', String(total))
+ .replace('{page}', String(page))
+ .replace('{pages}', String(pages))
+
return (
<>
-
+
-
+
+
+
+
{info.name}
+{/* reino */}
+
+
+ {info.guildPoints.toLocaleString(locale)}
+
+
+ {info.memberCount} {t('members')}
+
+ {info.createdYear > 0 && (
+
+ {t('guildFounded')} {info.createdYear}
+
+ )}
+
+
- {guild.members.map((m) => (
-
-
- {m.name}
-
-
- {t('level')} {m.level} · {raceName(m.race, locale)} · {className(m.class, locale)}
-
-
- ))}
+
)
}
+
+/* ---- Vista Hermandad (roster + barra lateral) ---- */
+async function GuildRoster({
+ guildId,
+ locale,
+ info,
+ t,
+}: {
+ guildId: number
+ locale: string
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ info: any
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ t: any
+}) {
+ const session = await getSession()
+ const accountId = session.accountId ?? 0
+ const [roster, recent, realm, roleBreak, isMember] = await Promise.all([
+ getGuildRoster(guildId, { page: 1, pageSize: PAGE_SIZE, classes: [], roles: [], sort: 'rank' }),
+ getGuildRecentAchievements(guildId, locale, 5),
+ getRealmName(),
+ getGuildRoleBreakdown(guildId),
+ isGuildMemberByAccount(accountId, guildId),
+ ])
+ const motdState: 'guest' | 'member' | 'nonmember' = !accountId ? 'guest' : isMember ? 'member' : 'nonmember'
+ const roleRows: { key: 'tank' | 'healer' | 'dps'; label: string; color: string; count: number }[] = [
+ { key: 'tank', label: t('roleTank'), color: '#4a90d9', count: roleBreak.tank },
+ { key: 'healer', label: t('roleHealer'), color: '#4ade5f', count: roleBreak.healer },
+ { key: 'dps', label: t('roleDps'), color: '#d9534f', count: roleBreak.dps },
+ ]
+ const maxRole = Math.max(1, roleBreak.tank, roleBreak.healer, roleBreak.dps)
+ const maxCount = Math.max(1, ...info.classBreakdown.map((c: { count: number }) => c.count))
+ const fmtDate = (unix: number) => {
+ if (!unix) return ''
+ const d = new Date(unix * 1000)
+ return Number.isNaN(d.getTime()) ? '' : d.toLocaleDateString(locale, { day: '2-digit', month: '2-digit', year: 'numeric' })
+ }
+
+ return (
+
+
+ {t('guild')}
+
+
+ {t('guildAchievements')}
+
+
+ {isLogros ? (
+
+
+ )
+}
+
+/* ---- Vista Logros de hermandad (anillos por categoría) ---- */
+async function GuildLogros({
+ guildId,
+ locale,
+ t,
+}: {
+ guildId: number
+ locale: string
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ t: any
+}) {
+ const overview = await getGuildAchievementOverview(guildId, null, locale)
+ return (
+
+ c.class)}
+ labels={{
+ view: t('guildView'), sortRank: t('guildSortRank'), sortPoints: t('guildSortPoints'),
+ sortLevel: t('guildSortLevel'), sortName: t('guildSortName'), filterClass: t('guildFilterClass'),
+ allClasses: t('guildAllClasses'), filterRole: t('guildFilterRole'), allRoles: t('guildAllRoles'),
+ roleTank: t('roleTank'), roleHealer: t('roleHealer'), roleDps: t('roleDps'),
+ sortIlvl: t('guildSortIlvl'), ilvl: t('colIlvl'),
+ name: t('colName'), race: t('colRace'), class: t('colClass'), role: t('colFunction'),
+ level: t('colLevel'), rank: t('colRank'), points: t('guildSortPoints'),
+ }}
+ />
+
+
+
+ + {t('guildMembers')} · {realm} +
+
+
+ )
+ }
+
+ // ---- Vista rejilla de categorías ----
+ const totalAch = categories.reduce((s, c) => s + c.total, 0)
+ const summary = labels.summary
+ .replace('{done}', String(totalCompleted))
+ .replace('{total}', String(totalAch))
+ .replace('{points}', String(earnedPoints))
+
+ return (
+
+
+
+
+ {entries.length === 0 && !loading ? (
+
+ {cat.name}
+
+ {cat.completed} {labels.of} {cat.total}
+ {cat.isFeats ? '' : ` · ${cat.earnedPoints} / ${cat.totalPoints}`}
+
+
+ {labels.empty}
+ ) : ( +-
+ {entries.map((a) => (
+
-
+
+
+ +
+ + {a.name} + + {a.description ?+{a.description}
: null} + {a.reward ? ( ++ {labels.reward}: {a.reward} +
+ ) : null} ++ {a.points > 0 ? ( + + {a.points} + + ) : null} + {fmtDate(a.date)} ++
+ ))}
+
+
+ {from > 1 && (
+ <>
+
+ {from > 2 && …}
+
+ )}
+ {nums.map((p) => (
+
+ ))}
+ {to < pages && (
+ <>
+ {to < pages - 1 && …}
+
+
+ )}
+
+
+ )}
+
+
+ )
+}
diff --git a/web-next/components/ArmoryActivity.tsx b/web-next/components/ArmoryActivity.tsx
index 7700712..3c5733c 100644
--- a/web-next/components/ArmoryActivity.tsx
+++ b/web-next/components/ArmoryActivity.tsx
@@ -2,20 +2,20 @@
import { useEffect, useRef, useState } from 'react'
import { WowheadRefresh } from './WowheadRefresh'
-import { wowheadIcon, wowheadUrl, wowheadData } from '@/lib/wowhead'
+import { wowheadUrl, wowheadData } from '@/lib/wowhead'
export type ActivityEntry = { id: number; name: string; icon: string; date: number }
/**
- * Navegador de logros del personaje: búsqueda en tiempo real (por nombre o ID) y
- * paginación (anterior/siguiente + números). Los datos se piden a /api/armory/activity;
- * la primera página llega ya renderizada del servidor.
+ * Pestaña de Logros: filtros por ID y por nombre, tabla Logro | Fecha, paginación.
+ * Mismo estilo que Misiones. Datos vía /api/armory/activity; 1ª página del servidor.
*/
export function ArmoryActivity({
guid,
locale,
initial,
total: initialTotal,
+ grandTotal,
pageSize,
labels,
}: {
@@ -23,21 +23,31 @@ export function ArmoryActivity({
locale: string
initial: ActivityEntry[]
total: number
+ grandTotal: number
pageSize: number
- labels: { earned: string; search: string; empty: string }
+ labels: {
+ filterId: string
+ filterName: string
+ empty: string
+ logro: string
+ date: string
+ title: string
+ countLine: string
+ }
}) {
const [entries, setEntries] = useState{summary}
+
+ {categories.map((c) => {
+ const col = ringColor(c.pct)
+ return (
+
+ )
+ })}
+
+
- {entries.length === 0 ? (
-
+
+
+ )}
+
{pages > 1 && (
{labels.empty}
- ) : ( - entries.map((a, i) => ( -
-
-
- {labels.earned}{' '}
-
- [{a.name}]
-
- .
-
- {fmt(a.date)}
-
- ))
- )}
+
+ setQid(e.target.value)} placeholder={labels.filterId} inputMode="numeric" />
+ setQname(e.target.value)} placeholder={labels.filterName} />
+ {countLine}
+ +
+ {labels.title} ({grandTotal})
+
+
+ {entries.length === 0 ? (
+ {labels.empty}
+ ) : ( +| {labels.logro} | +{labels.date} | +
|---|---|
| + + {a.name} + + ({a.id}) + | +{fmt(a.date)} | +