From 7e2141d1b5eb00aa0ad4ab1cab6548645b86df5a Mon Sep 17 00:00:00 2001 From: asonix Date: Thu, 21 Jan 2021 23:42:48 -0600 Subject: [PATCH] Accounts: Update to new toolkit api --- accounts/src/forms/logout.rs | 2 +- accounts/templates/cookies.rs.html | 2 +- accounts/templates/delete_user.rs.html | 2 +- accounts/templates/inputs/password_input.rs.html | 2 +- accounts/templates/inputs/text_input.rs.html | 2 +- accounts/templates/login.rs.html | 2 +- accounts/templates/logout.rs.html | 2 +- accounts/templates/register.rs.html | 2 +- accounts/templates/update_password.rs.html | 2 +- accounts/templates/update_username.rs.html | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/accounts/src/forms/logout.rs b/accounts/src/forms/logout.rs index 14de2cf..3791656 100644 --- a/accounts/src/forms/logout.rs +++ b/accounts/src/forms/logout.rs @@ -36,7 +36,7 @@ impl LogoutState { self } - pub fn button<'a>(&self, btn: &'a hyaenidae_toolkit::Button) -> &'a hyaenidae_toolkit::Button { + pub fn button<'a>(&self, btn: hyaenidae_toolkit::Button) -> hyaenidae_toolkit::Button { btn.form(&self.logout_path()) } diff --git a/accounts/templates/cookies.rs.html b/accounts/templates/cookies.rs.html index b3ef92c..1d98b06 100644 --- a/accounts/templates/cookies.rs.html +++ b/accounts/templates/cookies.rs.html @@ -11,7 +11,7 @@ @:card_body({
@:button_group(&[ - &Button::primary("Accept Cookies").dark(state.dark), + Button::primary("Accept Cookies").dark(state.dark), Button::primary_outline("Cancel").href(&state.home_path()).dark(state.dark), ])
diff --git a/accounts/templates/delete_user.rs.html b/accounts/templates/delete_user.rs.html index d55ab52..133a649 100644 --- a/accounts/templates/delete_user.rs.html +++ b/accounts/templates/delete_user.rs.html @@ -12,7 +12,7 @@ }) @:card_body({ @:button_group(&[ - &Button::primary("Delete Account").dark(state.dark), + Button::primary("Delete Account").dark(state.dark), Button::primary_outline("Cancel").href(&state.accounts_path()).dark(state.dark), ]) }) diff --git a/accounts/templates/inputs/password_input.rs.html b/accounts/templates/inputs/password_input.rs.html index b4416f5..8631497 100644 --- a/accounts/templates/inputs/password_input.rs.html +++ b/accounts/templates/inputs/password_input.rs.html @@ -2,4 +2,4 @@ @(name: &str, title: &str, value: Option, error: Option, dark: bool) -@:text_input(TextInput::new(name).title(title).value_opt(value).error_opt(error).password().dark(dark)) +@:text_input(&TextInput::new(name).title(title).value_opt(value).error_opt(error).password().dark(dark)) diff --git a/accounts/templates/inputs/text_input.rs.html b/accounts/templates/inputs/text_input.rs.html index e725a1e..c1d4635 100644 --- a/accounts/templates/inputs/text_input.rs.html +++ b/accounts/templates/inputs/text_input.rs.html @@ -2,4 +2,4 @@ @(name: &str, title: &str, value: Option, error: Option, dark:bool) -@:text_input(TextInput::new(name).title(title).value_opt(value).error_opt(error).dark(dark)) +@:text_input(&TextInput::new(name).title(title).value_opt(value).error_opt(error).dark(dark)) diff --git a/accounts/templates/login.rs.html b/accounts/templates/login.rs.html index 5cebcc8..7d698f4 100644 --- a/accounts/templates/login.rs.html +++ b/accounts/templates/login.rs.html @@ -14,7 +14,7 @@ }) @:card_body({ @:button_group(&[ - &Button::primary("Login").dark(state.dark), + Button::primary("Login").dark(state.dark), Button::primary_outline("Cancel").href(&state.home_path()).dark(state.dark), ]) }) diff --git a/accounts/templates/logout.rs.html b/accounts/templates/logout.rs.html index 9c91815..d77dbe4 100644 --- a/accounts/templates/logout.rs.html +++ b/accounts/templates/logout.rs.html @@ -1,6 +1,6 @@ @use crate::LogoutState; @use hyaenidae_toolkit::{templates::button_group, Button}; -@(btn: &Button, state: &LogoutState) +@(btn: Button, state: &LogoutState) @:button_group(&[state.button(btn)]) diff --git a/accounts/templates/register.rs.html b/accounts/templates/register.rs.html index 35c35b9..861913f 100644 --- a/accounts/templates/register.rs.html +++ b/accounts/templates/register.rs.html @@ -15,7 +15,7 @@ }) @:card_body({ @:button_group(&[ - &Button::primary("Register").dark(state.dark), + Button::primary("Register").dark(state.dark), Button::primary_outline("Cancel").href(&state.home_path()).dark(state.dark), ]) }) diff --git a/accounts/templates/update_password.rs.html b/accounts/templates/update_password.rs.html index 5c416b6..9b6c705 100644 --- a/accounts/templates/update_password.rs.html +++ b/accounts/templates/update_password.rs.html @@ -13,7 +13,7 @@ @:password_input("password", "Password", state.password(), state.password_error(), state.dark) }) @:card_body({ - @:button_group(&[&Button::primary("Update Password").dark(state.dark)]) + @:button_group(&[Button::primary("Update Password").dark(state.dark)]) }) }) diff --git a/accounts/templates/update_username.rs.html b/accounts/templates/update_username.rs.html index db7960e..85a6505 100644 --- a/accounts/templates/update_username.rs.html +++ b/accounts/templates/update_username.rs.html @@ -12,7 +12,7 @@ @:password_input("password", "Password", state.password(), state.password_error(), state.dark) }) @:card_body({ - @:button_group(&[&Button::primary("Update Username").dark(state.dark)]) + @:button_group(&[Button::primary("Update Username").dark(state.dark)]) }) })