diff --git a/.gitignore b/.gitignore index ea8c4bf..bcd5559 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /target + +.DS_Store diff --git a/BookForge.toml b/BookForge.toml index 57033f1..0ac7cc8 100644 --- a/BookForge.toml +++ b/BookForge.toml @@ -1,5 +1,6 @@ database_path = "" locale = "fr" +base_url = "" [listener] port = 8000 diff --git a/assets/images/favicon.png b/assets/images/favicon.png new file mode 100644 index 0000000..5dbbdbe Binary files /dev/null and b/assets/images/favicon.png differ diff --git a/locales/en.yml b/locales/en.yml index 2bc8531..5e258e0 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -1,12 +1,13 @@ _version: 1 name: "BookForge" + common: download: Download create: Create edit: Edit delete: Delete next: Next - previous: Prev + previous: Previous actions: Actions search: Search reset: Reset @@ -15,54 +16,77 @@ common: close: Close confirmation: Confirmation are_you_sure: Are you sure? + nav: toggle: Toggle navigation books: Books users: Users + theme: light: Light dark: Dark + user: attributes: name: Name - owner_books: Owner books + owner_books: Owned books borrowed_books: Borrowed books + index: + title_tag: Users list | BookForge title: All Users - button: Add User + button: Add a user + edit: + title_tag: Edit user | BookForge title: Edit button: Edit user + new: - title: New User - button: Create User + title_tag: New user | BookForge + title: New user + button: Create user + book: attributes: title: Title authors: Author(s) description: Description owner: Owner - current_holder: Current Holder + current_holder: Current holder comment: Comment + index: + title_tag: Books list | BookForge title: All Books + new: + title_tag: New book | BookForge title: New Book - button: Create Book + button: Create book button_short: Add book + edit: - title: Edit Book - button: Edit Book + title_tag: Edit book | BookForge + title: Edit book + button: Edit book + show: - book_details: Book Details - user_details: User Details - more_informations: More Informations + title_tag: Details | BookForge + book_details: Book details + user_details: User details + more_informations: More information + footer: - message: Made with Love & Fuck a Fascist! + message: Made with love & Fuck fascists! + error: error_404: - title: Oops ! This page does not exist + title_tag: Error 404 | BookForge + title: Oops! This page does not exist subtitle: 404 NOT FOUND button: Back to home + generic: + title_tag: Error | BookForge title: Oops! An error occurred diff --git a/locales/fr.yml b/locales/fr.yml index 4411bcc..22b0675 100644 --- a/locales/fr.yml +++ b/locales/fr.yml @@ -28,14 +28,17 @@ user: owner_books: Livres possédés borrowed_books: Livres empruntés index: - title: Tous les utilisateurs - button: Ajouter un utilisateur + title_tag: Liste des utilisateur.ice.s | BookForge + title: Tous les utilisateur.ice.s + button: Ajouter un.e utilisateur.ice edit: + title_tag: Modifier l'utilisateur.ice | BookForge title: Modifier - button: Modifier l'utilisateur + button: Modifier l'utilisateur.ice new: - title: Nouvel utilisateur - button: Créer l'utilisateur + title_tag: Nouvel utilisateur.ice | BookForge + title: Nouvel utilisateur.ice + button: Créer l'utilisateur.ice book: attributes: title: Titre @@ -45,24 +48,30 @@ book: current_holder: Détenteur.ice actuel.le comment: Commentaire index: + title_tag: Liste des livres | BookForge title: Tous les livres new: + title_tag: Nouveau livre | BookForge title: Nouveau livre button: Créer le livre button_short: Ajouter un livre edit: + title_tag: Modifier le livre | BookForge title: Modifier le livre button: Modifier le livre show: + title_tag: Details | BookForge book_details: Détails du livre - user_details: Détails de l'utilisateur + user_details: Détails de l'utilisateur.ice more_informations: Plus d'informations footer: message: Fait avec amour & Nique les fachos ! error: error_404: + title_tag: Erreur 404 | BookForge title: Oups ! Cette page n'existe pas subtitle: 404 NOT FOUND button: Retour à l'accueil generic: + title_tag: Erreur | BookForge title: Oups ! Une erreur s'est produite diff --git a/src/lib.rs b/src/lib.rs index 9c1f01d..6c3de23 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,10 +2,12 @@ use askama::Template; use askama_web::WebTemplate; use axum::{ Router, + extract::State, routing::{get, post}, }; use static_serve::embed_assets; +use crate::routes::router::Router as InternalRouter; use crate::state::AppState; mod migrations; @@ -44,8 +46,14 @@ pub fn build_app(state: AppState) -> Router { #[derive(Template, WebTemplate)] #[template(path = "404.html")] -struct NotFoundTemplate {} - -pub async fn error_handler() -> impl axum::response::IntoResponse { - NotFoundTemplate {} +struct NotFoundTemplate { + pub router: InternalRouter, +} + +pub async fn error_handler(State(state): State) -> impl axum::response::IntoResponse { + NotFoundTemplate { + router: InternalRouter { + base_path: state.config.base_path, + }, + } } diff --git a/src/routes/book.rs b/src/routes/book.rs index 124a44f..8d4fa03 100644 --- a/src/routes/book.rs +++ b/src/routes/book.rs @@ -13,7 +13,7 @@ use serde::Deserialize; use serde_with::{NoneAsEmptyString, serde_as}; use snafu::prelude::*; -use crate::{models::book::Model as BookModel, state::error::CSVSnafu}; +use crate::{models::book::Model as BookModel, routes::router::Router, state::error::CSVSnafu}; use crate::{models::user::Model as UserModel, state::error::IOSnafu}; use crate::{ @@ -55,6 +55,7 @@ struct BookIndexTemplate { current_page: u64, total_page: u64, base_query: String, + router: Router, } pub async fn index( @@ -73,7 +74,7 @@ pub async fn index( .context(UserSnafu)?; // Get all Book filtered with query - let books_paginate = BookOperator::new(state) + let books_paginate = BookOperator::new(state.clone()) .all_paginate(page, Some(query.clone())) .await .context(BookSnafu)?; @@ -127,6 +128,9 @@ pub async fn index( current_page: books_paginate.current_page, total_page: books_paginate.total_page, base_query, + router: Router { + base_path: state.config.base_path, + }, }) } @@ -136,6 +140,7 @@ struct ShowBookTemplate { book: BookModel, owner: UserModel, current_holder: Option, + router: Router, } pub async fn show( @@ -168,6 +173,9 @@ pub async fn show( book, owner, current_holder, + router: Router { + base_path: state.config.base_path, + }, }) } @@ -200,14 +208,23 @@ pub async fn create( #[template(path = "books/new.html")] struct NewBookTemplate { users: Vec, + router: Router, } pub async fn new( State(state): State, ) -> Result { - let users = UserOperator::new(state).all().await.context(UserSnafu)?; + let users = UserOperator::new(state.clone()) + .all() + .await + .context(UserSnafu)?; - Ok(NewBookTemplate { users }) + Ok(NewBookTemplate { + users, + router: Router { + base_path: state.config.base_path, + }, + }) } #[derive(Template, WebTemplate)] @@ -215,6 +232,7 @@ pub async fn new( struct EditBookTemplate { users: Vec, book: BookModel, + router: Router, } pub async fn edit( @@ -225,12 +243,18 @@ pub async fn edit( .all() .await .context(UserSnafu)?; - let book = BookOperator::new(state) + let book = BookOperator::new(state.clone()) .find_by_id(id) .await .context(BookSnafu)?; - Ok(EditBookTemplate { users, book }) + Ok(EditBookTemplate { + users, + book, + router: Router { + base_path: state.config.base_path, + }, + }) } pub async fn update( diff --git a/src/routes/mod.rs b/src/routes/mod.rs index 011ff79..2bbba56 100644 --- a/src/routes/mod.rs +++ b/src/routes/mod.rs @@ -1,2 +1,3 @@ pub mod book; +pub mod router; pub mod user; diff --git a/src/routes/router.rs b/src/routes/router.rs new file mode 100644 index 0000000..52bcd0b --- /dev/null +++ b/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) + } +} diff --git a/src/routes/user.rs b/src/routes/user.rs index e4458eb..04eed56 100644 --- a/src/routes/user.rs +++ b/src/routes/user.rs @@ -16,6 +16,7 @@ use crate::{ book::BookOperator, user::{self, UserOperator}, }, + routes::router::Router, state::{ AppState, error::{AppStateError, BookSnafu, UserSnafu}, @@ -27,6 +28,7 @@ use crate::{ struct UsersIndexTemplate { users_with_books_number: Vec, query: IndexQuery, + router: Router, } pub struct UserWithBookNumber { @@ -86,6 +88,9 @@ pub async fn index( Ok(UsersIndexTemplate { users_with_books_number: result, query, + router: Router { + base_path: state.config.base_path, + }, }) } @@ -135,24 +140,36 @@ pub async fn delete( #[template(path = "users/edit.html")] struct EditTemplate { user: user::Model, + router: Router, } pub async fn edit( State(state): State, Path(id): Path, ) -> Result { - let user = UserOperator::new(state) + let user = UserOperator::new(state.clone()) .find_by_id(id) .await .context(UserSnafu)?; - Ok(EditTemplate { user }) + Ok(EditTemplate { + user, + router: Router { + base_path: state.config.base_path, + }, + }) } #[derive(Template, WebTemplate)] #[template(path = "users/new.html")] -struct NewTemplate {} - -pub async fn new() -> impl axum::response::IntoResponse { - NewTemplate {} +struct NewTemplate { + router: Router, +} + +pub async fn new(State(state): State) -> impl axum::response::IntoResponse { + NewTemplate { + router: Router { + base_path: state.config.base_path, + }, + } } diff --git a/src/state/config.rs b/src/state/config.rs index 3686711..f137f8a 100644 --- a/src/state/config.rs +++ b/src/state/config.rs @@ -33,6 +33,7 @@ pub struct AppConfig { #[serde(default = "AppConfig::default_sqlite_path")] pub database_path: Utf8PathBuf, pub locale: String, + pub base_path: String, pub listener: Listener, } @@ -40,6 +41,7 @@ impl Default for AppConfig { fn default() -> Self { AppConfig { database_path: Self::default_sqlite_path(), + base_path: Self::default_base_path(), locale: Self::default_locale(), listener: Listener::default(), } @@ -98,6 +100,10 @@ impl AppConfig { "en".to_string() } + fn default_base_path() -> String { + "".to_string() + } + pub fn default_sqlite_path() -> Utf8PathBuf { Self::config_path().join("db.sqlite") } diff --git a/src/state/error.rs b/src/state/error.rs index 59d8232..6a031b6 100644 --- a/src/state/error.rs +++ b/src/state/error.rs @@ -6,6 +6,7 @@ use snafu::prelude::*; use crate::{ models::{book::BookError, user::UserError}, + routes::router::Router, state::config::ConfigError, }; @@ -47,6 +48,7 @@ pub enum AppStateError { #[template(path = "error.html")] struct ErrorTemplate { state: AppStateErrorContext, + router: Router, } struct AppStateErrorContext { @@ -66,6 +68,9 @@ impl IntoResponse for AppStateError { let error_context = AppStateErrorContext::from(self); ErrorTemplate { state: error_context, + router: Router { + base_path: "".to_string(), + }, } .into_response() } diff --git a/templates/404.html b/templates/404.html index 289eb9e..6f35ef6 100644 --- a/templates/404.html +++ b/templates/404.html @@ -1,8 +1,13 @@ {% extends "base.html" %} + +{% block title %} + {{ t!("error.error_404.title_tag") }} +{% endblock %} + {% block main %}

