.gitignore

@@ -1,10 +1,16 @@
-.vscode/
+# Generated by Cargo
-coverage/
 debug/
-node_modules/
-public/
 target/
 
+# Code coverage results
+coverage/
+
+# Environment configuration
 .env
-compose.yaml
+
+# NodeJS files
+node_modules/
 pnpm-lock.yaml
+
+# Default web build output directory
+public/

Cargo.lock

@@ -141,31 +141,24 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
 
 [[package]]
 name = "askama"
-version = "0.12.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47cbc3cf73fa8d9833727bbee4835ba5c421a0d65b72daf9a7b5d0e0f9cfb57e"
+checksum = "fb98f10f371286b177db5eeb9a6e5396609555686a35e1d4f7b9a9c6d8af0139"
 dependencies = [
  "askama_derive",
  "askama_escape",
- "humansize",
+ "askama_shared",
- "num-traits",
- "percent-encoding",
 ]
 
 [[package]]
 name = "askama_derive"
-version = "0.12.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c22fbe0413545c098358e56966ff22cdd039e10215ae213cfbd65032b119fc94"
+checksum = "87bf87e6e8b47264efa9bde63d6225c6276a52e05e91bf37eaa8afd0032d6b71"
 dependencies = [
- "basic-toml",
+ "askama_shared",
- "mime",
- "mime_guess",
- "nom 7.1.1",
  "proc-macro2",
- "quote",
+ "syn",
- "serde",
- "syn 2.0.18",
 ]
 
 [[package]]
@@ -174,6 +167,36 @@ version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341"
 
+[[package]]
+name = "askama_shared"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf722b94118a07fcbc6640190f247334027685d4e218b794dbfe17c32bf38ed0"
+dependencies = [
+ "askama_escape",
+ "humansize",
+ "mime",
+ "mime_guess",
+ "nom 7.1.1",
+ "num-traits",
+ "percent-encoding",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "syn",
+ "toml",
+]
+
+[[package]]
+name = "async-attributes"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5"
+dependencies = [
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "async-channel"
 version = "1.7.1"
@@ -222,6 +245,7 @@ dependencies = [
  "blocking",
  "futures-lite",
  "once_cell",
+ "tokio",
 ]
 
 [[package]]
@@ -293,6 +317,7 @@ version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d"
 dependencies = [
+ "async-attributes",
  "async-channel",
  "async-global-executor",
  "async-io",
@@ -332,7 +357,7 @@ checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.101",
+ "syn",
 ]
 
 [[package]]
@@ -362,7 +387,7 @@ checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.101",
+ "syn",
 ]
 
 [[package]]
@@ -422,7 +447,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 1.0.101",
+ "syn",
 ]
 
 [[package]]
@@ -443,32 +468,12 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 
-[[package]]
-name = "basic-toml"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c0de75129aa8d0cceaf750b89013f0e08804d6ec61416da787b35ad0d7cddf1"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "beef"
 version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1"
 
-[[package]]
-name = "bigdecimal"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa"
-dependencies = [
- "num-bigint",
- "num-integer",
- "num-traits",
-]
-
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -589,11 +594,14 @@ version = "3.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750"
 dependencies = [
+ "atty",
  "bitflags",
  "clap_derive 3.2.18",
  "clap_lex 0.2.4",
  "indexmap",
  "once_cell",
+ "strsim 0.10.0",
+ "termcolor",
  "textwrap 0.15.1",
 ]
 
@@ -622,7 +630,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 1.0.101",
+ "syn",
 ]
 
 [[package]]
@@ -635,7 +643,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 1.0.101",
+ "syn",
 ]
 
 [[package]]
@@ -759,6 +767,21 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba"
 
+[[package]]
+name = "crc"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53757d12b596c16c78b83458d732a5d1a17ab3f53f2f7412f6fb57cc8a140ab3"
+dependencies = [
+ "crc-catalog",
+]
+
+[[package]]
+name = "crc-catalog"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d0165d2900ae6778e36e80bbc4da3b5eefccee9ba939761f9c2882a5d9af3ff"
+
 [[package]]
 name = "crossbeam-queue"
 version = "0.3.6"
