feat: error handling; css to assets

Author: vladkens

Cargo.lock

@@ -10,8 +10,10 @@ base64 = "0.22.1"
 cached = { version = "0.55.1", features = ["default", "async"] }
 chrono = { version = "0.4.40", features = ["serde"] }
 maud = { version = "0.27.0", features = ["axum"] }
+mime_guess = "2.0.5"
 phf = { version = "0.11.3", features = ["macros"] }
-reqwest = { version = "0.12.12", features = ["json", "rustls-tls"], default-features = false }
+reqwest = { version = "0.12.13", features = ["json", "rustls-tls"], default-features = false }
+rust-embed = { version = "8.6.0", features = ["axum"] }
 semver = "1.0.26"
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
@@ -31,6 +33,9 @@ rusttype = "0.9.3"
 [lints.rust]
 dead_code = "allow"
 
+[lints.clippy]
+unused_imports = "deny"
+
 [profile.release]
 strip = true
 

Cargo.toml

@@ -0,0 +1,26 @@
+@media (min-width: 1024px) {
+  .container {
+    max-width: 950px !important;
+  }
+}
+
+html { scroll-behavior: smooth; }
+.absolute { position: absolute; }
+.relative { position: relative; }
+.flex { display: flex; }
+.flex-row { flex-direction: row; }
+.flex-col { flex-direction: column; }
+.flex-wrap { flex-wrap: wrap; }
+.items-center { align-items: center; }
+.w-1\/2 { width: 50%; }
+.w-1\/4 { width: 25%; }
+.gap-2 { gap: 0.5rem; }
+.py-1 { padding-top: 0.25rem; padding-bottom: 0.25rem; }
+.pr-2 { padding-right: 0.5rem; }
+.text-center { text-align: center; }
+.no-underline { text-decoration: none; }
+.heading { position: relative; }
+.heading a { position: absolute; transform: translateX(-100%); left: 0; padding-right: 0.5rem; opacity: 0; text-decoration: none; }
+.heading:hover a { opacity: 0.25; }
+.heading:hover a:hover { opacity: 1 !important; }
+.h20 { height: 20px; }

assets/favicon.svg

@@ -1,5 +1,11 @@
 # badges.ws
 
