From f09acf1e8d9a0c8dc0c178d0d6f7efdbf6499754 Mon Sep 17 00:00:00 2001 From: Lewis Larsen Date: Wed, 2 Nov 2022 09:37:51 +0000 Subject: [PATCH] applied patch --- app/src/components/app.rs | 40 ++++++------ app/src/components/change_password.rs | 35 +++++----- app/src/components/create_group.rs | 12 ++-- app/src/components/create_user.rs | 35 +++++----- app/src/components/delete_group.rs | 8 +-- app/src/components/delete_user.rs | 10 +-- app/src/components/group_details.rs | 2 +- app/src/components/login.rs | 2 +- app/src/components/reset_password_step1.rs | 2 +- app/src/components/user_details.rs | 6 +- app/src/components/user_details_form.rs | 75 +++++++++++----------- 11 files changed, 117 insertions(+), 110 deletions(-) diff --git a/app/src/components/app.rs b/app/src/components/app.rs index f52a890..7f35c43 100644 --- a/app/src/components/app.rs +++ b/app/src/components/app.rs @@ -98,8 +98,8 @@ impl Component for App { let link = self.link.clone(); let is_admin = self.is_admin(); html! { -
- {self.view_banner()} +
+ {self.view_banner()}
@@ -109,8 +109,8 @@ impl Component for App {
{self.view_footer()} -
+
} } } @@ -174,9 +174,9 @@ impl App {
- - {"Create a user"} - + + {"Create a user"} +
}, AppRoute::CreateGroup => html! { @@ -186,9 +186,9 @@ impl App {
- - {"Create a group"} - + + {"Create a group"} +
}, AppRoute::GroupDetails(group_id) => html! { @@ -225,7 +225,7 @@ impl App { - + {"Users"} @@ -233,7 +233,7 @@ impl App { - + {"Groups"} @@ -256,15 +256,15 @@ impl App { - // show user id - {if let Some((user_id, _)) = &self.user_info { html! { - - {user_id} - - } - } else { html!{} } - } - // end show user id + { + if let Some((user_id, _)) = &self.user_info { + html! { + + {user_id} + + } + } else { html!{} } + } {if let Some((user_id, _)) = &self.user_info { html! {
    ; html! { <> -
    {"Change password"}
    - { if let Some(e) = &self.common.error { +
    +
    + {"Change password"} +
    +
    + { + if let Some(e) = &self.common.error { html! {
    {e.to_string() } @@ -256,8 +261,8 @@ impl Component for ChangePasswordForm {
    -
    +
    - - - {"Back"} - + + + {"Back"} +
    diff --git a/app/src/components/create_group.rs b/app/src/components/create_group.rs index 78dbb5e..d3e9b45 100644 --- a/app/src/components/create_group.rs +++ b/app/src/components/create_group.rs @@ -107,10 +107,10 @@ impl Component for CreateGroupForm {
    + {"Group name"} + {"*"} + {":"} +
    - - {"Save changes"} + + {"Submit"}
    diff --git a/app/src/components/create_user.rs b/app/src/components/create_user.rs index 3be1307..b167bef 100644 --- a/app/src/components/create_user.rs +++ b/app/src/components/create_user.rs @@ -19,10 +19,10 @@ use yew_router::{ #[derive(GraphQLQuery)] #[graphql( -schema_path = "../schema.graphql", -query_path = "queries/create_user.graphql", -response_derives = "Debug", -custom_scalars_module = "crate::infra::graphql" + schema_path = "../schema.graphql", + query_path = "queries/create_user.graphql", + response_derives = "Debug", + custom_scalars_module = "crate::infra::graphql" )] pub struct CreateUser; @@ -43,8 +43,8 @@ pub struct CreateUserModel { first_name: String, last_name: String, #[validate(custom( - function = "empty_or_long", - message = "Password should be longer than 8 characters (or left empty)" + function = "empty_or_long", + message = "Password should be longer than 8 characters (or left empty)" ))] password: String, #[validate(must_match(other = "password", message = "Passwords must match"))] @@ -201,9 +201,9 @@ impl Component for CreateUserForm {
    {"Email"} - {"*"} - {":"} + {"*"} + {":"}
    - - {"Save changes"} + + {"Submit"}
    - { if let Some(e) = &self.common.error { + { + if let Some(e) = &self.common.error { html! {
    {e.to_string() } diff --git a/app/src/components/delete_group.rs b/app/src/components/delete_group.rs index dbb1a94..881f55f 100644 --- a/app/src/components/delete_group.rs +++ b/app/src/components/delete_group.rs @@ -154,16 +154,16 @@ impl DeleteGroup { type="button" class="btn btn-secondary" onclick=self.common.callback(|_| Msg::DismissModal)> - + {"Cancel"} + + {"Yes, I'm sure"} +
    diff --git a/app/src/components/delete_user.rs b/app/src/components/delete_user.rs index 9f950d3..a003917 100644 --- a/app/src/components/delete_user.rs +++ b/app/src/components/delete_user.rs @@ -152,16 +152,16 @@ impl DeleteUser { type="button" class="btn btn-secondary" onclick=self.common.callback(|_| Msg::DismissModal)> - - {"Cancel"} + + {"Cancel"} + + {"Yes, I'm sure"} +
    diff --git a/app/src/components/group_details.rs b/app/src/components/group_details.rs index 3e25178..ecba623 100644 --- a/app/src/components/group_details.rs +++ b/app/src/components/group_details.rs @@ -145,7 +145,7 @@ impl GroupDetails { {if g.users.is_empty() { html! { - {"There are currently no users in this group."} + {"There are no users in this group."} } diff --git a/app/src/components/login.rs b/app/src/components/login.rs index ece8645..0503e95 100644 --- a/app/src/components/login.rs +++ b/app/src/components/login.rs @@ -195,7 +195,7 @@ impl Component for LoginForm { class="btn btn-primary" disabled=self.common.is_task_running() onclick=self.common.callback(|e: MouseEvent| {e.prevent_default(); Msg::Submit})> - + {"Login"} - + {"Reset password"} - - {"Modify password"} + + {"Modify password"}
    -
    {"User details"}
    +
    {"User details"}
    diff --git a/app/src/components/user_details_form.rs b/app/src/components/user_details_form.rs index a4529ee..2f5dbf3 100644 --- a/app/src/components/user_details_form.rs +++ b/app/src/components/user_details_form.rs @@ -52,11 +52,11 @@ pub struct UserModel { /// The GraphQL query sent to the server to update the user details. #[derive(GraphQLQuery)] #[graphql( -schema_path = "../schema.graphql", -query_path = "queries/update_user.graphql", -response_derives = "Debug", -variables_derives = "Clone,PartialEq,Eq", -custom_scalars_module = "crate::infra::graphql" + schema_path = "../schema.graphql", + query_path = "queries/update_user.graphql", + response_derives = "Debug", + variables_derives = "Clone,PartialEq,Eq", + custom_scalars_module = "crate::infra::graphql" )] pub struct UpdateUser; @@ -180,7 +180,7 @@ impl Component for UserDetailsForm { html! {
    -
    +
    -
    +
    {&self.common.user.creation_date.date().naive_local()} @@ -200,8 +200,8 @@ impl Component for UserDetailsForm {
    {&self.common.user.uuid} @@ -210,9 +210,9 @@ impl Component for UserDetailsForm {
    {"Display Name"} - {"*"} - {":"} + {"*"} + {":"}
    -
    +
    -
    -
    - -
    -
    - Avatar -
    -
    -
    +
    +
    + +
    +
    + Avatar +
    +
    +
    - { if let Some(e) = &self.common.error { + { + if let Some(e) = &self.common.error { html! {
    {e.to_string() }