From dcf1f00ff9d498754adaf560497cc8431ed69b5b Mon Sep 17 00:00:00 2001 From: Per Stark Date: Tue, 3 Dec 2024 16:09:11 +0100 Subject: [PATCH] tera wip --- src/bin/server.rs | 10 ++++++---- src/server/routes/hello_world.rs | 10 ---------- src/server/routes/index.rs | 10 ++++++++++ src/server/routes/mod.rs | 2 +- src/server/templates/hello_world.html | 4 ---- src/server/templates/index.html | 11 +++++++++++ 6 files changed, 28 insertions(+), 19 deletions(-) delete mode 100644 src/server/routes/hello_world.rs create mode 100644 src/server/routes/index.rs delete mode 100644 src/server/templates/hello_world.html create mode 100644 src/server/templates/index.html diff --git a/src/bin/server.rs b/src/bin/server.rs index fdfa195..460d6c4 100644 --- a/src/bin/server.rs +++ b/src/bin/server.rs @@ -10,6 +10,7 @@ use zettle_db::{ rabbitmq::{publisher::RabbitMQProducer, RabbitMQConfig}, server::routes::{ file::{delete_file_handler, get_file_handler, update_file_handler, upload_handler}, + index::index_handler, ingress::ingress_handler, query::query_handler, queue_length::queue_length_handler, @@ -44,20 +45,21 @@ async fn main() -> Result<(), Box> { // Create Axum router let app = Router::new() + // Ingress routes .route("/ingress", post(ingress_handler)) .route("/message_count", get(queue_length_handler)) .layer(Extension(producer)) + // File routes .route("/file", post(upload_handler)) .layer(DefaultBodyLimit::max(1024 * 1024 * 1024)) .route("/file/:uuid", get(get_file_handler)) .route("/file/:uuid", put(update_file_handler)) .route("/file/:uuid", delete(delete_file_handler)) + // Query routes .route("/query", post(query_handler)) .layer(Extension(db_client)) - .route( - "/hello_world", - get(zettle_db::server::routes::hello_world::hello_world_handler), - ) + // Html routes + .route("/", get(index_handler)) .layer(Extension(tera)); tracing::info!("Listening on 0.0.0.0:3000"); diff --git a/src/server/routes/hello_world.rs b/src/server/routes/hello_world.rs deleted file mode 100644 index 4589920..0000000 --- a/src/server/routes/hello_world.rs +++ /dev/null @@ -1,10 +0,0 @@ -use axum::Extension; -use tera::{Context, Tera}; - -use crate::error::ApiError; - -pub async fn hello_world_handler(Extension(tera): Extension) -> Result { - let output = tera.render("hello_world.html", &Context::new()).unwrap(); - - Ok(output) -} diff --git a/src/server/routes/index.rs b/src/server/routes/index.rs new file mode 100644 index 0000000..f7705c4 --- /dev/null +++ b/src/server/routes/index.rs @@ -0,0 +1,10 @@ +use axum::{response::Html, Extension}; +use tera::{Context, Tera}; + +use crate::error::ApiError; + +pub async fn index_handler(Extension(tera): Extension) -> Result, ApiError> { + let output = tera.render("index.html", &Context::new()).unwrap(); + + Ok(output.into()) +} diff --git a/src/server/routes/mod.rs b/src/server/routes/mod.rs index d23b2fe..2b67058 100644 --- a/src/server/routes/mod.rs +++ b/src/server/routes/mod.rs @@ -1,5 +1,5 @@ pub mod file; -pub mod hello_world; +pub mod index; pub mod ingress; pub mod query; pub mod queue_length; diff --git a/src/server/templates/hello_world.html b/src/server/templates/hello_world.html deleted file mode 100644 index 29c63f8..0000000 --- a/src/server/templates/hello_world.html +++ /dev/null @@ -1,4 +0,0 @@ -

Hello

-
Hello
-

HI

-wowoow diff --git a/src/server/templates/index.html b/src/server/templates/index.html new file mode 100644 index 0000000..eb0ebf5 --- /dev/null +++ b/src/server/templates/index.html @@ -0,0 +1,11 @@ + + + + + + + + Hello world! + + + \ No newline at end of file