@@ -812,7 +835,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "smallvec",
- "syn 1.0.101",
+ "syn",
 ]
 
 [[package]]
@@ -822,7 +845,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e"
 dependencies = [
  "quote",
- "syn 1.0.101",
+ "syn",
 ]
 
 [[package]]
@@ -832,7 +855,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb"
 dependencies = [
  "quote",
- "syn 1.0.101",
+ "syn",
 ]
 
 [[package]]
@@ -881,7 +904,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version 0.4.0",
- "syn 1.0.101",
+ "syn",
 ]
 
 [[package]]
@@ -930,6 +953,12 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
 
+[[package]]
+name = "dotenv"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f"
+
 [[package]]
 name = "dotenvy"
 version = "0.15.5"
@@ -991,6 +1020,12 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "fallible-iterator"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
+
 [[package]]
 name = "fastrand"
 version = "1.8.0"
@@ -1101,7 +1136,7 @@ checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.101",
+ "syn",
 ]
 
 [[package]]
@@ -1351,7 +1386,7 @@ dependencies = [
  "markup5ever",
  "proc-macro2",
  "quote",
- "syn 1.0.101",
+ "syn",
 ]
 
 [[package]]
@@ -1403,12 +1438,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
 
 [[package]]
 name = "humansize"
-version = "2.1.3"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7"
+checksum = "02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026"
-dependencies = [
- "libm",
-]
 
 [[package]]
 name = "iana-time-zone"
@@ -1537,12 +1569,6 @@ version = "0.2.134"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "329c933548736bc49fd575ee68c89e8be4d260064184389a5b77517cddd99ffb"
 
-[[package]]
-name = "libm"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
-
 [[package]]
 name = "lock_api"
 version = "0.4.9"
@@ -1677,16 +1703,6 @@ dependencies = [
  "minimal-lexical",
 ]
 
-[[package]]
-name = "nu-ansi-term"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
-dependencies = [
- "overload",
- "winapi",
-]
-
 [[package]]
 name = "num-bigint"
 version = "0.4.3"
@@ -1795,15 +1811,9 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 1.0.101",
+ "syn",
 ]
 
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
 [[package]]
 name = "owo-colors"
 version = "3.5.0"
@@ -1968,7 +1978,7 @@ dependencies = [
  "proc-macro-hack",
  "proc-macro2",
  "quote",
- "syn 1.0.101",
+ "syn",
 ]
 
 [[package]]
@@ -1982,7 +1992,7 @@ dependencies = [
  "proc-macro-hack",
  "proc-macro2",
  "quote",
- "syn 1.0.101",
+ "syn",
 ]
 
 [[package]]
@@ -2029,7 +2039,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.101",
+ "syn",
 ]
 
 [[package]]
@@ -2097,6 +2107,40 @@ dependencies = [
  "universal-hash",
 ]
 
+[[package]]
+name = "postgres-protocol"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "878c6cbf956e03af9aa8204b407b9cbf47c072164800aa918c516cd4b056c50c"
+dependencies = [
+ "base64 0.13.0",
+ "byteorder",
+ "bytes",
+ "fallible-iterator",
+ "hmac 0.12.1",
+ "md-5",
+ "memchr",
+ "rand 0.8.5",
+ "sha2 0.10.6",
+ "stringprep",
+]
+
+[[package]]
+name = "postgres-types"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73d946ec7d256b04dfadc4e6a3292324e6f417124750fc5c0950f981b703a0f1"
+dependencies = [
+ "bytes",
+ "chrono",
+ "fallible-iterator",
+ "postgres-protocol",
+ "serde",
+ "serde_json",
+ "time 0.3.15",
+ "uuid",
+]
+
 [[package]]
 name = "ppv-lite86"
 version = "0.2.16"
