From 2ec200831f1823aad402c1fd39d3a315aa145218 Mon Sep 17 00:00:00 2001 From: Max Hohlfeld Date: Thu, 3 Jul 2025 21:28:47 +0200 Subject: [PATCH] refactor: move overview into calendar --- .../availability/{get_overview.rs => get_calendar.rs} | 4 ++-- web/src/endpoints/availability/mod.rs | 2 +- web/src/endpoints/mod.rs | 2 +- web/templates/{index.html => calendar.html} | 0 web/templates/nav.html | 4 ++++ 5 files changed, 8 insertions(+), 4 deletions(-) rename web/src/endpoints/availability/{get_overview.rs => get_calendar.rs} (98%) rename web/templates/{index.html => calendar.html} (100%) diff --git a/web/src/endpoints/availability/get_overview.rs b/web/src/endpoints/availability/get_calendar.rs similarity index 98% rename from web/src/endpoints/availability/get_overview.rs rename to web/src/endpoints/availability/get_calendar.rs index c6609734..e6e91ad4 100644 --- a/web/src/endpoints/availability/get_overview.rs +++ b/web/src/endpoints/availability/get_calendar.rs @@ -24,7 +24,7 @@ pub struct CalendarQuery { } #[derive(Template)] -#[template(path = "index.html")] +#[template(path = "calendar.html")] struct CalendarTemplate { user: User, user_can_create_availability: bool, @@ -41,7 +41,7 @@ struct CalendarTemplate { availabilities: Vec, } -#[actix_web::get("/")] +#[actix_web::get("/calendar")] async fn get( user: web::ReqData, pool: web::Data, diff --git a/web/src/endpoints/availability/mod.rs b/web/src/endpoints/availability/mod.rs index 78c0364b..d1632d81 100644 --- a/web/src/endpoints/availability/mod.rs +++ b/web/src/endpoints/availability/mod.rs @@ -9,8 +9,8 @@ use crate::{ use brass_db::models::{Role, User}; pub mod delete; +pub mod get_calendar; pub mod get_new; -pub mod get_overview; pub mod get_update; pub mod post_new; pub mod post_update; diff --git a/web/src/endpoints/mod.rs b/web/src/endpoints/mod.rs index 1a5eeb36..92c4ade0 100644 --- a/web/src/endpoints/mod.rs +++ b/web/src/endpoints/mod.rs @@ -56,7 +56,7 @@ pub fn init(cfg: &mut ServiceConfig) { cfg.service(availability::delete::delete); cfg.service(availability::get_new::get); - cfg.service(availability::get_overview::get); + cfg.service(availability::get_calendar::get); cfg.service(availability::get_update::get); cfg.service(availability::post_new::post); cfg.service(availability::post_update::post); diff --git a/web/templates/index.html b/web/templates/calendar.html similarity index 100% rename from web/templates/index.html rename to web/templates/calendar.html diff --git a/web/templates/nav.html b/web/templates/nav.html index 86064819..de48265f 100644 --- a/web/templates/nav.html +++ b/web/templates/nav.html @@ -18,6 +18,10 @@