diff --git a/src/endpoints/area/get_new.rs b/src/endpoints/area/get_new.rs new file mode 100644 index 00000000..f0484611 --- /dev/null +++ b/src/endpoints/area/get_new.rs @@ -0,0 +1,20 @@ +use actix_web::{web, Responder}; +use askama::Template; +use askama_actix::TemplateToResponse; + +use crate::models::{Role, User}; + +#[derive(Template)] +#[template(path = "area/new.html")] +struct NewAreaTemplate { + user: User, +} + +#[actix_web::get("/area/new")] +async fn get(user: web::ReqData) -> impl Responder { + let template = NewAreaTemplate { + user: user.into_inner(), + }; + + template.to_response() +} diff --git a/src/endpoints/area/mod.rs b/src/endpoints/area/mod.rs new file mode 100644 index 00000000..a9cb9a44 --- /dev/null +++ b/src/endpoints/area/mod.rs @@ -0,0 +1 @@ +pub mod get_new; diff --git a/src/endpoints/mod.rs b/src/endpoints/mod.rs index 8b273c3a..29c68d17 100644 --- a/src/endpoints/mod.rs +++ b/src/endpoints/mod.rs @@ -8,6 +8,7 @@ mod location; mod user; mod assignment; mod get_export; +mod area; #[derive(Deserialize)] pub struct IdPath { @@ -50,5 +51,7 @@ pub fn init(cfg: &mut ServiceConfig) { cfg.service(assignment::get_new::get); cfg.service(assignment::post_new::post); + cfg.service(area::get_new::get); + cfg.service(get_export::get); } diff --git a/src/endpoints/user/post_login.rs b/src/endpoints/user/post_login.rs index 66b1cb03..6a1f9bd1 100644 --- a/src/endpoints/user/post_login.rs +++ b/src/endpoints/user/post_login.rs @@ -27,6 +27,7 @@ async fn post( .unwrap(); return HttpResponse::Found() + .insert_header(("LOCATION", "/")) .insert_header(("HX-LOCATION", "/")) .finish(); } diff --git a/templates/area/new.html b/templates/area/new.html new file mode 100644 index 00000000..7d8eb976 --- /dev/null +++ b/templates/area/new.html @@ -0,0 +1,42 @@ +{% extends "nav.html" %} + +{% block content %} +
+
+
+

Neuen Bereich anlegen

+ +
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+ +
+
+ Zurück +
+
+
+
+ +
+
+
+ + +{% endblock %} diff --git a/templates/index.html b/templates/index.html index b50aa4df..a6b150de 100644 --- a/templates/index.html +++ b/templates/index.html @@ -5,13 +5,13 @@
- ← + ←
- → + →
diff --git a/templates/location/overview.html b/templates/location/overview.html index 249f969b..d4262214 100644 --- a/templates/location/overview.html +++ b/templates/location/overview.html @@ -10,7 +10,8 @@
- Neuen Ort anlegen + Neuen Bereich anlegen + Neuen Ort anlegen
diff --git a/templates/user/login.html b/templates/user/login.html index 4bfff2c6..81b37008 100644 --- a/templates/user/login.html +++ b/templates/user/login.html @@ -4,7 +4,7 @@

Brass - Anmeldung

-
+