From ac12dd874f0e47aab88d3779b88e30139b133980 Mon Sep 17 00:00:00 2001 From: Kichiyaki Date: Wed, 10 Feb 2021 21:48:59 +0100 Subject: [PATCH] show lastActivityAt instead of deletedAt at PlayerPage/IndexPage --- .../features/PlayerPage/features/IndexPage/IndexPage.tsx | 9 +++++++-- .../PlayerPage/libs/PlayerPageContext/context.ts | 1 + .../PlayerPage/libs/PlayerPageContext/queries.ts | 1 + .../features/PlayerPage/libs/PlayerPageContext/types.ts | 1 + src/libs/i18n/en/server-page/player-page/index-page.ts | 1 + src/libs/i18n/pl/server-page/player-page/index-page.ts | 1 + src/libs/i18n/pt/server-page/player-page/index-page.ts | 1 + .../i18n/pt_br/server-page/player-page/index-page.ts | 1 + 8 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/features/ServerPage/features/PlayerPage/features/IndexPage/IndexPage.tsx b/src/features/ServerPage/features/PlayerPage/features/IndexPage/IndexPage.tsx index ec0de4e..85283db 100644 --- a/src/features/ServerPage/features/PlayerPage/features/IndexPage/IndexPage.tsx +++ b/src/features/ServerPage/features/PlayerPage/features/IndexPage/IndexPage.tsx @@ -82,13 +82,18 @@ function IndexPage() { })`, }, { - field: 'deletedAt', + field: player.deletedAt ? 'deletedAt' : 'lastActivityAt', value: player.deletedAt ? dateUtils.format( dateUtils.date(player.deletedAt), DATE_FORMAT.DAY_MONTH_AND_YEAR ) - : '-', + : dateUtils.formatDistanceToNow( + new Date(player.lastActivityAt ?? 0), + { + addSuffix: true, + } + ), }, { field: 'bestRank', diff --git a/src/features/ServerPage/features/PlayerPage/libs/PlayerPageContext/context.ts b/src/features/ServerPage/features/PlayerPage/libs/PlayerPageContext/context.ts index e78f780..49494e0 100644 --- a/src/features/ServerPage/features/PlayerPage/libs/PlayerPageContext/context.ts +++ b/src/features/ServerPage/features/PlayerPage/libs/PlayerPageContext/context.ts @@ -21,6 +21,7 @@ const ctx = createContext({ mostPointsAt: new Date(0), mostVillages: 0, mostVillagesAt: new Date(0), + lastActivityAt: new Date(0), bestRank: 0, bestRankAt: new Date(0), joinedAt: new Date(0), diff --git a/src/features/ServerPage/features/PlayerPage/libs/PlayerPageContext/queries.ts b/src/features/ServerPage/features/PlayerPage/libs/PlayerPageContext/queries.ts index 4eba37f..0abd7b8 100644 --- a/src/features/ServerPage/features/PlayerPage/libs/PlayerPageContext/queries.ts +++ b/src/features/ServerPage/features/PlayerPage/libs/PlayerPageContext/queries.ts @@ -27,6 +27,7 @@ export const PLAYER = gql` joinedAt servers deletedAt + lastActivityAt nameChanges { oldName newName diff --git a/src/features/ServerPage/features/PlayerPage/libs/PlayerPageContext/types.ts b/src/features/ServerPage/features/PlayerPage/libs/PlayerPageContext/types.ts index 35c3797..bdff76c 100644 --- a/src/features/ServerPage/features/PlayerPage/libs/PlayerPageContext/types.ts +++ b/src/features/ServerPage/features/PlayerPage/libs/PlayerPageContext/types.ts @@ -28,6 +28,7 @@ export type Player = { bestRankAt: Date | string; joinedAt: Date | string; deletedAt?: Date | string; + lastActivityAt: Date | string; servers: string[]; nameChanges: NameChange[]; tribe?: { diff --git a/src/libs/i18n/en/server-page/player-page/index-page.ts b/src/libs/i18n/en/server-page/player-page/index-page.ts index 2793741..276a74d 100644 --- a/src/libs/i18n/en/server-page/player-page/index-page.ts +++ b/src/libs/i18n/en/server-page/player-page/index-page.ts @@ -24,6 +24,7 @@ const translations = { mostPoints: 'Most points', mostVillages: 'Most villages', servers: 'Servers', + lastActivityAt: 'Last activity', }, nameChanges: { title: 'Name changes', diff --git a/src/libs/i18n/pl/server-page/player-page/index-page.ts b/src/libs/i18n/pl/server-page/player-page/index-page.ts index 32bad57..e28daca 100644 --- a/src/libs/i18n/pl/server-page/player-page/index-page.ts +++ b/src/libs/i18n/pl/server-page/player-page/index-page.ts @@ -24,6 +24,7 @@ const translations = { mostPoints: 'Najwięcej punktów', mostVillages: 'Najwięcej wiosek', servers: 'Serwery', + lastActivityAt: 'Ostatnia aktywność', }, nameChanges: { title: 'Zmiany nicków', diff --git a/src/libs/i18n/pt/server-page/player-page/index-page.ts b/src/libs/i18n/pt/server-page/player-page/index-page.ts index 6bf0ceb..05de9c0 100644 --- a/src/libs/i18n/pt/server-page/player-page/index-page.ts +++ b/src/libs/i18n/pt/server-page/player-page/index-page.ts @@ -24,6 +24,7 @@ const translations = { mostPoints: 'Maior pontuação', mostVillages: 'Maior quantidade de aldeias', servers: 'Servidores', + lastActivityAt: 'Last activity', }, nameChanges: { title: 'Mudanças de nome', diff --git a/src/libs/i18n/pt_br/server-page/player-page/index-page.ts b/src/libs/i18n/pt_br/server-page/player-page/index-page.ts index 87fe684..545c219 100644 --- a/src/libs/i18n/pt_br/server-page/player-page/index-page.ts +++ b/src/libs/i18n/pt_br/server-page/player-page/index-page.ts @@ -24,6 +24,7 @@ const translations = { mostPoints: 'Maior pontuação', mostVillages: 'Maior quantidade de aldeias', servers: 'Servidores', + lastActivityAt: 'Last activity', }, nameChanges: { title: 'Mudanças de nome',