feat(frontend): analytics panel and online statuses speak russian and english with real plurals
This commit is contained in:
1 parent
543e6eaa50
commit
cff493f5dd
9 files changed
+286
-190
No files matched your search
@@ -24,35 +24,11 @@
|
||||
formatSpan,
|
||||
isOnline,
|
||||
} from "#lib/format/presence.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
import { accounts } from "#lib/stores/accounts.svelte.js";
|
||||
import { presence } from "#lib/stores/presence.svelte.js";
|
||||
import { page } from "$app/state";
|
||||
|
||||
const TEXT = {
|
||||
average: "В среднем за день",
|
||||
byDay: "По дням",
|
||||
byHour: "По часам недели",
|
||||
failed: "Не удалось загрузить аналитику.",
|
||||
firstOnline: "Обычно появляется",
|
||||
hidden:
|
||||
"Скрывает, когда был(а) в сети. Telegram показывает только «был(а) недавно», поэтому время в сети не посчитать.",
|
||||
lastOffline: "Обычно уходит",
|
||||
median: "Обычная сессия",
|
||||
messages: "Сообщения",
|
||||
mine: "Я отвечаю",
|
||||
missing: "Нет данных",
|
||||
noData: "нет данных",
|
||||
noMessages: "За этот период сообщений нет.",
|
||||
noStatus: "Статусов пока нет.",
|
||||
openChat: "Откройте чат",
|
||||
period: (count: number) => `${count} дней`,
|
||||
retry: "Повторить",
|
||||
sessions: "Сессии",
|
||||
theirs: "Мне отвечают",
|
||||
title: "Аналитика",
|
||||
total: (count: number) => `в сети за ${count} дней`,
|
||||
};
|
||||
|
||||
const PERIODS = [7, 30, 90];
|
||||
const DEFAULT_PERIOD = 30;
|
||||
const SESSION_PAGE = 30;
|
||||
@@ -60,7 +36,7 @@
|
||||
const MS_IN_SECOND = 1000;
|
||||
|
||||
const tz = browserTimeZone();
|
||||
const zone = timeZoneLabel();
|
||||
const zone = $derived(timeZoneLabel());
|
||||
|
||||
const chatId = $derived(
|
||||
page.params.chatId ? Number(page.params.chatId) : null
|
||||
@@ -97,25 +73,25 @@
|
||||
const result: { label: string; value: string }[] = [];
|
||||
if (summary.daily_seconds !== null) {
|
||||
result.push({
|
||||
label: TEXT.average,
|
||||
label: t("presence.average"),
|
||||
value: formatSpan(summary.daily_seconds),
|
||||
});
|
||||
}
|
||||
if (summary.median_session_seconds !== null) {
|
||||
result.push({
|
||||
label: TEXT.median,
|
||||
label: t("presence.median"),
|
||||
value: formatSpan(summary.median_session_seconds),
|
||||
});
|
||||
}
|
||||
if (summary.first_online !== null) {
|
||||
result.push({
|
||||
label: TEXT.firstOnline,
|
||||
label: t("presence.firstOnline"),
|
||||
value: formatClock(summary.first_online),
|
||||
});
|
||||
}
|
||||
if (summary.last_offline !== null) {
|
||||
result.push({
|
||||
label: TEXT.lastOffline,
|
||||
label: t("presence.lastOffline"),
|
||||
value: formatClock(summary.last_offline),
|
||||
});
|
||||
}
|
||||
@@ -124,13 +100,16 @@
|
||||
MS_IN_SECOND;
|
||||
const missing = period - summary.covered_seconds;
|
||||
if (missing >= SECONDS_IN_HOUR) {
|
||||
result.push({ label: TEXT.missing, value: formatLongSpan(missing) });
|
||||
result.push({
|
||||
label: t("presence.missing"),
|
||||
value: formatLongSpan(missing),
|
||||
});
|
||||
}
|
||||
return result;
|
||||
});
|
||||
|
||||
function reply(seconds: number | null): string {
|
||||
return seconds === null ? TEXT.noData : formatSpan(seconds);
|
||||
return seconds === null ? t("presence.noData") : formatSpan(seconds);
|
||||
}
|
||||
|
||||
async function load(id: number, period: number) {
|
||||
@@ -172,7 +151,7 @@
|
||||
</script>
|
||||
|
||||
{#if chatId === null}
|
||||
<EmptyState description={TEXT.openChat} title={TEXT.title} />
|
||||
<EmptyState description={t("profile.empty")} title={t("profile.analytics")} />
|
||||
{:else}
|
||||
<div class="analytics">
|
||||
<div class="periods">
|
||||
@@ -185,20 +164,20 @@
|
||||
}}
|
||||
type="button"
|
||||
>
|
||||
{TEXT.period(period)}
|
||||
{t("presence.days", { count: period })}
|
||||
</button>
|
||||
{/each}
|
||||
</div>
|
||||
|
||||
{#if failed}
|
||||
<div class="state">
|
||||
<p>{TEXT.failed}</p>
|
||||
<p>{t("presence.failed")}</p>
|
||||
<Button
|
||||
onclick={() => chatId !== null && load(chatId, days)}
|
||||
smaller
|
||||
variant="text"
|
||||
>
|
||||
{TEXT.retry}
|
||||
{t("ui.retry")}
|
||||
</Button>
|
||||
</div>
|
||||
{:else if volume === null || (isDm && stats === null)}
|
||||
@@ -211,7 +190,9 @@
|
||||
<span class="total"
|
||||
>{formatSpan(stats.summary.online_seconds)}</span
|
||||
>
|
||||
<span class="count">{TEXT.total(shownDays)}</span>
|
||||
<span class="count"
|
||||
>{t("presence.total", { count: shownDays })}</span
|
||||
>
|
||||
</div>
|
||||
{/if}
|
||||
{#if sample}
|
||||
@@ -220,9 +201,9 @@
|
||||
</p>
|
||||
{/if}
|
||||
{#if stats.hidden}
|
||||
<p class="note">{TEXT.hidden}</p>
|
||||
<p class="note">{t("presence.hidden")}</p>
|
||||
{:else if !tracked}
|
||||
<p class="note">{TEXT.noStatus}</p>
|
||||
<p class="note">{t("presence.noStatus")}</p>
|
||||
{/if}
|
||||
</section>
|
||||
|
||||
@@ -242,34 +223,34 @@
|
||||
|
||||
<section>
|
||||
<div class="section-title">
|
||||
<h3>{TEXT.byHour}</h3>
|
||||
<h3>{t("presence.byHour")}</h3>
|
||||
<span>{zone}</span>
|
||||
</div>
|
||||
<PresenceHeatmap week={stats.week} />
|
||||
</section>
|
||||
|
||||
<section>
|
||||
<div class="section-title"><h3>{TEXT.byDay}</h3></div>
|
||||
<div class="section-title"><h3>{t("presence.byDay")}</h3></div>
|
||||
<OnlineDays days={stats.days} />
|
||||
</section>
|
||||
{/if}
|
||||
{/if}
|
||||
|
||||
<section>
|
||||
<div class="section-title"><h3>{TEXT.messages}</h3></div>
|
||||
<div class="section-title"><h3>{t("presence.messages")}</h3></div>
|
||||
{#if quiet}
|
||||
<p class="state">{TEXT.noMessages}</p>
|
||||
<p class="state">{t("presence.noMessages")}</p>
|
||||
{:else}
|
||||
<VolumeChart {volume} />
|
||||
{/if}
|
||||
{#if response && response.mine_count + response.their_count > 0}
|
||||
<dl class="rows replies">
|
||||
<div class="row">
|
||||
<dt>{TEXT.mine}</dt>
|
||||
<dt>{t("presence.mine")}</dt>
|
||||
<dd>{reply(response.mine_median_seconds)}</dd>
|
||||
</div>
|
||||
<div class="row">
|
||||
<dt>{TEXT.theirs}</dt>
|
||||
<dt>{t("presence.theirs")}</dt>
|
||||
<dd>{reply(response.their_median_seconds)}</dd>
|
||||
</div>
|
||||
</dl>
|
||||
@@ -278,7 +259,7 @@
|
||||
|
||||
{#if isDm && stats && tracked && !stats.hidden}
|
||||
<section>
|
||||
<div class="section-title"><h3>{TEXT.sessions}</h3></div>
|
||||
<div class="section-title"><h3>{t("presence.sessions")}</h3></div>
|
||||
{#key `${chatId}:${shownDays}:${stats.until}`}
|
||||
<PresenceSessions
|
||||
days={shownDays}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
import type { PresenceDay } from "#lib/api/types.js";
|
||||
import { formatDay, parseDay } from "#lib/format/datetime.js";
|
||||
import { formatSpan } from "#lib/format/presence.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
|
||||
interface Props {
|
||||
days: PresenceDay[];
|
||||
@@ -12,18 +13,6 @@
|
||||
const SECONDS_IN_HOUR = 3600;
|
||||
const SECONDS_IN_DAY = 86_400;
|
||||
|
||||
const TEXT = {
|
||||
bar: (day: string, online: number, missing: number) => {
|
||||
if (missing >= SECONDS_IN_DAY - SECONDS_IN_HOUR) {
|
||||
return `${day}, нет данных`;
|
||||
}
|
||||
const gap =
|
||||
missing >= SECONDS_IN_HOUR ? `, нет данных ${formatSpan(missing)}` : "";
|
||||
return `${day}, ${formatSpan(online)} в сети${gap}`;
|
||||
},
|
||||
today: "сегодня",
|
||||
};
|
||||
|
||||
const peak = $derived(Math.max(1, ...days.map((day) => day.online_seconds)));
|
||||
const first = $derived(days[0]);
|
||||
|
||||
@@ -31,6 +20,23 @@
|
||||
return formatDay(parseDay(day).toISOString());
|
||||
}
|
||||
|
||||
function title(day: PresenceDay, index: number): string {
|
||||
const date = label(day.day);
|
||||
const missing = absent(day, index);
|
||||
if (missing >= SECONDS_IN_DAY - SECONDS_IN_HOUR) {
|
||||
return t("presence.dayNoData", { day: date });
|
||||
}
|
||||
const span = formatSpan(day.online_seconds);
|
||||
if (missing >= SECONDS_IN_HOUR) {
|
||||
return t("presence.dayGap", {
|
||||
day: date,
|
||||
gap: formatSpan(missing),
|
||||
span,
|
||||
});
|
||||
}
|
||||
return t("presence.day", { day: date, span });
|
||||
}
|
||||
|
||||
function absent(day: PresenceDay, index: number): number {
|
||||
if (index === days.length - 1) {
|
||||
return 0;
|
||||
@@ -46,11 +52,7 @@
|
||||
{#each days as day, index (day.day)}
|
||||
<div
|
||||
class={["slot", { empty: day.covered_seconds < SECONDS_IN_HOUR }]}
|
||||
title={TEXT.bar(
|
||||
label(day.day),
|
||||
day.online_seconds,
|
||||
absent(day, index)
|
||||
)}
|
||||
title={title(day, index)}
|
||||
>
|
||||
<span
|
||||
class={["bar", { zero: day.online_seconds === 0 }]}
|
||||
@@ -63,7 +65,7 @@
|
||||
{#if first}
|
||||
<div class="axis">
|
||||
<span>{label(first.day)}</span>
|
||||
<span>{TEXT.today}</span>
|
||||
<span>{t("presence.axisToday")}</span>
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<script lang="ts">
|
||||
import type { PresenceHour } from "#lib/api/types.js";
|
||||
import { formatSpan } from "#lib/format/presence.js";
|
||||
import { formatSpan, weekdayLabels } from "#lib/format/presence.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
|
||||
interface Props {
|
||||
week: PresenceHour[];
|
||||
@@ -8,28 +9,14 @@
|
||||
|
||||
const { week }: Props = $props();
|
||||
|
||||
const TEXT = {
|
||||
cell: (day: string, cell: PresenceHour) => {
|
||||
const slot = `${day}, ${cell.hour}:00`;
|
||||
if (cell.hours === 0) {
|
||||
return slot;
|
||||
}
|
||||
if (cell.online_minutes === null) {
|
||||
return `${slot}, нет данных`;
|
||||
}
|
||||
return `${slot}, в среднем ${formatSpan(cell.online_minutes * 60)} в сети`;
|
||||
},
|
||||
days: ["Пн", "Вт", "Ср", "Чт", "Пт", "Сб", "Вс"],
|
||||
empty: "нет данных",
|
||||
max: (minutes: number) => `до ${formatSpan(minutes * 60)}`,
|
||||
};
|
||||
|
||||
const HOURS_IN_DAY = 24;
|
||||
const SECONDS_IN_MINUTE = 60;
|
||||
const HOUR_TICKS = [0, 6, 12, 18];
|
||||
const MIN_SHADE = 0.18;
|
||||
|
||||
const weekdays = $derived(weekdayLabels());
|
||||
const rows = $derived(
|
||||
TEXT.days.map((_, weekday) =>
|
||||
weekdays.map((_, weekday) =>
|
||||
week
|
||||
.filter((cell) => cell.weekday === weekday)
|
||||
.sort((a, b) => a.hour - b.hour)
|
||||
@@ -44,6 +31,20 @@
|
||||
return cell.hours > 0 && cell.online_minutes === null;
|
||||
}
|
||||
|
||||
function title(day: string, cell: PresenceHour): string {
|
||||
const slot = `${day}, ${cell.hour}:00`;
|
||||
if (cell.hours === 0) {
|
||||
return slot;
|
||||
}
|
||||
if (cell.online_minutes === null) {
|
||||
return t("presence.cellNoData", { slot });
|
||||
}
|
||||
return t("presence.cellAverage", {
|
||||
slot,
|
||||
span: formatSpan(cell.online_minutes * SECONDS_IN_MINUTE),
|
||||
});
|
||||
}
|
||||
|
||||
function shade(minutes: number | null): number {
|
||||
if (minutes === null || minutes === 0 || peak === 0) {
|
||||
return 0;
|
||||
@@ -55,7 +56,7 @@
|
||||
<div class="heatmap">
|
||||
{#each rows as cells, weekday (weekday)}
|
||||
<div class="row">
|
||||
<span class="day">{TEXT.days[weekday]}</span>
|
||||
<span class="day">{weekdays[weekday]}</span>
|
||||
<div class="cells">
|
||||
{#each cells as cell (cell.hour)}
|
||||
<span
|
||||
@@ -67,7 +68,7 @@
|
||||
zero: cell.online_minutes === 0,
|
||||
},
|
||||
]}
|
||||
title={TEXT.cell(TEXT.days[weekday] ?? "", cell)}
|
||||
title={title(weekdays[weekday] ?? "", cell)}
|
||||
style:--shade="{shade(cell.online_minutes) * 100}%"
|
||||
></span>
|
||||
{/each}
|
||||
@@ -87,13 +88,13 @@
|
||||
{#if peak > 0}
|
||||
<span class="key">
|
||||
<span class="scale"></span>
|
||||
{TEXT.max(peak)}
|
||||
{t("presence.max", { span: formatSpan(peak * SECONDS_IN_MINUTE) })}
|
||||
</span>
|
||||
{/if}
|
||||
{#if hasGaps}
|
||||
<span class="key">
|
||||
<span class="swatch empty"></span>
|
||||
{TEXT.empty}
|
||||
{t("presence.noData")}
|
||||
</span>
|
||||
{/if}
|
||||
</div>
|
||||
@@ -115,7 +116,7 @@
|
||||
|
||||
.day {
|
||||
flex-shrink: 0;
|
||||
width: 1.375rem;
|
||||
width: 1.75rem;
|
||||
font-size: 0.75rem;
|
||||
color: var(--color-text-secondary);
|
||||
}
|
||||
@@ -173,7 +174,7 @@
|
||||
gap: 0.25rem 0.75rem;
|
||||
align-items: center;
|
||||
|
||||
margin: 0.375rem 0 0 1.875rem;
|
||||
margin: 0.375rem 0 0 2.25rem;
|
||||
|
||||
font-size: 0.75rem;
|
||||
font-variant-numeric: tabular-nums;
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
import Spinner from "#lib/components/ui/Spinner.svelte";
|
||||
import { formatLongDay, formatTime } from "#lib/format/datetime.js";
|
||||
import { formatSpan } from "#lib/format/presence.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
|
||||
interface Props {
|
||||
days: number;
|
||||
@@ -16,18 +17,6 @@
|
||||
|
||||
const { days, first, pageSize, peerId, tz }: Props = $props();
|
||||
|
||||
const TEXT = {
|
||||
failed: "Не удалось загрузить сессии.",
|
||||
more: "Показать ещё",
|
||||
none: "За этот период в сети не был(а).",
|
||||
now: "в сети",
|
||||
retry: "Повторить",
|
||||
since: (time: string) => `с ${time}`,
|
||||
span: (from: string, to: string) => (from === to ? from : `${from}–${to}`),
|
||||
today: "Сегодня",
|
||||
yesterday: "Вчера",
|
||||
};
|
||||
|
||||
const MS_IN_DAY = 86_400_000;
|
||||
|
||||
let extra = $state<PresenceSession[]>([]);
|
||||
@@ -54,18 +43,22 @@
|
||||
function dayLabel(date: Date): string {
|
||||
const today = new Date();
|
||||
if (date.toDateString() === today.toDateString()) {
|
||||
return TEXT.today;
|
||||
return t("presence.today");
|
||||
}
|
||||
if (
|
||||
date.toDateString() ===
|
||||
new Date(today.getTime() - MS_IN_DAY).toDateString()
|
||||
) {
|
||||
return TEXT.yesterday;
|
||||
return t("presence.yesterday");
|
||||
}
|
||||
const text = formatLongDay(date);
|
||||
return text.charAt(0).toUpperCase() + text.slice(1);
|
||||
}
|
||||
|
||||
function span(from: string, to: string): string {
|
||||
return from === to ? from : `${from}–${to}`;
|
||||
}
|
||||
|
||||
async function loadMore() {
|
||||
if (loading) {
|
||||
return;
|
||||
@@ -92,7 +85,7 @@
|
||||
</script>
|
||||
|
||||
{#if sessions.length === 0}
|
||||
<p class="state">{TEXT.none}</p>
|
||||
<p class="state">{t("presence.noSessions")}</p>
|
||||
{:else}
|
||||
{#each groups as group (group.label)}
|
||||
<h4 class="day">{group.label}</h4>
|
||||
@@ -101,14 +94,13 @@
|
||||
<li>
|
||||
<span>
|
||||
{session.ongoing
|
||||
? TEXT.since(formatTime(session.started))
|
||||
: TEXT.span(
|
||||
formatTime(session.started),
|
||||
formatTime(session.ended)
|
||||
)}
|
||||
? t("presence.since", { time: formatTime(session.started) })
|
||||
: span(formatTime(session.started), formatTime(session.ended))}
|
||||
</span>
|
||||
<span class={["length", { online: session.ongoing }]}>
|
||||
{session.ongoing ? TEXT.now : formatSpan(session.seconds)}
|
||||
{session.ongoing
|
||||
? t("presence.online")
|
||||
: formatSpan(session.seconds)}
|
||||
</span>
|
||||
</li>
|
||||
{/each}
|
||||
@@ -118,11 +110,13 @@
|
||||
<div class="state"><Spinner /></div>
|
||||
{:else if failed}
|
||||
<div class="state">
|
||||
<p>{TEXT.failed}</p>
|
||||
<Button onclick={loadMore} smaller variant="text">{TEXT.retry}</Button>
|
||||
<p>{t("presence.sessionsFailed")}</p>
|
||||
<Button onclick={loadMore} smaller variant="text">{t("ui.retry")}</Button>
|
||||
</div>
|
||||
{:else if !exhausted}
|
||||
<button class="more" onclick={loadMore} type="button">{TEXT.more}</button>
|
||||
<button class="more" onclick={loadMore} type="button">
|
||||
{t("ui.showMore")}
|
||||
</button>
|
||||
{/if}
|
||||
{/if}
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<script lang="ts">
|
||||
import type { VolumeBucket } from "#lib/api/types.js";
|
||||
import { formatDay, parseDay } from "#lib/format/datetime.js";
|
||||
import { t } from "#lib/i18n/locale.svelte.js";
|
||||
|
||||
interface Props {
|
||||
volume: VolumeBucket[];
|
||||
@@ -8,22 +9,25 @@
|
||||
|
||||
const { volume }: Props = $props();
|
||||
|
||||
const TEXT = {
|
||||
bar: (day: string, bucket: VolumeBucket) =>
|
||||
bucket.total === 0
|
||||
? `${day}, нет сообщений`
|
||||
: `${day}, всего ${bucket.total}: входящих ${bucket.incoming}, моих ${bucket.outgoing}`,
|
||||
incoming: "входящие",
|
||||
outgoing: "мои",
|
||||
today: "сегодня",
|
||||
};
|
||||
|
||||
const peak = $derived(Math.max(1, ...volume.map((bucket) => bucket.total)));
|
||||
const first = $derived(volume[0]);
|
||||
|
||||
function label(day: string): string {
|
||||
return formatDay(parseDay(day).toISOString());
|
||||
}
|
||||
|
||||
function title(bucket: VolumeBucket): string {
|
||||
const day = label(bucket.bucket);
|
||||
if (bucket.total === 0) {
|
||||
return t("presence.volumeEmpty", { day });
|
||||
}
|
||||
return t("presence.volume", {
|
||||
day,
|
||||
incoming: bucket.incoming,
|
||||
outgoing: bucket.outgoing,
|
||||
total: bucket.total,
|
||||
});
|
||||
}
|
||||
</script>
|
||||
|
||||
<div class="volume">
|
||||
@@ -31,7 +35,7 @@
|
||||
<span class="peak">{peak}</span>
|
||||
<div class={["bars", { dense: volume.length > 45 }]}>
|
||||
{#each volume as bucket (bucket.bucket)}
|
||||
<div class="slot" title={TEXT.bar(label(bucket.bucket), bucket)}>
|
||||
<div class="slot" title={title(bucket)}>
|
||||
<div
|
||||
class={["bar", { zero: bucket.total === 0 }]}
|
||||
style:height="{(bucket.total / peak) * 100}%"
|
||||
@@ -46,12 +50,16 @@
|
||||
{#if first}
|
||||
<div class="axis">
|
||||
<span>{label(first.bucket)}</span>
|
||||
<span>{TEXT.today}</span>
|
||||
<span>{t("presence.axisToday")}</span>
|
||||
</div>
|
||||
{/if}
|
||||
<div class="legend">
|
||||
<span class="key"><span class="swatch in"></span>{TEXT.incoming}</span>
|
||||
<span class="key"><span class="swatch out"></span>{TEXT.outgoing}</span>
|
||||
<span class="key"
|
||||
><span class="swatch in"></span>{t("presence.volumeIncoming")}</span
|
||||
>
|
||||
<span class="key"
|
||||
><span class="swatch out"></span>{t("presence.volumeOutgoing")}</span
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
Reference in new issue
Block a user