@@ -2118,7 +2162,7 @@ dependencies = [
  "proc-macro-error-attr",
  "proc-macro2",
  "quote",
- "syn 1.0.101",
+ "syn",
  "version_check",
 ]
 
@@ -2141,18 +2185,18 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.59"
+version = "1.0.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
+checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.28"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
 dependencies = [
  "proc-macro2",
 ]
@@ -2424,26 +2468,25 @@ dependencies = [
 
 [[package]]
 name = "sea-orm"
-version = "0.11.3"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fade86e8d41fd1a4721f84cb834f4ca2783f973cc30e6212b7fafc134f169214"
+checksum = "84c7282fc3d7f79f6c5bd57e603319862fc778bf74118c0ce2a0dc82d9141dee"
 dependencies = [
  "async-stream",
  "async-trait",
- "bigdecimal",
  "chrono",
  "futures",
+ "futures-util",
  "log",
+ "once_cell",
  "ouroboros",
  "rust_decimal",
  "sea-orm-macros",
  "sea-query",
- "sea-query-binder",
  "sea-strum",
  "serde",
  "serde_json",
  "sqlx",
- "thiserror",
  "time 0.3.15",
  "tracing",
  "url",
@@ -2452,13 +2495,14 @@ dependencies = [
 
 [[package]]
 name = "sea-orm-cli"
-version = "0.11.3"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efbf34a2caf70c2e3be9bb1e674e9540f6dfd7c8f40f6f05daf3b9740e476005"
+checksum = "de07b4a0fc83b1b7ef8a2fe5d42c2662b1c60315446e6ebb4151a301c35fe484"
 dependencies = [
+ "async-std",
  "chrono",
  "clap 3.2.22",
- "dotenvy",
+ "dotenv",
  "regex",
  "sea-schema",
  "tracing",
@@ -2468,27 +2512,26 @@ dependencies = [
 
 [[package]]
 name = "sea-orm-macros"
-version = "0.11.3"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28936f26d62234ff0be16f80115dbdeb3237fe9c25cf18fbcd1e3b3592360f20"
+checksum = "f96b8a479d25d8110751a0511265556dd9139bc11e342357a98e60910fbb07e3"
 dependencies = [
  "bae",
  "heck 0.3.3",
  "proc-macro2",
  "quote",
- "syn 1.0.101",
+ "syn",
 ]
 
 [[package]]
 name = "sea-orm-migration"
-version = "0.11.3"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "278d3adfd0832b6ffc17d3cfbc574d3695a5c1b38814e0bc8ac238d33f3d87cf"
+checksum = "f80e3ebbc654c1915686898de119d33a449a9512567009df0a3e95b1afe4e36c"
 dependencies = [
  "async-trait",
  "clap 3.2.22",
- "dotenvy",
+ "dotenv",
- "futures",
  "sea-orm",
  "sea-orm-cli",
  "sea-schema",
@@ -2498,53 +2541,49 @@ dependencies = [
 
 [[package]]
 name = "sea-query"
-version = "0.28.5"
+version = "0.26.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbab99b8cd878ab7786157b7eb8df96333a6807cc6e45e8888c85b51534b401a"
+checksum = "a6a1de9d0334895f7eb51bd1603c3c9f6737413f905a134001f1e198f43bfd70"
 dependencies = [
- "bigdecimal",
  "chrono",
+ "postgres-types",
  "rust_decimal",
  "sea-query-derive",
+ "sea-query-driver",
  "serde_json",
  "time 0.3.15",
  "uuid",
 ]
 
-[[package]]
-name = "sea-query-binder"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cea85029985b40dfbf18318d85fe985c04db7c1b4e5e8e0a0a0cdff5f1e30f9"
-dependencies = [
- "bigdecimal",
- "chrono",
- "rust_decimal",
- "sea-query",
- "serde_json",
- "sqlx",
- "time 0.3.15",
- "uuid",
-]
-
 [[package]]
 name = "sea-query-derive"
-version = "0.3.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63f62030c60f3a691f5fe251713b4e220b306e50a71e1d6f9cce1f24bb781978"
+checksum = "34cdc022b4f606353fe5dc85b09713a04e433323b70163e81513b141c6ae6eb5"
 dependencies = [
- "heck 0.4.0",
+ "heck 0.3.3",
  "proc-macro2",
  "quote",
- "syn 1.0.101",
+ "syn",
  "thiserror",
 ]
 
 [[package]]
-name = "sea-schema"
+name = "sea-query-driver"
-version = "0.11.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eeb2940bb5a10bc6cd05b450ce6cd3993e27fddd7eface2becb97fc5af3a040e"
+checksum = "7d7f0cae2e7ebb2affc378c40bc343c8197181d601d6755c3e66f1bd18cac253"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "sea-schema"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f737a6819fcad9727207d7090ccd6a33c0b384f3794e8838f952b52d599e3a17"
 dependencies = [
  "futures",
  "sea-query",
@@ -2560,7 +2599,7 @@ dependencies = [
  "heck 0.3.3",
  "proc-macro2",
  "quote",
- "syn 1.0.101",
+ "syn",
 ]
 
 [[package]]
@@ -2582,7 +2621,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 1.0.101",
+ "syn",
 ]
 
 [[package]]
@@ -2643,7 +2682,7 @@ checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.101",
+ "syn",
 ]
 
 [[package]]
@@ -2844,11 +2883,11 @@ dependencies = [
  "ahash",
  "atoi",
  "base64 0.13.0",
- "bigdecimal",
  "bitflags",
  "byteorder",
  "bytes",
  "chrono",
+ "crc",
  "crossbeam-queue",
  "dirs",
  "dotenvy",
@@ -2905,9 +2944,10 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_json",
+ "sha2 0.10.6",
  "sqlx-core",
  "sqlx-rt",
- "syn 1.0.101",
+ "syn",
  "url",
 ]
 
@@ -2966,7 +3006,7 @@ dependencies = [
  "quote",
  "serde",
  "serde_derive",
- "syn 1.0.101",
+ "syn",
 ]
 
 [[package]]
@@ -2982,7 +3022,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "sha1 0.6.1",
- "syn 1.0.101",
+ "syn",
 ]
 
 [[package]]
@@ -3080,17 +3120,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "syn"
-version = "2.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
 [[package]]
 name = "tendril"
 version = "0.4.3"
@@ -3149,7 +3178,7 @@ checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.101",
+ "syn",
 ]
 
 [[package]]
@@ -3227,7 +3256,6 @@ dependencies = [
  "itoa 1.0.3",
  "libc",
  "num_threads",
- "serde",
  "time-macros 0.2.4",
 ]
 
@@ -3257,7 +3285,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "standback",
- "syn 1.0.101",
+ "syn",
 ]
 
 [[package]]
@@ -3282,9 +3310,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099"
 dependencies = [
  "autocfg",
+ "num_cpus",
  "pin-project-lite",
 ]
 
+[[package]]
+name = "toml"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "tracing"
 version = "0.1.36"
@@ -3306,14 +3344,14 @@ checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.101",
+ "syn",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.31"
+version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
+checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7"
 dependencies = [
  "once_cell",
  "valuable",
@@ -3342,12 +3380,12 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.17"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
+checksum = "60db860322da191b40952ad9affe65ea23e7dd6a5c442c2c42865810c6ab8e6b"
 dependencies = [
+ "ansi_term",
  "matchers",
- "nu-ansi-term",
  "once_cell",
  "regex",
  "sharded-slab",
@@ -3452,6 +3490,7 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f"
 dependencies = [
+ "getrandom 0.2.7",
  "serde",
 ]
 
@@ -3528,7 +3567,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 1.0.101",
+ "syn",
  "wasm-bindgen-shared",
 ]
 
@@ -3562,7 +3601,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.101",
+ "syn",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]

Cargo.toml

@@ -12,13 +12,13 @@ name = "tildes-statistics"
 path = "source/main.rs"
 
 [dependencies]
-askama = "0.12.0"
+askama = "0.11.1"
 async-std = "1.12.0"
 chrono = "0.4.22"
 color-eyre = "0.6.2"
 dotenvy = "0.15.5"
 grass = "0.11.2"
-sea-orm-migration = "0.11.3"
+sea-orm-migration = "0.9.3"
 tracing = "0.1.36"
 
 [dependencies.clap]
@@ -32,7 +32,7 @@ version = "0.3.4"
 
 [dependencies.sea-orm]
 features = ["macros", "mock", "runtime-async-std-rustls", "sqlx-postgres"]
-version = "0.11.3"
+version = "0.9.3"
 
 [dependencies.surf]
 default-features = false

package.json

@@ -4,11 +4,11 @@
     "test": "stylelint 'source/**/*.scss'"
   },
   "dependencies": {
-    "modern-normalize": "^2.0.0"
+    "modern-normalize": "^1.1.0"
   },
   "devDependencies": {
-    "stylelint": "^15.7.0",
+    "stylelint": "^14.12.1",
-    "stylelint-config-standard-scss": "^9.0.0"
+    "stylelint-config-standard-scss": "^5.0.0"
   },
   "stylelint": {
     "extends": [

source/charts/mod.rs

@@ -23,13 +23,8 @@ pub struct UserCountChart {
 
 impl UserCountChart {
   /// Render the chart and write it to file.
-  pub async fn render(
+  pub async fn render(&self, parent: &PathBuf, group_name: &str) -> Result<()> {
-    &self,
+    let parent = parent.join("charts");
-    parent: &PathBuf,
-    group_name: &str,
-    render_point_circles: bool,
-  ) -> Result<PathBuf> {
-    let parent = parent.join("charts/user-count");
     create_dir_all(&parent).await?;
 
     let (mut datapoints, mut min_count, mut max_count) = (vec![], i64::MAX, 0);
@@ -50,8 +45,7 @@ impl UserCountChart {
     let min_count = min_count - 10;
     let max_count = max_count + 10;
 
-    let path = parent.join(format!("{group_name}.svg"));
+    let path = parent.join("user-count.svg");
-    let output_path = path.clone();
     let chart_root = SVGBackend::new(&path, (1280, 720)).into_drawing_area();
     chart_root.fill(&BACKGROUND_2)?;
 
@@ -77,13 +71,7 @@ impl UserCountChart {
     chart
       .configure_mesh()
       .x_labels(datapoints.len() + 2)
-      .x_label_formatter(&|x| {
+      .x_label_formatter(&|x| format!("{:0}", datapoints_len - x))
-        if (x - 1) % (datapoints_len / 20) != 0 {
-          String::new()
-        } else {
-          format!("{:0}", datapoints_len - x)
-        }
-      })
       .x_desc("N days ago")
       .y_labels(5)
       .y_label_formatter(&|y| format!("{y:0}"))
@@ -109,29 +97,21 @@ impl UserCountChart {
       &ACCENT_1,
       &|(x, y), size, style| {
         EmptyElement::at((x, y))
-          + Circle::new(
+          + Circle::new((0, 0), size, style.filled())
-            (0, 0),
-            size,
-            if render_point_circles {
-              style.filled()
-            } else {
-              TRANSPARENT.filled()
-            },
-          )
           + Text::new(
             {
-              if (x - 1) % (datapoints_len / 10) != 0 {
+              if (x - 1) % 2 != 0 {
                 String::new()
               } else {
                 format!("{:0}", y)
               }
             },
-            (-20, -25),
+            (-10, 15),
             text_style(20),
           )
       },
     ))?;
 
-    Ok(output_path)
+    Ok(())
   }
 }

source/cli/run.rs

@@ -1,11 +1,8 @@
 //! All logic for running the CLI.
 
 use {
-  async_std::fs::{copy, create_dir_all},
+  async_std::fs::create_dir_all, clap::Parser, color_eyre::Result,
-  clap::Parser,
+  sea_orm_migration::MigratorTrait, tracing::info,
-  color_eyre::Result,
-  sea_orm_migration::MigratorTrait,
-  tracing::info,
 };
 
 use crate::{
@@ -19,7 +16,7 @@ use crate::{
   migrations::Migrator,
   scss::generate_css,
   snapshots::SnapshotModel,
-  templates::{GroupTemplate, HomeTemplate},
+  templates::HomeTemplate,
   utilities::{create_db, today},
 };
 
@@ -109,21 +106,6 @@ pub async fn run() -> Result<()> {
           };
 
         create_dir_all(&output).await?;
-
-        for group in &groups {
-          UserCountChart {
-            groups: GroupDataModel::get_n_most_recent(&db, 31, &group.name)
-              .await?,
-          }
-          .render(&output, &group.name, true)
-          .await?;
-
-          GroupTemplate::new(&group.name)
-            .await
-            .render_to_file(&output)
-            .await?;
-        }
-
         HomeTemplate::new(
           groups,
           user_count_group.as_ref().map(|group| group.subscribers),
@@ -135,9 +117,11 @@ pub async fn run() -> Result<()> {
         write_assets(&output).await?;
 
         if let Some(group) = user_count_group {
-          let path =
+          let groups =
-            output.join(&format!("charts/user-count/{}.svg", &group.name));
+            GroupDataModel::get_n_most_recent(&db, 30, &group.name).await?;
-          copy(path, output.join("charts/main-user-count.svg")).await?;
+          UserCountChart { groups }
+            .render(&output, &group.name)
+            .await?;
         }
       }
     },

source/scss/common.scss

@@ -36,20 +36,6 @@ li {
   padding: 0;
 }
 
-details {
-  border: 1px dashed var(--foreground-1);
-
-  summary {
-    background-color: var(--background-2);
-    cursor: pointer;
-    padding: var(--medium-spacing);
-  }
-
-  &[open] > summary {
-    border-bottom: 1px dashed var(--foreground-1);
-  }
-}
-
 .bold {
   font-weight: bold;
 }

source/templates/base.html

@@ -15,26 +15,6 @@
 
 <body>
   {% block body %}{% endblock %}
-
-  <footer class="page-footer">
-    <p>
-      Last generated on
-      <time class="underline" datetime="{{ today }}">{{- today -}}</time>.
-    </p>
-
-    <p>
-      &copy; Code
-      <a href="https://git.bauke.xyz/Bauke/tildes-statistics">AGPL-3.0-or-later</a>,
-      charts & data
-      <a href="https://creativecommons.org/licenses/by-nc/4.0/">CC BY-NC 4.0</a>.
-    </p>
-
-    <p class="bold">
-      Consider joining <a href="{{ base_url }}">Tildes</a>, a non-profit
-      community site driven by its users' interests.
-    </p>
-  </footer>
-
   {{ extra_body_html|safe }}
 </body>
 

source/templates/group.html

@@ -1,19 +0,0 @@
-{% extends "base.html" %}
-
-{% block head %}
-<link rel="stylesheet" href="/css/index.css">
-{% endblock %}
-
-{% block body %}
-<header class="page-header">
-  <img src="/tildes-statistics.png" alt="Tildes Statistics Logo">
-  <h1>{{ group_name }} Statistics</h1>
-</header>
-
-<main class="page-main">
-  <h2>General</h2>
-
-  <img class="chart" src="/charts/user-count/{{ group_name }}.svg"
-    alt="{{ group_name }} User Count Chart">
-</main>
-{% endblock %}

source/templates/index.html

@@ -19,36 +19,51 @@
     registered users on Tildes.
   </p>
 
-  <img class="chart" src="/charts/main-user-count.svg" alt="User Count Chart">
+  <img class="chart" src="/charts/user-count.svg" alt="User Count Chart">
 
-  <details open>
+  <table>
-    <summary>Groups Overview</summary>
+    <thead>
+      <tr>
+        <th>Group</th>
+        <th>Subscribers</th>
+        <th>Description</th>
+      </tr>
+    </thead>
 
-    <table>
+    <tbody>
-      <thead>
+      {% for group in groups %}
-        <tr>
+      <tr>
-          <th>Group</th>
+        <td>
-          <th>Subscribers</th>
+          <a href="{{ base_url }}/{{ group.name }}">{{ group.name }}</a>
-          <th>Description</th>
+        </td>
-        </tr>
+        <td>{{ group.subscribers }}</td>
-      </thead>
+        <td>
-
+          {% if let Some(description) = group.description %}
-      <tbody>
+          {{ description }}
-        {% for group in groups %}
+          {% endif %}
-        <tr>
+        </td>
-          <td>
+      </tr>
-            <a href="/{{ group.name }}">{{ group.name }}</a>
+      {% endfor %}
-          </td>
+    </tbody>
-          <td>{{ group.subscribers }}</td>
+  </table>
-          <td>
-            {% if let Some(description) = group.description %}
-            {{ description }}
-            {% endif %}
-          </td>
-        </tr>
-        {% endfor %}
-      </tbody>
-    </table>
-  </details>
 </main>
+
+<footer class="page-footer">
+  <p>
+    Last generated on
+    <time class="underline" datetime="{{ today }}">{{- today -}}</time>.
+  </p>
+
+  <p>
+    &copy; Code
+    <a href="https://git.bauke.xyz/Bauke/tildes-statistics">AGPL-3.0-or-later</a>,
+    charts & data
+    <a href="https://creativecommons.org/licenses/by-nc/4.0/">CC BY-NC 4.0</a>.
+  </p>
+
+  <p class="bold">
+    Consider joining <a href="{{ base_url }}">Tildes</a>, a non-profit
+    community site driven by its users' interests.
+  </p>
+</footer>
 {% endblock %}

source/templates/mod.rs

@@ -10,8 +10,6 @@ use {
   color_eyre::Result,
 };
 
-use async_std::fs::create_dir_all;
-
 use crate::{
   group_data::GroupDataModel,
   utilities::{get_base_url, today},
@@ -72,52 +70,3 @@ impl HomeTemplate {
     Ok(())
   }
 }
-
-/// The template for group-specific pages.
-#[derive(Template)]
-#[template(path = "group.html")]
-pub struct GroupTemplate {
-  /// The base URL for links to the Tildes instance.
-  pub base_url: String,
-
-  /// Extra HTML to insert in the body.
-  pub extra_body_html: String,
-
-  /// Extra HTML to insert in the head.
-  pub extra_head_html: String,
-
-  /// The group name for this group.
-  pub group_name: String,
-
-  /// The string for the `<title>` element.
-  pub page_title: String,
-
-  /// The date of today's snapshot.
-  pub today: NaiveDate,
-}
-
-impl GroupTemplate {
-  /// Create a new [`GroupTemplate`].
-  pub async fn new(group_name: &str) -> Self {
-    let extra_body_html = read_to_string("extra-body.html").await;
-    let extra_head_html = read_to_string("extra-head.html").await;
-
-    Self {
-      base_url: get_base_url(),
-      extra_body_html: extra_body_html.unwrap_or_default(),
-      extra_head_html: extra_head_html.unwrap_or_default(),
-      group_name: group_name.to_string(),
-      page_title: "Tildes Statistics".to_string(),
-      today: today(),
-    }
-  }
-
-  /// Render the template and write it to file.
-  pub async fn render_to_file(&self, parent: &PathBuf) -> Result<()> {
-    let output_dir = parent.join(&self.group_name);
-    create_dir_all(&output_dir).await?;
-    write(output_dir.join("index.html"), self.render()?).await?;
-
-    Ok(())
-  }
-}