Merge pull request 'Add router' (#19) from add-router-base-path into main

Reviewed-on: #19

src/lib.rs

@@ -7,7 +7,8 @@ use axum::{
 };
 use static_serve::embed_assets;
 
-use crate::{routes::template_ctx::TemplateCtx, state::AppState};
+use crate::routes::router::Router as InternalRouter;
+use crate::state::AppState;
 
 mod migrations;
 mod models;
@@ -46,12 +47,12 @@ pub fn build_app(state: AppState) -> Router {
 #[derive(Template, WebTemplate)]
 #[template(path = "404.html")]
 struct NotFoundTemplate {
-    pub ctx: TemplateCtx,
+    pub router: InternalRouter,
 }
 
 pub async fn error_handler(State(state): State<AppState>) -> impl axum::response::IntoResponse {
     NotFoundTemplate {
-        ctx: TemplateCtx {
+        router: InternalRouter {
             base_path: state.config.base_path,
         },
     }

src/routes/book.rs

@@ -13,9 +13,7 @@ use serde::Deserialize;
 use serde_with::{NoneAsEmptyString, serde_as};
 use snafu::prelude::*;
 
-use crate::{
+use crate::{models::book::Model as BookModel, routes::router::Router, state::error::CSVSnafu};
-    models::book::Model as BookModel, routes::template_ctx::TemplateCtx, state::error::CSVSnafu,
-};
 use crate::{models::user::Model as UserModel, state::error::IOSnafu};
 
 use crate::{
@@ -57,7 +55,7 @@ struct BookIndexTemplate {
     current_page: u64,
     total_page: u64,
     base_query: String,
-    ctx: TemplateCtx,
+    router: Router,
 }
 
 pub async fn index(
@@ -130,7 +128,7 @@ pub async fn index(
         current_page: books_paginate.current_page,
         total_page: books_paginate.total_page,
         base_query,
-        ctx: TemplateCtx {
+        router: Router {
             base_path: state.config.base_path,
         },
     })
@@ -142,7 +140,7 @@ struct ShowBookTemplate {
     book: BookModel,
     owner: UserModel,
     current_holder: Option<UserModel>,
-    ctx: TemplateCtx,
+    router: Router,
 }
 
 pub async fn show(
@@ -175,7 +173,7 @@ pub async fn show(
         book,
         owner,
         current_holder,
-        ctx: TemplateCtx {
+        router: Router {
             base_path: state.config.base_path,
         },
     })
@@ -210,7 +208,7 @@ pub async fn create(
 #[template(path = "books/new.html")]
 struct NewBookTemplate {
     users: Vec<UserModel>,
-    ctx: TemplateCtx,
+    router: Router,
 }
 
 pub async fn new(
@@ -223,7 +221,7 @@ pub async fn new(
 
     Ok(NewBookTemplate {
         users,
-        ctx: TemplateCtx {
+        router: Router {
             base_path: state.config.base_path,
         },
     })
@@ -234,7 +232,7 @@ pub async fn new(
 struct EditBookTemplate {
     users: Vec<UserModel>,
     book: BookModel,
-    ctx: TemplateCtx,
+    router: Router,
 }
 
 pub async fn edit(
@@ -253,7 +251,7 @@ pub async fn edit(
     Ok(EditBookTemplate {
         users,
         book,
-        ctx: TemplateCtx {
+        router: Router {
             base_path: state.config.base_path,
         },
     })

src/routes/mod.rs

@@ -1,3 +1,3 @@
 pub mod book;
-pub mod template_ctx;
+pub mod router;
 pub mod user;

src/routes/router.rs

@@ -0,0 +1,54 @@
+#[derive(Clone)]
+pub struct Router {
+    pub base_path: String,
+}
+
+impl Router {
+    pub fn assets(&self, path: &str) -> String {
+        if self.base_path.is_empty() || self.base_path == "/" {
+            format!("/{}", path)
+        } else {
+            format!("{}/{}", self.base_path.trim_end_matches('/'), path)
+        }
+    }
+
+    pub fn root_path(&self) -> String {
+        format!("{}/", &self.base_path)
+    }
+
+    // BOOKS ROUTES
+
+    pub fn new_book_path(&self) -> String {
+        format!("{}/books/new", &self.base_path)
+    }
+
+    pub fn create_book_path(&self) -> String {
+        format!("{}/books", &self.base_path)
+    }
+
+    pub fn update_book_path(&self, id: &i32) -> String {
+        format!("{}/books/{}", &self.base_path, id)
+    }
+
+    pub fn download_csv_book_path(&self) -> String {
+        format!("{}/books/download_csv", &self.base_path)
+    }
+
+    // USERS
+
+    pub fn index_user_path(&self) -> String {
+        format!("{}/users", &self.base_path)
+    }
+
+    pub fn new_user_path(&self) -> String {
+        format!("{}/users/new", &self.base_path)
+    }
+
+    pub fn create_user_path(&self) -> String {
+        format!("{}/users", &self.base_path)
+    }
+
+    pub fn update_user_path(&self, id: &i32) -> String {
+        format!("{}/users/{}", &self.base_path, id)
+    }
+}

src/routes/template_ctx.rs

@@ -1,14 +0,0 @@
-#[derive(Clone)]
-pub struct TemplateCtx {
-    pub base_path: String,
-}
-
-impl TemplateCtx {
-    pub fn asset(&self, path: &str) -> String {
-        if self.base_path.is_empty() || self.base_path == "/" {
-            format!("/{}", path)
-        } else {
-            format!("{}/{}", self.base_path.trim_end_matches('/'), path)
-        }
-    }
-}

src/routes/user.rs

@@ -16,7 +16,7 @@ use crate::{
         book::BookOperator,
         user::{self, UserOperator},
     },
-    routes::template_ctx::TemplateCtx,
+    routes::router::Router,
     state::{
         AppState,
         error::{AppStateError, BookSnafu, UserSnafu},
@@ -28,7 +28,7 @@ use crate::{
 struct UsersIndexTemplate {
     users_with_books_number: Vec<UserWithBookNumber>,
     query: IndexQuery,
-    ctx: TemplateCtx,
+    router: Router,
 }
 
 pub struct UserWithBookNumber {
@@ -88,7 +88,7 @@ pub async fn index(
     Ok(UsersIndexTemplate {
         users_with_books_number: result,
         query,
-        ctx: TemplateCtx {
+        router: Router {
             base_path: state.config.base_path,
         },
     })
@@ -140,7 +140,7 @@ pub async fn delete(
 #[template(path = "users/edit.html")]
 struct EditTemplate {
     user: user::Model,
-    ctx: TemplateCtx,
+    router: Router,
 }
 
 pub async fn edit(
@@ -154,7 +154,7 @@ pub async fn edit(
 
     Ok(EditTemplate {
         user,
-        ctx: TemplateCtx {
+        router: Router {
             base_path: state.config.base_path,
         },
     })
@@ -163,12 +163,12 @@ pub async fn edit(
 #[derive(Template, WebTemplate)]
 #[template(path = "users/new.html")]
 struct NewTemplate {
-    ctx: TemplateCtx,
+    router: Router,
 }
 
 pub async fn new(State(state): State<AppState>) -> impl axum::response::IntoResponse {
     NewTemplate {
-        ctx: TemplateCtx {
+        router: Router {
             base_path: state.config.base_path,
         },
     }

src/state/error.rs

@@ -6,7 +6,7 @@ use snafu::prelude::*;
 
 use crate::{
     models::{book::BookError, user::UserError},
-    routes::template_ctx::TemplateCtx,
+    routes::router::Router,
     state::config::ConfigError,
 };
 
@@ -48,7 +48,7 @@ pub enum AppStateError {
 #[template(path = "error.html")]
 struct ErrorTemplate {
     state: AppStateErrorContext,
-    ctx: TemplateCtx,
+    router: Router,
 }
 
 struct AppStateErrorContext {
@@ -68,7 +68,7 @@ impl IntoResponse for AppStateError {
         let error_context = AppStateErrorContext::from(self);
         ErrorTemplate {
             state: error_context,
-            ctx: TemplateCtx {
+            router: Router {
                 base_path: "".to_string(),
             },
         }

templates/404.html

@@ -8,6 +8,6 @@
     <div class="mt-4 text-center">
         <h1>{{ t!("error.error_404.title") }}</h1>
         <h2 class="fst-italic">{{ t!("error.error_404.subtitle") }}</h2>
-        <a href="/" class="mt-3 btn btn-info">{{ t!("error.error_404.button") }}</a>
+        <a href="{{ router.root_path() }}" class="mt-3 btn btn-info">{{ t!("error.error_404.button") }}</a>
     </div>
 {% endblock %}

templates/base.html

@@ -4,12 +4,12 @@
   <meta charset="utf-8">
   <title>{% block title %}{{ t!("name") }}{% endblock %}</title>
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="stylesheet" href='{{ ctx.asset("assets/css/bootstrap.css") }}'>
+  <link rel="stylesheet" href='{{ router.assets("assets/css/bootstrap.css") }}'>
-  <link rel="stylesheet" href='{{ ctx.asset("assets/css/main.css") }}'>
+  <link rel="stylesheet" href='{{ router.assets("assets/css/main.css") }}'>
   <link rel="icon" type="image/png" sizes="32x32" href="/assets/images/favicon.png">
 
-  <link rel="stylesheet" href='{{ ctx.asset("assets/css/fork-awesome.min.css") }}'>
+  <link rel="stylesheet" href='{{ router.assets("assets/css/fork-awesome.min.css") }}'>
-  <link rel="icon" type="image/x-icon" href='{{ ctx.asset("assets/images/favicon.ico") }}'>
+  <link rel="icon" type="image/x-icon" href='{{ router.assets("assets/images/favicon.ico") }}'>
   {% block extra_head %}{% endblock extra_head %}
 </head>
 
@@ -26,7 +26,7 @@
     {% endblock %}
   </footer>
 
-  <script src='{{ ctx.asset("assets/js/bootstrap.min.js") }}'></script>
+  <script src='{{ router.assets("assets/js/bootstrap.min.js") }}'></script>
-  <script src='{{ ctx.asset("assets/js/script.js") }}'></script>
+  <script src='{{ router.assets("assets/js/script.js") }}'></script>
 </body>
 </html>

templates/books/edit.html

@@ -10,7 +10,7 @@
   {{ typography::heading(t!("book.edit.title")) }}
 
   {% call cards::card() %}
-    <form method="post" action="/books/{{ book.id }}">
+    <form method="post" action="{{ router.update_book_path(&book.id) }}">
       <div class="mb-3">
         <label class="form-label" for="title">{{ t!("book.attributes.title") }}</label>
         <input type="text" name="title" class="form-control" value="{{ book.title }}" required>

templates/books/new.html

@@ -11,7 +11,7 @@
   {{ typography::heading(t!("book.new.title")) }}
 
   {% call cards::card() %}
-    <form method="post" action="/books">
+    <form method="post" action="{{ router.create_book_path() }}">
       {{ form_helpers::input("title", t!("book.attributes.title"), is_required = true, placeholder = "Ex: La Petite Dernière") }}
       {{ form_helpers::input("authors", t!("book.attributes.authors"), is_required = true, placeholder = "Ex: Fatima Daas") }}
 

templates/components/dropdown.html

@@ -18,9 +18,9 @@
     </button>
     <ul class="dropdown-menu">
       {% if show %}
-        <li><a class="dropdown-item" href="/{{ sub_path }}/{{ book.id }}">{{ t!("common.show") }}</a></li>
+        <li><a class="dropdown-item" href="{{ router.root_path() }}{{ sub_path }}/{{ book.id }}">{{ t!("common.show") }}</a></li>
       {% endif %}
-      <li><a class="dropdown-item" href="/{{ sub_path }}/{{ book.id }}/edit">{{ t!("common.edit") }}</a></li>
+      <li><a class="dropdown-item" href="{{ router.root_path() }}{{ sub_path }}/{{ book.id }}/edit">{{ t!("common.edit") }}</a></li>
       <li>
         <a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#deleteUserModal{{ book.id }}">{{ t!("common.delete") }}</a>
       </li>
@@ -40,7 +40,7 @@
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{ t!("common.close") }}</button>
-          <form method="post" action="/{{ sub_path }}/{{ book.id }}/delete" class="m-0">
+          <form method="post" action="{{ router.root_path() }}{{ sub_path }}/{{ book.id }}/delete" class="m-0">
             <input class="btn btn-danger" type="submit" value='{{ t!("common.delete") }}'>
           </form>
         </div>

templates/error.html

@@ -12,6 +12,6 @@
             <p>{{ error }}</p>
           {% endfor %}
         </div>
-        <a href="/" class="mt-3 btn btn-info">{{ t!("error.error_404.button") }}</a>
+        <a href="{{ router.root_path() }}" class="mt-3 btn btn-info">{{ t!("error.error_404.button") }}</a>
     </div>
 {% endblock %}

templates/index.html

@@ -9,7 +9,7 @@
 
 {% block main %}
   {% call typography::heading(t!("book.index.title")) %}
-    <a href="/books/download_csv?{{ base_query }}" class="btn btn-info">
+    <a href="{{ router.download_csv_book_path() }}?{{ base_query }}" class="btn btn-info">
       <i class="fa fa-download me-2" aria-hidden="true"></i> {{ t!("common.download") }} (csv)
     </a>
   {% endcall %}
@@ -87,7 +87,7 @@
         </div>
 
         <div class="col-md-1 d-flex align-items-end">
-          <a href="/" class="btn btn-light">{{ t!("common.reset") }}</a>
+          <a href="{{ router.root_path() }}" class="btn btn-light">{{ t!("common.reset") }}</a>
         </div>
       </div>
     </form>
@@ -98,7 +98,7 @@
       <div class="d-flex flex-column align-items-center justify-content-center">
         <h2>{{ t!("common.no_result") }}</h2>
 
-        <a class="btn btn-success text-white text-nowrap mt-3" href="/books/new">
+        <a class="btn btn-success text-white text-nowrap mt-3" href="{{ router.new_book_path() }}">
           {{ t!("book.new.button_short") }}
         </a>
       </div>
@@ -142,19 +142,19 @@
           <nav aria-label="Page navigation">
             <ul class="pagination">
               <li class="page-item {% if current_page <= 1 %}disabled{% endif %}">
-                <a class="page-link" href="/?{{ base_query }}page={% if current_page > 1 %}{{ current_page - 1 }}{% else %}1{% endif %}">{{ t!("common.prev") }}</a>
+                <a class="page-link" href="{{ router.root_path() }}?{{ base_query }}page={% if current_page > 1 %}{{ current_page - 1 }}{% else %}1{% endif %}">{{ t!("common.previous") }}</a>
               </li>
 
               {% for page in 1..(total_page + 1) %}
                 {% if page >= current_page - 1 && page <= current_page + 1 %}
                   <li class="page-item {% if page == current_page %}active{% endif %}">
-                    <a class="page-link" href="/?{{ base_query }}page={{ page }}">{{ page }}</a>
+                    <a class="page-link" href="{{ router.root_path() }}?{{ base_query }}page={{ page }}">{{ page }}</a>
                   </li>
                 {% endif %}
               {% endfor %}
 
               <li class="page-item {% if current_page == total_page %}disabled{% endif %}">
-                <a class="page-link" href="/?{{ base_query }}page={{ current_page + 1 }}">{{ t!("common.next") }}</a>
+                <a class="page-link" href="{{ router.root_path() }}?{{ base_query }}page={{ current_page + 1 }}">{{ t!("common.next") }}</a>
               </li>
             </ul>
           </nav>

templates/layout/footer.html

@@ -2,4 +2,4 @@
   <div class="d-flex flex-column flex-sm-row gap-0 gap-sm-3 justify-content-center">
     <p>{{ t!("footer.message") }}</p>
   </div>
-</div>
+</div>

templates/layout/header.html

@@ -1,6 +1,6 @@
 <nav class="navbar navbar-expand-lg bg-body-tertiary fixed-top shadow">
   <div class="container">
-    <a class="navbar-brand" href="/">
+    <a class="navbar-brand" href="{{ router.root_path() }}">
       {{ t!("name") }}
     </a>
 
@@ -12,10 +12,10 @@
     <div class="collapse navbar-collapse" id="navbarNav">
       <ul class="navbar-nav me-auto">
         <li class="nav-item">
-          <a class="nav-link" href="/">{{ t!("nav.books") }}</a>
+          <a class="nav-link" href="{{ router.root_path() }}">{{ t!("nav.books") }}</a>
         </li>
         <li class="nav-item">
-          <a class="nav-link" href="/users">{{ t!("nav.users") }}</a>
+          <a class="nav-link" href="{{ router.index_user_path() }}">{{ t!("nav.users") }}</a>
         </li>
       </ul>
       <div class="d-flex align-items-center gap-2 py-3">
@@ -24,7 +24,7 @@
           <option value="dark">{{ t!("theme.dark") }}</option>
         </select>
 
-        <a class="btn btn-success text-white text-nowrap" href="/books/new">
+        <a class="btn btn-success text-white text-nowrap" href="{{ router.new_book_path() }}">
           {{ t!("book.new.button_short") }}
         </a>
       </div>

templates/users/edit.html

@@ -11,7 +11,7 @@
   {{ typography::heading(t!("user.edit.title")) }}
 
   {% call cards::card() %}
-    <form action="/users/{{ user.id }}" method="post">
+    <form action="{{ router.update_user_path(&user.id) }}" method="post">
       <div class="row align-items-end">
        <div class="col-md-10">
           {{ form_helpers::input("name", t!("user.attributes.name"), value = user.name, is_required = true, placeholder = "Ex: Kropotkine", margin_bottom = false) }}

templates/users/index.html

@@ -10,7 +10,7 @@
 
 {% block main %}
   {% call typography::heading(t!("user.index.title")) %}
-    <a class="btn-success btn" href="/users/new">{{ t!("user.index.button") }}</a>
+    <a class="btn-success btn" href="{{ router.new_user_path() }}">{{ t!("user.index.button") }}</a>
   {% endcall %}
 
   {% call cards::card() %}
@@ -42,7 +42,7 @@
       <div class="d-flex flex-column align-items-center justify-content-center">
         <h2>{{ t!("common.no_result") }}</h2>
 
-        <a class="btn btn-success text-white text-nowrap mt-3" href="//new">
+        <a class="btn btn-success text-white text-nowrap mt-3" href="{{ router.new_user_path() }}">
           {{ t!("user.index.button") }}
         </a>
       </div>

templates/users/new.html

@@ -11,7 +11,7 @@
   {{ typography::heading(t!("user.new.title")) }}
 
   {% call cards::card() %}
-    <form action="/users" method="post">
+    <form action="{{ router.create_user_path() }}" method="post">
       <div class="row align-items-end">
        <div class="col-md-10">
           {{ form_helpers::input("name", t!("user.attributes.name"), is_required = true, placeholder = "Ex: Kropotkine", margin_bottom = false) }}