+<img src="assets/favicon.svg" align="right" width="128" />
+
+[<img src="https://badges.ws/github/license/vladkens/badges" />](https://github.com/vladkens/badges/blob/main/LICENSE)
+[<img src="https://badges.ws/badge/Powered_by_Fly.io-24175B?logo=flydotio&logoColor=fff" />](https://fly.io)
+[<img src="https://badges.ws/badge/-/buy%20me%20a%20coffee/ff813f?icon=buymeacoffee&label" alt="donate" />](https://buymeacoffee.com/vladkens)
+
 Badges.ws is a modern, Rust-based badge generation service inspired by [Shields.io](https://github.com/badges/shields) and [Badgen.net](https://github.com/badgen/badgen.net). It offers a simpler, more efficient codebase with up-to-date integrations, self-hosting capabilities, and low memory consumption. Additionally, it incorporates API-level data caching on top of control-cache headers.
 
 ## Why Badges.ws?

assets/main.css

@@ -1,12 +1,12 @@
-use axum::{
-  extract::{Path, Query},
-  response::IntoResponse,
-};
+use axum::extract::{Path, Query};
 use serde::{Deserialize, Serialize};
 
 use super::get_client;
-use crate::badgelib::{Badge, DlPeriod};
-use crate::server::{Dict, Rep, Res};
+use crate::server::{Dict, Res};
+use crate::{
+  badgelib::{Badge, DlPeriod},
+  server::BadgeRep,
+};
 
 #[derive(Debug)]
 struct Data {
@@ -39,10 +39,7 @@ pub(crate) enum Kind {
   Weekly,
 }
 
-pub async fn handler(
-  Path((kind, name)): Path<(Kind, String)>,
-  Query(qs): Query<Dict>,
-) -> Rep<impl IntoResponse> {
+pub async fn handler(Path((kind, name)): Path<(Kind, String)>, Query(qs): Query<Dict>) -> BadgeRep {
   let rs = get_data(&name).await?;
   match kind {
     Kind::Version => Ok(Badge::for_version(&qs, "mozilla add-on", &rs.version)?),

readme.md

@@ -1,12 +1,9 @@
-use axum::{
-  extract::{Path, Query},
-  response::IntoResponse,
-};
+use axum::extract::{Path, Query};
 use serde::{Deserialize, Serialize};
 
 use super::get_client;
 use crate::badgelib::{Badge, DlPeriod};
-use crate::server::{Dict, Rep, Res};
+use crate::server::{BadgeRep, Dict, Res};
 
 #[derive(Debug)]
 struct CrateData {
@@ -53,10 +50,7 @@ pub(crate) enum Kind {
   Total,
 }
 
-pub async fn handler(
-  Path((kind, name)): Path<(Kind, String)>,
-  Query(qs): Query<Dict>,
-) -> Rep<impl IntoResponse> {
+pub async fn handler(Path((kind, name)): Path<(Kind, String)>, Query(qs): Query<Dict>) -> BadgeRep {
   let rs = get_data(&name).await?;
   match kind {
     Kind::Version => Ok(Badge::for_version(&qs, "crates.io", &rs.version)?),

src/apis/amo.rs

@@ -1,12 +1,9 @@
-use axum::{
-  extract::{Path, Query},
-  response::IntoResponse,
-};
+use axum::extract::{Path, Query};
 use serde::{Deserialize, Serialize};
 
 use super::get_client;
 use crate::badgelib::{Badge, Color, utils::render_stars};
-use crate::server::{Dict, Rep, Res};
+use crate::server::{BadgeRep, Dict, Res};
 
 #[derive(Debug)]
 struct Data {
@@ -48,10 +45,7 @@ pub(crate) enum Kind {
   Stars,
 }
 
-pub async fn handler(
-  Path((kind, name)): Path<(Kind, String)>,
-  Query(qs): Query<Dict>,
-) -> Rep<impl IntoResponse> {
+pub async fn handler(Path((kind, name)): Path<(Kind, String)>, Query(qs): Query<Dict>) -> BadgeRep {
   let rs = get_data(&name).await?;
   match kind {
     Kind::Version => Ok(Badge::for_version(&qs, "chrome web store", &rs.version)?),

src/apis/crates.rs

@@ -1,12 +1,9 @@
-use axum::{
-  extract::{Path, Query},
-  response::IntoResponse,
-};
+use axum::extract::{Path, Query};
 use serde::{Deserialize, Serialize};
 
 use super::get_client;
 use crate::badgelib::{Badge, DlPeriod};
-use crate::server::{Dict, Rep, Res};
+use crate::server::{BadgeRep, Dict, Res};
 
 #[derive(Debug)]
 struct Data {
@@ -66,10 +63,7 @@ pub(crate) enum Kind {
   Monthly,
 }
 
-pub async fn handler(
-  Path((kind, name)): Path<(Kind, String)>,
-  Query(qs): Query<Dict>,
-) -> Rep<impl IntoResponse> {
+pub async fn handler(Path((kind, name)): Path<(Kind, String)>, Query(qs): Query<Dict>) -> BadgeRep {
   match kind {
     Kind::Version => Ok(Badge::for_version(&qs, "pub", &get_data(&name).await?.version)?),
     Kind::License => Ok(Badge::for_license(&qs, &get_score(&name).await?.license)?),

src/apis/cws.rs

@@ -1,19 +1,13 @@
-use axum::{
-  extract::{Path, Query},
-  response::IntoResponse,
-};
+use axum::extract::{Path, Query};
 
 use crate::badgelib::{Badge, Color};
-use crate::server::{Dict, Rep};
+use crate::server::{BadgeRep, Dict};
 
-pub async fn handler1(Query(qs): Query<Dict>) -> Rep<impl IntoResponse> {
+pub async fn handler1(Query(qs): Query<Dict>) -> BadgeRep {
   Ok(Badge::from_qs(&qs)?)
 }
 
-pub async fn handler2(
-  Path(config): Path<String>,
-  Query(qs): Query<Dict>,
-) -> Rep<impl IntoResponse> {
+pub async fn handler2(Path(config): Path<String>, Query(qs): Query<Dict>) -> BadgeRep {
   // Label, message and color separated by a dash -. For example: `label-message-color`
   // Message and color only, separated by a dash -. For example: `just%20the%20message-8A2BE2`
   // Rules:
@@ -53,7 +47,7 @@ pub async fn handler2(
 pub async fn handler3(
   Path((label, value, color)): Path<(String, String, Color)>,
   Query(qs): Query<Dict>,
-) -> Rep<impl IntoResponse> {
+) -> BadgeRep {
   let label = qs.get("label").unwrap_or(&label);
   let value = qs.get("value").unwrap_or(&value);
   let color = qs.get("color").map_or(color, |x| Color::from_str(x).unwrap_or_default());