diff --git a/app/src/components/add_group_member.rs b/app/src/components/add_group_member.rs index 47dc1e3..61b9938 100644 --- a/app/src/components/add_group_member.rs +++ b/app/src/components/add_group_member.rs @@ -169,12 +169,13 @@ impl Component for AddGroupMemberComponent { } -
+
diff --git a/app/src/components/add_user_to_group.rs b/app/src/components/add_user_to_group.rs index 405481b..3d7d3f0 100644 --- a/app/src/components/add_user_to_group.rs +++ b/app/src/components/add_user_to_group.rs @@ -182,12 +182,13 @@ impl Component for AddUserToGroupComponent { } -
+
diff --git a/app/src/components/app.rs b/app/src/components/app.rs index 3c9bca7..f52a890 100644 --- a/app/src/components/app.rs +++ b/app/src/components/app.rs @@ -98,16 +98,18 @@ impl Component for App { let link = self.link.clone(); let is_admin = self.is_admin(); html! { -
+
{self.view_banner()} +
-
+
render = Router::render(move |s| Self::dispatch_route(s, &link, is_admin)) />
{self.view_footer()} +
} } @@ -171,7 +173,10 @@ impl App { AppRoute::Index | AppRoute::ListUsers => html! {
- {"Create a user"} + + + {"Create a user"} +
}, AppRoute::CreateGroup => html! { @@ -180,7 +185,10 @@ impl App { AppRoute::ListGroups => html! {
- {"Create a group"} + + + {"Create a group"} +
}, AppRoute::GroupDetails(group_id) => html! { @@ -203,11 +211,11 @@ impl App { fn view_banner(&self) -> Html { html! { -
+
- -

{"LLDAP"}

+ +

{"LLDAP"}
    @@ -215,15 +223,17 @@ impl App { <>
  • + {"Users"}
  • + {"Groups"}
    • @@ -246,6 +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! {
      - {"Profile"} + {"View details"}
      • @@ -274,7 +293,7 @@ impl App { fn view_footer(&self) -> Html { html! { -
      +
      {format!("LLDAP version {}", env!("CARGO_PKG_VERSION"))}
      diff --git a/app/src/components/change_password.rs b/app/src/components/change_password.rs index ef22710..2de1b76 100644 --- a/app/src/components/change_password.rs +++ b/app/src/components/change_password.rs @@ -220,6 +220,15 @@ impl Component for ChangePasswordForm { type Field = yew_form::Field; html! { <> +
      {"Change password"}
      + { if let Some(e) = &self.common.error { + html! { +
      + {e.to_string() } +
      + } + } else { html! {} } + }
      {if !is_admin { html! { @@ -243,10 +252,12 @@ impl Component for ChangePasswordForm {
}} else { html! {} }} -
+
-
+
-
+
-
- - { if let Some(e) = &self.common.error { - html! { -
- {e.to_string() } -
- } - } else { html! {} } - } -
+ {"Back"} -
+
+ } } diff --git a/app/src/components/create_group.rs b/app/src/components/create_group.rs index 7611d2b..78dbb5e 100644 --- a/app/src/components/create_group.rs +++ b/app/src/components/create_group.rs @@ -100,15 +100,17 @@ impl Component for CreateGroupForm { type Field = yew_form::Field; html! {
-
+
{"Create a group"}
+ {"Group name"} + {"*"} + {":"} +
- {"Submit"} + + {"Save changes"}
diff --git a/app/src/components/create_user.rs b/app/src/components/create_user.rs index 4a6911c..3be1307 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"))] @@ -194,14 +194,16 @@ impl Component for CreateUserForm { type Field = yew_form::Field; html! {
-
+
{"Create a user"}
- {"Submit"} + + {"Save changes"}
diff --git a/app/src/components/delete_group.rs b/app/src/components/delete_group.rs index 22d8551..dbb1a94 100644 --- a/app/src/components/delete_group.rs +++ b/app/src/components/delete_group.rs @@ -154,12 +154,16 @@ impl DeleteGroup { type="button" class="btn btn-secondary" onclick=self.common.callback(|_| Msg::DismissModal)> + {"Cancel"} + class="btn btn-danger"> + + {"Yes, I'm sure"} +
diff --git a/app/src/components/delete_user.rs b/app/src/components/delete_user.rs index 598dcf2..9f950d3 100644 --- a/app/src/components/delete_user.rs +++ b/app/src/components/delete_user.rs @@ -152,12 +152,16 @@ impl DeleteUser { type="button" class="btn btn-secondary" onclick=self.common.callback(|_| Msg::DismissModal)> + {"Cancel"} + class="btn btn-danger"> + + {"Yes, I'm sure"} +
diff --git a/app/src/components/group_details.rs b/app/src/components/group_details.rs index c3714e8..3e25178 100644 --- a/app/src/components/group_details.rs +++ b/app/src/components/group_details.rs @@ -133,7 +133,7 @@ impl GroupDetails { <>
{"Members"}
- +
@@ -145,7 +145,7 @@ impl GroupDetails { {if g.users.is_empty() { html! { - + } diff --git a/app/src/components/group_table.rs b/app/src/components/group_table.rs index 0cfdc24..72d9145 100644 --- a/app/src/components/group_table.rs +++ b/app/src/components/group_table.rs @@ -94,7 +94,7 @@ impl GroupTable { let make_table = |groups: &Vec| { html! {
-
{"User Id"}
{"No members"}{"There are currently no users in this group."}
+
diff --git a/app/src/components/login.rs b/app/src/components/login.rs index 70218a1..ece8645 100644 --- a/app/src/components/login.rs +++ b/app/src/components/login.rs @@ -195,6 +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"} { if let Some(e) = &self.common.error { html! { -
+
{e.to_string() }
} diff --git a/app/src/components/select.rs b/app/src/components/select.rs index cdeaaf2..b330608 100644 --- a/app/src/components/select.rs +++ b/app/src/components/select.rs @@ -67,7 +67,7 @@ impl Component for Select { fn view(&self) -> Html { html! { -
{"Group name"}
+
@@ -140,7 +140,7 @@ impl UserDetails { {if u.groups.is_empty() { html! { - + } } else { @@ -197,15 +197,19 @@ impl Component for UserDetails { html! { <>

{u.id.to_string()}

- -
+
- {"Change password"} + classes="btn btn-secondary"> + + {"Modify password"}
+
+
{"User details"}
+
+ {self.view_group_memberships(u)} {self.view_add_group_button(u)} {self.view_messages(error)} diff --git a/app/src/components/user_details_form.rs b/app/src/components/user_details_form.rs index 2db24a1..a4529ee 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,36 +180,39 @@ impl Component for UserDetailsForm { html! {
-
+
- {&self.common.user.id} + {&self.common.user.id} +
+
+
+ +
+ {&self.common.user.creation_date.date().naive_local()}
-
- Avatar -
+
- + {&self.common.user.uuid}
-
-
-
- -
- {&self.common.user.uuid} -
-
-
+
@@ -315,7 +328,7 @@ impl Component for UserDetailsForm { } else { html! {} } }
} diff --git a/app/src/components/user_table.rs b/app/src/components/user_table.rs index 4e4efcb..51ebf57 100644 --- a/app/src/components/user_table.rs +++ b/app/src/components/user_table.rs @@ -100,7 +100,7 @@ impl UserTable { let make_table = |users: &Vec| { html! {
-
{"Group"}
{"Not member of any group"}{"This user is not a member of any groups."}
+
diff --git a/app/static/style.css b/app/static/style.css index bcad908..f9099c9 100644 --- a/app/static/style.css +++ b/app/static/style.css @@ -1,4 +1,4 @@ -header h1 { +header h2 { font-family: 'Bebas Neue', cursive; }
{"User ID"}