Move web pages

src/web.rs

@@ -110,7 +110,7 @@ impl App {
             config,
             db,
             session_store,
-            tera: Arc::new(Tera::new("templates/*.html")?),
+            tera: Arc::new(Tera::new("templates/**/*.html")?),
         })
     }
 
@@ -126,16 +126,7 @@ impl App {
                 )
             }
         )
-        // example route, remove later or something
-        .or(warp::path!("hello" / String).map({
-            let tera = self.tera.clone();
-            move |name: String| {
-                let mut ctx = Context::new();
-                ctx.insert("name", &name);
-                warp::reply::html(tera.render("hello.html", &ctx).unwrap())
-            }
-        }))
-        .or(warp::path("tmtd").map({
+        .or(warp::path("task").map({
             let tera = self.tera.clone();
             move || {
                 let mut ctx = Context::new();
@@ -151,7 +142,7 @@ impl App {
                     tasks.push(task_ctx);
                 }
                 ctx.insert("tasks", &tasks);
-                warp::reply::html(tera.render("task_page.html", &ctx).unwrap())
+                warp::reply::html(tera.render("task/task_page.html", &ctx).unwrap())
             }
         }))
         .or(warp::path("task")
@@ -160,7 +151,7 @@ impl App {
             let tera = self.tera.clone();
             move || {
                 let ctx = Context::new();
-                warp::reply::html(tera.render("create_task.html", &ctx).unwrap())
+                warp::reply::html(tera.render("task/create_task.html", &ctx).unwrap())
             }
         }))
         .or(warp::post()

templates/form.css

@@ -1 +0,0 @@
-

templates/hello.html

@@ -1,5 +0,0 @@
-{% extends "base.html" %}
-
-{% block content %}
-Hello, {{name}}
-{% endblock content %}

templates/navbar.html

@@ -0,0 +1,10 @@
+logo or something<br>
+navbar<br>
+
+<a href="/">home</a> |
+<a href="/task">tasks</a> |
+<a href="/users">users</a> |
+<a href="/admin">admin panel</a>
+
+<hr>
+

templates/task/create_task.html

@@ -2,14 +2,8 @@
 
 {% block content %}
 
-logo or something<br>
-navbar<br>
+{% include "navbar.html" %}
 
-<a href="/tasks">tasks</a> |
-<a href="/users">users</a> |
-(<a href="/admin">admin panel</a>) 
-
-<hr>
 <form action="/api/task/create" method="post">
     <label for="title">Title</label><br>
     <input type="text" id="title" name="title" style="width:fit-content"><br>

templates/task/task_page.html

@@ -2,14 +2,8 @@
 
 {% block content %}
 
-logo or something<br>
-navbar<br>
+{% include "navbar.html" %}
 
-<a href="/tasks">tasks</a> |
-<a href="/users">users</a> |
-(<a href="/admin">admin panel</a>) 
-
-<hr>
 <a href="api/task/create">Create issue</a><br><br>
 
 <label for="group">Task group</label>
@@ -25,7 +19,7 @@ navbar<br>
 
 <ul>
 {% for task in tasks %}
-    {% include "task.html" %}
+    {% include "task/task.html" %}
 {% endfor %}
 </ul>