diff --git a/scss/layout.scss b/scss/layout.scss index 674b089..0b95951 100644 --- a/scss/layout.scss +++ b/scss/layout.scss @@ -85,11 +85,16 @@ picture { } .home-content { - padding: 96px 0 32px; + padding: 80px 0 32px; +} + +.tabs { + padding: 0 12px; + overflow-x: auto; } .profile-search { - margin-bottom: 32px; + margin: 32px 0; } .profile-result { @@ -307,6 +312,10 @@ picture { right: 0; } + .tabs { + padding: 0; + } + .profile-search { padding: 0 8px; } diff --git a/src/accounts.rs b/src/accounts.rs index fadf895..aa1ae9e 100644 --- a/src/accounts.rs +++ b/src/accounts.rs @@ -101,13 +101,11 @@ async fn cookies_page( args: CookiesPageArgs, nav_state: NavState, ) -> Result { - let mut cookie_state = match hyaenidae_accounts::cookies_page(args) { + let cookie_state = match hyaenidae_accounts::cookies_page(args) { Ok(state) => state, Err(res) => return Ok(res), }; - cookie_state.dark(nav_state.dark()); - rendered(HttpResponse::Ok(), |cursor| { crate::templates::session::cookies(cursor, &loader, &cookie_state, &nav_state) }) @@ -122,13 +120,11 @@ async fn login_page( args: LoginPageArgs, nav_state: NavState, ) -> Result { - let mut login_state = match hyaenidae_accounts::login_page(args) { + let login_state = match hyaenidae_accounts::login_page(args) { Ok(state) => state, Err(res) => return Ok(res), }; - login_state.dark(nav_state.dark()); - rendered(HttpResponse::Ok(), |cursor| { crate::templates::session::login(cursor, &loader, &login_state, &nav_state) }) @@ -139,13 +135,11 @@ async fn login( args: LoginArgs, nav_state: NavState, ) -> Result { - let mut login_state = match hyaenidae_accounts::login(args).await? { + let login_state = match hyaenidae_accounts::login(args).await? { Ok(state) => state, Err(res) => return Ok(res), }; - login_state.dark(nav_state.dark()); - rendered(HttpResponse::BadRequest(), |cursor| { crate::templates::session::login(cursor, &loader, &login_state, &nav_state) }) @@ -156,13 +150,11 @@ async fn register_page( args: RegisterPageArgs, nav_state: NavState, ) -> Result { - let mut register_state = match hyaenidae_accounts::register_page(args) { + let register_state = match hyaenidae_accounts::register_page(args) { Ok(state) => state, Err(res) => return Ok(res), }; - register_state.dark(nav_state.dark()); - rendered(HttpResponse::Ok(), |cursor| { crate::templates::session::register(cursor, &loader, ®ister_state, &nav_state) }) @@ -173,13 +165,11 @@ async fn register( args: RegisterArgs, nav_state: NavState, ) -> Result { - let mut register_state = match hyaenidae_accounts::register(args).await? { + let register_state = match hyaenidae_accounts::register(args).await? { Ok(state) => state, Err(res) => return Ok(res), }; - register_state.dark(nav_state.dark()); - rendered(HttpResponse::BadRequest(), |cursor| { crate::templates::session::register(cursor, &loader, ®ister_state, &nav_state) }) @@ -196,11 +186,8 @@ async fn account_page( user: User, nav_state: NavState, ) -> Result { - let mut uname_state = hyaenidae_accounts::update_username_page(uname_args); - let mut pass_state = hyaenidae_accounts::update_password_page(pass_args); - - uname_state.dark(nav_state.dark()); - pass_state.dark(nav_state.dark()); + let uname_state = hyaenidae_accounts::update_username_page(uname_args); + let pass_state = hyaenidae_accounts::update_password_page(pass_args); rendered(HttpResponse::Ok(), |cursor| { crate::templates::session::account( @@ -227,14 +214,11 @@ async fn update_username( user: User, nav_state: NavState, ) -> Result { - let mut uname_state = match hyaenidae_accounts::update_username(uname_args).await? { + let uname_state = match hyaenidae_accounts::update_username(uname_args).await? { Ok(state) => state, Err(res) => return Ok(res), }; - let mut pass_state = hyaenidae_accounts::update_password_page(pass_args); - - uname_state.dark(nav_state.dark()); - pass_state.dark(nav_state.dark()); + let pass_state = hyaenidae_accounts::update_password_page(pass_args); rendered(HttpResponse::BadRequest(), |cursor| { crate::templates::session::account( @@ -255,15 +239,12 @@ async fn update_password( user: User, nav_state: NavState, ) -> Result { - let mut uname_state = hyaenidae_accounts::update_username_page(uname_args); - let mut pass_state = match hyaenidae_accounts::update_password(pass_args).await? { + let uname_state = hyaenidae_accounts::update_username_page(uname_args); + let pass_state = match hyaenidae_accounts::update_password(pass_args).await? { Ok(state) => state, Err(res) => return Ok(res), }; - uname_state.dark(nav_state.dark()); - pass_state.dark(nav_state.dark()); - rendered(HttpResponse::BadRequest(), |cursor| { crate::templates::session::account( cursor, @@ -281,13 +262,11 @@ async fn delete_account_page( args: DeleteUserPageArgs, nav_state: NavState, ) -> Result { - let mut delete_state = match hyaenidae_accounts::delete_user_page(args) { + let delete_state = match hyaenidae_accounts::delete_user_page(args) { Ok(state) => state, Err(res) => return Ok(res), }; - delete_state.dark(nav_state.dark()); - rendered(HttpResponse::Ok(), |cursor| { crate::templates::session::delete_account(cursor, &loader, &delete_state, &nav_state) }) @@ -298,13 +277,11 @@ async fn delete_account( args: DeleteUserArgs, nav_state: NavState, ) -> Result { - let mut delete_state = match hyaenidae_accounts::delete_user(args).await? { + let delete_state = match hyaenidae_accounts::delete_user(args).await? { Ok(state) => state, Err(res) => return Ok(res), }; - delete_state.dark(nav_state.dark()); - rendered(HttpResponse::BadRequest(), |cursor| { crate::templates::session::delete_account(cursor, &loader, &delete_state, &nav_state) }) diff --git a/src/main.rs b/src/main.rs index 6c1757f..3a286c9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -73,10 +73,6 @@ async fn main() -> anyhow::Result<()> { }; let accounts_config = hyaenidae_accounts::Config { - toolkit_path: format!( - "/toolkit/{}", - hyaenidae_toolkit::templates::statics::toolkit_css.name - ), key: secret_key, https: false, pages: std::sync::Arc::new(accounts::Pages), diff --git a/src/nav.rs b/src/nav.rs index 1d0a8fd..379a063 100644 --- a/src/nav.rs +++ b/src/nav.rs @@ -73,7 +73,7 @@ impl FromRequest for NavState { admin, href, is_open, - dark: true, + dark: false, }) }) } @@ -137,7 +137,7 @@ impl NavState { } fn logout_button(&self, logout_state: &LogoutState, loader: &ActixLoader) -> Button { - logout_state.button(Button::primary_outline(&fl!(loader, "nav-logout-button"))) + Button::primary_outline(&fl!(loader, "nav-logout-button")).form(&logout_state.logout_path()) } pub(crate) fn buttons(&self, loader: &ActixLoader) -> Vec