Compare commits
47 Commits
7de23303bd
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
2821548e6e
|
|||
|
72eeb547af
|
|||
|
86411bb88e
|
|||
|
acb061baca
|
|||
|
8a7177a54a
|
|||
|
818a535903
|
|||
|
9a8c0955b5
|
|||
|
25eab2d795
|
|||
|
2130032d46
|
|||
|
92a66422ab
|
|||
|
94b6fbe42d
|
|||
|
048646a7c1
|
|||
|
1f2fea3427
|
|||
|
d539892b70
|
|||
|
a57682e610
|
|||
|
22c80fd7af
|
|||
|
8b5656ef26
|
|||
|
dd1de38b2f
|
|||
|
283b2126c0
|
|||
|
e8dcb5fcaf
|
|||
|
b41e8c330a
|
|||
|
f386e0b574
|
|||
|
111a2af573
|
|||
|
6f30a61184
|
|||
|
14643273c0
|
|||
|
ee93429317
|
|||
|
c66aaeb268
|
|||
|
2a20b47a29
|
|||
|
f77a8ab48f
|
|||
|
1679153c43
|
|||
|
0aa53d30db
|
|||
|
cd833b18f1
|
|||
|
293d112c18
|
|||
|
ef1e84a41b
|
|||
|
f8c13b5e21
|
|||
|
abc90c8da0
|
|||
|
d46a0e3777
|
|||
|
642209068a
|
|||
|
c1e964de06
|
|||
|
45fd45f5da
|
|||
|
03c816d2d3
|
|||
|
13db392273
|
|||
|
e63583877c
|
|||
|
2284a886d0
|
|||
|
1ca85fe632
|
|||
|
822def3227
|
|||
|
27ce16e630
|
1
.gitignore
vendored
1
.gitignore
vendored
@@ -2,6 +2,7 @@
|
||||
**/*.rs.bk
|
||||
.env
|
||||
.env.local
|
||||
.zed/
|
||||
|
||||
# frontend
|
||||
/ui/node_modules
|
||||
|
||||
78
CLAUDE.md
Normal file
78
CLAUDE.md
Normal file
@@ -0,0 +1,78 @@
|
||||
# CLAUDE.md
|
||||
|
||||
This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
|
||||
|
||||
## Project Overview
|
||||
|
||||
**moments** is a personal activity timeline and portfolio site. It ingests developer activity from multiple forges (GitHub, Gitea, Mercurial, Bugzilla), stores raw JSON payloads in PostgreSQL, and serves a React frontend showing contribution graphs, a ranked project dashboard, and a filterable activity timeline.
|
||||
|
||||
## Architecture
|
||||
|
||||
Hexagonal (ports & adapters) Rust backend with a React/TypeScript frontend.
|
||||
|
||||
### Crate Dependency Graph
|
||||
|
||||
```
|
||||
moments-entities — pure types/DTOs, no DB or HTTP deps
|
||||
^
|
||||
moments-core — port traits (EventReader, EventWriter, EventSource, PollerStateStore)
|
||||
+ presentation reshape + poller loop
|
||||
^
|
||||
moments-data — sole adapter: PgStore implements all core traits
|
||||
+ EventSource impls (github, gitea, hg, bugzilla)
|
||||
+ SQL migrations
|
||||
^
|
||||
moments-api — axum HTTP API binary (read-only, connects as moments_ro)
|
||||
moments-worker — ingestion daemon binary (runs migrations, connects as moments_rw)
|
||||
```
|
||||
|
||||
### Key Design Decisions
|
||||
|
||||
- **Raw payload storage**: upstream JSON is stored verbatim in `events.payload` (JSONB). The `reshape()` function in `moments-core/src/presentation.rs` transforms payloads into `TimelineItem` at request time — no re-ingestion needed to change presentation.
|
||||
- **Public/private gate**: `events.public` boolean controls API visibility. Only `public = true` rows are served.
|
||||
- **Wire types are hand-maintained**: `ui/src/api/client.ts` mirrors Rust entity types manually.
|
||||
- **Migrations**: run automatically on worker startup via `sqlx::migrate!`. The API binary never runs migrations.
|
||||
|
||||
### Frontend
|
||||
|
||||
React 19 + Vite 6 (SWC) + TypeScript + Bootstrap 5. State/data via `@tanstack/react-query`. Package manager is **pnpm**.
|
||||
|
||||
Routes: `/` (dashboard), `/activity` (timeline), `/project/:source/*` (project detail), `/cv` (resume).
|
||||
|
||||
## Build & Dev Commands
|
||||
|
||||
### Rust
|
||||
|
||||
```sh
|
||||
cargo build --workspace # build all crates
|
||||
cargo build --workspace --release # release build
|
||||
cargo clippy --workspace # lint
|
||||
cargo fmt --check # format check
|
||||
cargo test --workspace # run tests
|
||||
|
||||
# Run binaries (need DATABASE_URL)
|
||||
DATABASE_URL=postgres://localhost/moments cargo run -p moments-api
|
||||
DATABASE_URL=postgres://localhost/moments cargo run -p moments-worker
|
||||
```
|
||||
|
||||
### Frontend
|
||||
|
||||
```sh
|
||||
cd ui
|
||||
pnpm install # install deps
|
||||
pnpm dev # dev server on :5173 (proxies /api/* to localhost:8080)
|
||||
pnpm lint # tsc --noEmit type-check
|
||||
pnpm build # production build (tsc -b && vite build)
|
||||
```
|
||||
|
||||
## Database
|
||||
|
||||
PostgreSQL with three migrations in `crates/moments-data/migrations/`. Two roles: `moments_rw` (worker, full access) and `moments_ro` (API, SELECT-only).
|
||||
|
||||
## API Endpoints
|
||||
|
||||
All under `/v1/`: `healthz`, `events`, `sources`, `projects`, `activity/daily`, `forge/{source}/*`, `og/contributions.png`.
|
||||
|
||||
## Deployment
|
||||
|
||||
Production uses `./script/deploy.sh`. Services run under systemd with hardened units. Secrets resolved from `pass` store via template substitution. Nginx reverse-proxies `/api/` to the API host.
|
||||
390
Cargo.lock
generated
390
Cargo.lock
generated
@@ -88,6 +88,18 @@ version = "1.0.102"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
|
||||
|
||||
[[package]]
|
||||
name = "arrayref"
|
||||
version = "0.3.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
|
||||
|
||||
[[package]]
|
||||
name = "arrayvec"
|
||||
version = "0.7.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
|
||||
|
||||
[[package]]
|
||||
name = "async-compression"
|
||||
version = "0.4.42"
|
||||
@@ -196,6 +208,12 @@ version = "1.8.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "1.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "2.11.1"
|
||||
@@ -220,12 +238,24 @@ version = "3.20.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb"
|
||||
|
||||
[[package]]
|
||||
name = "bytemuck"
|
||||
version = "1.25.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec"
|
||||
|
||||
[[package]]
|
||||
name = "byteorder"
|
||||
version = "1.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
|
||||
|
||||
[[package]]
|
||||
name = "byteorder-lite"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
|
||||
|
||||
[[package]]
|
||||
name = "bytes"
|
||||
version = "1.11.1"
|
||||
@@ -306,6 +336,12 @@ version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"
|
||||
|
||||
[[package]]
|
||||
name = "color_quant"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
|
||||
|
||||
[[package]]
|
||||
name = "colorchoice"
|
||||
version = "1.0.5"
|
||||
@@ -350,6 +386,15 @@ version = "0.8.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
|
||||
|
||||
[[package]]
|
||||
name = "core_maths"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "77745e017f5edba1a9c1d854f6f3a52dac8a12dd5af5d2f54aecf61e43d80d30"
|
||||
dependencies = [
|
||||
"libm",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cpufeatures"
|
||||
version = "0.2.17"
|
||||
@@ -408,6 +453,12 @@ dependencies = [
|
||||
"typenum",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "data-url"
|
||||
version = "0.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "be1e0bca6c3637f992fc1cc7cbc52a78c1ef6db076dbf1059c4323d6a2048376"
|
||||
|
||||
[[package]]
|
||||
name = "der"
|
||||
version = "0.7.10"
|
||||
@@ -484,6 +535,15 @@ dependencies = [
|
||||
"windows-sys 0.48.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "euclid"
|
||||
version = "0.22.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f1a05365e3b1c6d1650318537c7460c6923f1abdd272ad6842baa2b509957a06"
|
||||
dependencies = [
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "event-listener"
|
||||
version = "5.4.1"
|
||||
@@ -495,6 +555,15 @@ dependencies = [
|
||||
"pin-project-lite",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "fdeflate"
|
||||
version = "0.3.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c"
|
||||
dependencies = [
|
||||
"simd-adler32",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "find-msvc-tools"
|
||||
version = "0.1.9"
|
||||
@@ -511,6 +580,12 @@ dependencies = [
|
||||
"miniz_oxide",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "float-cmp"
|
||||
version = "0.9.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
|
||||
|
||||
[[package]]
|
||||
name = "flume"
|
||||
version = "0.11.1"
|
||||
@@ -528,6 +603,29 @@ version = "0.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
|
||||
|
||||
[[package]]
|
||||
name = "fontconfig-parser"
|
||||
version = "0.5.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bbc773e24e02d4ddd8395fd30dc147524273a83e54e0f312d986ea30de5f5646"
|
||||
dependencies = [
|
||||
"roxmltree",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "fontdb"
|
||||
version = "0.23.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "457e789b3d1202543297a350643cf459f836cade38934e7a4cf6a39e7cde2905"
|
||||
dependencies = [
|
||||
"fontconfig-parser",
|
||||
"log",
|
||||
"memmap2",
|
||||
"slotmap",
|
||||
"tinyvec",
|
||||
"ttf-parser",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "form_urlencoded"
|
||||
version = "1.2.2"
|
||||
@@ -645,6 +743,16 @@ dependencies = [
|
||||
"wasm-bindgen",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gif"
|
||||
version = "0.13.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4ae047235e33e2829703574b54fdec96bfbad892062d97fed2f76022287de61b"
|
||||
dependencies = [
|
||||
"color_quant",
|
||||
"weezl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hashbrown"
|
||||
version = "0.15.5"
|
||||
@@ -941,6 +1049,22 @@ dependencies = [
|
||||
"icu_properties",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "image-webp"
|
||||
version = "0.2.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "525e9ff3e1a4be2fbea1fdf0e98686a6d98b4d8f937e1bf7402245af1909e8c3"
|
||||
dependencies = [
|
||||
"byteorder-lite",
|
||||
"quick-error",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "imagesize"
|
||||
version = "0.13.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285"
|
||||
|
||||
[[package]]
|
||||
name = "indexmap"
|
||||
version = "2.14.0"
|
||||
@@ -991,6 +1115,17 @@ dependencies = [
|
||||
"wasm-bindgen",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "kurbo"
|
||||
version = "0.11.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c62026ae44756f8a599ba21140f350303d4f08dcdcc71b5ad9c9bb8128c13c62"
|
||||
dependencies = [
|
||||
"arrayvec",
|
||||
"euclid",
|
||||
"smallvec",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "lazy_static"
|
||||
version = "1.5.0"
|
||||
@@ -1018,7 +1153,7 @@ version = "0.1.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"bitflags 2.11.1",
|
||||
"libc",
|
||||
"plain",
|
||||
"redox_syscall 0.7.4",
|
||||
@@ -1092,6 +1227,15 @@ version = "2.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
|
||||
|
||||
[[package]]
|
||||
name = "memmap2"
|
||||
version = "0.9.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "714098028fe011992e1c3962653c96b2d578c4b4bce9036e15ff220319b1e0e3"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "mime"
|
||||
version = "0.3.17"
|
||||
@@ -1127,10 +1271,12 @@ dependencies = [
|
||||
"axum",
|
||||
"chrono",
|
||||
"clap",
|
||||
"fontdb",
|
||||
"moments-core",
|
||||
"moments-data",
|
||||
"moments-entities",
|
||||
"reqwest",
|
||||
"resvg",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"tokio",
|
||||
@@ -1161,6 +1307,7 @@ dependencies = [
|
||||
"chrono",
|
||||
"moments-core",
|
||||
"moments-entities",
|
||||
"percent-encoding",
|
||||
"reqwest",
|
||||
"serde",
|
||||
"serde_json",
|
||||
@@ -1308,6 +1455,12 @@ version = "2.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
|
||||
|
||||
[[package]]
|
||||
name = "pico-args"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
|
||||
|
||||
[[package]]
|
||||
name = "pin-project-lite"
|
||||
version = "0.2.17"
|
||||
@@ -1347,6 +1500,19 @@ version = "0.2.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
|
||||
|
||||
[[package]]
|
||||
name = "png"
|
||||
version = "0.17.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"crc32fast",
|
||||
"fdeflate",
|
||||
"flate2",
|
||||
"miniz_oxide",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "potential_utf"
|
||||
version = "0.1.5"
|
||||
@@ -1374,6 +1540,12 @@ dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quick-error"
|
||||
version = "2.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
|
||||
|
||||
[[package]]
|
||||
name = "quinn"
|
||||
version = "0.11.9"
|
||||
@@ -1509,7 +1681,7 @@ version = "0.5.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"bitflags 2.11.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1518,7 +1690,7 @@ version = "0.7.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f450ad9c3b1da563fb6948a8e0fb0fb9269711c9c73d9ea1de5058c79c8d643a"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"bitflags 2.11.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1576,6 +1748,32 @@ dependencies = [
|
||||
"webpki-roots 1.0.7",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "resvg"
|
||||
version = "0.45.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a8928798c0a55e03c9ca6c4c6846f76377427d2c1e1f7e6de3c06ae57942df43"
|
||||
dependencies = [
|
||||
"gif",
|
||||
"image-webp",
|
||||
"log",
|
||||
"pico-args",
|
||||
"rgb",
|
||||
"svgtypes",
|
||||
"tiny-skia",
|
||||
"usvg",
|
||||
"zune-jpeg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rgb"
|
||||
version = "0.8.53"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "47b34b781b31e5d73e9fbc8689c70551fd1ade9a19e3e28cfec8580a79290cc4"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ring"
|
||||
version = "0.17.14"
|
||||
@@ -1590,6 +1788,12 @@ dependencies = [
|
||||
"windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "roxmltree"
|
||||
version = "0.20.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97"
|
||||
|
||||
[[package]]
|
||||
name = "rsa"
|
||||
version = "0.9.10"
|
||||
@@ -1657,6 +1861,24 @@ version = "1.0.22"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
|
||||
|
||||
[[package]]
|
||||
name = "rustybuzz"
|
||||
version = "0.20.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fd3c7c96f8a08ee34eff8857b11b49b07d71d1c3f4e88f8a88d4c9e9f90b1702"
|
||||
dependencies = [
|
||||
"bitflags 2.11.1",
|
||||
"bytemuck",
|
||||
"core_maths",
|
||||
"log",
|
||||
"smallvec",
|
||||
"ttf-parser",
|
||||
"unicode-bidi-mirroring",
|
||||
"unicode-ccc",
|
||||
"unicode-properties",
|
||||
"unicode-script",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ryu"
|
||||
version = "1.0.23"
|
||||
@@ -1798,12 +2020,36 @@ version = "0.3.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214"
|
||||
|
||||
[[package]]
|
||||
name = "simplecss"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7a9c6883ca9c3c7c90e888de77b7a5c849c779d25d74a1269b0218b14e8b136c"
|
||||
dependencies = [
|
||||
"log",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "siphasher"
|
||||
version = "1.0.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649"
|
||||
|
||||
[[package]]
|
||||
name = "slab"
|
||||
version = "0.4.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
|
||||
|
||||
[[package]]
|
||||
name = "slotmap"
|
||||
version = "1.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bdd58c3c93c3d278ca835519292445cb4b0d4dc59ccfdf7ceadaab3f8aeb4038"
|
||||
dependencies = [
|
||||
"version_check",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "smallvec"
|
||||
version = "1.15.1"
|
||||
@@ -1938,7 +2184,7 @@ checksum = "aa003f0038df784eb8fecbbac13affe3da23b45194bd57dba231c8f48199c526"
|
||||
dependencies = [
|
||||
"atoi",
|
||||
"base64",
|
||||
"bitflags",
|
||||
"bitflags 2.11.1",
|
||||
"byteorder",
|
||||
"bytes",
|
||||
"chrono",
|
||||
@@ -1981,7 +2227,7 @@ checksum = "db58fcd5a53cf07c184b154801ff91347e4c30d17a3562a635ff028ad5deda46"
|
||||
dependencies = [
|
||||
"atoi",
|
||||
"base64",
|
||||
"bitflags",
|
||||
"bitflags 2.11.1",
|
||||
"byteorder",
|
||||
"chrono",
|
||||
"crc",
|
||||
@@ -2042,6 +2288,15 @@ version = "1.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
|
||||
|
||||
[[package]]
|
||||
name = "strict-num"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
|
||||
dependencies = [
|
||||
"float-cmp",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "stringprep"
|
||||
version = "0.1.5"
|
||||
@@ -2065,6 +2320,16 @@ version = "2.6.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
|
||||
|
||||
[[package]]
|
||||
name = "svgtypes"
|
||||
version = "0.15.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "68c7541fff44b35860c1a7a47a7cadf3e4a304c457b58f9870d9706ece028afc"
|
||||
dependencies = [
|
||||
"kurbo",
|
||||
"siphasher",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.117"
|
||||
@@ -2125,6 +2390,32 @@ dependencies = [
|
||||
"cfg-if",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tiny-skia"
|
||||
version = "0.11.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab"
|
||||
dependencies = [
|
||||
"arrayref",
|
||||
"arrayvec",
|
||||
"bytemuck",
|
||||
"cfg-if",
|
||||
"log",
|
||||
"png",
|
||||
"tiny-skia-path",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tiny-skia-path"
|
||||
version = "0.11.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93"
|
||||
dependencies = [
|
||||
"arrayref",
|
||||
"bytemuck",
|
||||
"strict-num",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tinystr"
|
||||
version = "0.8.3"
|
||||
@@ -2234,7 +2525,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8"
|
||||
dependencies = [
|
||||
"async-compression",
|
||||
"bitflags",
|
||||
"bitflags 2.11.1",
|
||||
"bytes",
|
||||
"futures-core",
|
||||
"futures-util",
|
||||
@@ -2344,6 +2635,15 @@ version = "0.2.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
|
||||
|
||||
[[package]]
|
||||
name = "ttf-parser"
|
||||
version = "0.25.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31"
|
||||
dependencies = [
|
||||
"core_maths",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "typenum"
|
||||
version = "1.20.0"
|
||||
@@ -2356,6 +2656,18 @@ version = "0.3.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-bidi-mirroring"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5dfa6e8c60bb66d49db113e0125ee8711b7647b5579dc7f5f19c42357ed039fe"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-ccc"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ce61d488bcdc9bc8b5d1772c404828b17fc481c0a582b5581e95fb233aef503e"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.24"
|
||||
@@ -2377,6 +2689,18 @@ version = "0.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-script"
|
||||
version = "0.5.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "383ad40bb927465ec0ce7720e033cb4ca06912855fc35db31b5755d0de75b1ee"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-vo"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94"
|
||||
|
||||
[[package]]
|
||||
name = "untrusted"
|
||||
version = "0.9.0"
|
||||
@@ -2395,6 +2719,33 @@ dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "usvg"
|
||||
version = "0.45.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "80be9b06fbae3b8b303400ab20778c80bbaf338f563afe567cf3c9eea17b47ef"
|
||||
dependencies = [
|
||||
"base64",
|
||||
"data-url",
|
||||
"flate2",
|
||||
"fontdb",
|
||||
"imagesize",
|
||||
"kurbo",
|
||||
"log",
|
||||
"pico-args",
|
||||
"roxmltree",
|
||||
"rustybuzz",
|
||||
"simplecss",
|
||||
"siphasher",
|
||||
"strict-num",
|
||||
"svgtypes",
|
||||
"tiny-skia-path",
|
||||
"unicode-bidi",
|
||||
"unicode-script",
|
||||
"unicode-vo",
|
||||
"xmlwriter",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "utf8_iter"
|
||||
version = "1.0.4"
|
||||
@@ -2548,6 +2899,12 @@ dependencies = [
|
||||
"rustls-pki-types",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "weezl"
|
||||
version = "0.1.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88"
|
||||
|
||||
[[package]]
|
||||
name = "whoami"
|
||||
version = "1.6.1"
|
||||
@@ -2860,6 +3217,12 @@ version = "0.6.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
|
||||
|
||||
[[package]]
|
||||
name = "xmlwriter"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
|
||||
|
||||
[[package]]
|
||||
name = "yoke"
|
||||
version = "0.8.2"
|
||||
@@ -2968,3 +3331,18 @@ name = "zmij"
|
||||
version = "1.0.21"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
|
||||
|
||||
[[package]]
|
||||
name = "zune-core"
|
||||
version = "0.4.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
|
||||
|
||||
[[package]]
|
||||
name = "zune-jpeg"
|
||||
version = "0.4.21"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "29ce2c8a9384ad323cf564b67da86e21d3cfdff87908bc1223ed5c99bc792713"
|
||||
dependencies = [
|
||||
"zune-core",
|
||||
]
|
||||
|
||||
@@ -30,6 +30,8 @@ anyhow = "1"
|
||||
reqwest = { version = "0.12", default-features = false, features = ["rustls-tls", "json", "gzip"] }
|
||||
figment = { version = "0.10", features = ["toml", "env"] }
|
||||
clap = { version = "4", features = ["derive", "env"] }
|
||||
resvg = "0.45"
|
||||
fontdb = "0.23"
|
||||
|
||||
# internal
|
||||
moments-entities = { path = "crates/moments-entities", version = "=0.1.0" }
|
||||
|
||||
@@ -20,7 +20,7 @@ server {
|
||||
add_header Cache-Control "no-cache" always;
|
||||
}
|
||||
|
||||
location ~* \.(js|css|woff2?|ttf|eot|svg|png|jpg|jpeg|gif|ico|webp|avif)$ {
|
||||
location ~* ^(?!/api/)\S+\.(js|css|woff2?|ttf|eot|svg|png|jpg|jpeg|gif|ico|webp|avif)$ {
|
||||
expires 30d;
|
||||
add_header Cache-Control "public, max-age=2592000, immutable";
|
||||
try_files $uri =404;
|
||||
|
||||
@@ -21,3 +21,5 @@ serde_json.workspace = true
|
||||
chrono.workspace = true
|
||||
clap.workspace = true
|
||||
reqwest.workspace = true
|
||||
resvg.workspace = true
|
||||
fontdb.workspace = true
|
||||
|
||||
@@ -7,11 +7,11 @@ use axum::{
|
||||
response::IntoResponse,
|
||||
routing::get,
|
||||
};
|
||||
use chrono::{DateTime, Utc};
|
||||
use chrono::{DateTime, Datelike, NaiveDate, Utc};
|
||||
use clap::Parser;
|
||||
use moments_core::{EventReader, reshape};
|
||||
use moments_data::PgStore;
|
||||
use moments_entities::{EventQuery, ProjectSummary, Source, SourceSummary, TimelineItem};
|
||||
use moments_entities::{DailyCount, EventQuery, HourlyAvg, LanguageDailyCount, ProjectSummary, RepoLanguage, Source, SourceSummary, TimelineItem};
|
||||
use serde::Deserialize;
|
||||
use tower_http::{cors::CorsLayer, trace::TraceLayer};
|
||||
use tracing::info;
|
||||
@@ -56,7 +56,12 @@ async fn main() -> anyhow::Result<()> {
|
||||
.route("/v1/events", get(list_events))
|
||||
.route("/v1/sources", get(list_sources))
|
||||
.route("/v1/projects", get(list_projects))
|
||||
.route("/v1/activity/daily", get(daily_counts))
|
||||
.route("/v1/activity/hourly", get(hourly_avgs))
|
||||
.route("/v1/languages/daily", get(language_daily_counts))
|
||||
.route("/v1/languages/repos", get(repo_languages))
|
||||
.route("/v1/forge/{source}/{*rest}", get(forge_proxy))
|
||||
.route("/v1/og/contributions.png", get(og_contributions))
|
||||
.with_state(state)
|
||||
.layer(TraceLayer::new_for_http())
|
||||
.layer(CorsLayer::permissive());
|
||||
@@ -126,7 +131,7 @@ async fn list_sources(
|
||||
) -> Result<Json<Vec<SourceSummary>>, ApiError> {
|
||||
let summaries = state
|
||||
.store
|
||||
.source_summaries(/* include_private */ false)
|
||||
.source_summaries(/* include_private */ true)
|
||||
.await
|
||||
.map_err(internal)?;
|
||||
Ok(Json(summaries))
|
||||
@@ -139,6 +144,273 @@ async fn list_projects(
|
||||
Ok(Json(projects))
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
struct DailyCountsParams {
|
||||
from: Option<NaiveDate>,
|
||||
to: Option<NaiveDate>,
|
||||
}
|
||||
|
||||
async fn daily_counts(
|
||||
State(state): State<AppState>,
|
||||
Query(params): Query<DailyCountsParams>,
|
||||
) -> Result<Json<Vec<DailyCount>>, ApiError> {
|
||||
let to = params.to.unwrap_or_else(|| Utc::now().date_naive());
|
||||
let from = params.from.unwrap_or_else(|| to - chrono::Duration::days(365));
|
||||
let counts = state.store.daily_counts(from, to, /* include_private */ true).await.map_err(internal)?;
|
||||
Ok(Json(counts))
|
||||
}
|
||||
|
||||
async fn language_daily_counts(
|
||||
State(state): State<AppState>,
|
||||
Query(params): Query<DailyCountsParams>,
|
||||
) -> Result<Json<Vec<LanguageDailyCount>>, ApiError> {
|
||||
let to = params.to.unwrap_or_else(|| Utc::now().date_naive());
|
||||
let from = params.from.unwrap_or_else(|| to - chrono::Duration::days(365));
|
||||
let counts = state.store.language_daily_counts(from, to, /* include_private */ true).await.map_err(internal)?;
|
||||
Ok(Json(counts))
|
||||
}
|
||||
|
||||
#[derive(Debug, Deserialize)]
|
||||
struct HourlyAvgsParams {
|
||||
from: Option<NaiveDate>,
|
||||
to: Option<NaiveDate>,
|
||||
/// IANA timezone name (e.g. "Europe/Helsinki"). Defaults to UTC.
|
||||
/// Hour buckets are computed in this zone so the chart matches the
|
||||
/// clock the user sees.
|
||||
tz: Option<String>,
|
||||
}
|
||||
|
||||
async fn hourly_avgs(
|
||||
State(state): State<AppState>,
|
||||
Query(params): Query<HourlyAvgsParams>,
|
||||
) -> Result<Json<Vec<HourlyAvg>>, ApiError> {
|
||||
let to = params.to.unwrap_or_else(|| Utc::now().date_naive());
|
||||
let from = params.from.unwrap_or_else(|| to - chrono::Duration::days(365));
|
||||
let tz = params.tz.as_deref().unwrap_or("UTC");
|
||||
// Validate the tz string before handing it to postgres — a bad name
|
||||
// here would surface as an opaque 500 from the DB. chrono-tz would do
|
||||
// it for free but we don't depend on it; instead reject obvious shell
|
||||
// injection vectors (the value is bound, not interpolated, so this is
|
||||
// belt-and-braces).
|
||||
if tz.len() > 64 || tz.chars().any(|c| !(c.is_ascii_alphanumeric() || matches!(c, '/' | '_' | '+' | '-'))) {
|
||||
return Err(ApiError {
|
||||
status: StatusCode::BAD_REQUEST,
|
||||
message: "invalid tz".into(),
|
||||
});
|
||||
}
|
||||
let avgs = state.store.hourly_avgs(from, to, tz, /* include_private */ true).await.map_err(internal)?;
|
||||
Ok(Json(avgs))
|
||||
}
|
||||
|
||||
async fn repo_languages(
|
||||
State(state): State<AppState>,
|
||||
) -> Result<Json<Vec<RepoLanguage>>, ApiError> {
|
||||
let langs = state.store.repo_languages().await.map_err(internal)?;
|
||||
Ok(Json(langs))
|
||||
}
|
||||
|
||||
async fn og_contributions(
|
||||
State(state): State<AppState>,
|
||||
) -> Result<impl IntoResponse, ApiError> {
|
||||
// Get date range from source summaries
|
||||
let summaries = state
|
||||
.store
|
||||
.source_summaries(/* include_private */ true)
|
||||
.await
|
||||
.map_err(internal)?;
|
||||
let earliest = summaries
|
||||
.iter()
|
||||
.filter_map(|s| s.earliest)
|
||||
.min()
|
||||
.unwrap_or_else(Utc::now)
|
||||
.date_naive();
|
||||
let today = Utc::now().date_naive();
|
||||
|
||||
let counts = state
|
||||
.store
|
||||
.daily_counts(earliest, today, /* include_private */ true)
|
||||
.await
|
||||
.map_err(internal)?;
|
||||
|
||||
let projects = state.store.list_projects().await.map_err(internal)?;
|
||||
let repo_count = projects.len();
|
||||
|
||||
let png = render_contributions_png(&counts, earliest, today, repo_count).map_err(|e| ApiError {
|
||||
status: StatusCode::INTERNAL_SERVER_ERROR,
|
||||
message: e,
|
||||
})?;
|
||||
|
||||
Ok((
|
||||
StatusCode::OK,
|
||||
[
|
||||
(axum::http::header::CONTENT_TYPE, "image/png"),
|
||||
(axum::http::header::CACHE_CONTROL, "public, max-age=3600"),
|
||||
],
|
||||
png,
|
||||
))
|
||||
}
|
||||
|
||||
fn render_contributions_png(
|
||||
counts: &[DailyCount],
|
||||
from: NaiveDate,
|
||||
to: NaiveDate,
|
||||
repo_count: usize,
|
||||
) -> Result<Vec<u8>, String> {
|
||||
use std::collections::HashMap;
|
||||
|
||||
let count_map: HashMap<NaiveDate, i64> = counts.iter().map(|d| (d.date, d.count)).collect();
|
||||
|
||||
// OG image canvas: 1200x630
|
||||
let og_w = 1200_f64;
|
||||
let og_h = 630_f64;
|
||||
let padding = 40_f64;
|
||||
let bg = "#2c3e50";
|
||||
|
||||
let year_label_w = 50_f64;
|
||||
let max_cols = 53;
|
||||
// Scale cell size to fill available width
|
||||
let avail_w = og_w - 2.0 * padding - year_label_w;
|
||||
let step = (avail_w / max_cols as f64).floor();
|
||||
let gap = (step * 0.17).round();
|
||||
let cell = step - gap;
|
||||
let radius = cell / 2.0;
|
||||
|
||||
let colors = ["rgba(255,255,255,0.05)", "#0e4429", "#006d32", "#26a641", "#39d353"];
|
||||
|
||||
// Build weekly data per year
|
||||
struct YearRow {
|
||||
year: i32,
|
||||
weeks: Vec<(NaiveDate, NaiveDate, i64)>, // start, end, count
|
||||
}
|
||||
let start_year = from.year();
|
||||
let end_year = to.year();
|
||||
let mut rows: Vec<YearRow> = Vec::new();
|
||||
|
||||
for yr in start_year..=end_year {
|
||||
let year_start = NaiveDate::from_ymd_opt(yr, 1, 1).unwrap();
|
||||
let year_end = if yr == end_year {
|
||||
to
|
||||
} else {
|
||||
NaiveDate::from_ymd_opt(yr, 12, 31).unwrap()
|
||||
};
|
||||
let offset = year_start.weekday().num_days_from_sunday();
|
||||
let mut cursor = year_start - chrono::Duration::days(offset as i64);
|
||||
|
||||
let mut weeks = Vec::new();
|
||||
while cursor <= year_end {
|
||||
let week_start = cursor;
|
||||
let mut week_count = 0i64;
|
||||
for _ in 0..7 {
|
||||
week_count += count_map.get(&cursor).copied().unwrap_or(0);
|
||||
cursor += chrono::Duration::days(1);
|
||||
}
|
||||
let week_end = cursor - chrono::Duration::days(1);
|
||||
weeks.push((week_start, week_end, week_count));
|
||||
}
|
||||
rows.push(YearRow { year: yr, weeks });
|
||||
}
|
||||
|
||||
// Quantile thresholds
|
||||
let mut non_zero: Vec<i64> = rows
|
||||
.iter()
|
||||
.flat_map(|r| r.weeks.iter().map(|w| w.2))
|
||||
.filter(|&c| c > 0)
|
||||
.collect();
|
||||
non_zero.sort();
|
||||
let thresholds = if non_zero.is_empty() {
|
||||
[1i64, 2, 3]
|
||||
} else {
|
||||
let p = |pct: f64| non_zero[(pct * non_zero.len() as f64).min(non_zero.len() as f64 - 1.0) as usize];
|
||||
[p(0.25), p(0.5), p(0.75)]
|
||||
};
|
||||
|
||||
let color_for = |count: i64| -> &str {
|
||||
if count == 0 { colors[0] }
|
||||
else if count <= thresholds[0] { colors[1] }
|
||||
else if count <= thresholds[1] { colors[2] }
|
||||
else if count <= thresholds[2] { colors[3] }
|
||||
else { colors[4] }
|
||||
};
|
||||
|
||||
let n_rows = rows.len();
|
||||
let graph_h = (n_rows as f64) * step;
|
||||
|
||||
let total: i64 = counts.iter().map(|d| d.count).sum();
|
||||
let repo_text = if repo_count > 0 {
|
||||
format!(" in {repo_count} repositories")
|
||||
} else {
|
||||
String::new()
|
||||
};
|
||||
|
||||
// Layout: headline at top, graph vertically centered in remaining space
|
||||
let offset_x = padding;
|
||||
let headline_y = padding + 36.0;
|
||||
let subtitle_y = headline_y + 28.0;
|
||||
let graph_top = subtitle_y + 16.0;
|
||||
let avail_graph_h = og_h - graph_top - padding;
|
||||
let graph_y = graph_top + (avail_graph_h - graph_h).max(0.0) / 2.0;
|
||||
|
||||
let mut svg = format!(
|
||||
r#"<svg xmlns="http://www.w3.org/2000/svg" width="{og_w}" height="{og_h}" viewBox="0 0 {og_w} {og_h}"><rect width="100%" height="100%" fill="{bg}"/>"#,
|
||||
);
|
||||
|
||||
// Headline
|
||||
svg.push_str(&format!(
|
||||
r##"<text x="{x}" y="{y}" fill="#ecf0f1" font-family="sans-serif" font-size="36" font-weight="bold">rob thijssen</text>"##,
|
||||
x = offset_x + year_label_w,
|
||||
y = headline_y,
|
||||
));
|
||||
|
||||
// Subtitle
|
||||
svg.push_str(&format!(
|
||||
r##"<text x="{x}" y="{y}" fill="#ecf0f1" font-family="sans-serif" font-size="16" opacity="0.6">{total} contributions since {from}{repo_text}</text>"##,
|
||||
x = offset_x + year_label_w,
|
||||
y = subtitle_y,
|
||||
));
|
||||
|
||||
let label_font_size = (step * 0.7).round().max(8.0).min(14.0);
|
||||
|
||||
for (row_idx, row) in rows.iter().enumerate() {
|
||||
let y_base = graph_y + (row_idx as f64) * step;
|
||||
svg.push_str(&format!(
|
||||
r##"<text x="{x}" y="{y}" text-anchor="end" dominant-baseline="central" fill="#ecf0f1" font-family="sans-serif" font-size="{fs}" opacity="0.6">{yr}</text>"##,
|
||||
x = offset_x + year_label_w - 6.0,
|
||||
y = y_base + radius,
|
||||
fs = label_font_size,
|
||||
yr = row.year,
|
||||
));
|
||||
for (col, (_, _, count)) in row.weeks.iter().enumerate() {
|
||||
let cx = offset_x + year_label_w + (col as f64) * step + radius;
|
||||
let cy = y_base + radius;
|
||||
let fill = color_for(*count);
|
||||
svg.push_str(&format!(
|
||||
r#"<circle cx="{cx}" cy="{cy}" r="{r}" fill="{fill}"/>"#,
|
||||
r = radius - 1.0,
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
svg.push_str("</svg>");
|
||||
|
||||
// Rasterize at 1200x630
|
||||
let mut fontdb = fontdb::Database::new();
|
||||
fontdb.load_system_fonts();
|
||||
let mut opts = resvg::usvg::Options::default();
|
||||
opts.fontdb = std::sync::Arc::new(fontdb);
|
||||
opts.font_family = "Noto Sans".to_owned();
|
||||
let tree = resvg::usvg::Tree::from_str(&svg, &opts)
|
||||
.map_err(|e| format!("svg parse: {e}"))?;
|
||||
|
||||
let mut pixmap =
|
||||
resvg::tiny_skia::Pixmap::new(og_w as u32, og_h as u32).ok_or_else(|| "pixmap alloc failed".to_string())?;
|
||||
|
||||
resvg::render(&tree, resvg::tiny_skia::Transform::default(), &mut pixmap.as_mut());
|
||||
|
||||
pixmap
|
||||
.encode_png()
|
||||
.map_err(|e| format!("png encode: {e}"))
|
||||
}
|
||||
|
||||
/// Allowlisted forge hosts that the proxy may contact.
|
||||
const ALLOWED_HOSTS: &[&str] = &["api.github.com", "git.lair.cafe"];
|
||||
|
||||
|
||||
@@ -5,7 +5,8 @@ pub use presentation::reshape;
|
||||
pub use sources::{EventSource, PollerState, PollerStateStore, SourceError, run_poller};
|
||||
|
||||
use async_trait::async_trait;
|
||||
use moments_entities::{Event, EventQuery, ProjectSummary, SourceSummary};
|
||||
use chrono::NaiveDate;
|
||||
use moments_entities::{DailyCount, Event, EventQuery, HourlyAvg, LanguageDailyCount, ProjectSummary, RepoLanguage, SourceSummary};
|
||||
|
||||
#[derive(Debug, thiserror::Error)]
|
||||
pub enum StoreError {
|
||||
@@ -19,10 +20,15 @@ pub trait EventReader: Send + Sync {
|
||||
async fn list_events(&self, query: &EventQuery) -> Result<Vec<Event>, StoreError>;
|
||||
async fn source_summaries(&self, include_private: bool) -> Result<Vec<SourceSummary>, StoreError>;
|
||||
async fn list_projects(&self) -> Result<Vec<ProjectSummary>, StoreError>;
|
||||
async fn daily_counts(&self, from: NaiveDate, to: NaiveDate, include_private: bool) -> Result<Vec<DailyCount>, StoreError>;
|
||||
async fn language_daily_counts(&self, from: NaiveDate, to: NaiveDate, include_private: bool) -> Result<Vec<LanguageDailyCount>, StoreError>;
|
||||
async fn hourly_avgs(&self, from: NaiveDate, to: NaiveDate, tz: &str, include_private: bool) -> Result<Vec<HourlyAvg>, StoreError>;
|
||||
async fn repo_languages(&self) -> Result<Vec<RepoLanguage>, StoreError>;
|
||||
}
|
||||
|
||||
/// Write-side port consumed by `moments-worker`. Idempotent upserts on `id`.
|
||||
#[async_trait]
|
||||
pub trait EventWriter: Send + Sync {
|
||||
async fn upsert_events(&self, events: &[Event]) -> Result<usize, StoreError>;
|
||||
async fn upsert_repo_languages(&self, languages: &[RepoLanguage]) -> Result<usize, StoreError>;
|
||||
}
|
||||
|
||||
@@ -480,6 +480,7 @@ fn commit_reshape(event: &Event) -> TimelineItem {
|
||||
.get("repository")
|
||||
.and_then(|r| r.get("full_name"))
|
||||
.and_then(Value::as_str)
|
||||
.or_else(|| p.get("_repo").and_then(Value::as_str))
|
||||
.unwrap_or("(unknown repo)");
|
||||
let author_login = p
|
||||
.get("author")
|
||||
|
||||
@@ -17,3 +17,4 @@ tracing.workspace = true
|
||||
async-trait.workspace = true
|
||||
reqwest.workspace = true
|
||||
serde.workspace = true
|
||||
percent-encoding = "2"
|
||||
|
||||
9
crates/moments-data/migrations/0004_repo_languages.sql
Normal file
9
crates/moments-data/migrations/0004_repo_languages.sql
Normal file
@@ -0,0 +1,9 @@
|
||||
CREATE TABLE repo_languages (
|
||||
source TEXT NOT NULL,
|
||||
repo TEXT NOT NULL,
|
||||
language TEXT NOT NULL,
|
||||
bytes BIGINT NOT NULL,
|
||||
color TEXT,
|
||||
fetched_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
PRIMARY KEY (source, repo, language)
|
||||
);
|
||||
55
crates/moments-data/migrations/0005_dedup_gitea_events.sql
Normal file
55
crates/moments-data/migrations/0005_dedup_gitea_events.sql
Normal file
@@ -0,0 +1,55 @@
|
||||
-- Collapse duplicate Gitea events introduced by polling both the user
|
||||
-- activity feed and per-org activity feeds.
|
||||
--
|
||||
-- Gitea writes one Action row per interested user-context: a push to
|
||||
-- helexa/cortex by user grenade produces two rows, one with
|
||||
-- user_id=grenade and one with user_id=helexa. Everything else (op_type,
|
||||
-- act_user_id, repo_id, ref_name, comment_id, created) is identical.
|
||||
-- Our prior id scheme (gitea:{action_row_id}) gave them different ids,
|
||||
-- so the upsert-on-id dedup never fired and the timeline rendered each
|
||||
-- push twice.
|
||||
--
|
||||
-- This migration re-keys every existing gitea row to the same canonical
|
||||
-- formula `parse_gitea_event` now emits, deleting duplicates encountered
|
||||
-- along the way. Idempotent: running it again is a no-op because the
|
||||
-- canonical id of a canonical id is itself.
|
||||
|
||||
-- Snapshot the canonical id for every gitea row.
|
||||
CREATE TEMP TABLE _gitea_canonical AS
|
||||
SELECT
|
||||
id AS old_id,
|
||||
'gitea:'
|
||||
|| coalesce(payload->>'op_type', '') || ':'
|
||||
|| coalesce(payload->>'act_user_id', payload->'act_user'->>'id', '0') || ':'
|
||||
|| coalesce(payload->>'repo_id', payload->'repo'->>'id', '0') || ':'
|
||||
|| coalesce(payload->>'ref_name', '') || ':'
|
||||
|| coalesce(payload->>'comment_id', '0') || ':'
|
||||
|| coalesce(payload->>'created', '')
|
||||
AS new_id
|
||||
FROM events
|
||||
WHERE source = 'gitea';
|
||||
|
||||
-- For each canonical id, keep the row whose current id is lexicographically
|
||||
-- smallest (stable, arbitrary tie-break) and delete the rest. The "old id
|
||||
-- already matches the new id" case lands here too — DELETE skips it because
|
||||
-- rn = 1 for any singleton group.
|
||||
DELETE FROM events
|
||||
WHERE id IN (
|
||||
SELECT old_id FROM (
|
||||
SELECT old_id, new_id,
|
||||
row_number() OVER (PARTITION BY new_id ORDER BY old_id) AS rn
|
||||
FROM _gitea_canonical
|
||||
) ranked
|
||||
WHERE rn > 1
|
||||
);
|
||||
|
||||
-- Rename remaining rows to the canonical id. Postgres defers PK uniqueness
|
||||
-- to statement end, so swapping ids across rows in one UPDATE is fine
|
||||
-- provided the final set is unique (dedup above guarantees that).
|
||||
UPDATE events e
|
||||
SET id = c.new_id
|
||||
FROM _gitea_canonical c
|
||||
WHERE e.id = c.old_id
|
||||
AND e.id <> c.new_id;
|
||||
|
||||
DROP TABLE _gitea_canonical;
|
||||
@@ -9,12 +9,13 @@
|
||||
//! Each item carries a self-contained payload — including the event-emitting
|
||||
//! host — so the reshape layer can construct URLs without needing config.
|
||||
|
||||
use std::collections::HashSet;
|
||||
use std::sync::Arc;
|
||||
|
||||
use async_trait::async_trait;
|
||||
use chrono::{DateTime, Utc};
|
||||
use moments_core::{EventSource, EventWriter, PollerStateStore, SourceError};
|
||||
use moments_entities::{Event, Source};
|
||||
use moments_entities::{Event, RepoLanguage, Source};
|
||||
use reqwest::{Client, header};
|
||||
use serde_json::Value;
|
||||
use tracing::debug;
|
||||
@@ -126,17 +127,19 @@ impl GiteaSource {
|
||||
/// for org feeds which contain all members' activity).
|
||||
///
|
||||
/// `base_url` should contain everything except the `&page=N` suffix.
|
||||
/// Returns (ingested_count, set_of_repo_full_names).
|
||||
async fn poll_feed(
|
||||
&self,
|
||||
state_key: &str,
|
||||
base_url: &str,
|
||||
filter_user: bool,
|
||||
) -> Result<usize, SourceError> {
|
||||
) -> Result<(usize, HashSet<String>), SourceError> {
|
||||
let prior = self.state.load(state_key).await?;
|
||||
let first_run = prior.is_none();
|
||||
let max_pages = if first_run { MAX_BACKFILL_PAGES } else { 1 };
|
||||
|
||||
let mut total = 0usize;
|
||||
let mut repos = HashSet::new();
|
||||
for page in 1..=max_pages {
|
||||
let url = format!("{base_url}&page={page}");
|
||||
let req = self.apply_headers(self.client.get(&url));
|
||||
@@ -155,6 +158,17 @@ impl GiteaSource {
|
||||
break;
|
||||
}
|
||||
|
||||
// Collect repo names from feed items
|
||||
for item in &items {
|
||||
if let Some(name) = item
|
||||
.get("repo")
|
||||
.and_then(|r| r.get("full_name"))
|
||||
.and_then(Value::as_str)
|
||||
{
|
||||
repos.insert(name.to_string());
|
||||
}
|
||||
}
|
||||
|
||||
let events: Vec<Event> = items
|
||||
.iter()
|
||||
.filter(|it| {
|
||||
@@ -177,6 +191,44 @@ impl GiteaSource {
|
||||
}
|
||||
|
||||
self.state.touch(state_key).await?;
|
||||
Ok((total, repos))
|
||||
}
|
||||
|
||||
/// Fetch language breakdowns for the given repos via the Gitea REST API.
|
||||
async fn fetch_languages(&self, repos: &HashSet<String>) -> Result<usize, SourceError> {
|
||||
let mut total = 0usize;
|
||||
for repo in repos {
|
||||
let url = format!(
|
||||
"https://{}/api/v1/repos/{}/languages",
|
||||
self.config.host, repo
|
||||
);
|
||||
let req = self.apply_headers(self.client.get(&url));
|
||||
let resp = req
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| SourceError::Http(e.to_string()))?;
|
||||
if !resp.status().is_success() {
|
||||
tracing::warn!(repo = %repo, status = %resp.status(), "gitea language fetch failed; skipping");
|
||||
continue;
|
||||
}
|
||||
let lang_map: std::collections::HashMap<String, i64> = resp
|
||||
.json()
|
||||
.await
|
||||
.map_err(|e| SourceError::Parse(e.to_string()))?;
|
||||
|
||||
let languages: Vec<RepoLanguage> = lang_map
|
||||
.into_iter()
|
||||
.map(|(language, bytes)| RepoLanguage {
|
||||
source: Source::Gitea,
|
||||
repo: repo.clone(),
|
||||
language,
|
||||
bytes,
|
||||
color: None, // Gitea doesn't return colors
|
||||
})
|
||||
.collect();
|
||||
total += self.writer.upsert_repo_languages(&languages).await?;
|
||||
}
|
||||
debug!(total, repos = repos.len(), "gitea repo languages updated");
|
||||
Ok(total)
|
||||
}
|
||||
}
|
||||
@@ -188,9 +240,12 @@ impl EventSource for GiteaSource {
|
||||
}
|
||||
|
||||
async fn poll(&self) -> Result<usize, SourceError> {
|
||||
let mut all_repos = HashSet::new();
|
||||
|
||||
// Poll user's own activity feed (existing behavior).
|
||||
let user_url = self.user_feed_base_url();
|
||||
let mut total = self.poll_feed(SOURCE_NAME, &user_url, false).await?;
|
||||
let (mut total, repos) = self.poll_feed(SOURCE_NAME, &user_url, false).await?;
|
||||
all_repos.extend(repos);
|
||||
|
||||
// Discover orgs and poll each org's activity feed, filtering for
|
||||
// events performed by this user.
|
||||
@@ -199,13 +254,20 @@ impl EventSource for GiteaSource {
|
||||
let state_key = format!("gitea:org:{org}");
|
||||
let org_url = self.org_feed_base_url(org);
|
||||
match self.poll_feed(&state_key, &org_url, true).await {
|
||||
Ok(n) => total += n,
|
||||
Ok((n, repos)) => {
|
||||
total += n;
|
||||
all_repos.extend(repos);
|
||||
}
|
||||
Err(e) => {
|
||||
tracing::warn!(org = %org, error = %e, "failed to poll org feed");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if let Err(e) = self.fetch_languages(&all_repos).await {
|
||||
tracing::warn!(error = %e, "gitea language fetch failed; continuing");
|
||||
}
|
||||
|
||||
debug!(ingested = total, orgs = orgs.len(), "gitea poll complete");
|
||||
Ok(total)
|
||||
}
|
||||
@@ -214,8 +276,14 @@ impl EventSource for GiteaSource {
|
||||
/// Convert a Gitea activity feed item into our Event row. The host gets
|
||||
/// stamped into the payload as `_host` so the reshape layer can build
|
||||
/// web URLs without needing global config.
|
||||
///
|
||||
/// The id is content-derived rather than using Gitea's `id` field directly:
|
||||
/// Gitea creates one Action row per interested user-context, so a push to
|
||||
/// an org repo by user U produces two rows (one under U's context, one
|
||||
/// under the org's), distinguished only by `id` and `user_id`. Keying on
|
||||
/// `(op_type, act_user_id, repo_id, ref_name, comment_id, created)` makes
|
||||
/// those two rows collapse to the same event on upsert.
|
||||
fn parse_gitea_event(item: &Value, host: &str) -> Option<Event> {
|
||||
let id = item.get("id").and_then(Value::as_i64)?;
|
||||
let op_type = item.get("op_type").and_then(Value::as_str)?.to_string();
|
||||
let created_str = item.get("created").and_then(Value::as_str)?;
|
||||
let occurred_at = DateTime::parse_from_rfc3339(created_str)
|
||||
@@ -223,13 +291,15 @@ fn parse_gitea_event(item: &Value, host: &str) -> Option<Event> {
|
||||
.with_timezone(&Utc);
|
||||
let private = item.get("is_private").and_then(Value::as_bool).unwrap_or(false);
|
||||
|
||||
let id = gitea_canonical_id(item, &op_type, created_str);
|
||||
|
||||
let mut payload = item.clone();
|
||||
if let Some(obj) = payload.as_object_mut() {
|
||||
obj.insert("_host".into(), Value::String(host.into()));
|
||||
}
|
||||
|
||||
Some(Event {
|
||||
id: format!("gitea:{id}"),
|
||||
id,
|
||||
source: Source::Gitea,
|
||||
action: op_type,
|
||||
occurred_at,
|
||||
@@ -238,6 +308,25 @@ fn parse_gitea_event(item: &Value, host: &str) -> Option<Event> {
|
||||
})
|
||||
}
|
||||
|
||||
/// Build the canonical, content-derived id for a Gitea action. Must stay
|
||||
/// in lockstep with the SQL formula in migration 0005 so back-fill and
|
||||
/// new writes share the same id space.
|
||||
fn gitea_canonical_id(item: &Value, op_type: &str, created: &str) -> String {
|
||||
let act_user_id = item
|
||||
.get("act_user_id")
|
||||
.and_then(Value::as_i64)
|
||||
.or_else(|| item.get("act_user").and_then(|u| u.get("id")).and_then(Value::as_i64))
|
||||
.unwrap_or(0);
|
||||
let repo_id = item
|
||||
.get("repo_id")
|
||||
.and_then(Value::as_i64)
|
||||
.or_else(|| item.get("repo").and_then(|r| r.get("id")).and_then(Value::as_i64))
|
||||
.unwrap_or(0);
|
||||
let ref_name = item.get("ref_name").and_then(Value::as_str).unwrap_or("");
|
||||
let comment_id = item.get("comment_id").and_then(Value::as_i64).unwrap_or(0);
|
||||
format!("gitea:{op_type}:{act_user_id}:{repo_id}:{ref_name}:{comment_id}:{created}")
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
@@ -248,14 +337,16 @@ mod tests {
|
||||
let raw = json!({
|
||||
"id": 973,
|
||||
"op_type": "commit_repo",
|
||||
"act_user_id": 42,
|
||||
"repo_id": 7,
|
||||
"ref_name": "refs/heads/main",
|
||||
"is_private": false,
|
||||
"content": "{\"Commits\":[{\"Sha1\":\"abc123\"}],\"Len\":1}",
|
||||
"created": "2026-05-03T16:37:45Z",
|
||||
"repo": { "full_name": "grenade/moments" }
|
||||
"repo": { "id": 7, "full_name": "grenade/moments" }
|
||||
});
|
||||
let ev = parse_gitea_event(&raw, "git.lair.cafe").expect("parses");
|
||||
assert_eq!(ev.id, "gitea:973");
|
||||
assert_eq!(ev.id, "gitea:commit_repo:42:7:refs/heads/main:0:2026-05-03T16:37:45Z");
|
||||
assert_eq!(ev.source, Source::Gitea);
|
||||
assert_eq!(ev.action, "commit_repo");
|
||||
assert!(ev.public);
|
||||
@@ -266,6 +357,43 @@ mod tests {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn dup_action_rows_for_user_and_org_contexts_collapse_to_same_id() {
|
||||
// Gitea creates two Action rows when grenade pushes to helexa/cortex:
|
||||
// one with user_id=grenade (surfaced by the user feed), one with
|
||||
// user_id=helexa (surfaced by the org feed). Everything except `id`
|
||||
// and `user_id` is identical. The canonical id ignores both.
|
||||
let user_ctx = json!({
|
||||
"id": 1322,
|
||||
"user_id": 42,
|
||||
"op_type": "commit_repo",
|
||||
"act_user_id": 42,
|
||||
"act_user": { "login": "grenade", "id": 42 },
|
||||
"repo_id": 99,
|
||||
"repo": { "id": 99, "full_name": "helexa/cortex" },
|
||||
"ref_name": "refs/heads/main",
|
||||
"comment_id": 0,
|
||||
"is_private": false,
|
||||
"created": "2026-05-20T04:32:50Z"
|
||||
});
|
||||
let org_ctx = json!({
|
||||
"id": 1323,
|
||||
"user_id": 7,
|
||||
"op_type": "commit_repo",
|
||||
"act_user_id": 42,
|
||||
"act_user": { "login": "grenade", "id": 42 },
|
||||
"repo_id": 99,
|
||||
"repo": { "id": 99, "full_name": "helexa/cortex" },
|
||||
"ref_name": "refs/heads/main",
|
||||
"comment_id": 0,
|
||||
"is_private": false,
|
||||
"created": "2026-05-20T04:32:50Z"
|
||||
});
|
||||
let a = parse_gitea_event(&user_ctx, "git.lair.cafe").expect("parses");
|
||||
let b = parse_gitea_event(&org_ctx, "git.lair.cafe").expect("parses");
|
||||
assert_eq!(a.id, b.id, "duplicate action rows must collide on id");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn org_event_user_filter_predicate() {
|
||||
let by_user = json!({
|
||||
|
||||
@@ -1,26 +1,55 @@
|
||||
//! Per-repo commit enumeration for full GitHub history.
|
||||
//!
|
||||
//! The Search API caps at 1000 results; this source enumerates all repos
|
||||
//! the user can access via `/user/repos` and walks each repo's commit
|
||||
//! history via `/repos/{owner}/{repo}/commits?author={user}` — no cap.
|
||||
//! Discovers repos via two sources:
|
||||
//! 1. REST `/user/repos` — repos where the user is owner, collaborator,
|
||||
//! or org member.
|
||||
//! 2. GraphQL `repositoriesContributedTo` — repos the user has committed
|
||||
//! to, opened issues/PRs on, or reviewed, even without collaborator
|
||||
//! status. No result cap (cursor-paginated).
|
||||
//!
|
||||
//! Then walks each branch's commit history via
|
||||
//! `/repos/{owner}/{repo}/commits?author={user}&sha={branch}` with a
|
||||
//! per-branch `since` cursor to avoid re-fetching known commits. Walking
|
||||
//! every branch (not just the default) is what catches work-in-progress
|
||||
//! on feature branches and pushes to fork branches that never get merged
|
||||
//! upstream — neither the user events feed nor /search/commits surface
|
||||
//! those reliably.
|
||||
//!
|
||||
//! Events use `github-commit:{sha}` as their ID, matching the scheme in
|
||||
//! `github_search`, so duplicates are resolved via idempotent upsert.
|
||||
//!
|
||||
//! Per-repo poller state keys (`github-repo:{owner}/{repo}`) track which
|
||||
//! repos have been fully backfilled. First run paginates the full history;
|
||||
//! subsequent runs fetch only page 1.
|
||||
//! `github_search`, so duplicates are resolved via idempotent upsert
|
||||
//! (the same commit reached via two branches just upserts twice).
|
||||
|
||||
use std::collections::HashSet;
|
||||
use std::sync::Arc;
|
||||
|
||||
use async_trait::async_trait;
|
||||
use chrono::{DateTime, Utc};
|
||||
use moments_core::{EventSource, EventWriter, PollerStateStore, SourceError};
|
||||
use moments_entities::{Event, Source};
|
||||
use moments_entities::{Event, RepoLanguage, Source};
|
||||
use percent_encoding::{AsciiSet, CONTROLS, utf8_percent_encode};
|
||||
use reqwest::{Client, header};
|
||||
use serde_json::Value;
|
||||
use tracing::{debug, warn};
|
||||
|
||||
/// Encode characters that have meaning in a URL query — branch names can
|
||||
/// contain `/`, `#`, `?`, etc. Whitelisting is too fragile; encode anything
|
||||
/// outside the unreserved set plus a few safe characters.
|
||||
const BRANCH_ENCODE_SET: &AsciiSet = &CONTROLS
|
||||
.add(b' ')
|
||||
.add(b'"')
|
||||
.add(b'#')
|
||||
.add(b'<')
|
||||
.add(b'>')
|
||||
.add(b'?')
|
||||
.add(b'`')
|
||||
.add(b'{')
|
||||
.add(b'}')
|
||||
.add(b'/')
|
||||
.add(b'&')
|
||||
.add(b'=')
|
||||
.add(b'+')
|
||||
.add(b'%');
|
||||
|
||||
const SOURCE_NAME: &str = "github-repo";
|
||||
const USER_AGENT: &str = concat!(
|
||||
"moments/",
|
||||
@@ -114,22 +143,330 @@ impl GithubRepoSource {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// Supplement with repos from GraphQL repositoriesContributedTo.
|
||||
// This catches repos where the user contributed via PRs but isn't
|
||||
// an owner, collaborator, or org member — no result cap.
|
||||
let mut known: HashSet<String> = repos.iter().map(|r| r.full_name.clone()).collect();
|
||||
let contributed = self.discover_contributed_repos().await;
|
||||
match contributed {
|
||||
Ok(extra) => {
|
||||
for r in extra {
|
||||
if known.insert(r.full_name.clone()) {
|
||||
repos.push(r);
|
||||
}
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
warn!(error = %e, "GraphQL contributed-repos discovery failed; continuing with known repos");
|
||||
}
|
||||
}
|
||||
|
||||
Ok(repos)
|
||||
}
|
||||
|
||||
/// Fetch commits for a single repo, paginating fully on first run.
|
||||
/// Discover repos the user has contributed to via GraphQL.
|
||||
/// Uses cursor-based pagination with no result cap.
|
||||
async fn discover_contributed_repos(&self) -> Result<Vec<Repo>, SourceError> {
|
||||
let token = match &self.config.token {
|
||||
Some(t) => t,
|
||||
None => return Ok(vec![]),
|
||||
};
|
||||
|
||||
let mut repos = Vec::new();
|
||||
let mut cursor: Option<String> = None;
|
||||
|
||||
loop {
|
||||
let after = match &cursor {
|
||||
Some(c) => format!(", after: \"{}\"", c),
|
||||
None => String::new(),
|
||||
};
|
||||
let query = format!(
|
||||
r#"{{ user(login: "{}") {{ repositoriesContributedTo(first: 100, contributionTypes: [COMMIT, PULL_REQUEST, ISSUE]{}) {{ pageInfo {{ hasNextPage endCursor }} nodes {{ nameWithOwner isPrivate }} }} }} }}"#,
|
||||
self.config.user, after
|
||||
);
|
||||
let body = serde_json::json!({ "query": query });
|
||||
|
||||
let resp = self
|
||||
.client
|
||||
.post("https://api.github.com/graphql")
|
||||
.header(header::AUTHORIZATION, format!("Bearer {token}"))
|
||||
.header(header::USER_AGENT, USER_AGENT)
|
||||
.header(header::CONTENT_TYPE, "application/json")
|
||||
.json(&body)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| SourceError::Http(e.to_string()))?;
|
||||
|
||||
if !resp.status().is_success() {
|
||||
return Err(SourceError::Http(format!(
|
||||
"{} POST graphql",
|
||||
resp.status()
|
||||
)));
|
||||
}
|
||||
|
||||
let data: Value = resp
|
||||
.json()
|
||||
.await
|
||||
.map_err(|e| SourceError::Parse(e.to_string()))?;
|
||||
|
||||
// Check for GraphQL-level errors
|
||||
if let Some(errors) = data.get("errors").and_then(Value::as_array) {
|
||||
if let Some(msg) = errors.first().and_then(|e| e.get("message")).and_then(Value::as_str) {
|
||||
return Err(SourceError::Http(format!("GraphQL error: {msg}")));
|
||||
}
|
||||
}
|
||||
|
||||
let contributed = &data["data"]["user"]["repositoriesContributedTo"];
|
||||
let nodes = contributed["nodes"].as_array();
|
||||
if let Some(nodes) = nodes {
|
||||
for node in nodes {
|
||||
let full_name = node
|
||||
.get("nameWithOwner")
|
||||
.and_then(Value::as_str);
|
||||
let private = node
|
||||
.get("isPrivate")
|
||||
.and_then(Value::as_bool)
|
||||
.unwrap_or(false);
|
||||
if let Some(name) = full_name {
|
||||
repos.push(Repo {
|
||||
full_name: name.to_string(),
|
||||
private,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let has_next = contributed["pageInfo"]["hasNextPage"]
|
||||
.as_bool()
|
||||
.unwrap_or(false);
|
||||
if !has_next {
|
||||
break;
|
||||
}
|
||||
cursor = contributed["pageInfo"]["endCursor"]
|
||||
.as_str()
|
||||
.map(String::from);
|
||||
}
|
||||
|
||||
debug!(repos = repos.len(), "discovered contributed repos via GraphQL");
|
||||
Ok(repos)
|
||||
}
|
||||
|
||||
/// Branch discovery via GraphQL, filtered to branches whose HEAD
|
||||
/// commit was authored by the user. Skips the long tail of
|
||||
/// upstream-contributor branches in large forks (e.g. azure-docs).
|
||||
///
|
||||
/// Why HEAD author and not `history(author:).totalCount`: the latter
|
||||
/// forces GraphQL to walk full commit history per branch looking for
|
||||
/// matches, which times out (502) on forks with thousands of branches.
|
||||
/// Checking the HEAD commit's author is O(1) per branch. The blind
|
||||
/// spot — branches with the user's older commits but a different
|
||||
/// HEAD author — is rare in practice for forks/feature branches.
|
||||
///
|
||||
/// On any GraphQL failure, callers should fall back to `list_branches`
|
||||
/// (REST, walks everything; 500s from empty branches are silenced
|
||||
/// inside `scan_repo_branch`).
|
||||
async fn list_branches_with_commits(
|
||||
&self,
|
||||
repo: &Repo,
|
||||
user_login: &str,
|
||||
) -> Result<Vec<String>, SourceError> {
|
||||
let token = match &self.config.token {
|
||||
Some(t) => t,
|
||||
None => return Err(SourceError::Http("no token; graphql unavailable".into())),
|
||||
};
|
||||
let parts: Vec<&str> = repo.full_name.splitn(2, '/').collect();
|
||||
if parts.len() != 2 {
|
||||
return Ok(Vec::new());
|
||||
}
|
||||
let (owner, name) = (parts[0], parts[1]);
|
||||
|
||||
let mut branches = Vec::new();
|
||||
let mut cursor: Option<String> = None;
|
||||
// Cap pages to bound cost on pathological repos. 50 pages × 100
|
||||
// branches = 5000; well past anything plausible for a human user.
|
||||
for _ in 0..50u32 {
|
||||
let after = match &cursor {
|
||||
Some(c) => format!(", after: \"{}\"", c),
|
||||
None => String::new(),
|
||||
};
|
||||
// `author.user.login` resolves the commit's GitHub user (may
|
||||
// differ from the raw commit author name); falling back to
|
||||
// `author.email` is intentionally omitted to keep the query
|
||||
// shape minimal — false negatives there are caught by the
|
||||
// REST fallback on the next poll cycle.
|
||||
let query = format!(
|
||||
r#"{{ repository(owner: "{owner}", name: "{name}") {{ refs(refPrefix: "refs/heads/", first: 100{after}) {{ pageInfo {{ hasNextPage endCursor }} nodes {{ name target {{ ... on Commit {{ author {{ user {{ login }} }} }} }} }} }} }} }}"#,
|
||||
);
|
||||
let body = serde_json::json!({ "query": query });
|
||||
let resp = self
|
||||
.client
|
||||
.post("https://api.github.com/graphql")
|
||||
.header(header::AUTHORIZATION, format!("Bearer {token}"))
|
||||
.header(header::USER_AGENT, USER_AGENT)
|
||||
.header(header::CONTENT_TYPE, "application/json")
|
||||
.json(&body)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| SourceError::Http(e.to_string()))?;
|
||||
if !resp.status().is_success() {
|
||||
return Err(SourceError::Http(format!(
|
||||
"{} POST graphql (branches {}/{})",
|
||||
resp.status(),
|
||||
owner,
|
||||
name
|
||||
)));
|
||||
}
|
||||
let data: Value = resp
|
||||
.json()
|
||||
.await
|
||||
.map_err(|e| SourceError::Parse(e.to_string()))?;
|
||||
if let Some(errors) = data.get("errors").and_then(Value::as_array) {
|
||||
if let Some(msg) = errors.first().and_then(|e| e.get("message")).and_then(Value::as_str) {
|
||||
return Err(SourceError::Http(format!("GraphQL error listing branches: {msg}")));
|
||||
}
|
||||
}
|
||||
let refs = &data["data"]["repository"]["refs"];
|
||||
if refs.is_null() {
|
||||
// Repo may be deleted or inaccessible — treat as empty.
|
||||
return Ok(Vec::new());
|
||||
}
|
||||
if let Some(nodes) = refs["nodes"].as_array() {
|
||||
for node in nodes {
|
||||
let branch = node["name"].as_str();
|
||||
let head_login = node["target"]["author"]["user"]["login"].as_str();
|
||||
if let (Some(b), Some(login)) = (branch, head_login) {
|
||||
if login.eq_ignore_ascii_case(user_login) {
|
||||
branches.push(b.to_string());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
let has_next = refs["pageInfo"]["hasNextPage"].as_bool().unwrap_or(false);
|
||||
if !has_next {
|
||||
break;
|
||||
}
|
||||
cursor = refs["pageInfo"]["endCursor"].as_str().map(String::from);
|
||||
}
|
||||
Ok(branches)
|
||||
}
|
||||
|
||||
/// List every branch in a repo. Returns an empty vec for empty (409)
|
||||
/// or missing (404) repos; surfaces rate-limit / transport errors so the
|
||||
/// caller can decide whether to bail.
|
||||
async fn list_branches(&self, repo: &Repo) -> Result<Vec<String>, SourceError> {
|
||||
let mut branches = Vec::new();
|
||||
for page in 1..=10u32 {
|
||||
let url = format!(
|
||||
"https://api.github.com/repos/{}/branches?per_page={}&page={}",
|
||||
repo.full_name, self.config.per_page, page
|
||||
);
|
||||
let req = self.apply_headers(self.client.get(&url));
|
||||
let resp = req
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| SourceError::Http(e.to_string()))?;
|
||||
|
||||
let status = resp.status();
|
||||
if status.as_u16() == 404 || status.as_u16() == 409 {
|
||||
return Ok(Vec::new());
|
||||
}
|
||||
if status.as_u16() == 403 || status.as_u16() == 429 {
|
||||
return Err(SourceError::Http(format!("{} GET {}", status, url)));
|
||||
}
|
||||
if !status.is_success() {
|
||||
return Err(SourceError::Http(format!("{} GET {}", status, url)));
|
||||
}
|
||||
|
||||
let items: Vec<Value> = resp
|
||||
.json()
|
||||
.await
|
||||
.map_err(|e| SourceError::Parse(e.to_string()))?;
|
||||
if items.is_empty() {
|
||||
break;
|
||||
}
|
||||
for item in &items {
|
||||
if let Some(name) = item.get("name").and_then(Value::as_str) {
|
||||
branches.push(name.to_string());
|
||||
}
|
||||
}
|
||||
if items.len() < self.config.per_page as usize {
|
||||
break;
|
||||
}
|
||||
}
|
||||
Ok(branches)
|
||||
}
|
||||
|
||||
/// Fetch commits for a single repo across all branches the user has
|
||||
/// touched. Per-branch state keys (`github-repo:{full_name}@{branch}`)
|
||||
/// hold the newest seen commit timestamp so each branch can be
|
||||
/// incremented independently — important because a brand new branch's
|
||||
/// `since` cursor must start unset even when the default branch has
|
||||
/// been polled many times already.
|
||||
///
|
||||
/// When `user_id` is supplied, branches are pre-filtered via GraphQL
|
||||
/// to those with at least one commit by the user — vastly cheaper for
|
||||
/// large upstream forks where most branches were never touched. On
|
||||
/// GraphQL failure (or no token), falls back to the REST branch list
|
||||
/// and relies on the per-branch 500-as-empty handling to discard the
|
||||
/// noise.
|
||||
async fn scan_repo(&self, repo: &Repo) -> Result<usize, SourceError> {
|
||||
let state_key = format!("github-repo:{}", repo.full_name);
|
||||
let prior = self.state.load(&state_key).await?;
|
||||
let first_run = prior.is_none();
|
||||
let max_pages = if first_run { MAX_BACKFILL_PAGES } else { 1 };
|
||||
let branches = if self.config.token.is_some() {
|
||||
match self.list_branches_with_commits(repo, &self.config.user).await {
|
||||
Ok(b) => b,
|
||||
Err(e) => {
|
||||
warn!(repo = %repo.full_name, error = %e, "graphql branch filter failed; falling back to REST");
|
||||
self.list_branches(repo).await?
|
||||
}
|
||||
}
|
||||
} else {
|
||||
self.list_branches(repo).await?
|
||||
};
|
||||
if branches.is_empty() {
|
||||
return Ok(0);
|
||||
}
|
||||
|
||||
let mut total = 0usize;
|
||||
for page in 1..=max_pages {
|
||||
let url = format!(
|
||||
"https://api.github.com/repos/{}/commits?author={}&per_page={}&page={}",
|
||||
repo.full_name, self.config.user, self.config.per_page, page
|
||||
// Dedup commits seen via multiple branches in one tick. Without this
|
||||
// the same SHA appears in the upsert batch twice (postgres rejects
|
||||
// duplicate conflict targets in a single INSERT).
|
||||
let mut seen_in_tick: HashSet<String> = HashSet::new();
|
||||
for branch in &branches {
|
||||
match self.scan_repo_branch(repo, branch, &mut seen_in_tick).await {
|
||||
Ok(n) => total += n,
|
||||
Err(SourceError::Http(ref msg)) if msg.starts_with("403") || msg.starts_with("429") => {
|
||||
return Err(SourceError::Http(msg.clone()));
|
||||
}
|
||||
Err(e) => {
|
||||
warn!(repo = %repo.full_name, branch = %branch, error = %e, "branch scan failed; continuing");
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(total)
|
||||
}
|
||||
|
||||
async fn scan_repo_branch(
|
||||
&self,
|
||||
repo: &Repo,
|
||||
branch: &str,
|
||||
seen_in_tick: &mut HashSet<String>,
|
||||
) -> Result<usize, SourceError> {
|
||||
let state_key = format!("github-repo:{}@{}", repo.full_name, branch);
|
||||
let prior = self.state.load(&state_key).await?;
|
||||
let since = prior.as_ref().and_then(|s| s.last_modified);
|
||||
|
||||
let encoded_branch = utf8_percent_encode(branch, BRANCH_ENCODE_SET).to_string();
|
||||
|
||||
let mut total = 0usize;
|
||||
let mut newest: Option<DateTime<Utc>> = since;
|
||||
for page in 1..=MAX_BACKFILL_PAGES {
|
||||
let mut url = format!(
|
||||
"https://api.github.com/repos/{}/commits?author={}&sha={}&per_page={}&page={}",
|
||||
repo.full_name, self.config.user, encoded_branch, self.config.per_page, page
|
||||
);
|
||||
if let Some(since_dt) = since {
|
||||
url.push_str(&format!("&since={}", since_dt.to_rfc3339()));
|
||||
}
|
||||
let req = self.apply_headers(self.client.get(&url));
|
||||
let resp = req
|
||||
.send()
|
||||
@@ -142,11 +479,20 @@ impl GithubRepoSource {
|
||||
break;
|
||||
}
|
||||
if status.as_u16() == 403 || status.as_u16() == 429 {
|
||||
warn!(repo = %repo.full_name, status = %status, "rate limited; stopping early");
|
||||
warn!(repo = %repo.full_name, branch = %branch, status = %status, "rate limited; stopping early");
|
||||
return Err(SourceError::Http(format!("{} GET {}", status, url)));
|
||||
}
|
||||
if status.as_u16() == 404 {
|
||||
warn!(repo = %repo.full_name, "repo not found; skipping");
|
||||
warn!(repo = %repo.full_name, branch = %branch, "repo or branch not found; skipping");
|
||||
break;
|
||||
}
|
||||
// GitHub's `/repos/.../commits?author=X&sha=branch` returns 500
|
||||
// (not an empty array) when the user has zero commits on the
|
||||
// specified branch. Treat it as "no commits on this branch"
|
||||
// rather than a server error — surfacing it as a warning floods
|
||||
// logs on forks whose branches were all authored by upstream.
|
||||
if status.as_u16() == 500 {
|
||||
debug!(repo = %repo.full_name, branch = %branch, "no commits by author on branch (500)");
|
||||
break;
|
||||
}
|
||||
if !status.is_success() {
|
||||
@@ -161,10 +507,33 @@ impl GithubRepoSource {
|
||||
break;
|
||||
}
|
||||
|
||||
let events: Vec<Event> = items
|
||||
.iter()
|
||||
.filter_map(|item| parse_commit(item, repo))
|
||||
.collect();
|
||||
let mut events = Vec::with_capacity(items.len());
|
||||
for item in &items {
|
||||
if let Some(ev) = parse_commit(item, repo) {
|
||||
if seen_in_tick.insert(ev.id.clone()) {
|
||||
if let Some(n) = newest {
|
||||
if ev.occurred_at > n {
|
||||
newest = Some(ev.occurred_at);
|
||||
}
|
||||
} else {
|
||||
newest = Some(ev.occurred_at);
|
||||
}
|
||||
events.push(ev);
|
||||
} else {
|
||||
// Already ingested via another branch this tick;
|
||||
// still advance `newest` so the per-branch cursor
|
||||
// doesn't get stuck behind shared history.
|
||||
let occurred = parse_commit_date(item);
|
||||
if let Some(t) = occurred {
|
||||
newest = Some(match newest {
|
||||
Some(n) if t > n => t,
|
||||
Some(n) => n,
|
||||
None => t,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
total += self.writer.upsert_events(&events).await?;
|
||||
|
||||
if items.len() < self.config.per_page as usize {
|
||||
@@ -172,7 +541,106 @@ impl GithubRepoSource {
|
||||
}
|
||||
}
|
||||
|
||||
self.state.touch(&state_key).await?;
|
||||
self.state.save(&state_key, None, newest).await?;
|
||||
Ok(total)
|
||||
}
|
||||
|
||||
/// Batch-fetch language breakdowns for repos via GraphQL, upserting
|
||||
/// into repo_languages. Repos are batched using GraphQL aliases to
|
||||
/// minimise round trips.
|
||||
async fn fetch_languages(&self, repos: &[Repo]) -> Result<usize, SourceError> {
|
||||
let token = match &self.config.token {
|
||||
Some(t) => t,
|
||||
None => return Ok(0),
|
||||
};
|
||||
|
||||
let mut total = 0usize;
|
||||
for chunk in repos.chunks(20) {
|
||||
let mut fragments = Vec::with_capacity(chunk.len());
|
||||
for (i, repo) in chunk.iter().enumerate() {
|
||||
let parts: Vec<&str> = repo.full_name.splitn(2, '/').collect();
|
||||
if parts.len() != 2 {
|
||||
continue;
|
||||
}
|
||||
fragments.push(format!(
|
||||
r#"r{i}: repository(owner: "{}", name: "{}") {{ languages(first: 20, orderBy: {{field: SIZE, direction: DESC}}) {{ edges {{ size node {{ name color }} }} }} }}"#,
|
||||
parts[0], parts[1]
|
||||
));
|
||||
}
|
||||
if fragments.is_empty() {
|
||||
continue;
|
||||
}
|
||||
|
||||
let query = format!("{{ {} }}", fragments.join(" "));
|
||||
let body = serde_json::json!({ "query": query });
|
||||
|
||||
let resp = self
|
||||
.client
|
||||
.post("https://api.github.com/graphql")
|
||||
.header(header::AUTHORIZATION, format!("Bearer {token}"))
|
||||
.header(header::USER_AGENT, USER_AGENT)
|
||||
.header(header::CONTENT_TYPE, "application/json")
|
||||
.json(&body)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| SourceError::Http(e.to_string()))?;
|
||||
|
||||
if !resp.status().is_success() {
|
||||
warn!(status = %resp.status(), "GraphQL language fetch failed");
|
||||
break;
|
||||
}
|
||||
|
||||
let data: Value = resp
|
||||
.json()
|
||||
.await
|
||||
.map_err(|e| SourceError::Parse(e.to_string()))?;
|
||||
|
||||
if let Some(errors) = data.get("errors").and_then(Value::as_array) {
|
||||
if let Some(msg) = errors.first().and_then(|e| e.get("message")).and_then(Value::as_str) {
|
||||
warn!(error = %msg, "GraphQL language fetch had errors");
|
||||
}
|
||||
}
|
||||
|
||||
let data_obj = match data.get("data") {
|
||||
Some(d) => d,
|
||||
None => continue,
|
||||
};
|
||||
|
||||
let mut languages = Vec::new();
|
||||
for (i, repo) in chunk.iter().enumerate() {
|
||||
let alias = format!("r{i}");
|
||||
let edges = data_obj
|
||||
.get(&alias)
|
||||
.and_then(|r| r.get("languages"))
|
||||
.and_then(|l| l.get("edges"))
|
||||
.and_then(Value::as_array);
|
||||
if let Some(edges) = edges {
|
||||
for edge in edges {
|
||||
let size = edge.get("size").and_then(Value::as_i64).unwrap_or(0);
|
||||
let name = edge
|
||||
.get("node")
|
||||
.and_then(|n| n.get("name"))
|
||||
.and_then(Value::as_str);
|
||||
let color = edge
|
||||
.get("node")
|
||||
.and_then(|n| n.get("color"))
|
||||
.and_then(Value::as_str);
|
||||
if let Some(name) = name {
|
||||
languages.push(RepoLanguage {
|
||||
source: Source::Github,
|
||||
repo: repo.full_name.clone(),
|
||||
language: name.to_string(),
|
||||
bytes: size,
|
||||
color: color.map(String::from),
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
total += self.writer.upsert_repo_languages(&languages).await?;
|
||||
}
|
||||
|
||||
debug!(total, "repo languages updated");
|
||||
Ok(total)
|
||||
}
|
||||
}
|
||||
@@ -206,6 +674,10 @@ impl EventSource for GithubRepoSource {
|
||||
}
|
||||
}
|
||||
|
||||
if let Err(e) = self.fetch_languages(&repos).await {
|
||||
warn!(error = %e, "language fetch failed; continuing");
|
||||
}
|
||||
|
||||
self.state.touch(SOURCE_NAME).await?;
|
||||
debug!(ingested = total, repos = repos.len(), "github-repo poll complete");
|
||||
Ok(total)
|
||||
@@ -227,8 +699,7 @@ fn parse_repo(item: &Value) -> Option<Repo> {
|
||||
})
|
||||
}
|
||||
|
||||
fn parse_commit(item: &Value, repo: &Repo) -> Option<Event> {
|
||||
let sha = item.get("sha").and_then(Value::as_str)?;
|
||||
fn parse_commit_date(item: &Value) -> Option<DateTime<Utc>> {
|
||||
let date_str = item
|
||||
.get("commit")
|
||||
.and_then(|c| c.get("author"))
|
||||
@@ -240,9 +711,21 @@ fn parse_commit(item: &Value, repo: &Repo) -> Option<Event> {
|
||||
.and_then(|c| c.get("date"))
|
||||
.and_then(Value::as_str)
|
||||
})?;
|
||||
let occurred_at = DateTime::parse_from_rfc3339(date_str)
|
||||
.ok()?
|
||||
.with_timezone(&Utc);
|
||||
Some(
|
||||
DateTime::parse_from_rfc3339(date_str)
|
||||
.ok()?
|
||||
.with_timezone(&Utc),
|
||||
)
|
||||
}
|
||||
|
||||
fn parse_commit(item: &Value, repo: &Repo) -> Option<Event> {
|
||||
let sha = item.get("sha").and_then(Value::as_str)?;
|
||||
let occurred_at = parse_commit_date(item)?;
|
||||
|
||||
let mut payload = item.clone();
|
||||
if let Some(obj) = payload.as_object_mut() {
|
||||
obj.insert("_repo".into(), Value::String(repo.full_name.clone()));
|
||||
}
|
||||
|
||||
Some(Event {
|
||||
id: format!("github-commit:{sha}"),
|
||||
@@ -250,7 +733,7 @@ fn parse_commit(item: &Value, repo: &Repo) -> Option<Event> {
|
||||
action: "Commit".into(),
|
||||
occurred_at,
|
||||
public: !repo.private,
|
||||
payload: item.clone(),
|
||||
payload,
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -113,8 +113,11 @@ impl GithubSearchSource {
|
||||
) -> Result<usize, SourceError> {
|
||||
let mut total = 0usize;
|
||||
for page in 1..=self.config.max_pages {
|
||||
// `fork:true` opts forks into the search — by default GitHub's
|
||||
// search API excludes them entirely, which means commits on a
|
||||
// user's fork (regardless of branch) never surface here.
|
||||
let url = format!(
|
||||
"https://api.github.com/search/commits?q=author:{}&sort=author-date&order=desc&per_page={}&page={}",
|
||||
"https://api.github.com/search/commits?q=author:{}+fork:true&sort=author-date&order=desc&per_page={}&page={}",
|
||||
self.config.user, self.config.per_page, page
|
||||
);
|
||||
let req = self.apply_headers(self.client.get(&url));
|
||||
|
||||
@@ -248,6 +248,12 @@ mod tests {
|
||||
) -> Result<usize, moments_core::StoreError> {
|
||||
Ok(0)
|
||||
}
|
||||
async fn upsert_repo_languages(
|
||||
&self,
|
||||
_languages: &[moments_entities::RepoLanguage],
|
||||
) -> Result<usize, moments_core::StoreError> {
|
||||
Ok(0)
|
||||
}
|
||||
}
|
||||
struct NoopState;
|
||||
#[async_trait]
|
||||
|
||||
@@ -8,7 +8,8 @@ pub mod hg;
|
||||
use async_trait::async_trait;
|
||||
use chrono::{DateTime, Utc};
|
||||
use moments_core::{EventReader, EventWriter, PollerState, PollerStateStore, StoreError};
|
||||
use moments_entities::{Event, EventQuery, ProjectSummary, Source, SourceSummary};
|
||||
use chrono::NaiveDate;
|
||||
use moments_entities::{DailyCount, Event, EventQuery, HourlyAvg, LanguageDailyCount, ProjectSummary, RepoLanguage, Source, SourceSummary};
|
||||
use sqlx::Row;
|
||||
use sqlx::postgres::{PgPool, PgPoolOptions};
|
||||
use std::str::FromStr;
|
||||
@@ -57,7 +58,8 @@ impl EventReader for PgStore {
|
||||
AND ($6::text IS NULL OR (CASE source
|
||||
WHEN 'github' THEN COALESCE(
|
||||
payload->'repo'->>'name',
|
||||
payload->'repository'->>'full_name'
|
||||
payload->'repository'->>'full_name',
|
||||
payload->>'_repo'
|
||||
)
|
||||
WHEN 'gitea' THEN COALESCE(
|
||||
payload->'repo'->>'full_name',
|
||||
@@ -144,7 +146,8 @@ impl EventReader for PgStore {
|
||||
CASE source
|
||||
WHEN 'github' THEN COALESCE(
|
||||
payload->'repo'->>'name',
|
||||
payload->'repository'->>'full_name'
|
||||
payload->'repository'->>'full_name',
|
||||
payload->>'_repo'
|
||||
)
|
||||
WHEN 'gitea' THEN COALESCE(
|
||||
payload->'repo'->>'full_name',
|
||||
@@ -192,6 +195,181 @@ impl EventReader for PgStore {
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
async fn daily_counts(&self, from: NaiveDate, to: NaiveDate, include_private: bool) -> Result<Vec<DailyCount>, StoreError> {
|
||||
let rows = sqlx::query(
|
||||
r#"
|
||||
SELECT d::date AS date,
|
||||
COUNT(e.id)::bigint AS count
|
||||
FROM generate_series($1::date, $2::date, '1 day') d
|
||||
LEFT JOIN events e
|
||||
ON e.occurred_at >= (d::date || 'T00:00:00Z')::timestamptz
|
||||
AND e.occurred_at < ((d::date + 1) || 'T00:00:00Z')::timestamptz
|
||||
AND ($3::bool OR e.public = true)
|
||||
GROUP BY d::date
|
||||
ORDER BY d::date
|
||||
"#,
|
||||
)
|
||||
.bind(from)
|
||||
.bind(to)
|
||||
.bind(include_private)
|
||||
.fetch_all(&self.pool)
|
||||
.await
|
||||
.map_err(map_err)?;
|
||||
|
||||
rows.into_iter()
|
||||
.map(|r| {
|
||||
Ok(DailyCount {
|
||||
date: r.try_get("date").map_err(map_err)?,
|
||||
count: r.try_get("count").map_err(map_err)?,
|
||||
})
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
async fn language_daily_counts(&self, from: NaiveDate, to: NaiveDate, include_private: bool) -> Result<Vec<LanguageDailyCount>, StoreError> {
|
||||
let rows = sqlx::query(
|
||||
r#"
|
||||
SELECT date, language, color,
|
||||
ROUND(SUM(weight))::bigint AS commits
|
||||
FROM (
|
||||
SELECT d::date AS date,
|
||||
rl.language,
|
||||
COALESCE(rl.color,
|
||||
(SELECT color FROM repo_languages
|
||||
WHERE language = rl.language AND color IS NOT NULL
|
||||
LIMIT 1)
|
||||
) AS color,
|
||||
rl.bytes::float / NULLIF(rt.total, 0) AS weight
|
||||
FROM generate_series($1::date, $2::date, '1 day') d
|
||||
JOIN events e
|
||||
ON e.occurred_at >= (d::date || 'T00:00:00Z')::timestamptz
|
||||
AND e.occurred_at < ((d::date + 1) || 'T00:00:00Z')::timestamptz
|
||||
AND ($3::bool OR e.public = true)
|
||||
AND e.action IN ('Commit', 'PushEvent', 'commit_repo')
|
||||
JOIN repo_languages rl
|
||||
ON rl.source = e.source
|
||||
AND rl.repo = CASE e.source
|
||||
WHEN 'github' THEN COALESCE(
|
||||
e.payload->'repo'->>'name',
|
||||
e.payload->'repository'->>'full_name',
|
||||
e.payload->>'_repo'
|
||||
)
|
||||
WHEN 'gitea' THEN COALESCE(
|
||||
e.payload->'repo'->>'full_name',
|
||||
e.payload->'repo'->>'name'
|
||||
)
|
||||
ELSE NULL
|
||||
END
|
||||
JOIN LATERAL (
|
||||
SELECT SUM(bytes)::float AS total
|
||||
FROM repo_languages r2
|
||||
WHERE r2.source = rl.source AND r2.repo = rl.repo
|
||||
) rt ON true
|
||||
) weighted
|
||||
GROUP BY date, language, color
|
||||
HAVING ROUND(SUM(weight)) > 0
|
||||
ORDER BY date, commits DESC
|
||||
"#,
|
||||
)
|
||||
.bind(from)
|
||||
.bind(to)
|
||||
.bind(include_private)
|
||||
.fetch_all(&self.pool)
|
||||
.await
|
||||
.map_err(map_err)?;
|
||||
|
||||
rows.into_iter()
|
||||
.map(|r| {
|
||||
Ok(LanguageDailyCount {
|
||||
date: r.try_get("date").map_err(map_err)?,
|
||||
language: r.try_get("language").map_err(map_err)?,
|
||||
color: r.try_get("color").map_err(map_err)?,
|
||||
commits: r.try_get("commits").map_err(map_err)?,
|
||||
})
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
async fn hourly_avgs(
|
||||
&self,
|
||||
from: NaiveDate,
|
||||
to: NaiveDate,
|
||||
tz: &str,
|
||||
include_private: bool,
|
||||
) -> Result<Vec<HourlyAvg>, StoreError> {
|
||||
// GREATEST guards against from > to (returns NaN-via-div-by-zero
|
||||
// otherwise). EXTRACT(hour FROM tz-shifted timestamp) buckets each
|
||||
// event into the user's local hour rather than UTC, so the chart
|
||||
// matches the labels they'd see on a clock.
|
||||
let rows = sqlx::query(
|
||||
r#"
|
||||
WITH params AS (
|
||||
SELECT GREATEST(($2::date - $1::date + 1), 1)::float8 AS day_count
|
||||
),
|
||||
bucketed AS (
|
||||
SELECT EXTRACT(hour FROM (occurred_at AT TIME ZONE $3))::int AS hour
|
||||
FROM events
|
||||
WHERE occurred_at >= ($1::date::timestamp AT TIME ZONE 'UTC')
|
||||
AND occurred_at < (($2::date + 1)::timestamp AT TIME ZONE 'UTC')
|
||||
AND ($4::bool OR public = true)
|
||||
)
|
||||
SELECT g.h::int AS hour,
|
||||
(COUNT(b.hour)::float8 / (SELECT day_count FROM params)) AS avg
|
||||
FROM generate_series(0, 23) AS g(h)
|
||||
LEFT JOIN bucketed b ON b.hour = g.h
|
||||
GROUP BY g.h
|
||||
ORDER BY g.h
|
||||
"#,
|
||||
)
|
||||
.bind(from)
|
||||
.bind(to)
|
||||
.bind(tz)
|
||||
.bind(include_private)
|
||||
.fetch_all(&self.pool)
|
||||
.await
|
||||
.map_err(map_err)?;
|
||||
|
||||
rows.into_iter()
|
||||
.map(|r| {
|
||||
Ok(HourlyAvg {
|
||||
hour: r.try_get("hour").map_err(map_err)?,
|
||||
avg: r.try_get("avg").map_err(map_err)?,
|
||||
})
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
async fn repo_languages(&self) -> Result<Vec<RepoLanguage>, StoreError> {
|
||||
let rows = sqlx::query(
|
||||
r#"
|
||||
SELECT source, repo, language, bytes,
|
||||
COALESCE(color,
|
||||
(SELECT color FROM repo_languages r2
|
||||
WHERE r2.language = repo_languages.language AND r2.color IS NOT NULL
|
||||
LIMIT 1)
|
||||
) AS color
|
||||
FROM repo_languages
|
||||
ORDER BY repo, bytes DESC
|
||||
"#,
|
||||
)
|
||||
.fetch_all(&self.pool)
|
||||
.await
|
||||
.map_err(map_err)?;
|
||||
|
||||
rows.into_iter()
|
||||
.map(|r| {
|
||||
let source_str: String = r.try_get("source").map_err(map_err)?;
|
||||
Ok(RepoLanguage {
|
||||
source: Source::from_str(&source_str).map_err(map_err)?,
|
||||
repo: r.try_get("repo").map_err(map_err)?,
|
||||
language: r.try_get("language").map_err(map_err)?,
|
||||
bytes: r.try_get("bytes").map_err(map_err)?,
|
||||
color: r.try_get("color").map_err(map_err)?,
|
||||
})
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
@@ -299,4 +477,37 @@ impl EventWriter for PgStore {
|
||||
tx.commit().await.map_err(map_err)?;
|
||||
Ok(inserted)
|
||||
}
|
||||
|
||||
async fn upsert_repo_languages(&self, languages: &[RepoLanguage]) -> Result<usize, StoreError> {
|
||||
if languages.is_empty() {
|
||||
return Ok(0);
|
||||
}
|
||||
|
||||
let mut tx = self.pool.begin().await.map_err(map_err)?;
|
||||
let mut count = 0usize;
|
||||
for lang in languages {
|
||||
let n = sqlx::query(
|
||||
r#"
|
||||
INSERT INTO repo_languages (source, repo, language, bytes, color, fetched_at)
|
||||
VALUES ($1, $2, $3, $4, $5, now())
|
||||
ON CONFLICT (source, repo, language) DO UPDATE
|
||||
SET bytes = EXCLUDED.bytes,
|
||||
color = EXCLUDED.color,
|
||||
fetched_at = EXCLUDED.fetched_at
|
||||
"#,
|
||||
)
|
||||
.bind(lang.source.as_str())
|
||||
.bind(&lang.repo)
|
||||
.bind(&lang.language)
|
||||
.bind(lang.bytes)
|
||||
.bind(&lang.color)
|
||||
.execute(&mut *tx)
|
||||
.await
|
||||
.map_err(map_err)?
|
||||
.rows_affected();
|
||||
count += n as usize;
|
||||
}
|
||||
tx.commit().await.map_err(map_err)?;
|
||||
Ok(count)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -84,6 +84,21 @@ pub struct SourceSummary {
|
||||
pub latest: Option<DateTime<Utc>>,
|
||||
}
|
||||
|
||||
/// Per-day event count for the contribution graph.
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct DailyCount {
|
||||
pub date: chrono::NaiveDate,
|
||||
pub count: i64,
|
||||
}
|
||||
|
||||
/// Average events per day at a given hour of the day, computed in a
|
||||
/// caller-supplied IANA timezone. 24 entries (0..=23).
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct HourlyAvg {
|
||||
pub hour: i32,
|
||||
pub avg: f64,
|
||||
}
|
||||
|
||||
/// Per-repo activity rollup for the dashboard.
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct ProjectSummary {
|
||||
@@ -97,6 +112,25 @@ pub struct ProjectSummary {
|
||||
pub last_activity: Option<DateTime<Utc>>,
|
||||
}
|
||||
|
||||
/// Per-language daily commit count for the language stream graph.
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct LanguageDailyCount {
|
||||
pub date: chrono::NaiveDate,
|
||||
pub language: String,
|
||||
pub color: Option<String>,
|
||||
pub commits: i64,
|
||||
}
|
||||
|
||||
/// Per-repo language breakdown from the forge.
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct RepoLanguage {
|
||||
pub source: Source,
|
||||
pub repo: String,
|
||||
pub language: String,
|
||||
pub bytes: i64,
|
||||
pub color: Option<String>,
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
// Presentation shape — what `GET /v1/events` actually returns.
|
||||
// The API reshapes raw payloads into these so the frontend stays dumb.
|
||||
|
||||
127
readme.md
127
readme.md
@@ -1,42 +1,87 @@
|
||||
# moments
|
||||
|
||||
Personal activity timeline. Polls public sources (GitHub, Gitea, Mercurial, Bugzilla), stores raw payloads in Postgres, and serves a reshaped timeline to a static React frontend.
|
||||
personal activity timeline and portfolio site. polls public sources (github, gitea, mercurial, bugzilla), stores raw payloads in postgres, and serves a dashboard + project detail views to a react frontend.
|
||||
|
||||
Successor to the now-defunct [grenade-events-react](https://github.com/grenade/grenade-events-react), which depended on MongoDB Stitch (retired by MongoDB in September 2022).
|
||||
successor to the now-defunct [grenade-events-react](https://github.com/grenade/grenade-events-react), which depended on mongodb stitch (retired by mongodb in september 2022).
|
||||
|
||||
## Layout
|
||||
## layout
|
||||
|
||||
```
|
||||
crates/
|
||||
moments-entities/ # types and DTOs
|
||||
moments-core/ # ingestion + reshape logic
|
||||
moments-data/ # postgres adapter + migrations
|
||||
moments-api/ # axum read-only HTTP API (binary)
|
||||
moments-entities/ # types and dtos (event, source, project/daily summaries)
|
||||
moments-core/ # ingestion traits, presentation reshape, poller loop
|
||||
moments-data/ # postgres adapter, migrations, all event-source impls
|
||||
moments-api/ # axum read-only http api + forge proxy + og image (binary)
|
||||
moments-worker/ # ingestion daemon (binary)
|
||||
ui/ # vite + react + swc + ts frontend
|
||||
ui/ # vite + react + swc + typescript frontend
|
||||
asset/ # systemd, nginx, firewalld, manifest.yml
|
||||
script/deploy.sh
|
||||
script/
|
||||
deploy.sh # manifest-driven deploy to prod
|
||||
hg-ingest.sh # one-shot local hg clone + psql ingest
|
||||
certify.sh # letsencrypt cert management
|
||||
teardown.sh # service removal
|
||||
db-perms.sh # postgres role + ident setup
|
||||
```
|
||||
|
||||
Architectural conventions follow [grenade/architecture/generic.md](https://git.lair.cafe/grenade/architecture/src/branch/main/generic.md).
|
||||
architectural conventions follow [grenade/architecture/generic.md](https://git.lair.cafe/grenade/architecture/src/branch/main/generic.md).
|
||||
|
||||
## Local development
|
||||
## data sources
|
||||
|
||||
| source | impl | endpoint | notes |
|
||||
|--------|------|----------|-------|
|
||||
| github events | `github.rs` | `/users/{user}/events` | last 90 days, etag-optimised polling |
|
||||
| github search | `github_search.rs` | `/search/commits` + `/search/issues` | historical backfill, 1000-result cap |
|
||||
| github repo | `github_repo.rs` | `/user/repos` + `/repos/{o}/{r}/commits` | full commit history, no cap, weekly poll |
|
||||
| gitea | `gitea.rs` | user + org activity feeds | auto-discovers orgs, filters by user |
|
||||
| mercurial | `hg.rs` | `json-log?rev=author()` | revset-based, one-shot backfill then skip |
|
||||
| bugzilla | `bugzilla.rs` | `/rest/bug?creator=` | mozilla bugzilla |
|
||||
|
||||
hg repos are archived (mozilla retired hg). the worker skips hg after the first successful scan. for bulk ingestion, `script/hg-ingest.sh` clones repos locally and inserts via psql, avoiding rate limits on hg-edge.mozilla.org.
|
||||
|
||||
## frontend routes
|
||||
|
||||
| path | page | description |
|
||||
|------|------|-------------|
|
||||
| `/` or `/dash` | dashboard | contribution graphs (daily + all-time weekly) + ranked project cards with forge icons and language info |
|
||||
| `/activity` | timeline | filterable activity feed with source toggles, date range slider, and event limit |
|
||||
| `/activity/:timespan` | timeline | pre-filtered by date (`YYYY-MM-DD`) or range (`YYYY-MM-DD..YYYY-MM-DD`) |
|
||||
| `/project/:source/*` | project detail | repo readme, language breakdown bar, per-repo activity timeline |
|
||||
| `/cv` | resume | loaded from github gist, markdown-rendered |
|
||||
|
||||
shared layout provides nav header (dash, activity, cv + external links) and footer across all routes.
|
||||
|
||||
## api endpoints
|
||||
|
||||
| method | path | description |
|
||||
|--------|------|-------------|
|
||||
| GET | `/v1/healthz` | liveness probe |
|
||||
| GET | `/v1/events?from=&to=&source=&repo=&limit=` | reshaped timeline items |
|
||||
| GET | `/v1/sources` | per-source summary (count, earliest, latest) |
|
||||
| GET | `/v1/projects` | per-repo aggregated stats (commits, issues, prs, date range) |
|
||||
| GET | `/v1/activity/daily?from=&to=` | per-day event counts for contribution graphs |
|
||||
| GET | `/v1/forge/{source}/*?host=` | proxy to github/gitea apis (avoids cors) |
|
||||
| GET | `/v1/og/contributions.png` | server-rendered contribution graph as png (resvg) |
|
||||
|
||||
the og image endpoint renders the all-time weekly contribution graph as svg, rasterizes to png via resvg, and serves it with a 1-hour cache. used as the `og:image` meta tag for social media previews.
|
||||
|
||||
## local development
|
||||
|
||||
```sh
|
||||
cargo build --workspace
|
||||
cargo run -p moments-api # serves on 127.0.0.1:8080
|
||||
cargo run -p moments-worker # one-shot ingest tick (until --interval is wired up)
|
||||
cargo run -p moments-worker # starts all pollers
|
||||
cd ui && npm install && npm run dev # vite dev server on :5173
|
||||
```
|
||||
|
||||
The API expects a Postgres reachable at `DATABASE_URL`. In production this is an mTLS connection using the host cert. For local dev against a throwaway database:
|
||||
the api expects a postgres reachable at `DATABASE_URL`. in production this is an mtls connection using the host cert. for local dev against a throwaway database:
|
||||
|
||||
```sh
|
||||
DATABASE_URL=postgres://localhost/moments cargo run -p moments-api
|
||||
```
|
||||
|
||||
Migrations live in `crates/moments-data/migrations/` and run automatically on worker startup. The API connects as `moments_ro` and never runs migrations — the worker (as `moments_rw`) is the schema owner.
|
||||
migrations live in `crates/moments-data/migrations/` and run automatically on worker startup. the api connects as `moments_ro` and never runs migrations — the worker (as `moments_rw`) is the schema owner.
|
||||
|
||||
## Deployment
|
||||
## deployment
|
||||
|
||||
```sh
|
||||
./script/deploy.sh <env> all # api + worker + web
|
||||
@@ -45,25 +90,47 @@ Migrations live in `crates/moments-data/migrations/` and run automatically on wo
|
||||
./script/deploy.sh <env> all --dry-run
|
||||
```
|
||||
|
||||
Concrete hosts, ports, and the site's `server_name` live in `asset/manifest.yml`. The shape of the deployment:
|
||||
concrete hosts, ports, and the site's `server_name` live in `asset/manifest.yml`. the shape of the deployment:
|
||||
|
||||
| Component | Notes |
|
||||
| --------- | ---------------------------------------------------------------------- |
|
||||
| api | binds the port from `api.config.bind`; firewalld service `moments-api` |
|
||||
| worker | no listening port; pollers only |
|
||||
| web | per-site nginx ingress; `/api/*` reverse-proxies to the api host |
|
||||
| db | postgres mTLS, passwordless |
|
||||
| component | notes |
|
||||
|-----------|-------|
|
||||
| api | binds the port from `api.config.bind`; firewalld service `moments-api` |
|
||||
| worker | no listening port; pollers only |
|
||||
| web | per-site nginx ingress; `/api/*` reverse-proxies to the api host |
|
||||
| db | postgres mtls, passwordless |
|
||||
|
||||
Postgres roles `moments_rw` and `moments_ro` must exist on the primary, with `pg_ident.conf.d/<host>.conf` mapping the api host's FQDN → `moments_ro` and the worker host's FQDN → `moments_rw`. See `asset/sql/bootstrap-moments.sql`, `asset/postgres/ident.conf.tmpl`, and `script/db-perms.sh` (idempotently adds the cert_cn lines on the postgres primary + standby and reloads postgres).
|
||||
postgres roles `moments_rw` and `moments_ro` must exist on the primary, with `pg_ident.conf.d/<host>.conf` mapping the api host's fqdn to `moments_ro` and the worker host's fqdn to `moments_rw`. see `asset/sql/bootstrap-moments.sql`, `asset/postgres/ident.conf.tmpl`, and `script/db-perms.sh`.
|
||||
|
||||
Inter-host traffic over the WG mesh: web's nginx connects to the api host in plaintext. The mesh provides the encryption layer; per-hop TLS for an internal HTTP read-only API on already-public data is deferred. If that changes, swap the api binary to rustls + the host cert pair, and update the nginx upstream to `https://`.
|
||||
secrets are resolved at deploy time via `pass`. the mapping of env-var name to pass-store path lives under `worker.secrets` in `manifest.yml`; `deploy.sh` iterates the map, fetches each secret, and substitutes the matching `{{NAME}}` placeholder in `worker.env.tmpl`.
|
||||
|
||||
Secrets are resolved at deploy time via `pass`. The mapping of env-var name → pass-store path lives under `worker.secrets` in `manifest.yml`; `deploy.sh` iterates the map, fetches each secret, and substitutes the matching `{{NAME}}` placeholder in `worker.env.tmpl`. To add a secret: add a `worker.secrets` entry, add `NAME={{NAME}}` to `worker.env.tmpl`, and ensure `pass show <path>` returns the value on the deploying machine.
|
||||
## environment variables
|
||||
|
||||
### First-time setup
|
||||
### worker
|
||||
|
||||
After the first successful prod deploy:
|
||||
| variable | default | description |
|
||||
|----------|---------|-------------|
|
||||
| `DATABASE_URL` | required | postgres connection string |
|
||||
| `GITHUB_USER` | `grenade` | github username |
|
||||
| `GITHUB_TOKEN` | optional | github pat for higher rate limits + private events |
|
||||
| `POLL_INTERVAL_SECS` | `600` | github events api poll interval |
|
||||
| `SEARCH_POLL_INTERVAL_SECS` | `86400` | github search backfill interval |
|
||||
| `REPO_POLL_INTERVAL_SECS` | `604800` | github per-repo commit enumeration (weekly) |
|
||||
| `GITEA_HOST` | `git.lair.cafe` | gitea instance hostname |
|
||||
| `GITEA_USER` | `grenade` | gitea username |
|
||||
| `GITEA_TOKEN` | optional | gitea token for org discovery |
|
||||
| `GITEA_POLL_INTERVAL_SECS` | `600` | gitea activity feed poll interval |
|
||||
| `HG_HOST` | `hg-edge.mozilla.org` | mercurial host |
|
||||
| `HG_GROUPS` | `build,integration` | hg repo groups to discover |
|
||||
| `HG_REPOS` | `mozilla-central` | individual hg repos |
|
||||
| `HG_AUTHOR_TERMS` | `rthijssen,grenade` | author substrings for revset queries |
|
||||
| `HG_POLL_INTERVAL_SECS` | `86400` | hg poll interval (skips after first scan) |
|
||||
| `BUGZILLA_HOST` | `bugzilla.mozilla.org` | bugzilla instance |
|
||||
| `BUGZILLA_EMAIL` | `rthijssen@mozilla.com` | bugzilla creator email filter |
|
||||
| `BUGZILLA_POLL_INTERVAL_SECS` | `86400` | bugzilla poll interval |
|
||||
|
||||
1. Point public DNS for the site at the web host's public IP (unproxied).
|
||||
2. Confirm `curl --fail --silent --show-error https://<site>/api/v1/healthz` returns `ok`.
|
||||
3. If migrating from a predecessor, archive the old repo with a pointer to this one.
|
||||
### api
|
||||
|
||||
| variable | default | description |
|
||||
|----------|---------|-------------|
|
||||
| `DATABASE_URL` | required | postgres connection string (read-only role) |
|
||||
| `BIND_ADDR` | `127.0.0.1:8080` | api listen address |
|
||||
|
||||
@@ -48,6 +48,31 @@ ssh_run() {
|
||||
fi
|
||||
}
|
||||
|
||||
# Ensure /tmp on the remote is world-writable + sticky (mode 1777). Some
|
||||
# hosts in this fleet have had /tmp reset to root-owned 0755 by an
|
||||
# unrelated configuration step, which silently breaks the rsync of the
|
||||
# deploy stage dir under our unprivileged user. Check the mode first so a
|
||||
# correctly-configured host doesn't incur a needless sudo call.
|
||||
ensure_tmp_writable() {
|
||||
local host="$1"
|
||||
if (( dry_run )); then
|
||||
printf '\033[2m[dry-run]\033[0m ssh %s -- stat /tmp; chmod 1777 if needed\n' "$host" >&2
|
||||
return 0
|
||||
fi
|
||||
local mode
|
||||
mode="$(ssh -o BatchMode=yes "$host" 'stat -c %a /tmp')" || {
|
||||
warn "could not stat /tmp on $host"
|
||||
return 1
|
||||
}
|
||||
if [[ "$mode" != "1777" ]]; then
|
||||
warn "/tmp on $host is mode $mode; fixing to 1777"
|
||||
ssh -o BatchMode=yes "$host" 'sudo chmod 1777 /tmp' || {
|
||||
warn "failed to chmod /tmp on $host"
|
||||
return 1
|
||||
}
|
||||
fi
|
||||
}
|
||||
|
||||
[[ $# -ge 1 ]] || usage
|
||||
environment="$1"; shift
|
||||
components=()
|
||||
@@ -60,10 +85,24 @@ while [[ $# -gt 0 ]]; do
|
||||
done
|
||||
|
||||
[[ -f "$manifest" ]] || die "manifest not found: $manifest"
|
||||
command -v yq >/dev/null 2>&1 || die "yq is required"
|
||||
command -v pass >/dev/null 2>&1 || die "pass is required"
|
||||
command -v rsync >/dev/null 2>&1 || die "rsync is required"
|
||||
command -v cargo >/dev/null 2>&1 || die "cargo is required"
|
||||
command -v yq >/dev/null 2>&1 || die "yq is required"
|
||||
command -v pass >/dev/null 2>&1 || die "pass is required"
|
||||
command -v rsync >/dev/null 2>&1 || die "rsync is required"
|
||||
command -v cargo >/dev/null 2>&1 || die "cargo is required"
|
||||
command -v podman >/dev/null 2>&1 || die "podman is required (used for the deploy build container)"
|
||||
|
||||
# Rust binaries are built inside a Debian container so the resulting ELF
|
||||
# links against an older glibc than this workstation's. Building natively
|
||||
# on f44 (glibc 2.43) produces binaries that won't load on f42 / f43
|
||||
# servers — the dynamic loader refuses them outright. Debian bookworm's
|
||||
# glibc 2.36 is older than every Fedora release we deploy to, so its
|
||||
# binaries are forward-compatible.
|
||||
#
|
||||
# The artifacts land in target/deploy/release/ so a native `cargo build`
|
||||
# in this checkout (for tests, clippy, dev runs) doesn't compete with
|
||||
# the container for incremental state, and vice-versa.
|
||||
rust_build_image="docker.io/library/rust:1-bookworm"
|
||||
rust_target_dir="${repo_root}/target/deploy"
|
||||
|
||||
# Resolve component list ----------------------------------------------------
|
||||
|
||||
@@ -93,8 +132,20 @@ for c in "${components[@]}"; do
|
||||
done
|
||||
|
||||
if (( needs_rust )); then
|
||||
log "cargo build --release (api, worker)"
|
||||
run cargo build --release --bin moments-api --bin moments-worker --manifest-path "${repo_root}/Cargo.toml"
|
||||
log "cargo build --release in ${rust_build_image} (api, worker)"
|
||||
install --directory "$rust_target_dir"
|
||||
# Named volumes cache the cargo registry and git index across runs so
|
||||
# subsequent builds don't re-fetch every crate. CARGO_TARGET_DIR
|
||||
# redirects build output into the host-mounted target/deploy.
|
||||
# :Z relabels the bind mount for SELinux on Fedora hosts.
|
||||
run podman run --rm \
|
||||
--volume "${repo_root}:/workspace:Z" \
|
||||
--volume moments-deploy-cargo-registry:/usr/local/cargo/registry \
|
||||
--volume moments-deploy-cargo-git:/usr/local/cargo/git \
|
||||
--workdir /workspace \
|
||||
--env CARGO_TARGET_DIR=/workspace/target/deploy \
|
||||
"$rust_build_image" \
|
||||
cargo build --release --bin moments-api --bin moments-worker
|
||||
fi
|
||||
|
||||
if (( needs_web )); then
|
||||
@@ -156,7 +207,7 @@ deploy_api() {
|
||||
install --mode=0644 "${repo_root}/asset/systemd/moments-api.service" "$stage/etc/systemd/system/"
|
||||
install --mode=0644 "${repo_root}/asset/systemd/moments-api-cert-reload.service" "$stage/etc/systemd/system/"
|
||||
install --mode=0644 "${repo_root}/asset/systemd/moments.sysusers.conf" "$stage/etc/sysusers.d/moments.conf"
|
||||
install --mode=0755 "${repo_root}/target/release/moments-api" "$stage/usr/local/bin/moments-api"
|
||||
install --mode=0755 "${rust_target_dir}/release/moments-api" "$stage/usr/local/bin/moments-api"
|
||||
|
||||
chmod 0640 "$stage/etc/moments/api.env"
|
||||
|
||||
@@ -166,6 +217,8 @@ deploy_api() {
|
||||
# live system dirs.
|
||||
local remote_stage="/tmp/moments-deploy.api.${$}.${RANDOM}"
|
||||
|
||||
ensure_tmp_writable "$host" || return 1
|
||||
|
||||
rsync \
|
||||
--archive \
|
||||
--hard-links \
|
||||
@@ -310,7 +363,7 @@ deploy_worker() {
|
||||
install --mode=0644 "${repo_root}/asset/systemd/moments-worker.service" "$stage/etc/systemd/system/"
|
||||
install --mode=0644 "${repo_root}/asset/systemd/moments-worker-cert-reload.service" "$stage/etc/systemd/system/"
|
||||
install --mode=0644 "${repo_root}/asset/systemd/moments.sysusers.conf" "$stage/etc/sysusers.d/moments.conf"
|
||||
install --mode=0755 "${repo_root}/target/release/moments-worker" "$stage/usr/local/bin/moments-worker"
|
||||
install --mode=0755 "${rust_target_dir}/release/moments-worker" "$stage/usr/local/bin/moments-worker"
|
||||
|
||||
chmod 0640 "$stage/etc/moments/worker.env"
|
||||
|
||||
@@ -318,6 +371,8 @@ deploy_worker() {
|
||||
# path via the heredoc. Never rsync into /.
|
||||
local remote_stage="/tmp/moments-deploy.worker.${$}.${RANDOM}"
|
||||
|
||||
ensure_tmp_writable "$host" || return 1
|
||||
|
||||
rsync \
|
||||
--archive \
|
||||
--hard-links \
|
||||
|
||||
@@ -1,19 +1,74 @@
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>rob.tn</title>
|
||||
<link rel="icon" type="image/x-icon" href="/favicon.ico" />
|
||||
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16.png" />
|
||||
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32.png" />
|
||||
<link rel="icon" type="image/png" sizes="48x48" href="/favicon-48.png" />
|
||||
<link rel="apple-touch-icon" href="/apple-touch-icon.png" />
|
||||
<link rel="icon" type="image/png" sizes="192x192" href="/icon-192.png" />
|
||||
<link rel="icon" type="image/png" sizes="512x512" href="/icon-512.png" />
|
||||
</head>
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
<script type="module" src="/src/main.tsx"></script>
|
||||
</body>
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>rob.tn</title>
|
||||
<meta
|
||||
name="description"
|
||||
content="a timeline of open source contributions across github, gitea, and mozilla hg. ranked projects, language trends, and commit activity since 2012."
|
||||
/>
|
||||
<meta
|
||||
property="og:title"
|
||||
content="rob thijssen: developer activity and contribution history"
|
||||
/>
|
||||
<meta
|
||||
property="og:description"
|
||||
content="a timeline of open source contributions across github, gitea, and mozilla hg. ranked projects, language trends, and commit activity since 2012."
|
||||
/>
|
||||
<meta
|
||||
property="og:image"
|
||||
content="https://rob.tn/api/v1/og/contributions.png"
|
||||
width="1200"
|
||||
height="630"
|
||||
/>
|
||||
<meta property="og:type" content="website" />
|
||||
<meta property="og:url" content="https://rob.tn/" />
|
||||
<meta property="og:site_name" content="rob.tn" />
|
||||
<meta property="og:locale" content="en_US" />
|
||||
<meta property="og:logo" content="https://rob.tn/icon-512.png" />
|
||||
<meta name="twitter:card" content="summary_large_image" />
|
||||
<meta
|
||||
name="twitter:image"
|
||||
content="https://rob.tn/api/v1/og/contributions.png"
|
||||
width="1200"
|
||||
height="630"
|
||||
/>
|
||||
<link rel="icon" type="image/x-icon" href="/favicon.ico" />
|
||||
<link
|
||||
rel="icon"
|
||||
type="image/png"
|
||||
sizes="16x16"
|
||||
href="/favicon-16.png"
|
||||
/>
|
||||
<link
|
||||
rel="icon"
|
||||
type="image/png"
|
||||
sizes="32x32"
|
||||
href="/favicon-32.png"
|
||||
/>
|
||||
<link
|
||||
rel="icon"
|
||||
type="image/png"
|
||||
sizes="48x48"
|
||||
href="/favicon-48.png"
|
||||
/>
|
||||
<link rel="apple-touch-icon" href="/apple-touch-icon.png" />
|
||||
<link
|
||||
rel="icon"
|
||||
type="image/png"
|
||||
sizes="192x192"
|
||||
href="/icon-192.png"
|
||||
/>
|
||||
<link
|
||||
rel="icon"
|
||||
type="image/png"
|
||||
sizes="512x512"
|
||||
href="/icon-512.png"
|
||||
/>
|
||||
</head>
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
<script type="module" src="/src/main.tsx"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -19,7 +19,10 @@
|
||||
"react-dom": "^19.0.0",
|
||||
"react-markdown": "^9.0.1",
|
||||
"react-router-dom": "^7.14.2",
|
||||
"react-vertical-timeline-component": "^3.6.0"
|
||||
"react-vertical-timeline-component": "^3.6.0",
|
||||
"rehype-raw": "^7.0.0",
|
||||
"rehype-sanitize": "^6.0.0",
|
||||
"remark-gfm": "^4.0.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/react": "^19.0.0",
|
||||
|
||||
328
ui/pnpm-lock.yaml
generated
328
ui/pnpm-lock.yaml
generated
@@ -38,6 +38,15 @@ importers:
|
||||
react-vertical-timeline-component:
|
||||
specifier: ^3.6.0
|
||||
version: 3.6.0(react@19.2.5)
|
||||
rehype-raw:
|
||||
specifier: ^7.0.0
|
||||
version: 7.0.0
|
||||
rehype-sanitize:
|
||||
specifier: ^6.0.0
|
||||
version: 6.0.0
|
||||
remark-gfm:
|
||||
specifier: ^4.0.1
|
||||
version: 4.0.1
|
||||
devDependencies:
|
||||
'@types/react':
|
||||
specifier: ^19.0.0
|
||||
@@ -625,11 +634,19 @@ packages:
|
||||
dom-helpers@5.2.1:
|
||||
resolution: {integrity: sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==}
|
||||
|
||||
entities@6.0.1:
|
||||
resolution: {integrity: sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==}
|
||||
engines: {node: '>=0.12'}
|
||||
|
||||
esbuild@0.25.12:
|
||||
resolution: {integrity: sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg==}
|
||||
engines: {node: '>=18'}
|
||||
hasBin: true
|
||||
|
||||
escape-string-regexp@5.0.0:
|
||||
resolution: {integrity: sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==}
|
||||
engines: {node: '>=12'}
|
||||
|
||||
estree-util-is-identifier-name@3.0.0:
|
||||
resolution: {integrity: sha512-hFtqIDZTIUZ9BXLb8y4pYGyk6+wekIivNVTcmvk8NoOh+VeRn5y6cEHzbURrWbfp1fIqdVipilzj+lfaadNZmg==}
|
||||
|
||||
@@ -650,15 +667,36 @@ packages:
|
||||
engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
|
||||
os: [darwin]
|
||||
|
||||
hast-util-from-parse5@8.0.3:
|
||||
resolution: {integrity: sha512-3kxEVkEKt0zvcZ3hCRYI8rqrgwtlIOFMWkbclACvjlDw8Li9S2hk/d51OI0nr/gIpdMHNepwgOKqZ/sy0Clpyg==}
|
||||
|
||||
hast-util-parse-selector@4.0.0:
|
||||
resolution: {integrity: sha512-wkQCkSYoOGCRKERFWcxMVMOcYE2K1AaNLU8DXS9arxnLOUEWbOXKXiJUNzEpqZ3JOKpnha3jkFrumEjVliDe7A==}
|
||||
|
||||
hast-util-raw@9.1.0:
|
||||
resolution: {integrity: sha512-Y8/SBAHkZGoNkpzqqfCldijcuUKh7/su31kEBp67cFY09Wy0mTRgtsLYsiIxMJxlu0f6AA5SUTbDR8K0rxnbUw==}
|
||||
|
||||
hast-util-sanitize@5.0.2:
|
||||
resolution: {integrity: sha512-3yTWghByc50aGS7JlGhk61SPenfE/p1oaFeNwkOOyrscaOkMGrcW9+Cy/QAIOBpZxP1yqDIzFMR0+Np0i0+usg==}
|
||||
|
||||
hast-util-to-jsx-runtime@2.3.6:
|
||||
resolution: {integrity: sha512-zl6s8LwNyo1P9uw+XJGvZtdFF1GdAkOg8ujOw+4Pyb76874fLps4ueHXDhXWdk6YHQ6OgUtinliG7RsYvCbbBg==}
|
||||
|
||||
hast-util-to-parse5@8.0.1:
|
||||
resolution: {integrity: sha512-MlWT6Pjt4CG9lFCjiz4BH7l9wmrMkfkJYCxFwKQic8+RTZgWPuWxwAfjJElsXkex7DJjfSJsQIt931ilUgmwdA==}
|
||||
|
||||
hast-util-whitespace@3.0.0:
|
||||
resolution: {integrity: sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==}
|
||||
|
||||
hastscript@9.0.1:
|
||||
resolution: {integrity: sha512-g7df9rMFX/SPi34tyGCyUBREQoKkapwdY/T04Qn9TDWfHhAYt4/I0gMVirzK5wEzeUqIjEB+LXC/ypb7Aqno5w==}
|
||||
|
||||
html-url-attributes@3.0.1:
|
||||
resolution: {integrity: sha512-ol6UPyBWqsrO6EJySPz2O7ZSr856WDrEzM5zMqp+FJJLGMW35cLYmmZnl0vztAZxRUoNZJFTCohfjuIJ8I4QBQ==}
|
||||
|
||||
html-void-elements@3.0.0:
|
||||
resolution: {integrity: sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==}
|
||||
|
||||
inline-style-parser@0.2.7:
|
||||
resolution: {integrity: sha512-Nb2ctOyNR8DqQoR0OwRG95uNWIC0C1lCgf5Naz5H6Ji72KZ8OcFZLz2P5sNgwlyoJ8Yif11oMuYs5pBQa86csA==}
|
||||
|
||||
@@ -691,9 +729,33 @@ packages:
|
||||
resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
|
||||
hasBin: true
|
||||
|
||||
markdown-table@3.0.4:
|
||||
resolution: {integrity: sha512-wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw==}
|
||||
|
||||
mdast-util-find-and-replace@3.0.2:
|
||||
resolution: {integrity: sha512-Tmd1Vg/m3Xz43afeNxDIhWRtFZgM2VLyaf4vSTYwudTyeuTneoL3qtWMA5jeLyz/O1vDJmmV4QuScFCA2tBPwg==}
|
||||
|
||||
mdast-util-from-markdown@2.0.3:
|
||||
resolution: {integrity: sha512-W4mAWTvSlKvf8L6J+VN9yLSqQ9AOAAvHuoDAmPkz4dHf553m5gVj2ejadHJhoJmcmxEnOv6Pa8XJhpxE93kb8Q==}
|
||||
|
||||
mdast-util-gfm-autolink-literal@2.0.1:
|
||||
resolution: {integrity: sha512-5HVP2MKaP6L+G6YaxPNjuL0BPrq9orG3TsrZ9YXbA3vDw/ACI4MEsnoDpn6ZNm7GnZgtAcONJyPhOP8tNJQavQ==}
|
||||
|
||||
mdast-util-gfm-footnote@2.1.0:
|
||||
resolution: {integrity: sha512-sqpDWlsHn7Ac9GNZQMeUzPQSMzR6Wv0WKRNvQRg0KqHh02fpTz69Qc1QSseNX29bhz1ROIyNyxExfawVKTm1GQ==}
|
||||
|
||||
mdast-util-gfm-strikethrough@2.0.0:
|
||||
resolution: {integrity: sha512-mKKb915TF+OC5ptj5bJ7WFRPdYtuHv0yTRxK2tJvi+BDqbkiG7h7u/9SI89nRAYcmap2xHQL9D+QG/6wSrTtXg==}
|
||||
|
||||
mdast-util-gfm-table@2.0.0:
|
||||
resolution: {integrity: sha512-78UEvebzz/rJIxLvE7ZtDd/vIQ0RHv+3Mh5DR96p7cS7HsBhYIICDBCu8csTNWNO6tBWfqXPWekRuj2FNOGOZg==}
|
||||
|
||||
mdast-util-gfm-task-list-item@2.0.0:
|
||||
resolution: {integrity: sha512-IrtvNvjxC1o06taBAVJznEnkiHxLFTzgonUdy8hzFVeDun0uTjxxrRGVaNFqkU1wJR3RBPEfsxmU6jDWPofrTQ==}
|
||||
|
||||
mdast-util-gfm@3.1.0:
|
||||
resolution: {integrity: sha512-0ulfdQOM3ysHhCJ1p06l0b0VKlhU0wuQs3thxZQagjcjPrlFRqY215uZGHHJan9GEAXd9MbfPjFJz+qMkVR6zQ==}
|
||||
|
||||
mdast-util-mdx-expression@2.0.1:
|
||||
resolution: {integrity: sha512-J6f+9hUp+ldTZqKRSg7Vw5V6MqjATc+3E4gf3CFNcuZNWD8XdyI6zQ8GqH7f8169MM6P7hMBRDVGnn7oHB9kXQ==}
|
||||
|
||||
@@ -718,6 +780,27 @@ packages:
|
||||
micromark-core-commonmark@2.0.3:
|
||||
resolution: {integrity: sha512-RDBrHEMSxVFLg6xvnXmb1Ayr2WzLAWjeSATAoxwKYJV94TeNavgoIdA0a9ytzDSVzBy2YKFK+emCPOEibLeCrg==}
|
||||
|
||||
micromark-extension-gfm-autolink-literal@2.1.0:
|
||||
resolution: {integrity: sha512-oOg7knzhicgQ3t4QCjCWgTmfNhvQbDDnJeVu9v81r7NltNCVmhPy1fJRX27pISafdjL+SVc4d3l48Gb6pbRypw==}
|
||||
|
||||
micromark-extension-gfm-footnote@2.1.0:
|
||||
resolution: {integrity: sha512-/yPhxI1ntnDNsiHtzLKYnE3vf9JZ6cAisqVDauhp4CEHxlb4uoOTxOCJ+9s51bIB8U1N1FJ1RXOKTIlD5B/gqw==}
|
||||
|
||||
micromark-extension-gfm-strikethrough@2.1.0:
|
||||
resolution: {integrity: sha512-ADVjpOOkjz1hhkZLlBiYA9cR2Anf8F4HqZUO6e5eDcPQd0Txw5fxLzzxnEkSkfnD0wziSGiv7sYhk/ktvbf1uw==}
|
||||
|
||||
micromark-extension-gfm-table@2.1.1:
|
||||
resolution: {integrity: sha512-t2OU/dXXioARrC6yWfJ4hqB7rct14e8f7m0cbI5hUmDyyIlwv5vEtooptH8INkbLzOatzKuVbQmAYcbWoyz6Dg==}
|
||||
|
||||
micromark-extension-gfm-tagfilter@2.0.0:
|
||||
resolution: {integrity: sha512-xHlTOmuCSotIA8TW1mDIM6X2O1SiX5P9IuDtqGonFhEK0qgRI4yeC6vMxEV2dgyr2TiD+2PQ10o+cOhdVAcwfg==}
|
||||
|
||||
micromark-extension-gfm-task-list-item@2.1.0:
|
||||
resolution: {integrity: sha512-qIBZhqxqI6fjLDYFTBIa4eivDMnP+OZqsNwmQ3xNLE4Cxwc+zfQEfbs6tzAo2Hjq+bh6q5F+Z8/cksrLFYWQQw==}
|
||||
|
||||
micromark-extension-gfm@3.0.0:
|
||||
resolution: {integrity: sha512-vsKArQsicm7t0z2GugkCKtZehqUm31oeGBV/KVSorWSy8ZlNAv7ytjFhvaryUiCUJYqs+NoE6AFhpQvBTM6Q4w==}
|
||||
|
||||
micromark-factory-destination@2.0.1:
|
||||
resolution: {integrity: sha512-Xe6rDdJlkmbFRExpTOmRj9N3MaWmbAgdpSrBQvCFqhezUn4AHqJHbaEnfbVYYiexVSs//tqOdY/DxhjdCiJnIA==}
|
||||
|
||||
@@ -793,6 +876,9 @@ packages:
|
||||
parse-entities@4.0.2:
|
||||
resolution: {integrity: sha512-GG2AQYWoLgL877gQIKeRPGO1xF9+eG1ujIb5soS5gPvLQ1y2o8FL90w2QWNdf9I361Mpp7726c+lj3U0qK1uGw==}
|
||||
|
||||
parse5@7.3.0:
|
||||
resolution: {integrity: sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==}
|
||||
|
||||
picocolors@1.1.1:
|
||||
resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
|
||||
|
||||
@@ -909,12 +995,24 @@ packages:
|
||||
resolution: {integrity: sha512-llUJLzz1zTUBrskt2pwZgLq59AemifIftw4aB7JxOqf1HY2FDaGDxgwpAPVzHU1kdWabH7FauP4i1oEeer2WCA==}
|
||||
engines: {node: '>=0.10.0'}
|
||||
|
||||
rehype-raw@7.0.0:
|
||||
resolution: {integrity: sha512-/aE8hCfKlQeA8LmyeyQvQF3eBiLRGNlfBJEvWH7ivp9sBqs7TNqBL5X3v157rM4IFETqDnIOO+z5M/biZbo9Ww==}
|
||||
|
||||
rehype-sanitize@6.0.0:
|
||||
resolution: {integrity: sha512-CsnhKNsyI8Tub6L4sm5ZFsme4puGfc6pYylvXo1AeqaGbjOYyzNv3qZPwvs0oMJ39eryyeOdmxwUIo94IpEhqg==}
|
||||
|
||||
remark-gfm@4.0.1:
|
||||
resolution: {integrity: sha512-1quofZ2RQ9EWdeN34S79+KExV1764+wCUGop5CPL1WGdD0ocPpu91lzPGbwWMECpEpd42kJGQwzRfyov9j4yNg==}
|
||||
|
||||
remark-parse@11.0.0:
|
||||
resolution: {integrity: sha512-FCxlKLNGknS5ba/1lmpYijMUzX2esxW5xQqjWxw2eHFfS2MSdaHVINFmhjo+qN1WhZhNimq0dZATN9pH0IDrpA==}
|
||||
|
||||
remark-rehype@11.1.2:
|
||||
resolution: {integrity: sha512-Dh7l57ianaEoIpzbp0PC9UKAdCSVklD8E5Rpw7ETfbTl3FqcOOgq5q2LVDhgGCkaBv7p24JXikPdvhhmHvKMsw==}
|
||||
|
||||
remark-stringify@11.0.0:
|
||||
resolution: {integrity: sha512-1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw==}
|
||||
|
||||
rollup@4.60.2:
|
||||
resolution: {integrity: sha512-J9qZyW++QK/09NyN/zeO0dG/1GdGfyp9lV8ajHnRVLfo/uFsbji5mHnDgn/qYdUHyCkM2N+8VyspgZclfAh0eQ==}
|
||||
engines: {node: '>=18.0.0', npm: '>=8.0.0'}
|
||||
@@ -993,6 +1091,9 @@ packages:
|
||||
peerDependencies:
|
||||
react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
|
||||
|
||||
vfile-location@5.0.3:
|
||||
resolution: {integrity: sha512-5yXvWDEgqeiYiBe1lbxYF7UMAIm/IcopxMHrMQDq3nvKcjPKIhZklUKL+AE7J7uApI4kwe2snsK+eI6UTj9EHg==}
|
||||
|
||||
vfile-message@4.0.3:
|
||||
resolution: {integrity: sha512-QTHzsGd1EhbZs4AsQ20JX1rC3cOlt/IWJruk893DfLRr57lcnOeMaWG4K0JrRta4mIJZKth2Au3mM3u03/JWKw==}
|
||||
|
||||
@@ -1042,6 +1143,9 @@ packages:
|
||||
warning@4.0.3:
|
||||
resolution: {integrity: sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==}
|
||||
|
||||
web-namespaces@2.0.1:
|
||||
resolution: {integrity: sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==}
|
||||
|
||||
zwitch@2.0.4:
|
||||
resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
|
||||
|
||||
@@ -1428,6 +1532,8 @@ snapshots:
|
||||
'@babel/runtime': 7.29.2
|
||||
csstype: 3.2.3
|
||||
|
||||
entities@6.0.1: {}
|
||||
|
||||
esbuild@0.25.12:
|
||||
optionalDependencies:
|
||||
'@esbuild/aix-ppc64': 0.25.12
|
||||
@@ -1457,6 +1563,8 @@ snapshots:
|
||||
'@esbuild/win32-ia32': 0.25.12
|
||||
'@esbuild/win32-x64': 0.25.12
|
||||
|
||||
escape-string-regexp@5.0.0: {}
|
||||
|
||||
estree-util-is-identifier-name@3.0.0: {}
|
||||
|
||||
extend@3.0.2: {}
|
||||
@@ -1468,6 +1576,43 @@ snapshots:
|
||||
fsevents@2.3.3:
|
||||
optional: true
|
||||
|
||||
hast-util-from-parse5@8.0.3:
|
||||
dependencies:
|
||||
'@types/hast': 3.0.4
|
||||
'@types/unist': 3.0.3
|
||||
devlop: 1.1.0
|
||||
hastscript: 9.0.1
|
||||
property-information: 7.1.0
|
||||
vfile: 6.0.3
|
||||
vfile-location: 5.0.3
|
||||
web-namespaces: 2.0.1
|
||||
|
||||
hast-util-parse-selector@4.0.0:
|
||||
dependencies:
|
||||
'@types/hast': 3.0.4
|
||||
|
||||
hast-util-raw@9.1.0:
|
||||
dependencies:
|
||||
'@types/hast': 3.0.4
|
||||
'@types/unist': 3.0.3
|
||||
'@ungap/structured-clone': 1.3.0
|
||||
hast-util-from-parse5: 8.0.3
|
||||
hast-util-to-parse5: 8.0.1
|
||||
html-void-elements: 3.0.0
|
||||
mdast-util-to-hast: 13.2.1
|
||||
parse5: 7.3.0
|
||||
unist-util-position: 5.0.0
|
||||
unist-util-visit: 5.1.0
|
||||
vfile: 6.0.3
|
||||
web-namespaces: 2.0.1
|
||||
zwitch: 2.0.4
|
||||
|
||||
hast-util-sanitize@5.0.2:
|
||||
dependencies:
|
||||
'@types/hast': 3.0.4
|
||||
'@ungap/structured-clone': 1.3.0
|
||||
unist-util-position: 5.0.0
|
||||
|
||||
hast-util-to-jsx-runtime@2.3.6:
|
||||
dependencies:
|
||||
'@types/estree': 1.0.8
|
||||
@@ -1488,12 +1633,32 @@ snapshots:
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
hast-util-to-parse5@8.0.1:
|
||||
dependencies:
|
||||
'@types/hast': 3.0.4
|
||||
comma-separated-tokens: 2.0.3
|
||||
devlop: 1.1.0
|
||||
property-information: 7.1.0
|
||||
space-separated-tokens: 2.0.2
|
||||
web-namespaces: 2.0.1
|
||||
zwitch: 2.0.4
|
||||
|
||||
hast-util-whitespace@3.0.0:
|
||||
dependencies:
|
||||
'@types/hast': 3.0.4
|
||||
|
||||
hastscript@9.0.1:
|
||||
dependencies:
|
||||
'@types/hast': 3.0.4
|
||||
comma-separated-tokens: 2.0.3
|
||||
hast-util-parse-selector: 4.0.0
|
||||
property-information: 7.1.0
|
||||
space-separated-tokens: 2.0.2
|
||||
|
||||
html-url-attributes@3.0.1: {}
|
||||
|
||||
html-void-elements@3.0.0: {}
|
||||
|
||||
inline-style-parser@0.2.7: {}
|
||||
|
||||
invariant@2.2.4:
|
||||
@@ -1521,6 +1686,15 @@ snapshots:
|
||||
dependencies:
|
||||
js-tokens: 4.0.0
|
||||
|
||||
markdown-table@3.0.4: {}
|
||||
|
||||
mdast-util-find-and-replace@3.0.2:
|
||||
dependencies:
|
||||
'@types/mdast': 4.0.4
|
||||
escape-string-regexp: 5.0.0
|
||||
unist-util-is: 6.0.1
|
||||
unist-util-visit-parents: 6.0.2
|
||||
|
||||
mdast-util-from-markdown@2.0.3:
|
||||
dependencies:
|
||||
'@types/mdast': 4.0.4
|
||||
@@ -1538,6 +1712,63 @@ snapshots:
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
mdast-util-gfm-autolink-literal@2.0.1:
|
||||
dependencies:
|
||||
'@types/mdast': 4.0.4
|
||||
ccount: 2.0.1
|
||||
devlop: 1.1.0
|
||||
mdast-util-find-and-replace: 3.0.2
|
||||
micromark-util-character: 2.1.1
|
||||
|
||||
mdast-util-gfm-footnote@2.1.0:
|
||||
dependencies:
|
||||
'@types/mdast': 4.0.4
|
||||
devlop: 1.1.0
|
||||
mdast-util-from-markdown: 2.0.3
|
||||
mdast-util-to-markdown: 2.1.2
|
||||
micromark-util-normalize-identifier: 2.0.1
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
mdast-util-gfm-strikethrough@2.0.0:
|
||||
dependencies:
|
||||
'@types/mdast': 4.0.4
|
||||
mdast-util-from-markdown: 2.0.3
|
||||
mdast-util-to-markdown: 2.1.2
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
mdast-util-gfm-table@2.0.0:
|
||||
dependencies:
|
||||
'@types/mdast': 4.0.4
|
||||
devlop: 1.1.0
|
||||
markdown-table: 3.0.4
|
||||
mdast-util-from-markdown: 2.0.3
|
||||
mdast-util-to-markdown: 2.1.2
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
mdast-util-gfm-task-list-item@2.0.0:
|
||||
dependencies:
|
||||
'@types/mdast': 4.0.4
|
||||
devlop: 1.1.0
|
||||
mdast-util-from-markdown: 2.0.3
|
||||
mdast-util-to-markdown: 2.1.2
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
mdast-util-gfm@3.1.0:
|
||||
dependencies:
|
||||
mdast-util-from-markdown: 2.0.3
|
||||
mdast-util-gfm-autolink-literal: 2.0.1
|
||||
mdast-util-gfm-footnote: 2.1.0
|
||||
mdast-util-gfm-strikethrough: 2.0.0
|
||||
mdast-util-gfm-table: 2.0.0
|
||||
mdast-util-gfm-task-list-item: 2.0.0
|
||||
mdast-util-to-markdown: 2.1.2
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
mdast-util-mdx-expression@2.0.1:
|
||||
dependencies:
|
||||
'@types/estree-jsx': 1.0.5
|
||||
@@ -1629,6 +1860,64 @@ snapshots:
|
||||
micromark-util-symbol: 2.0.1
|
||||
micromark-util-types: 2.0.2
|
||||
|
||||
micromark-extension-gfm-autolink-literal@2.1.0:
|
||||
dependencies:
|
||||
micromark-util-character: 2.1.1
|
||||
micromark-util-sanitize-uri: 2.0.1
|
||||
micromark-util-symbol: 2.0.1
|
||||
micromark-util-types: 2.0.2
|
||||
|
||||
micromark-extension-gfm-footnote@2.1.0:
|
||||
dependencies:
|
||||
devlop: 1.1.0
|
||||
micromark-core-commonmark: 2.0.3
|
||||
micromark-factory-space: 2.0.1
|
||||
micromark-util-character: 2.1.1
|
||||
micromark-util-normalize-identifier: 2.0.1
|
||||
micromark-util-sanitize-uri: 2.0.1
|
||||
micromark-util-symbol: 2.0.1
|
||||
micromark-util-types: 2.0.2
|
||||
|
||||
micromark-extension-gfm-strikethrough@2.1.0:
|
||||
dependencies:
|
||||
devlop: 1.1.0
|
||||
micromark-util-chunked: 2.0.1
|
||||
micromark-util-classify-character: 2.0.1
|
||||
micromark-util-resolve-all: 2.0.1
|
||||
micromark-util-symbol: 2.0.1
|
||||
micromark-util-types: 2.0.2
|
||||
|
||||
micromark-extension-gfm-table@2.1.1:
|
||||
dependencies:
|
||||
devlop: 1.1.0
|
||||
micromark-factory-space: 2.0.1
|
||||
micromark-util-character: 2.1.1
|
||||
micromark-util-symbol: 2.0.1
|
||||
micromark-util-types: 2.0.2
|
||||
|
||||
micromark-extension-gfm-tagfilter@2.0.0:
|
||||
dependencies:
|
||||
micromark-util-types: 2.0.2
|
||||
|
||||
micromark-extension-gfm-task-list-item@2.1.0:
|
||||
dependencies:
|
||||
devlop: 1.1.0
|
||||
micromark-factory-space: 2.0.1
|
||||
micromark-util-character: 2.1.1
|
||||
micromark-util-symbol: 2.0.1
|
||||
micromark-util-types: 2.0.2
|
||||
|
||||
micromark-extension-gfm@3.0.0:
|
||||
dependencies:
|
||||
micromark-extension-gfm-autolink-literal: 2.1.0
|
||||
micromark-extension-gfm-footnote: 2.1.0
|
||||
micromark-extension-gfm-strikethrough: 2.1.0
|
||||
micromark-extension-gfm-table: 2.1.1
|
||||
micromark-extension-gfm-tagfilter: 2.0.0
|
||||
micromark-extension-gfm-task-list-item: 2.1.0
|
||||
micromark-util-combine-extensions: 2.0.1
|
||||
micromark-util-types: 2.0.2
|
||||
|
||||
micromark-factory-destination@2.0.1:
|
||||
dependencies:
|
||||
micromark-util-character: 2.1.1
|
||||
@@ -1759,6 +2048,10 @@ snapshots:
|
||||
is-decimal: 2.0.1
|
||||
is-hexadecimal: 2.0.1
|
||||
|
||||
parse5@7.3.0:
|
||||
dependencies:
|
||||
entities: 6.0.1
|
||||
|
||||
picocolors@1.1.1: {}
|
||||
|
||||
picomatch@4.0.4: {}
|
||||
@@ -1913,6 +2206,28 @@ snapshots:
|
||||
|
||||
react@19.2.5: {}
|
||||
|
||||
rehype-raw@7.0.0:
|
||||
dependencies:
|
||||
'@types/hast': 3.0.4
|
||||
hast-util-raw: 9.1.0
|
||||
vfile: 6.0.3
|
||||
|
||||
rehype-sanitize@6.0.0:
|
||||
dependencies:
|
||||
'@types/hast': 3.0.4
|
||||
hast-util-sanitize: 5.0.2
|
||||
|
||||
remark-gfm@4.0.1:
|
||||
dependencies:
|
||||
'@types/mdast': 4.0.4
|
||||
mdast-util-gfm: 3.1.0
|
||||
micromark-extension-gfm: 3.0.0
|
||||
remark-parse: 11.0.0
|
||||
remark-stringify: 11.0.0
|
||||
unified: 11.0.5
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
remark-parse@11.0.0:
|
||||
dependencies:
|
||||
'@types/mdast': 4.0.4
|
||||
@@ -1930,6 +2245,12 @@ snapshots:
|
||||
unified: 11.0.5
|
||||
vfile: 6.0.3
|
||||
|
||||
remark-stringify@11.0.0:
|
||||
dependencies:
|
||||
'@types/mdast': 4.0.4
|
||||
mdast-util-to-markdown: 2.1.2
|
||||
unified: 11.0.5
|
||||
|
||||
rollup@4.60.2:
|
||||
dependencies:
|
||||
'@types/estree': 1.0.8
|
||||
@@ -2044,6 +2365,11 @@ snapshots:
|
||||
dependencies:
|
||||
react: 19.2.5
|
||||
|
||||
vfile-location@5.0.3:
|
||||
dependencies:
|
||||
'@types/unist': 3.0.3
|
||||
vfile: 6.0.3
|
||||
|
||||
vfile-message@4.0.3:
|
||||
dependencies:
|
||||
'@types/unist': 3.0.3
|
||||
@@ -2069,4 +2395,6 @@ snapshots:
|
||||
dependencies:
|
||||
loose-envify: 1.4.0
|
||||
|
||||
web-namespaces@2.0.1: {}
|
||||
|
||||
zwitch@2.0.4: {}
|
||||
|
||||
23
ui/public/gitea.svg
Normal file
23
ui/public/gitea.svg
Normal file
@@ -0,0 +1,23 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
aria-label="Gitea"
|
||||
role="img"
|
||||
viewBox="0 0 512 512"
|
||||
>
|
||||
<rect rx="15%" height="512" width="512" fill="#ffffff" />
|
||||
<path
|
||||
d="M419 150c-98 7-186 2-276-1-27 0-63 19-61 67 3 75 71 82 99 83 3 14 35 62 59 65h104c63-5 109-213 75-214zm-311 67c-3-21 7-42 42-42 3 39 10 61 22 96-32-5-59-15-64-54z"
|
||||
fill="#592"
|
||||
/>
|
||||
<path d="m293 152v70" stroke="#ffffff" stroke-width="9" />
|
||||
<g transform="rotate(25.7 496 -423)" stroke-width="7" fill="#592">
|
||||
<path d="M561 246h97" stroke="#592" />
|
||||
<rect x="561" y="246" width="97" height="97" rx="16" fill="#ffffff" />
|
||||
<path d="M592 245v75" stroke="#592" />
|
||||
<path d="M592 273c45 0 38-5 38 48" fill="none" stroke="#592" />
|
||||
<circle cx="592" cy="320" r="10" />
|
||||
<circle cx="630" cy="320" r="10" />
|
||||
<circle cx="592" cy="273" r="10" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 951 B |
14
ui/public/github.svg
Normal file
14
ui/public/github.svg
Normal file
@@ -0,0 +1,14 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<svg
|
||||
fill="#ffffff"
|
||||
width="800px"
|
||||
height="800px"
|
||||
viewBox="0 0 24 24"
|
||||
role="img"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
>
|
||||
<title>github</title>
|
||||
<path
|
||||
d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"
|
||||
/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 956 B |
30
ui/public/mozilla.svg
Normal file
30
ui/public/mozilla.svg
Normal file
@@ -0,0 +1,30 @@
|
||||
<?xml version="1.0" standalone="no" ?>
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
|
||||
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg
|
||||
width="800px"
|
||||
height="800px"
|
||||
viewBox="-10 -5 1034 1034"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
version="1.1"
|
||||
>
|
||||
<path
|
||||
fill="#ffffff"
|
||||
d="M411 237q-31 1 -64 10q-27 8 -54 22q-20 9 -38 20l-14 10q-50 33 -120 94q-67 57 -108 100q8 1 23 -5q12 -4 18 -5l99 -27l-32 26q-47 38 -69 59q-39 36 -52 62q11 -4 42 -19t46 -21q26 -11 40 -12l-18 16q-33 30 -49 46q-28 27 -38 44q1 1 1 4v2l10 -6q33 -20 52 -29
|
||||
q32 -16 47 -18q-77 83 -89 125q19 -13 55 -32.5t55 -26.5q-3 8 -15 23q-9 12 -12.5 18.5t-15.5 21.5t-17 23q-8 14 -9 25q30 -29 73 -53q-4 10 -15 27q-10 15 -14 23q-7 13 -9 26q9 -10 27 -18q11 -5 33 -12l11 -4l-4 4q-27 21 -42 39l8 -1q2 -1 9 1l6 1l-32 13
|
||||
q143 188 395 166l-13 -28q10 -18 19 -63t19 -66q16 -34 48 -51l25 -14q24 -14 37 -17q18 -4 49 2q8 1 32 7q35 9 52 12q30 6 46 2l10 -5q36 -22 58 -39q24 5 34.5 1.5t18.5 -16.5l5 -14q18 -50 28 -72l1 -15q-7 -21 -11 -75q-2 -32 -5 -36q-13 -18 -45 -34q-20 -10 -67 -27
|
||||
q-54 -20 -79 -33q-43 -21 -66 -47q8 -25 -5 -51q-10 -19 -32 -40q-25 -18 -63 -16q-24 1 -64 12q-30 -6 -86 -24q-29 -9 -44 -14q-8 -1 -18 -1h-4zM410 285q22 0 64 12q27 7 41 9q-1 4 -6.5 8t-6.5 7l-4 6q-4 5 -5.5 8.5t0.5 7.5l32 -12q13 -4 38 -12q32 -11 48 -14
|
||||
q28 -6 51 -3l24 31q-24 -20 -55 -15q-19 3 -56 20q-33 15 -49 18q-11 2 -33 8q-17 5 -25 7q29 22 75 17q3 15 18 34.5t29 22.5q-1 -6 -7 -20.5t-7 -22.5q-3 -14 4 -25l9 -6q17 -10 26 -13q16 -5 27 4q-10 1 -26 11l-8 5q-6 4 -8.5 14t-0.5 14q7 20 39 33q36 14 90 14
|
||||
q-3 -4 -16 -18.5t-18 -21.5q-9 -11 -8 -17q30 30 81 55q30 14 89 35q35 12 49 18q22 10 31 19q1 5 -13 22q-7 9 -9 13q-4 7 -2 10q-3 7 7 22q5 8 22 29l3 4q-3 -25 -1.5 -36.5t6 -9.5t8.5 14.5t3 28.5q0 19 -7 37l-35 -8q-47 -3 -84 -15q-33 -9 -66 -28q-21 -12 -65 -42
|
||||
l-30 -20q-27 -18 -79 -60l-14 -11l-50 -19q14 17 36 41q20 22 25 30q7 12 5 24.5t-16 36.5l-17 -31l-7 -55q-11 40 -13 66q-2 36 13 62q17 30 58 49l50 7q-22 -18 -30 -29q-12 -16 -8 -31q15 30 78 55q35 14 105 32l24 6q15 6 24 15q-7 6 -13 9q-4 2 -13 4.5t-15 4.5l-28 -9
|
||||
q-36 -11 -51 -18q-26 -11 -36 -25q4 6 -27 14q-18 4 -63 13q-29 5 -37 7q-13 3 -3 4q-35 -1 -72 -23q-33 -19 -61 -50l-9 -3q0 17 11 35q6 11 22.5 32t22.5 31l38 17l-10 6q-16 10 -23 16q-13 10 -19 21l-2 6q-5 9 -6 14q-2 8 1 14q21 -23 61 -33l-16 25q2 18 -9 49
|
||||
q-2 -5 -5 -10q-47 -20 -71 -39q6 20 25 44q16 21 37 38q-5 12 -12 23q-36 -25 -54 -42q5 9 11 27q9 24 15 34q-133 -10 -217 -82l60 -34q-10 2 -47 11l-30 8l-7 -8l24 -12q29 -14 42 -22q23 -14 29 -26v0l-6 2l-61 3q-4 -13 0 -27q2 -9 10.5 -24.5t9.5 -23.5q2 -13 -7 -25
|
||||
q-35 -46 -49 -80q-20 -46 -15 -90l1 2q7 15 13 20l2 -17q2 -18 5 -26v1q6 20 11 29q8 16 21 24l1 -2q-14 -50 -2 -95q13 -51 56 -78q-6 2 -23 4q-26 4 -41 10q2 -1 5 -10q11 -29 23 -39q6 -4 15 -13q11 -10 19 -15q24 -19 43 -28q26 -14 59 -19q8 -1 16 -1h4zM425 332
|
||||
q-28 0 -60 12l-13 10q-14 17 -19 26q-10 14 -12 29l3 4q13 -16 37 -28q0 18 9.5 33.5t25.5 24.5h3q-3 -19 -1 -39.5t9 -37.5q7 -6 23 -14q18 -10 25 -17q-14 -4 -30 -3zM625 391v0q8 0 15 3q-6 3 -8 11q-1 4 0 7q-11 -8 -11 -21h4zM462 392q2 7 14 22l9 11q-28 2 -60 11
|
||||
q5 4 14.5 9t13.5 9l-16 6q-21 7 -31 11q-16 8 -28 19l5 2q31 -6 66 -5.5t67 7.5l3 -2l-25 -46l38 -8q-39 -37 -70 -46zM662 406q8 7 15 16q-11 3 -22 0q5 -3 7 -10v-6zM599 430q13 39 37 41q33 6 62 1q-12 -7 -39 -13q-22 -6 -32 -10q-17 -7 -28 -19zM368 492
|
||||
q-23 17 -32.5 42t-5.5 53q2 7 1 17q-1 6 -4 17q-4 17 -3 25q0 13 8 22q22 25 63 55l-2 -8q-35 -41 -46 -74l17 6q36 13 55 16q-6 -10 -22 -29q-28 -34 -36 -53q-14 -32 -4 -62q0 -5 6 -12q7 -10 5 -15zM728 621q2 0 5 1q8 2 9 4q-3 2 -8.5 7t-8.5 6l1 -6q0 -9 2 -12z
|
||||
M768 642v0q4 0 9 4h1l-13 13l1 -17h2zM798 653v0l10 6q-1 0 -6 7t-5.5 6.5t-0.5 -6.5q0 -13 2 -13zM829 667v0l9 2q-1 1 -4 7q-6 11 -11 11l4 -8v-9q0 -3 2 -3zM861 673l12 3l-13 22zM896 679q1 0 8 2l4 2l-15 11q-1 -9 -0.5 -12t3.5 -3zM933 685q5 0 7 2q0 5 -7 12
|
||||
q-4 4 -5 7v-6q2 -10 0 -15h5z"
|
||||
/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 3.8 KiB |
14
ui/public/robots.txt
Normal file
14
ui/public/robots.txt
Normal file
@@ -0,0 +1,14 @@
|
||||
User-agent: *
|
||||
Allow: /
|
||||
|
||||
User-agent: facebookexternalhit
|
||||
Allow: /
|
||||
|
||||
User-agent: Twitterbot
|
||||
Allow: /
|
||||
|
||||
User-agent: LinkedInBot
|
||||
Allow: /
|
||||
|
||||
User-agent: WhatsApp
|
||||
Allow: /
|
||||
@@ -77,6 +77,23 @@ a.hot-pink {
|
||||
opacity: 0.3;
|
||||
}
|
||||
|
||||
.graph-label {
|
||||
fill: #ecf0f1;
|
||||
font-size: 9px;
|
||||
opacity: 0.6;
|
||||
}
|
||||
|
||||
.graph-cell {
|
||||
cursor: pointer;
|
||||
transition: opacity 0.15s;
|
||||
}
|
||||
|
||||
.graph-cell:hover {
|
||||
opacity: 0.8;
|
||||
stroke: #ecf0f1;
|
||||
stroke-width: 1;
|
||||
}
|
||||
|
||||
.project-card {
|
||||
background: rgba(255, 255, 255, 0.05);
|
||||
border: 1px solid rgba(255, 255, 255, 0.1);
|
||||
@@ -88,6 +105,14 @@ a.hot-pink {
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
|
||||
.forge-icon {
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
margin-right: 6px;
|
||||
vertical-align: -2px;
|
||||
opacity: 0.7;
|
||||
}
|
||||
|
||||
.project-card a {
|
||||
color: #ff4081;
|
||||
}
|
||||
|
||||
@@ -18,6 +18,7 @@ export default function App() {
|
||||
<Route index element={<DashPage />} />
|
||||
<Route path="/dash" element={<DashPage />} />
|
||||
<Route path="/activity" element={<TimelineHome />} />
|
||||
<Route path="/activity/:timespan" element={<TimelineHome />} />
|
||||
<Route path="/project/:source/*" element={<ProjectPage />} />
|
||||
<Route path="/cv" element={<CvPage />} />
|
||||
</Route>
|
||||
|
||||
@@ -65,6 +65,23 @@ export interface ProjectSummary {
|
||||
last_activity: string | null;
|
||||
}
|
||||
|
||||
export interface DailyCount {
|
||||
date: string;
|
||||
count: number;
|
||||
}
|
||||
|
||||
export interface HourlyAvg {
|
||||
hour: number;
|
||||
avg: number;
|
||||
}
|
||||
|
||||
export interface LanguageDailyCount {
|
||||
date: string;
|
||||
language: string;
|
||||
color: string | null;
|
||||
commits: number;
|
||||
}
|
||||
|
||||
export interface EventQuery {
|
||||
from?: Date;
|
||||
to?: Date;
|
||||
@@ -102,6 +119,39 @@ export async function fetchSources(): Promise<SourceSummary[]> {
|
||||
return resp.json();
|
||||
}
|
||||
|
||||
export async function fetchDailyCounts(from: string, to: string): Promise<DailyCount[]> {
|
||||
const resp = await fetch(`${API_BASE}/activity/daily?from=${from}&to=${to}`);
|
||||
if (!resp.ok) throw new Error(`daily-counts: HTTP ${resp.status}`);
|
||||
return resp.json();
|
||||
}
|
||||
|
||||
export async function fetchHourlyAvgs(from: string, to: string, tz: string): Promise<HourlyAvg[]> {
|
||||
const qs = new URLSearchParams({ from, to, tz });
|
||||
const resp = await fetch(`${API_BASE}/activity/hourly?${qs}`);
|
||||
if (!resp.ok) throw new Error(`hourly-avgs: HTTP ${resp.status}`);
|
||||
return resp.json();
|
||||
}
|
||||
|
||||
export async function fetchLanguageDailyCounts(from: string, to: string): Promise<LanguageDailyCount[]> {
|
||||
const resp = await fetch(`${API_BASE}/languages/daily?from=${from}&to=${to}`);
|
||||
if (!resp.ok) throw new Error(`language-daily-counts: HTTP ${resp.status}`);
|
||||
return resp.json();
|
||||
}
|
||||
|
||||
export interface RepoLanguageEntry {
|
||||
source: Source;
|
||||
repo: string;
|
||||
language: string;
|
||||
bytes: number;
|
||||
color: string | null;
|
||||
}
|
||||
|
||||
export async function fetchRepoLanguages(): Promise<RepoLanguageEntry[]> {
|
||||
const resp = await fetch(`${API_BASE}/languages/repos`);
|
||||
if (!resp.ok) throw new Error(`repo-languages: HTTP ${resp.status}`);
|
||||
return resp.json();
|
||||
}
|
||||
|
||||
export async function fetchProjects(): Promise<ProjectSummary[]> {
|
||||
const resp = await fetch(`${API_BASE}/projects`);
|
||||
if (!resp.ok) throw new Error(`projects: HTTP ${resp.status}`);
|
||||
@@ -133,12 +183,3 @@ export async function fetchReadme(source: Source, host: string, repo: string): P
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/** Fetch repo languages as { language: bytes } map via the forge proxy. */
|
||||
export async function fetchLanguages(source: Source, host: string, repo: string): Promise<Record<string, number> | null> {
|
||||
if (source !== 'github' && source !== 'gitea') return null;
|
||||
const hostParam = source === 'gitea' ? `?host=${encodeURIComponent(host)}` : '';
|
||||
const resp = await fetch(`${API_BASE}/forge/${source}/repos/${repo}/languages${hostParam}`);
|
||||
if (!resp.ok) return null;
|
||||
return resp.json();
|
||||
}
|
||||
|
||||
464
ui/src/components/ContributionGraph.tsx
Normal file
464
ui/src/components/ContributionGraph.tsx
Normal file
@@ -0,0 +1,464 @@
|
||||
import { useMemo } from "react";
|
||||
import { useQuery } from "@tanstack/react-query";
|
||||
import { useNavigate } from "react-router-dom";
|
||||
|
||||
import {
|
||||
fetchDailyCounts,
|
||||
fetchLanguageDailyCounts,
|
||||
fetchProjects,
|
||||
fetchSources,
|
||||
} from "../api/client";
|
||||
|
||||
const CELL_SIZE = 12;
|
||||
const GAP = 3;
|
||||
const RADIUS = CELL_SIZE / 2;
|
||||
const ROWS = 7;
|
||||
const LEFT_LABEL_WIDTH = 28;
|
||||
const TOP_LABEL_HEIGHT = 16;
|
||||
|
||||
const DAY_LABELS = ["", "mon", "", "wed", "", "fri", ""];
|
||||
const MONTH_LABELS = [
|
||||
"jan",
|
||||
"feb",
|
||||
"mar",
|
||||
"apr",
|
||||
"may",
|
||||
"jun",
|
||||
"jul",
|
||||
"aug",
|
||||
"sep",
|
||||
"oct",
|
||||
"nov",
|
||||
"dec",
|
||||
];
|
||||
|
||||
const EMPTY_COLOR = "rgba(255,255,255,0.05)";
|
||||
const FALLBACK_COLOR = "#39d353";
|
||||
|
||||
/** Daily contribution graph — last 1 year, one circle per day. */
|
||||
export function ContributionGraph() {
|
||||
const to = new Date();
|
||||
const from = new Date(to);
|
||||
from.setFullYear(from.getFullYear() - 1);
|
||||
|
||||
const fromStr = fmt(from);
|
||||
const toStr = fmt(to);
|
||||
|
||||
const dailyQ = useQuery({
|
||||
queryKey: ["daily-counts", fromStr, toStr],
|
||||
queryFn: () => fetchDailyCounts(fromStr, toStr),
|
||||
staleTime: 5 * 60_000,
|
||||
});
|
||||
|
||||
const langQ = useQuery({
|
||||
queryKey: ["language-daily", fromStr, toStr],
|
||||
queryFn: () => fetchLanguageDailyCounts(fromStr, toStr),
|
||||
staleTime: 5 * 60_000,
|
||||
});
|
||||
|
||||
const projectsQ = useQuery({
|
||||
queryKey: ["projects"],
|
||||
queryFn: fetchProjects,
|
||||
staleTime: 60_000,
|
||||
});
|
||||
|
||||
const repoCount = useMemo(() => {
|
||||
if (!projectsQ.data) return 0;
|
||||
const fromMs = from.getTime();
|
||||
const toMs = to.getTime();
|
||||
return projectsQ.data.filter((p) => {
|
||||
const first = p.first_activity
|
||||
? new Date(p.first_activity).getTime()
|
||||
: Infinity;
|
||||
const last = p.last_activity ? new Date(p.last_activity).getTime() : 0;
|
||||
return last >= fromMs && first <= toMs;
|
||||
}).length;
|
||||
}, [projectsQ.data]);
|
||||
|
||||
const navigate = useNavigate();
|
||||
|
||||
// Build map of date → dominant language color
|
||||
const dayColorMap = useMemo(() => {
|
||||
return buildDominantColorMap(langQ.data ?? []);
|
||||
}, [langQ.data]);
|
||||
|
||||
const { weeks, monthMarkers, thresholds, totalCount } = useMemo(() => {
|
||||
const counts = dailyQ.data ?? [];
|
||||
const countMap = new Map(counts.map((d) => [d.date, d.count]));
|
||||
|
||||
const start = new Date(from);
|
||||
start.setDate(start.getDate() - start.getDay());
|
||||
|
||||
const weeks: { date: string; count: number; col: number; row: number }[][] =
|
||||
[];
|
||||
const monthMarkers: { col: number; label: string }[] = [];
|
||||
let col = 0;
|
||||
let prevMonth = -1;
|
||||
const cursor = new Date(start);
|
||||
|
||||
while (cursor <= to) {
|
||||
const week: (typeof weeks)[0] = [];
|
||||
for (let row = 0; row < ROWS; row++) {
|
||||
const dateStr = fmt(cursor);
|
||||
const count = countMap.get(dateStr) ?? 0;
|
||||
week.push({ date: dateStr, count, col, row });
|
||||
if (row === 0) {
|
||||
const m = cursor.getMonth();
|
||||
if (m !== prevMonth) {
|
||||
monthMarkers.push({ col, label: MONTH_LABELS[m] });
|
||||
prevMonth = m;
|
||||
}
|
||||
}
|
||||
cursor.setDate(cursor.getDate() + 1);
|
||||
}
|
||||
weeks.push(week);
|
||||
col++;
|
||||
}
|
||||
|
||||
const nonZero = counts
|
||||
.map((d) => d.count)
|
||||
.filter((c) => c > 0)
|
||||
.sort((a, b) => a - b);
|
||||
const thresholds = computeThresholds(nonZero);
|
||||
const totalCount = counts.reduce((sum, d) => sum + d.count, 0);
|
||||
|
||||
return { weeks, monthMarkers, thresholds, totalCount };
|
||||
}, [dailyQ.data]);
|
||||
|
||||
const cols = weeks.length;
|
||||
const svgWidth = LEFT_LABEL_WIDTH + cols * (CELL_SIZE + GAP);
|
||||
const svgHeight = TOP_LABEL_HEIGHT + ROWS * (CELL_SIZE + GAP);
|
||||
|
||||
if (dailyQ.isLoading)
|
||||
return <p style={{ fontSize: "0.8rem" }}>loading contribution graph...</p>;
|
||||
if (dailyQ.isError) return null;
|
||||
|
||||
return (
|
||||
<div className="contribution-graph mb-3">
|
||||
<p style={{ fontSize: "0.8rem", opacity: 0.6 }}>
|
||||
{new Intl.NumberFormat().format(totalCount)} contributions
|
||||
{repoCount > 0 && `, across ${repoCount} repositories, `}
|
||||
in the last year
|
||||
</p>
|
||||
<div>
|
||||
<svg
|
||||
viewBox={`0 0 ${svgWidth} ${svgHeight}`}
|
||||
width="100%"
|
||||
className="d-block"
|
||||
>
|
||||
{DAY_LABELS.map((label, i) =>
|
||||
label ? (
|
||||
<text
|
||||
key={i}
|
||||
x={LEFT_LABEL_WIDTH - 6}
|
||||
y={TOP_LABEL_HEIGHT + i * (CELL_SIZE + GAP) + CELL_SIZE / 2}
|
||||
textAnchor="end"
|
||||
dominantBaseline="central"
|
||||
className="graph-label"
|
||||
>
|
||||
{label}
|
||||
</text>
|
||||
) : null,
|
||||
)}
|
||||
{monthMarkers.map(({ col, label }, i) => (
|
||||
<text
|
||||
key={i}
|
||||
x={LEFT_LABEL_WIDTH + col * (CELL_SIZE + GAP) + RADIUS}
|
||||
y={10}
|
||||
textAnchor="middle"
|
||||
className="graph-label"
|
||||
>
|
||||
{label}
|
||||
</text>
|
||||
))}
|
||||
{weeks.flatMap((week) =>
|
||||
week.map(({ date, count, col, row }) => (
|
||||
<circle
|
||||
key={date}
|
||||
cx={LEFT_LABEL_WIDTH + col * (CELL_SIZE + GAP) + RADIUS}
|
||||
cy={TOP_LABEL_HEIGHT + row * (CELL_SIZE + GAP) + RADIUS}
|
||||
r={RADIUS - 1}
|
||||
fill={
|
||||
count === 0
|
||||
? EMPTY_COLOR
|
||||
: (dayColorMap.get(date) ?? FALLBACK_COLOR)
|
||||
}
|
||||
opacity={count === 0 ? 1 : opacityFor(count, thresholds)}
|
||||
className="graph-cell"
|
||||
onClick={() => navigate(`/activity/${date}`)}
|
||||
>
|
||||
<title>{`${date}: ${count} ${count === 1 ? "contribution" : "contributions"}`}</title>
|
||||
</circle>
|
||||
)),
|
||||
)}
|
||||
</svg>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
/** All-time monthly contribution graph — years on X axis, months on Y axis. */
|
||||
export function AllTimeGraph() {
|
||||
const sourcesQ = useQuery({
|
||||
queryKey: ["sources"],
|
||||
queryFn: fetchSources,
|
||||
staleTime: 60_000,
|
||||
});
|
||||
|
||||
const earliest = useMemo(() => {
|
||||
if (!sourcesQ.data) return null;
|
||||
const dates = sourcesQ.data
|
||||
.map((s) => s.earliest)
|
||||
.filter((d): d is string => d != null)
|
||||
.map((d) => new Date(d));
|
||||
return dates.length > 0
|
||||
? new Date(Math.min(...dates.map((d) => d.getTime())))
|
||||
: null;
|
||||
}, [sourcesQ.data]);
|
||||
|
||||
const projectsQ = useQuery({
|
||||
queryKey: ["projects"],
|
||||
queryFn: fetchProjects,
|
||||
staleTime: 60_000,
|
||||
});
|
||||
const repoCount = projectsQ.data?.length ?? 0;
|
||||
|
||||
const to = new Date();
|
||||
const from = earliest ?? new Date(to.getFullYear() - 5, 0, 1);
|
||||
const fromStr = fmt(from);
|
||||
const toStr = fmt(to);
|
||||
|
||||
const dailyQ = useQuery({
|
||||
queryKey: ["daily-counts-alltime", fromStr, toStr],
|
||||
queryFn: () => fetchDailyCounts(fromStr, toStr),
|
||||
enabled: !!earliest,
|
||||
staleTime: 10 * 60_000,
|
||||
});
|
||||
|
||||
const langQ = useQuery({
|
||||
queryKey: ["language-daily-alltime", fromStr, toStr],
|
||||
queryFn: () => fetchLanguageDailyCounts(fromStr, toStr),
|
||||
enabled: !!earliest,
|
||||
staleTime: 10 * 60_000,
|
||||
});
|
||||
|
||||
const navigate = useNavigate();
|
||||
|
||||
// Aggregate daily language data to month level: pick the language with most commits
|
||||
const monthColorMap = useMemo(() => {
|
||||
const entries = langQ.data ?? [];
|
||||
if (entries.length === 0) return new Map<string, string>();
|
||||
const map = new Map<
|
||||
string,
|
||||
Map<string, { commits: number; color: string }>
|
||||
>();
|
||||
for (const e of entries) {
|
||||
const key = e.date.slice(0, 7); // YYYY-MM
|
||||
if (!map.has(key)) map.set(key, new Map());
|
||||
const langMap = map.get(key)!;
|
||||
const cur = langMap.get(e.language);
|
||||
if (cur) {
|
||||
cur.commits += e.commits;
|
||||
} else {
|
||||
langMap.set(e.language, {
|
||||
commits: e.commits,
|
||||
color: e.color ?? FALLBACK_COLOR,
|
||||
});
|
||||
}
|
||||
}
|
||||
const result = new Map<string, string>();
|
||||
for (const [key, langMap] of map) {
|
||||
let best = { commits: 0, color: FALLBACK_COLOR };
|
||||
for (const v of langMap.values()) {
|
||||
if (v.commits > best.commits) best = v;
|
||||
}
|
||||
result.set(key, best.color);
|
||||
}
|
||||
return result;
|
||||
}, [langQ.data]);
|
||||
|
||||
const { years, monthGrid, thresholds, totalCount } = useMemo(() => {
|
||||
const counts = dailyQ.data ?? [];
|
||||
if (counts.length === 0)
|
||||
return { years: [], monthGrid: [], thresholds: [1, 2, 3], totalCount: 0 };
|
||||
|
||||
const countMap = new Map(counts.map((d) => [d.date, d.count]));
|
||||
|
||||
const startYear = from.getFullYear();
|
||||
const endYear = to.getFullYear();
|
||||
const years: number[] = [];
|
||||
for (let yr = startYear; yr <= endYear; yr++) years.push(yr);
|
||||
|
||||
// Build a 12 x years grid of monthly totals
|
||||
const monthGrid: {
|
||||
year: number;
|
||||
month: number;
|
||||
count: number;
|
||||
monthStart: string;
|
||||
monthEnd: string;
|
||||
monthKey: string;
|
||||
}[][] = [];
|
||||
for (let m = 0; m < 12; m++) {
|
||||
const row: (typeof monthGrid)[0] = [];
|
||||
for (const yr of years) {
|
||||
const monthStart = new Date(yr, m, 1);
|
||||
const monthEnd = new Date(yr, m + 1, 0); // last day of month
|
||||
const monthKey = `${yr}-${String(m + 1).padStart(2, "0")}`;
|
||||
// Don't include months entirely outside our data range
|
||||
if (monthStart > to || monthEnd < from) {
|
||||
row.push({
|
||||
year: yr,
|
||||
month: m,
|
||||
count: 0,
|
||||
monthStart: fmt(monthStart),
|
||||
monthEnd: fmt(monthEnd),
|
||||
monthKey,
|
||||
});
|
||||
continue;
|
||||
}
|
||||
let total = 0;
|
||||
const cursor = new Date(monthStart);
|
||||
while (cursor <= monthEnd && cursor <= to) {
|
||||
total += countMap.get(fmt(cursor)) ?? 0;
|
||||
cursor.setDate(cursor.getDate() + 1);
|
||||
}
|
||||
row.push({
|
||||
year: yr,
|
||||
month: m,
|
||||
count: total,
|
||||
monthStart: fmt(monthStart),
|
||||
monthEnd: fmt(monthEnd),
|
||||
monthKey,
|
||||
});
|
||||
}
|
||||
monthGrid.push(row);
|
||||
}
|
||||
|
||||
const allCounts = monthGrid.flat().map((c) => c.count);
|
||||
const nonZero = allCounts.filter((c) => c > 0).sort((a, b) => a - b);
|
||||
const thresholds = computeThresholds(nonZero);
|
||||
const totalCount = counts.reduce((sum, d) => sum + d.count, 0);
|
||||
|
||||
return { years, monthGrid, thresholds, totalCount };
|
||||
}, [dailyQ.data]);
|
||||
|
||||
if (!earliest || dailyQ.isLoading) return null;
|
||||
if (dailyQ.isError) return null;
|
||||
if (years.length === 0) return null;
|
||||
|
||||
const monthLabelWidth = 28;
|
||||
const topLabelHeight = 16;
|
||||
const numCols = years.length;
|
||||
const svgWidth = monthLabelWidth + numCols * (CELL_SIZE + GAP);
|
||||
const svgHeight = topLabelHeight + 12 * (CELL_SIZE + GAP);
|
||||
|
||||
return (
|
||||
<div className="contribution-graph mb-4">
|
||||
<p style={{ fontSize: "0.8rem", opacity: 0.6 }}>
|
||||
{new Intl.NumberFormat().format(totalCount)} contributions
|
||||
{repoCount > 0 && `, across ${repoCount} repos, `}
|
||||
since {fmt(from).split("-")[0]}
|
||||
</p>
|
||||
<div>
|
||||
<svg
|
||||
viewBox={`0 0 ${svgWidth} ${svgHeight}`}
|
||||
width="100%"
|
||||
className="d-block"
|
||||
>
|
||||
{/* Year labels along the top */}
|
||||
{years.map((year, colIdx) => (
|
||||
<text
|
||||
key={year}
|
||||
x={monthLabelWidth + colIdx * (CELL_SIZE + GAP) + RADIUS}
|
||||
y={10}
|
||||
textAnchor="middle"
|
||||
className="graph-label"
|
||||
>
|
||||
{String(year).slice(2)}
|
||||
</text>
|
||||
))}
|
||||
{/* Month labels along the left */}
|
||||
{MONTH_LABELS.map((label, rowIdx) => (
|
||||
<text
|
||||
key={rowIdx}
|
||||
x={monthLabelWidth - 6}
|
||||
y={topLabelHeight + rowIdx * (CELL_SIZE + GAP) + CELL_SIZE / 2}
|
||||
textAnchor="end"
|
||||
dominantBaseline="central"
|
||||
className="graph-label"
|
||||
>
|
||||
{label}
|
||||
</text>
|
||||
))}
|
||||
{/* Monthly contribution circles */}
|
||||
{monthGrid.map((row, rowIdx) =>
|
||||
row.map(
|
||||
({ year, count, monthStart, monthEnd, monthKey }, colIdx) => (
|
||||
<circle
|
||||
key={`${year}-${rowIdx}`}
|
||||
cx={monthLabelWidth + colIdx * (CELL_SIZE + GAP) + RADIUS}
|
||||
cy={topLabelHeight + rowIdx * (CELL_SIZE + GAP) + RADIUS}
|
||||
r={RADIUS - 1}
|
||||
fill={
|
||||
count === 0
|
||||
? EMPTY_COLOR
|
||||
: (monthColorMap.get(monthKey) ?? FALLBACK_COLOR)
|
||||
}
|
||||
opacity={count === 0 ? 1 : opacityFor(count, thresholds)}
|
||||
className="graph-cell"
|
||||
onClick={() =>
|
||||
navigate(`/activity/${monthStart}..${monthEnd}`)
|
||||
}
|
||||
>
|
||||
<title>{`${MONTH_LABELS[rowIdx]} ${year}: ${count} ${count === 1 ? "contribution" : "contributions"}`}</title>
|
||||
</circle>
|
||||
),
|
||||
),
|
||||
)}
|
||||
</svg>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function fmt(d: Date): string {
|
||||
return d.toISOString().slice(0, 10);
|
||||
}
|
||||
|
||||
/** Build a map of date → dominant (highest commit count) language color. */
|
||||
function buildDominantColorMap(
|
||||
entries: {
|
||||
date: string;
|
||||
language: string;
|
||||
color: string | null;
|
||||
commits: number;
|
||||
}[],
|
||||
): Map<string, string> {
|
||||
const map = new Map<string, { commits: number; color: string }>();
|
||||
for (const e of entries) {
|
||||
const cur = map.get(e.date);
|
||||
if (!cur || e.commits > cur.commits) {
|
||||
map.set(e.date, { commits: e.commits, color: e.color ?? FALLBACK_COLOR });
|
||||
}
|
||||
}
|
||||
const result = new Map<string, string>();
|
||||
for (const [date, { color }] of map) {
|
||||
result.set(date, color);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/** Map count to opacity (0.3 – 1.0) based on quartile thresholds. */
|
||||
function opacityFor(count: number, thresholds: number[]): number {
|
||||
if (count <= thresholds[0]) return 0.35;
|
||||
if (count <= thresholds[1]) return 0.55;
|
||||
if (count <= thresholds[2]) return 0.75;
|
||||
return 1;
|
||||
}
|
||||
|
||||
function computeThresholds(sorted: number[]): number[] {
|
||||
if (sorted.length === 0) return [1, 2, 3];
|
||||
const p = (pct: number) =>
|
||||
sorted[Math.min(Math.floor(pct * sorted.length), sorted.length - 1)];
|
||||
return [p(0.25), p(0.5), p(0.75)];
|
||||
}
|
||||
200
ui/src/components/ContributionStats.tsx
Normal file
200
ui/src/components/ContributionStats.tsx
Normal file
@@ -0,0 +1,200 @@
|
||||
import { useMemo } from 'react';
|
||||
import { useQuery } from '@tanstack/react-query';
|
||||
|
||||
import { fetchDailyCounts, fetchHourlyAvgs, fetchSources } from '../api/client';
|
||||
|
||||
export function ContributionStats() {
|
||||
const sourcesQ = useQuery({
|
||||
queryKey: ['sources'],
|
||||
queryFn: fetchSources,
|
||||
staleTime: 60_000,
|
||||
});
|
||||
|
||||
const earliest = useMemo(() => {
|
||||
if (!sourcesQ.data) return null;
|
||||
const dates = sourcesQ.data
|
||||
.map((s) => s.earliest)
|
||||
.filter((d): d is string => d != null)
|
||||
.map((d) => new Date(d));
|
||||
return dates.length > 0 ? new Date(Math.min(...dates.map((d) => d.getTime()))) : null;
|
||||
}, [sourcesQ.data]);
|
||||
|
||||
const to = new Date();
|
||||
const from = earliest ?? new Date(to.getFullYear() - 5, 0, 1);
|
||||
const fromStr = fmt(from);
|
||||
const toStr = fmt(to);
|
||||
|
||||
const dailyQ = useQuery({
|
||||
queryKey: ['daily-counts-alltime', fromStr, toStr],
|
||||
queryFn: () => fetchDailyCounts(fromStr, toStr),
|
||||
enabled: !!earliest,
|
||||
staleTime: 10 * 60_000,
|
||||
});
|
||||
|
||||
// Bucket hour-of-day in the user's local timezone so the chart matches
|
||||
// the clock they see. Browser may report e.g. "Europe/Helsinki"; fall
|
||||
// back to UTC if the resolver returns something the server won't
|
||||
// accept (it validates the string before binding).
|
||||
const tz = useMemo(
|
||||
() => Intl.DateTimeFormat().resolvedOptions().timeZone || 'UTC',
|
||||
[],
|
||||
);
|
||||
const hourlyQ = useQuery({
|
||||
queryKey: ['hourly-avgs-alltime', fromStr, toStr, tz],
|
||||
queryFn: () => fetchHourlyAvgs(fromStr, toStr, tz),
|
||||
enabled: !!earliest,
|
||||
staleTime: 10 * 60_000,
|
||||
});
|
||||
|
||||
const stats = useMemo(() => {
|
||||
const counts = dailyQ.data ?? [];
|
||||
if (counts.length === 0) return null;
|
||||
|
||||
// Build a set of dates with contributions
|
||||
const countMap = new Map(counts.map((d) => [d.date, d.count]));
|
||||
|
||||
// Current streak (consecutive days ending today or yesterday with contributions)
|
||||
let currentStreak = 0;
|
||||
const cursor = new Date(to);
|
||||
// Allow today to have 0 (day isn't over yet) — start from yesterday if today is 0
|
||||
if ((countMap.get(fmt(cursor)) ?? 0) > 0) {
|
||||
currentStreak = 1;
|
||||
cursor.setDate(cursor.getDate() - 1);
|
||||
} else {
|
||||
cursor.setDate(cursor.getDate() - 1);
|
||||
if ((countMap.get(fmt(cursor)) ?? 0) > 0) {
|
||||
currentStreak = 1;
|
||||
cursor.setDate(cursor.getDate() - 1);
|
||||
}
|
||||
}
|
||||
if (currentStreak > 0) {
|
||||
while ((countMap.get(fmt(cursor)) ?? 0) > 0) {
|
||||
currentStreak++;
|
||||
cursor.setDate(cursor.getDate() - 1);
|
||||
}
|
||||
}
|
||||
|
||||
// Longest streak
|
||||
let longestStreak = 0;
|
||||
let streak = 0;
|
||||
const sorted = [...counts].sort((a, b) => a.date.localeCompare(b.date));
|
||||
for (let i = 0; i < sorted.length; i++) {
|
||||
if (sorted[i].count > 0) {
|
||||
streak++;
|
||||
if (streak > longestStreak) longestStreak = streak;
|
||||
} else {
|
||||
streak = 0;
|
||||
}
|
||||
}
|
||||
|
||||
// Busiest day
|
||||
const busiest = sorted.reduce((best, d) => (d.count > best.count ? d : best), sorted[0]);
|
||||
|
||||
// Day-of-week averages
|
||||
const dayTotals = [0, 0, 0, 0, 0, 0, 0];
|
||||
const dayCounts = [0, 0, 0, 0, 0, 0, 0];
|
||||
for (const d of sorted) {
|
||||
const dow = new Date(d.date + 'T00:00:00').getDay();
|
||||
dayTotals[dow] += d.count;
|
||||
dayCounts[dow]++;
|
||||
}
|
||||
const dayNames = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'];
|
||||
const dayAvgs = dayNames.map((name, i) => ({
|
||||
name,
|
||||
avg: dayCounts[i] > 0 ? dayTotals[i] / dayCounts[i] : 0,
|
||||
}));
|
||||
const maxAvg = Math.max(...dayAvgs.map((d) => d.avg));
|
||||
|
||||
// Total active days
|
||||
const activeDays = sorted.filter((d) => d.count > 0).length;
|
||||
|
||||
return { currentStreak, longestStreak, busiest, dayAvgs, maxAvg, activeDays };
|
||||
}, [dailyQ.data]);
|
||||
|
||||
const hourly = useMemo(() => {
|
||||
const data = hourlyQ.data ?? [];
|
||||
if (data.length === 0) return null;
|
||||
const byHour = new Array(24).fill(0);
|
||||
for (const { hour, avg } of data) {
|
||||
if (hour >= 0 && hour < 24) byHour[hour] = avg;
|
||||
}
|
||||
const max = Math.max(...byHour);
|
||||
return { hours: byHour, max };
|
||||
}, [hourlyQ.data]);
|
||||
|
||||
if (!stats) return null;
|
||||
|
||||
return (
|
||||
<div>
|
||||
<p style={{ fontSize: '0.8rem', opacity: 0.6 }}>contribution stats</p>
|
||||
<div className="d-flex flex-column gap-2" style={{ fontSize: '0.8rem' }}>
|
||||
<div className="d-flex justify-content-between">
|
||||
<span style={{ opacity: 0.7 }}>current streak</span>
|
||||
<span>{stats.currentStreak} {stats.currentStreak === 1 ? 'day' : 'days'}</span>
|
||||
</div>
|
||||
<div className="d-flex justify-content-between">
|
||||
<span style={{ opacity: 0.7 }}>longest streak</span>
|
||||
<span>{stats.longestStreak} {stats.longestStreak === 1 ? 'day' : 'days'}</span>
|
||||
</div>
|
||||
<div className="d-flex justify-content-between">
|
||||
<span style={{ opacity: 0.7 }}>busiest day</span>
|
||||
<span>{stats.busiest.count} on {stats.busiest.date}</span>
|
||||
</div>
|
||||
<div className="d-flex justify-content-between">
|
||||
<span style={{ opacity: 0.7 }}>active days</span>
|
||||
<span>{stats.activeDays.toLocaleString()}</span>
|
||||
</div>
|
||||
<div className="mt-1">
|
||||
<span style={{ opacity: 0.7, fontSize: '0.75rem' }}>avg by weekday</span>
|
||||
<div className="d-flex align-items-end gap-1 mt-1" style={{ height: 64 }}>
|
||||
{stats.dayAvgs.map(({ name, avg }) => (
|
||||
<div key={name} className="d-flex flex-column align-items-center" style={{ flex: 1, height: '100%', justifyContent: 'flex-end' }}>
|
||||
<span style={{ fontSize: '0.65rem', opacity: 0.6, marginBottom: 2 }}>{avg.toFixed(1)}</span>
|
||||
<div style={{ width: '100%', maxWidth: 20, borderRadius: 3, background: 'rgba(255,255,255,0.05)', flex: 1, display: 'flex', flexDirection: 'column', justifyContent: 'flex-end' }}>
|
||||
<div
|
||||
style={{
|
||||
height: stats.maxAvg > 0 ? `${(avg / stats.maxAvg) * 100}%` : '0%',
|
||||
borderRadius: 3,
|
||||
backgroundColor: '#39d353',
|
||||
opacity: 0.7,
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
<span style={{ fontSize: '0.65rem', opacity: 0.7, marginTop: 2 }}>{name}</span>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
{hourly && (
|
||||
<div className="mt-3">
|
||||
<span style={{ opacity: 0.7, fontSize: '0.75rem' }}>avg by hour ({tz})</span>
|
||||
<div className="d-flex align-items-end gap-1 mt-1" style={{ height: 64 }}>
|
||||
{hourly.hours.map((avg, h) => (
|
||||
<div key={h} className="d-flex flex-column align-items-center" style={{ flex: 1, height: '100%', justifyContent: 'flex-end' }}>
|
||||
<div style={{ width: '100%', borderRadius: 2, background: 'rgba(255,255,255,0.05)', flex: 1, display: 'flex', flexDirection: 'column', justifyContent: 'flex-end' }}>
|
||||
<div
|
||||
style={{
|
||||
height: hourly.max > 0 ? `${(avg / hourly.max) * 100}%` : '0%',
|
||||
borderRadius: 2,
|
||||
backgroundColor: '#39d353',
|
||||
opacity: 0.7,
|
||||
}}
|
||||
title={`${h.toString().padStart(2, '0')}:00 — ${avg.toFixed(2)}/day`}
|
||||
/>
|
||||
</div>
|
||||
<span style={{ fontSize: '0.6rem', opacity: 0.7, marginTop: 2, minHeight: '0.7rem' }}>
|
||||
{h % 4 === 0 ? h.toString().padStart(2, '0') : ''}
|
||||
</span>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function fmt(d: Date): string {
|
||||
return d.toISOString().slice(0, 10);
|
||||
}
|
||||
35
ui/src/components/LanguageBar.tsx
Normal file
35
ui/src/components/LanguageBar.tsx
Normal file
@@ -0,0 +1,35 @@
|
||||
export function LanguageBar({ languages, colorMap, compact }: {
|
||||
languages: Record<string, number>;
|
||||
colorMap: Record<string, string>;
|
||||
compact?: boolean;
|
||||
}) {
|
||||
const total = Object.values(languages).reduce((a, b) => a + b, 0);
|
||||
if (total === 0) return null;
|
||||
|
||||
const sorted = Object.entries(languages).sort(([, a], [, b]) => b - a);
|
||||
|
||||
return (
|
||||
<div className={compact ? 'mb-1' : 'mt-2'}>
|
||||
<div className="language-bar">
|
||||
{sorted.map(([lang, bytes]) => (
|
||||
<div
|
||||
key={lang}
|
||||
className="language-bar-segment"
|
||||
style={{ width: `${(bytes / total) * 100}%`, backgroundColor: colorMap[lang] ?? '#8b8b8b' }}
|
||||
title={`${lang} ${((bytes / total) * 100).toFixed(1)}%`}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
{!compact && (
|
||||
<div className="d-flex flex-wrap gap-2 mt-1" style={{ fontSize: '0.75rem' }}>
|
||||
{sorted.slice(0, 8).map(([lang, bytes]) => (
|
||||
<span key={lang}>
|
||||
<span className="language-dot" style={{ backgroundColor: colorMap[lang] ?? '#8b8b8b' }} />
|
||||
{lang} {((bytes / total) * 100).toFixed(1)}%
|
||||
</span>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
198
ui/src/components/LanguageStreamGraph.tsx
Normal file
198
ui/src/components/LanguageStreamGraph.tsx
Normal file
@@ -0,0 +1,198 @@
|
||||
import { useMemo } from 'react';
|
||||
import { useQuery } from '@tanstack/react-query';
|
||||
|
||||
import { fetchLanguageDailyCounts } from '../api/client';
|
||||
|
||||
const HEIGHT = 160;
|
||||
const LABEL_HEIGHT = 16;
|
||||
|
||||
/** Language stream graph — stacked area showing language usage over time. */
|
||||
export function LanguageStreamGraph() {
|
||||
const to = new Date();
|
||||
const from = new Date(to);
|
||||
from.setFullYear(from.getFullYear() - 1);
|
||||
|
||||
const fromStr = fmt(from);
|
||||
const toStr = fmt(to);
|
||||
|
||||
const langQ = useQuery({
|
||||
queryKey: ['language-daily', fromStr, toStr],
|
||||
queryFn: () => fetchLanguageDailyCounts(fromStr, toStr),
|
||||
staleTime: 5 * 60_000,
|
||||
});
|
||||
|
||||
const { languages, paths, legendItems } = useMemo(() => {
|
||||
const raw = langQ.data ?? [];
|
||||
if (raw.length === 0)
|
||||
return { weeks: [], languages: [], paths: [], legendItems: [] };
|
||||
|
||||
// Aggregate daily counts into weekly buckets
|
||||
const colorMap = new Map<string, string>();
|
||||
const weeklyMap = new Map<string, Map<string, number>>();
|
||||
|
||||
for (const d of raw) {
|
||||
if (d.color) colorMap.set(d.language, d.color);
|
||||
// Bucket to ISO week (Monday-based, keyed by Monday date)
|
||||
const dt = new Date(d.date + 'T00:00:00Z');
|
||||
const day = dt.getUTCDay();
|
||||
const monday = new Date(dt);
|
||||
monday.setUTCDate(monday.getUTCDate() - ((day + 6) % 7));
|
||||
const weekKey = monday.toISOString().slice(0, 10);
|
||||
|
||||
if (!weeklyMap.has(weekKey)) weeklyMap.set(weekKey, new Map());
|
||||
const langs = weeklyMap.get(weekKey)!;
|
||||
langs.set(d.language, (langs.get(d.language) ?? 0) + d.commits);
|
||||
}
|
||||
|
||||
const weeks = [...weeklyMap.keys()].sort();
|
||||
|
||||
// Rank languages by total commits to pick top N + "other"
|
||||
const totals = new Map<string, number>();
|
||||
for (const langs of weeklyMap.values()) {
|
||||
for (const [lang, count] of langs) {
|
||||
totals.set(lang, (totals.get(lang) ?? 0) + count);
|
||||
}
|
||||
}
|
||||
const ranked = [...totals.entries()].sort(([, a], [, b]) => b - a);
|
||||
const topN = 8;
|
||||
const topLangs = ranked.slice(0, topN).map(([l]) => l);
|
||||
const hasOther = ranked.length > topN;
|
||||
const languages = hasOther ? [...topLangs, 'Other'] : topLangs;
|
||||
|
||||
// Build stacked data per week
|
||||
const stacked: number[][] = weeks.map((wk) => {
|
||||
const langs = weeklyMap.get(wk)!;
|
||||
const values = topLangs.map((l) => langs.get(l) ?? 0);
|
||||
if (hasOther) {
|
||||
let other = 0;
|
||||
for (const [l, c] of langs) {
|
||||
if (!topLangs.includes(l)) other += c;
|
||||
}
|
||||
values.push(other);
|
||||
}
|
||||
return values;
|
||||
});
|
||||
|
||||
// Compute stream layout (centered baseline)
|
||||
const maxTotal = Math.max(...stacked.map((row) => row.reduce((a, b) => a + b, 0)), 1);
|
||||
const chartHeight = HEIGHT - LABEL_HEIGHT;
|
||||
|
||||
// For each week, compute y0 (centered) then stack upward
|
||||
const layerCount = languages.length;
|
||||
const y0s: number[][] = [];
|
||||
const y1s: number[][] = [];
|
||||
|
||||
for (let w = 0; w < weeks.length; w++) {
|
||||
const total = stacked[w].reduce((a, b) => a + b, 0);
|
||||
const scaledTotal = (total / maxTotal) * chartHeight;
|
||||
let baseline = (chartHeight - scaledTotal) / 2 + LABEL_HEIGHT;
|
||||
|
||||
const wy0: number[] = [];
|
||||
const wy1: number[] = [];
|
||||
for (let l = 0; l < layerCount; l++) {
|
||||
const h = (stacked[w][l] / maxTotal) * chartHeight;
|
||||
wy0.push(baseline);
|
||||
baseline += h;
|
||||
wy1.push(baseline);
|
||||
}
|
||||
y0s.push(wy0);
|
||||
y1s.push(wy1);
|
||||
}
|
||||
|
||||
// Build SVG paths for each language layer using smooth curves
|
||||
const xFor = (w: number) =>
|
||||
weeks.length > 1 ? (w / (weeks.length - 1)) * 100 : 50;
|
||||
|
||||
const paths = languages.map((_, l) => {
|
||||
if (weeks.length === 0) return '';
|
||||
const topPts = weeks.map((_, w) => [xFor(w), y0s[w][l]] as [number, number]);
|
||||
const bottomPts = weeks
|
||||
.map((_, w) => [xFor(w), y1s[w][l]] as [number, number])
|
||||
.reverse();
|
||||
return `M${topPts[0][0]},${topPts[0][1]} ${smoothLine(topPts)} L${bottomPts[0][0]},${bottomPts[0][1]} ${smoothLine(bottomPts)} Z`;
|
||||
});
|
||||
|
||||
// Default colors for "Other" and fallback
|
||||
const FALLBACK_COLORS = [
|
||||
'#e34c26', '#563d7c', '#3178c6', '#dea584',
|
||||
'#f1e05a', '#89e051', '#00ADD8', '#438eff',
|
||||
];
|
||||
|
||||
const legendItems = languages.map((lang, i) => ({
|
||||
language: lang,
|
||||
color:
|
||||
lang === 'Other'
|
||||
? 'rgba(255,255,255,0.2)'
|
||||
: colorMap.get(lang) ?? FALLBACK_COLORS[i % FALLBACK_COLORS.length],
|
||||
total: ranked[i]?.[1] ?? 0,
|
||||
}));
|
||||
|
||||
return { weeks, languages, paths, legendItems };
|
||||
}, [langQ.data]);
|
||||
|
||||
if (langQ.isLoading) return <p style={{ fontSize: '0.8rem' }}>loading language graph...</p>;
|
||||
if (langQ.isError || languages.length === 0) return null;
|
||||
|
||||
return (
|
||||
<div className="contribution-graph mb-4">
|
||||
<p style={{ fontSize: '0.8rem', opacity: 0.6 }}>languages by commit activity</p>
|
||||
<svg viewBox={`0 0 100 ${HEIGHT}`} width="100%" preserveAspectRatio="none" className="d-block" style={{ height: `${HEIGHT}px` }}>
|
||||
{paths.map((d, i) => (
|
||||
<path
|
||||
key={legendItems[i].language}
|
||||
d={d}
|
||||
fill={legendItems[i].color}
|
||||
opacity={0.85}
|
||||
>
|
||||
<title>{legendItems[i].language}</title>
|
||||
</path>
|
||||
))}
|
||||
</svg>
|
||||
<div className="d-flex flex-wrap gap-2 mt-1" style={{ fontSize: '0.75rem' }}>
|
||||
{legendItems.map(({ language, color }) => (
|
||||
<span key={language} className="d-flex align-items-center gap-1">
|
||||
<span
|
||||
style={{
|
||||
width: 10,
|
||||
height: 10,
|
||||
borderRadius: '50%',
|
||||
backgroundColor: color,
|
||||
display: 'inline-block',
|
||||
}}
|
||||
/>
|
||||
{language}
|
||||
</span>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function fmt(d: Date): string {
|
||||
return d.toISOString().slice(0, 10);
|
||||
}
|
||||
|
||||
/** Convert a series of points into smooth cubic bezier curve commands.
|
||||
* Uses Catmull-Rom to Bezier conversion with tension 0.5. */
|
||||
function smoothLine(pts: [number, number][]): string {
|
||||
if (pts.length < 2) return '';
|
||||
if (pts.length === 2)
|
||||
return `L${pts[1][0]},${pts[1][1]}`;
|
||||
|
||||
const commands: string[] = [];
|
||||
for (let i = 1; i < pts.length; i++) {
|
||||
const p0 = pts[Math.max(i - 2, 0)];
|
||||
const p1 = pts[i - 1];
|
||||
const p2 = pts[i];
|
||||
const p3 = pts[Math.min(i + 1, pts.length - 1)];
|
||||
|
||||
const t = 0.5;
|
||||
const cp1x = p1[0] + (p2[0] - p0[0]) * t / 3;
|
||||
const cp1y = p1[1] + (p2[1] - p0[1]) * t / 3;
|
||||
const cp2x = p2[0] - (p3[0] - p1[0]) * t / 3;
|
||||
const cp2y = p2[1] - (p3[1] - p1[1]) * t / 3;
|
||||
|
||||
commands.push(`C${cp1x},${cp1y} ${cp2x},${cp2y} ${p2[0]},${p2[1]}`);
|
||||
}
|
||||
return commands.join(' ');
|
||||
}
|
||||
60
ui/src/components/TopLanguages.tsx
Normal file
60
ui/src/components/TopLanguages.tsx
Normal file
@@ -0,0 +1,60 @@
|
||||
import { useMemo } from 'react';
|
||||
import { useQuery } from '@tanstack/react-query';
|
||||
|
||||
import { fetchRepoLanguages } from '../api/client';
|
||||
|
||||
const MAX_LANGS = 14;
|
||||
|
||||
export function TopLanguages() {
|
||||
const langsQ = useQuery({
|
||||
queryKey: ['repo-languages'],
|
||||
queryFn: fetchRepoLanguages,
|
||||
staleTime: 10 * 60_000,
|
||||
});
|
||||
|
||||
const ranked = useMemo(() => {
|
||||
if (!langsQ.data) return [];
|
||||
const totals = new Map<string, { bytes: number; color: string }>();
|
||||
for (const e of langsQ.data) {
|
||||
const cur = totals.get(e.language);
|
||||
if (cur) {
|
||||
cur.bytes += e.bytes;
|
||||
} else {
|
||||
totals.set(e.language, { bytes: e.bytes, color: e.color ?? '#8b8b8b' });
|
||||
}
|
||||
}
|
||||
return [...totals.entries()]
|
||||
.sort(([, a], [, b]) => b.bytes - a.bytes)
|
||||
.slice(0, MAX_LANGS);
|
||||
}, [langsQ.data]);
|
||||
|
||||
if (!langsQ.data || ranked.length === 0) return null;
|
||||
|
||||
const maxBytes = ranked[0][1].bytes;
|
||||
|
||||
return (
|
||||
<div>
|
||||
<p style={{ fontSize: '0.8rem', opacity: 0.6 }}>
|
||||
top languages by code volume
|
||||
</p>
|
||||
<div className="d-flex flex-column gap-1">
|
||||
{ranked.map(([lang, { bytes, color }]) => (
|
||||
<div key={lang} className="d-flex align-items-center gap-2" style={{ fontSize: '0.75rem' }}>
|
||||
<span style={{ width: 70, textAlign: 'right', opacity: 0.8, flexShrink: 0 }}>{lang}</span>
|
||||
<div style={{ flex: 1, height: 10, borderRadius: 3, background: 'rgba(255,255,255,0.05)' }}>
|
||||
<div
|
||||
style={{
|
||||
width: `${(bytes / maxBytes) * 100}%`,
|
||||
height: '100%',
|
||||
borderRadius: 3,
|
||||
backgroundColor: color,
|
||||
opacity: 0.85,
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -1,9 +1,15 @@
|
||||
import { useMemo } from 'react';
|
||||
import { useQuery } from '@tanstack/react-query';
|
||||
import { Link } from 'react-router-dom';
|
||||
import Col from 'react-bootstrap/Col';
|
||||
import Row from 'react-bootstrap/Row';
|
||||
|
||||
import { fetchProjects, fetchLanguages, type ProjectSummary, type Source } from '../api/client';
|
||||
import { fetchProjects, fetchRepoLanguages, type ProjectSummary } from '../api/client';
|
||||
import { LanguageBar } from '../components/LanguageBar';
|
||||
import { ContributionGraph, AllTimeGraph } from '../components/ContributionGraph';
|
||||
import { ContributionStats } from '../components/ContributionStats';
|
||||
import { LanguageStreamGraph } from '../components/LanguageStreamGraph';
|
||||
import { TopLanguages } from '../components/TopLanguages';
|
||||
|
||||
export function DashPage() {
|
||||
const projectsQ = useQuery({
|
||||
@@ -12,8 +18,32 @@ export function DashPage() {
|
||||
refetchInterval: 60_000,
|
||||
});
|
||||
|
||||
const langsQ = useQuery({
|
||||
queryKey: ['repo-languages'],
|
||||
queryFn: fetchRepoLanguages,
|
||||
staleTime: 10 * 60_000,
|
||||
});
|
||||
|
||||
const langsByRepo = useMemo(() => {
|
||||
const map = new Map<string, Record<string, number>>();
|
||||
for (const entry of langsQ.data ?? []) {
|
||||
const key = `${entry.source}:${entry.repo}`;
|
||||
if (!map.has(key)) map.set(key, {});
|
||||
map.get(key)![entry.language] = entry.bytes;
|
||||
}
|
||||
return map;
|
||||
}, [langsQ.data]);
|
||||
|
||||
const langColors = useMemo(() => {
|
||||
const map: Record<string, string> = {};
|
||||
for (const e of langsQ.data ?? []) {
|
||||
if (e.color && !map[e.language]) map[e.language] = e.color;
|
||||
}
|
||||
return map;
|
||||
}, [langsQ.data]);
|
||||
|
||||
const projects = projectsQ.data ?? [];
|
||||
const ranked = rankProjects(projects).slice(0, 24);
|
||||
const ranked = rankProjects(projects);
|
||||
|
||||
return (
|
||||
<>
|
||||
@@ -25,6 +55,19 @@ export function DashPage() {
|
||||
</p>
|
||||
</Col>
|
||||
</Row>
|
||||
<ContributionGraph />
|
||||
<LanguageStreamGraph />
|
||||
<Row xs={1} md={2} lg={3} className="g-3 mb-3">
|
||||
<Col>
|
||||
<AllTimeGraph />
|
||||
</Col>
|
||||
<Col>
|
||||
<TopLanguages />
|
||||
</Col>
|
||||
<Col>
|
||||
<ContributionStats />
|
||||
</Col>
|
||||
</Row>
|
||||
{projectsQ.isLoading && <p>loading...</p>}
|
||||
{projectsQ.isError && (
|
||||
<p>error: {(projectsQ.error as Error).message}</p>
|
||||
@@ -32,7 +75,7 @@ export function DashPage() {
|
||||
<Row xs={1} md={2} lg={3} className="g-3">
|
||||
{ranked.map((p) => (
|
||||
<Col key={`${p.source}:${p.repo}`}>
|
||||
<ProjectCard project={p} />
|
||||
<ProjectCard project={p} langs={langsByRepo.get(`${p.source}:${p.repo}`) ?? null} colorMap={langColors} />
|
||||
</Col>
|
||||
))}
|
||||
</Row>
|
||||
@@ -40,25 +83,12 @@ export function DashPage() {
|
||||
);
|
||||
}
|
||||
|
||||
function ProjectCard({ project: p }: { project: ProjectSummary }) {
|
||||
const langsQ = useQuery({
|
||||
queryKey: ['languages', p.source, p.host, p.repo],
|
||||
queryFn: () => fetchLanguages(p.source as Source, p.host, p.repo),
|
||||
enabled: p.source === 'github' || p.source === 'gitea',
|
||||
staleTime: 10 * 60_000,
|
||||
});
|
||||
|
||||
const langs = langsQ.data;
|
||||
const topLangs = langs ? topLanguages(langs, 3) : null;
|
||||
|
||||
function ProjectCard({ project: p, langs, colorMap }: { project: ProjectSummary; langs: Record<string, number> | null; colorMap: Record<string, string> }) {
|
||||
return (
|
||||
<Link to={`/project/${p.source}/${p.repo}`} className="text-decoration-none">
|
||||
<div className="project-card p-3">
|
||||
<h5 className="mb-1">{p.repo}</h5>
|
||||
<small className="text-muted d-block mb-2">
|
||||
{p.source}
|
||||
{topLangs && ` · ${topLangs}`}
|
||||
</small>
|
||||
<h5 className="mb-1"><img src={forgeIcon(p.source)} alt={p.source} className="forge-icon" />{p.repo}</h5>
|
||||
{langs && <LanguageBar languages={langs} colorMap={colorMap} compact />}
|
||||
<div className="d-flex gap-3" style={{ fontSize: '0.8rem' }}>
|
||||
{p.commit_count > 0 && <span>{p.commit_count} commits</span>}
|
||||
{p.issue_count > 0 && <span>{p.issue_count} issues</span>}
|
||||
@@ -72,12 +102,13 @@ function ProjectCard({ project: p }: { project: ProjectSummary }) {
|
||||
);
|
||||
}
|
||||
|
||||
function topLanguages(langs: Record<string, number>, n: number): string {
|
||||
return Object.entries(langs)
|
||||
.sort(([, a], [, b]) => b - a)
|
||||
.slice(0, n)
|
||||
.map(([lang]) => lang.toLowerCase())
|
||||
.join(', ');
|
||||
function forgeIcon(source: string): string {
|
||||
switch (source) {
|
||||
case 'github': return '/github.svg';
|
||||
case 'gitea': return '/gitea.svg';
|
||||
case 'hg': return '/mozilla.svg';
|
||||
default: return '/github.svg';
|
||||
}
|
||||
}
|
||||
|
||||
function formatRange(first: string | null, last: string | null): string {
|
||||
@@ -100,6 +131,7 @@ function rankProjects(projects: ProjectSummary[]): ProjectSummary[] {
|
||||
return [...projects].sort((a, b) => score(b) - score(a));
|
||||
|
||||
function score(p: ProjectSummary): number {
|
||||
if (p.commit_count >= 10000) return -1;
|
||||
const volume = (p.commit_count + p.issue_count + p.pr_count) / (maxVolume || 1);
|
||||
const recency = p.last_activity
|
||||
? (new Date(p.last_activity).getTime() - oldest) / range
|
||||
|
||||
@@ -1,11 +1,16 @@
|
||||
import { useMemo } from 'react';
|
||||
import { useParams } from 'react-router-dom';
|
||||
import { useQuery } from '@tanstack/react-query';
|
||||
import Col from 'react-bootstrap/Col';
|
||||
import Row from 'react-bootstrap/Row';
|
||||
import ReactMarkdown from 'react-markdown';
|
||||
import rehypeRaw from 'rehype-raw';
|
||||
import rehypeSanitize, { defaultSchema } from 'rehype-sanitize';
|
||||
import remarkGfm from 'remark-gfm';
|
||||
import { VerticalTimeline } from 'react-vertical-timeline-component';
|
||||
|
||||
import { fetchEvents, fetchReadme, fetchLanguages, fetchProjects, type Source } from '../api/client';
|
||||
import { fetchEvents, fetchReadme, fetchRepoLanguages, fetchProjects, type Source } from '../api/client';
|
||||
import { LanguageBar } from '../components/LanguageBar';
|
||||
import { TimelineEntry } from '../components/TimelineEntry';
|
||||
|
||||
export function ProjectPage() {
|
||||
@@ -40,23 +45,39 @@ export function ProjectPage() {
|
||||
staleTime: 5 * 60_000,
|
||||
});
|
||||
|
||||
const langsQ = useQuery({
|
||||
queryKey: ['languages', source, host, repo],
|
||||
queryFn: () => fetchLanguages(source as Source, host, repo),
|
||||
enabled: !!host && (source === 'github' || source === 'gitea'),
|
||||
staleTime: 5 * 60_000,
|
||||
const repoLangsQ = useQuery({
|
||||
queryKey: ['repo-languages'],
|
||||
queryFn: fetchRepoLanguages,
|
||||
staleTime: 10 * 60_000,
|
||||
});
|
||||
|
||||
const langs = useMemo(() => {
|
||||
if (!repoLangsQ.data || !source) return null;
|
||||
const entries = repoLangsQ.data.filter(
|
||||
(e) => e.source === source && e.repo === repo,
|
||||
);
|
||||
if (entries.length === 0) return null;
|
||||
const result: Record<string, number> = {};
|
||||
for (const e of entries) result[e.language] = e.bytes;
|
||||
return result;
|
||||
}, [repoLangsQ.data, source, repo]);
|
||||
|
||||
const langColors = useMemo(() => {
|
||||
const map: Record<string, string> = {};
|
||||
for (const e of repoLangsQ.data ?? []) {
|
||||
if (e.color && !map[e.language]) map[e.language] = e.color;
|
||||
}
|
||||
return map;
|
||||
}, [repoLangsQ.data]);
|
||||
|
||||
const events = eventsQ.data ?? [];
|
||||
const langs = langsQ.data;
|
||||
|
||||
return (
|
||||
<>
|
||||
<Row className="mb-3">
|
||||
<Col>
|
||||
<h2>{repo}</h2>
|
||||
<small className="text-muted">{source}</small>
|
||||
{langs && <LanguageBar languages={langs} />}
|
||||
<h2><a href={repoUrl(source ?? '', host, repo)} target="_blank" rel="noopener noreferrer"><img src={forgeIcon(source ?? '')} alt={source} className="forge-icon" style={{ width: 24, height: 24 }} /></a>{repo}</h2>
|
||||
{langs && <LanguageBar languages={langs} colorMap={langColors} />}
|
||||
</Col>
|
||||
</Row>
|
||||
|
||||
@@ -64,7 +85,12 @@ export function ProjectPage() {
|
||||
<Row className="mb-4">
|
||||
<Col>
|
||||
<div className="project-readme">
|
||||
<ReactMarkdown>{readmeQ.data}</ReactMarkdown>
|
||||
<ReactMarkdown
|
||||
remarkPlugins={[remarkGfm]}
|
||||
rehypePlugins={[rehypeRaw, [rehypeSanitize, readmeSanitizeSchema]]}
|
||||
>
|
||||
{readmeQ.data}
|
||||
</ReactMarkdown>
|
||||
</div>
|
||||
</Col>
|
||||
</Row>
|
||||
@@ -90,55 +116,67 @@ export function ProjectPage() {
|
||||
);
|
||||
}
|
||||
|
||||
function LanguageBar({ languages }: { languages: Record<string, number> }) {
|
||||
const total = Object.values(languages).reduce((a, b) => a + b, 0);
|
||||
if (total === 0) return null;
|
||||
|
||||
const sorted = Object.entries(languages).sort(([, a], [, b]) => b - a);
|
||||
|
||||
return (
|
||||
<div className="mt-2">
|
||||
<div className="language-bar">
|
||||
{sorted.map(([lang, bytes]) => (
|
||||
<div
|
||||
key={lang}
|
||||
className="language-bar-segment"
|
||||
style={{ width: `${(bytes / total) * 100}%`, backgroundColor: langColor(lang) }}
|
||||
title={`${lang} ${((bytes / total) * 100).toFixed(1)}%`}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
<div className="d-flex flex-wrap gap-2 mt-1" style={{ fontSize: '0.75rem' }}>
|
||||
{sorted.slice(0, 8).map(([lang, bytes]) => (
|
||||
<span key={lang}>
|
||||
<span className="language-dot" style={{ backgroundColor: langColor(lang) }} />
|
||||
{lang} {((bytes / total) * 100).toFixed(1)}%
|
||||
</span>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
function repoUrl(source: string, host: string, repo: string): string {
|
||||
switch (source) {
|
||||
case 'github': return `https://github.com/${repo}`;
|
||||
case 'gitea': return `https://${host}/${repo}`;
|
||||
case 'hg': return `https://${host}/${repo}`;
|
||||
default: return '#';
|
||||
}
|
||||
}
|
||||
|
||||
const LANG_COLORS: Record<string, string> = {
|
||||
Rust: '#dea584',
|
||||
TypeScript: '#3178c6',
|
||||
JavaScript: '#f1e05a',
|
||||
Python: '#3572a5',
|
||||
Go: '#00add8',
|
||||
Shell: '#89e051',
|
||||
HTML: '#e34c26',
|
||||
CSS: '#563d7c',
|
||||
C: '#555555',
|
||||
'C++': '#f34b7d',
|
||||
Java: '#b07219',
|
||||
Ruby: '#701516',
|
||||
Nix: '#7e7eff',
|
||||
Makefile: '#427819',
|
||||
Dockerfile: '#384d54',
|
||||
SCSS: '#c6538c',
|
||||
function forgeIcon(source: string): string {
|
||||
switch (source) {
|
||||
case 'github': return '/github.svg';
|
||||
case 'gitea': return '/gitea.svg';
|
||||
case 'hg': return '/mozilla.svg';
|
||||
default: return '/github.svg';
|
||||
}
|
||||
}
|
||||
|
||||
// rehype-sanitize defaults are conservative — README authors lean on raw
|
||||
// HTML for layout (centered headers, collapsible sections, image
|
||||
// dimensions). Extend the schema to permit those tags/attributes while
|
||||
// still blocking script-y or interactive content (iframe, object, etc.).
|
||||
const readmeSanitizeSchema = {
|
||||
...defaultSchema,
|
||||
tagNames: [
|
||||
...(defaultSchema.tagNames ?? []),
|
||||
'details',
|
||||
'summary',
|
||||
'picture',
|
||||
'source',
|
||||
'kbd',
|
||||
'sub',
|
||||
'sup',
|
||||
'mark',
|
||||
'abbr',
|
||||
'cite',
|
||||
'figure',
|
||||
'figcaption',
|
||||
'center',
|
||||
],
|
||||
attributes: {
|
||||
...defaultSchema.attributes,
|
||||
'*': [
|
||||
...((defaultSchema.attributes && defaultSchema.attributes['*']) || []),
|
||||
'align',
|
||||
'style',
|
||||
],
|
||||
a: [
|
||||
...((defaultSchema.attributes && defaultSchema.attributes.a) || []),
|
||||
'target',
|
||||
'rel',
|
||||
],
|
||||
img: [
|
||||
...((defaultSchema.attributes && defaultSchema.attributes.img) || []),
|
||||
'width',
|
||||
'height',
|
||||
'align',
|
||||
'srcset',
|
||||
],
|
||||
source: ['srcset', 'media', 'type'],
|
||||
details: ['open'],
|
||||
},
|
||||
};
|
||||
|
||||
function langColor(lang: string): string {
|
||||
return LANG_COLORS[lang] ?? '#8b8b8b';
|
||||
}
|
||||
|
||||
@@ -1,17 +1,46 @@
|
||||
import { useMemo, useState } from 'react';
|
||||
import { useParams } from 'react-router-dom';
|
||||
import { useQuery } from '@tanstack/react-query';
|
||||
import Col from 'react-bootstrap/Col';
|
||||
import Row from 'react-bootstrap/Row';
|
||||
import { VerticalTimeline } from 'react-vertical-timeline-component';
|
||||
|
||||
import { fetchEvents, fetchSources, type Source } from '../api/client';
|
||||
import { fetchDailyCounts, fetchEvents, fetchSources, type Source } from '../api/client';
|
||||
import { Filters } from '../components/Filters';
|
||||
import { TimelineEntry } from '../components/TimelineEntry';
|
||||
|
||||
const RANGE_MIN = new Date('2010-01-01T00:00:00Z').getTime();
|
||||
const RANGE_MAX = Date.now();
|
||||
|
||||
function parseDate(s: string): number {
|
||||
// Accept YYYY-MM-DD or full ISO datetime
|
||||
const t = new Date(s.includes('T') ? s : s + 'T00:00:00Z').getTime();
|
||||
return isNaN(t) ? NaN : t;
|
||||
}
|
||||
|
||||
function endOfDay(s: string): number {
|
||||
const t = new Date(s.includes('T') ? s : s + 'T23:59:59Z').getTime();
|
||||
return isNaN(t) ? NaN : t;
|
||||
}
|
||||
|
||||
function parseTimespan(timespan?: string): [number, number] | null {
|
||||
if (!timespan) return null;
|
||||
if (timespan.includes('..')) {
|
||||
const [a, b] = timespan.split('..');
|
||||
const from = parseDate(a);
|
||||
const to = endOfDay(b);
|
||||
if (!isNaN(from) && !isNaN(to)) return [from, to];
|
||||
} else {
|
||||
const from = parseDate(timespan);
|
||||
const to = endOfDay(timespan);
|
||||
if (!isNaN(from)) return [from, to];
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
export function TimelineHome() {
|
||||
const { timespan } = useParams();
|
||||
|
||||
const [enabledSources, setEnabledSources] = useState<Record<Source, boolean>>({
|
||||
github: true,
|
||||
gitea: true,
|
||||
@@ -19,6 +48,8 @@ export function TimelineHome() {
|
||||
bugzilla: true,
|
||||
});
|
||||
const [rangeValue, setRangeValue] = useState<[number, number]>(() => {
|
||||
const parsed = parseTimespan(timespan);
|
||||
if (parsed) return parsed;
|
||||
const now = Date.now();
|
||||
const thirtyDaysAgo = now - 30 * 24 * 60 * 60 * 1000;
|
||||
return [thirtyDaysAgo, now];
|
||||
@@ -51,6 +82,19 @@ export function TimelineHome() {
|
||||
|
||||
const events = eventsQ.data ?? [];
|
||||
|
||||
const fromStr = new Date(rangeValue[0]).toISOString().slice(0, 10);
|
||||
const toStr = new Date(rangeValue[1]).toISOString().slice(0, 10);
|
||||
const dailyQ = useQuery({
|
||||
queryKey: ['daily-counts', fromStr, toStr],
|
||||
queryFn: () => fetchDailyCounts(fromStr, toStr),
|
||||
staleTime: 5 * 60_000,
|
||||
});
|
||||
const totalCount = useMemo(
|
||||
() => (dailyQ.data ?? []).reduce((sum, d) => sum + d.count, 0),
|
||||
[dailyQ.data],
|
||||
);
|
||||
const privateCount = totalCount - events.length;
|
||||
|
||||
return (
|
||||
<>
|
||||
<Filters
|
||||
@@ -74,7 +118,7 @@ export function TimelineHome() {
|
||||
? 'loading…'
|
||||
: eventsQ.isError
|
||||
? `error: ${(eventsQ.error as Error).message}`
|
||||
: `showing ${events.length} ${events.length === 1 ? 'activity' : 'activities'}`}
|
||||
: `showing ${events.length} public ${events.length === 1 ? 'activity' : 'activities'}${privateCount > 0 ? `, ${privateCount} private` : ''}`}
|
||||
</p>
|
||||
<VerticalTimeline>
|
||||
{events.map((item) => (
|
||||
|
||||
Reference in New Issue
Block a user