Финальное исправление иконок в оформлении
This commit is contained in:
39
src/web.rs
39
src/web.rs
@@ -11,7 +11,6 @@ use serde::Serialize;
|
||||
use std::net::SocketAddr;
|
||||
use std::sync::Arc;
|
||||
use tokio::sync::Mutex;
|
||||
use tower_http::services::ServeDir;
|
||||
use tower_http::trace::TraceLayer;
|
||||
|
||||
#[derive(Clone)]
|
||||
@@ -89,19 +88,26 @@ pub async fn run_web_server(config: Config) -> anyhow::Result<()> {
|
||||
.route("/favicon.ico", get(favicon))
|
||||
.route("/static/style.css", get(style_css))
|
||||
.route("/static/fontawesome/all.min.css", get(fontawesome_css))
|
||||
.route(
|
||||
"/static/fontawesome/webfonts/fa-solid-900.woff2",
|
||||
get(fa_solid_woff2),
|
||||
)
|
||||
.route(
|
||||
"/static/fontawesome/webfonts/fa-regular-400.woff2",
|
||||
get(fa_regular_woff2),
|
||||
)
|
||||
.route(
|
||||
"/static/fontawesome/webfonts/fa-brands-400.woff2",
|
||||
get(fa_brands_woff2),
|
||||
)
|
||||
.route("/assets/logo.png", get(logo_png))
|
||||
.route("/api/jobs", get(list_jobs))
|
||||
.route("/api/generate", post(generate_jobs))
|
||||
.route("/api/cleanup", post(cleanup_jobs))
|
||||
.route("/api/status", get(get_status))
|
||||
.route("/api/jobs/stop-all", post(stop_all_jobs))
|
||||
.nest_service(
|
||||
"/static/fontawesome/webfonts",
|
||||
ServeDir::new("src/static/fontawesome/webfonts"),
|
||||
)
|
||||
.layer(TraceLayer::new_for_http())
|
||||
.with_state(state);
|
||||
|
||||
let addr: SocketAddr = format!("0.0.0.0:{}", web_port).parse()?;
|
||||
log::info!("Web server listening on http://{}", addr);
|
||||
|
||||
@@ -229,6 +235,27 @@ async fn stop_all_jobs(State(state): State<AppState>) -> Result<impl IntoRespons
|
||||
Ok((StatusCode::OK, format!("Stopped {} jobs", stopped)))
|
||||
}
|
||||
|
||||
async fn fa_solid_woff2() -> impl IntoResponse {
|
||||
(
|
||||
[(CONTENT_TYPE, "font/woff2")],
|
||||
include_bytes!("static/fontawesome/webfonts/fa-solid-900.woff2").as_slice(),
|
||||
)
|
||||
}
|
||||
|
||||
async fn fa_regular_woff2() -> impl IntoResponse {
|
||||
(
|
||||
[(CONTENT_TYPE, "font/woff2")],
|
||||
include_bytes!("static/fontawesome/webfonts/fa-regular-400.woff2").as_slice(),
|
||||
)
|
||||
}
|
||||
|
||||
async fn fa_brands_woff2() -> impl IntoResponse {
|
||||
(
|
||||
[(CONTENT_TYPE, "font/woff2")],
|
||||
include_bytes!("static/fontawesome/webfonts/fa-brands-400.woff2").as_slice(),
|
||||
)
|
||||
}
|
||||
|
||||
struct AppError(StatusCode, String);
|
||||
|
||||
impl IntoResponse for AppError {
|
||||
|
||||
Reference in New Issue
Block a user