diff --git a/endsong_ui/Cargo.lock b/endsong_ui/Cargo.lock index b59d001..21b24df 100644 --- a/endsong_ui/Cargo.lock +++ b/endsong_ui/Cargo.lock @@ -98,9 +98,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.1.18" +version = "1.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" dependencies = [ "shlex", ] @@ -161,18 +161,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.17" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" +checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.17" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" +checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b" dependencies = [ "anstyle", "clap_lex", @@ -481,9 +481,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -774,9 +774,9 @@ checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "plotly" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d944e5f68193cb484fa63cfff0b22e5d1c2773221ff242f30d18645873fbdbfa" +checksum = "4e1ffd11c8a6ef0b730b9d3e46ad2404f79905825cb20223fa0547434a2dff54" dependencies = [ "dyn-clone", "erased-serde", @@ -792,9 +792,9 @@ dependencies = [ [[package]] name = "plotly_derive" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8a29f91d6bfbba26a2ad35baecd507f59b87dacfdf90c21c04404e621e5d78" +checksum = "69e940d8d8db30c6f4cc37dab9aab61f4c9cc1e6efb6d18902ab88fa09c03560" dependencies = [ "darling", "proc-macro2", @@ -978,9 +978,9 @@ checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "rinja" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a73141aab0b35b30bb993f5c832b8c9211709563b8b95517713b7d00ebb063e" +checksum = "f28580fecce391f3c0e65a692e5f2b5db258ba2346ee04f355ae56473ab973dc" dependencies = [ "humansize", "itoa", @@ -993,9 +993,9 @@ dependencies = [ [[package]] name = "rinja_derive" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b0baa0b963e94a919d0dcad5be1e2d30dcc0fdab93d9803ab4a019e188647c" +checksum = "1f1ae91455a4c82892d9513fcfa1ac8faff6c523602d0041536341882714aede" dependencies = [ "basic-toml", "memchr", @@ -1012,9 +1012,9 @@ dependencies = [ [[package]] name = "rinja_parser" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27303ef1ee98bb4240e3dd417f26459061e068d331b7ad05576167da3ae59a4e" +checksum = "06ea17639e1f35032e1c67539856e498c04cd65fe2a45f55ec437ec55e4be941" dependencies = [ "memchr", "nom", @@ -1231,18 +1231,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", @@ -1390,15 +1390,15 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "utf8parse" diff --git a/endsong_ui/Cargo.toml b/endsong_ui/Cargo.toml index dee08a7..fa972a2 100644 --- a/endsong_ui/Cargo.toml +++ b/endsong_ui/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" chrono = "0.4" endsong = { path = ".." } rustyline = { version = "14.*", features = ["derive"] } -plotly = "0.9" +plotly = "0.10" itertools = "0.13" textwrap = "0.16" thiserror = "1.0" diff --git a/endsong_ui/templates/artist.html b/endsong_ui/templates/artist.html index cd5bb2c..591a11e 100644 --- a/endsong_ui/templates/artist.html +++ b/endsong_ui/templates/artist.html @@ -32,7 +32,10 @@

General info

-

Top {{ top }} songs

+
+

Top {{ top }} songs

+ summed across albums +
    {% for song in songs -%}
  1. {{ song.0 }} | {{ song.1 }} plays
  2. diff --git a/endsong_ui/templates/tailwind_style.css b/endsong_ui/templates/tailwind_style.css index ff1cd5d..faac1dd 100644 --- a/endsong_ui/templates/tailwind_style.css +++ b/endsong_ui/templates/tailwind_style.css @@ -554,14 +554,6 @@ video { display: none; } -.-mb-8 { - margin-bottom: -2rem; -} - -.ml-4 { - margin-left: 1rem; -} - .ml-6 { margin-left: 1.5rem; } @@ -570,31 +562,14 @@ video { display: flex; } -.h-fit { - height: -moz-fit-content; - height: fit-content; -} - -.w-40 { - width: 10rem; -} - .w-96 { width: 24rem; } -.w-80 { - width: 20rem; -} - .list-decimal { list-style-type: decimal; } -.list-disc { - list-style-type: disc; -} - .list-none { list-style-type: none; } @@ -607,6 +582,10 @@ video { align-items: center; } +.justify-center { + justify-content: center; +} + .justify-evenly { justify-content: space-evenly; } @@ -615,6 +594,10 @@ video { gap: 4rem; } +.gap-3 { + gap: 0.75rem; +} + .gap-4 { gap: 1rem; } @@ -623,10 +606,6 @@ video { gap: 2rem; } -.gap-3 { - gap: 0.75rem; -} - .self-center { align-self: center; } @@ -671,16 +650,16 @@ video { line-height: 1.75rem; } -.text-sm { - font-size: 0.875rem; - line-height: 1.25rem; -} - .text-xs { font-size: 0.75rem; line-height: 1rem; } +.text-sm { + font-size: 0.875rem; + line-height: 1.25rem; +} + .font-bold { font-weight: 700; }