{{ t!("error.error_404.title") }}

{{ t!("error.error_404.subtitle") }}

- {{ t!("error.error_404.button") }} + {{ t!("error.error_404.button") }}
{% endblock %} diff --git a/templates/base.html b/templates/base.html index dcbe412..bc0ed7e 100644 --- a/templates/base.html +++ b/templates/base.html @@ -4,11 +4,12 @@ {% block title %}{{ t!("name") }}{% endblock %} - - + + + - - + + {% block extra_head %}{% endblock extra_head %} @@ -25,7 +26,7 @@ {% endblock %} - - + + diff --git a/templates/books/edit.html b/templates/books/edit.html index 462dbd1..f80be6a 100644 --- a/templates/books/edit.html +++ b/templates/books/edit.html @@ -2,11 +2,15 @@ {% import "components/typography.html" as typography %} {% import "components/cards.html" as cards %} +{% block title %} + {{ t!("book.edit.title_tag") }} +{% endblock %} + {% block main %} {{ typography::heading(t!("book.edit.title")) }} {% call cards::card() %} -
+
diff --git a/templates/books/new.html b/templates/books/new.html index 294aa03..30deb91 100644 --- a/templates/books/new.html +++ b/templates/books/new.html @@ -3,11 +3,15 @@ {% import "components/cards.html" as cards %} {% import "components/inputs.html" as form_helpers %} +{% block title %} + {{ t!("book.new.title_tag") }} +{% endblock %} + {% block main %} {{ typography::heading(t!("book.new.title")) }} {% call cards::card() %} - + {{ 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") }} diff --git a/templates/books/show.html b/templates/books/show.html index 88f8603..61042f2 100644 --- a/templates/books/show.html +++ b/templates/books/show.html @@ -4,12 +4,16 @@ {% import "components/fields.html" as fields %} {% import "components/cards.html" as cards %} +{% block title %} + {{ t!("book.show.title_tag") }} +{% endblock %} + {% block main %} {{ typography::book_heading(book.title, book, show = false) }} {% call cards::card() %} -
-
{{ t!("book.show.book_details") }}
+
+
{{ t!("book.show.book_details") }}
{{ fields::field(t!("book.attributes.title"), book.title) }} {{ fields::field(t!("book.attributes.authors"), book.authors) }} @@ -20,7 +24,7 @@ {{ fields::field(t!("book.attributes.description"), "-") }} {% endmatch %} -
{{ t!("book.show.user_details") }}
+
{{ t!("book.show.user_details") }}
{{ fields::field(t!("book.attributes.owner"), owner.name) }} {% match current_holder %} @@ -31,7 +35,7 @@ {% endmatch %} -
{{ t!("book.show.more_informations") }}
+
{{ t!("book.show.more_informations") }}
{% match book.comment %} {% when Some with (comment) %} {{ fields::field(t!("book.attributes.comment"), comment) }} diff --git a/templates/components/dropdown.html b/templates/components/dropdown.html index 29c0841..7b0e55d 100644 --- a/templates/components/dropdown.html +++ b/templates/components/dropdown.html @@ -18,9 +18,9 @@
- +
diff --git a/templates/error.html b/templates/error.html index eba937a..09e125b 100644 --- a/templates/error.html +++ b/templates/error.html @@ -1,4 +1,9 @@ {% extends "base.html" %} + +{% block title %} + {{ t!("error.generic.title_tag") }} +{% endblock %} + {% block main %}

{{ t!("error.generic.title") }}

@@ -7,6 +12,6 @@

{{ error }}

{% endfor %}
- {{ t!("error.error_404.button") }} + {{ t!("error.error_404.button") }}
{% endblock %} diff --git a/templates/index.html b/templates/index.html index 4dc9640..2701d7b 100644 --- a/templates/index.html +++ b/templates/index.html @@ -3,9 +3,13 @@ {% import "components/dropdown.html" as dropdown %} {% import "components/cards.html" as cards %} +{% block title %} + {{ t!("book.index.title_tag") }} +{% endblock %} + {% block main %} {% call typography::heading(t!("book.index.title")) %} - + {{ t!("common.download") }} (csv) {% endcall %} @@ -83,7 +87,7 @@
- {{ t!("common.reset") }} + {{ t!("common.reset") }}
@@ -94,7 +98,7 @@

{{ t!("common.no_result") }}

- + {{ t!("book.new.button_short") }}
@@ -138,19 +142,19 @@ diff --git a/templates/layout/footer.html b/templates/layout/footer.html index 0cafa82..3f29c8b 100644 --- a/templates/layout/footer.html +++ b/templates/layout/footer.html @@ -2,4 +2,4 @@

{{ t!("footer.message") }}

- \ No newline at end of file + diff --git a/templates/layout/header.html b/templates/layout/header.html index dd9ecbc..114aa1f 100644 --- a/templates/layout/header.html +++ b/templates/layout/header.html @@ -1,6 +1,6 @@