phil/ezidam
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ezidam: minor stuff

Browse source
This commit is contained in:
Philippe Loctaux 2023-03-05 23:34:06 +01:00
parent a3866b0af2
commit bb3e4dfd40
3 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/ezidam/Cargo.toml
View file

@ -13,3 +13,6 @@ erased-serde = "0.3"
# local crates # local crates
database_pool = { path = "../database_pool" } database_pool = { path = "../database_pool" }
settings = { path = "../settings" } settings = { path = "../settings" }
users = { path = "../users" }
id = { path = "../id" }
hash = { path = "../hash" }

8
crates/ezidam/src/page.rs
View file

@ -7,7 +7,7 @@ use erased_serde::Serialize;
pub enum Page { pub enum Page {
Error(Error), Error(Error),
Setup(), Setup,
Homepage(Homepage), Homepage(Homepage),
} }
@ -16,7 +16,7 @@ impl Page {
fn template_name(&self) -> &'static str { fn template_name(&self) -> &'static str {
match self { match self {
Page::Error(_) => "error", Page::Error(_) => "error",
Page::Setup() => "setup", Page::Setup => "setup",
Page::Homepage(_) => "homepage", Page::Homepage(_) => "homepage",
} }
} }
@ -25,7 +25,7 @@ impl Page {
fn page_title(&self) -> &'static str { fn page_title(&self) -> &'static str {
match self { match self {
Page::Error(_) => "Error", Page::Error(_) => "Error",
Page::Setup() => "Setup", Page::Setup => "Setup",
Page::Homepage(_) => "Home", Page::Homepage(_) => "Home",
} }
} }
@ -34,7 +34,7 @@ impl Page {
fn content(self) -> Box<dyn Serialize> { fn content(self) -> Box<dyn Serialize> {
match self { match self {
Page::Error(error) => Box::new(error), Page::Error(error) => Box::new(error),
Page::Setup() => Box::new(()), Page::Setup => Box::new(()),
Page::Homepage(homepage) => Box::new(homepage), Page::Homepage(homepage) => Box::new(homepage),
} }
} }

9
crates/ezidam/src/routes.rs
View file

@ -6,7 +6,16 @@ pub(self) mod prelude {
pub use crate::database::Database; pub use crate::database::Database;
pub use crate::error::Error; pub use crate::error::Error;
pub use crate::file_from_bytes::FileFromBytes; pub use crate::file_from_bytes::FileFromBytes;
pub use crate::guards::*;
pub use crate::page::Page; pub use crate::page::Page;
pub use hash::Password;
pub use id::UserID;
pub use rocket::form::Form;
pub use rocket::response::Redirect;
pub use rocket::tokio::task;
pub use rocket::FromForm;
pub use rocket::{routes, uri, Either, Route};
pub use rocket_db_pools::sqlx::Acquire;
pub use rocket_db_pools::Connection; pub use rocket_db_pools::Connection;
pub type Result<T> = std::result::Result<T, Error>; pub type Result<T> = std::result::Result<T, Error>;