mirror/lldap
1
0
Fork 0
mirror of https://github.com/nitnelave/lldap.git synced 2023-04-12 14:25:13 +00:00
Code Issues Projects Releases Wiki Activity

Sort out merge changes

Browse Source
This commit is contained in:
Austin 2023-03-20 19:28:48 +00:00
parent 0bce04e2a7
commit a7b7a10209
1 changed files with 1 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
app/src/components/app.rs
View File

@ -289,49 +289,6 @@ impl App {
</> </>
} } else { html!{} } } } } else { html!{} } }
</ul> </ul>
{
if let Some((user_id, _)) = &self.user_info {
html! {
<div class="dropdown text-end">
<a href="#"
class="d-block text-body nav-link text-decoration-none dropdown-toggle"
id="dropdownUser"
data-bs-toggle="dropdown"
aria-expanded="false">
<svg xmlns="http://www.w3.org/2000/svg"
width="32"
height="32"
fill="currentColor"
class="bi bi-person-circle"
viewBox="0 0 16 16">
<path d="M11 6a3 3 0 1 1-6 0 3 3 0 0 1 6 0z"/>
<path fill-rule="evenodd" d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8zm8-7a7 7 0 0 0-5.468 11.37C3.242 11.226 4.805 10 8 10s4.757 1.225 5.468 2.37A7 7 0 0 0 8 1z"/>
</svg>
<span class="ms-2">
{user_id}
</span>
</a>
<ul
class="dropdown-menu text-small dropdown-menu-lg-end"
aria-labelledby="dropdownUser1"
style="">
<li>
<Link
classes="dropdown-item"
to={AppRoute::UserDetails{ user_id: user_id.clone() }}>
{"View details"}
</Link>
</li>
<li><hr class="dropdown-divider" /></li>
<li>
<LogoutButton on_logged_out={link.callback(|_| Msg::Logout)} />
</li>
</ul>
</div>
}
} else { html!{} }
}
{ self.view_user_menu(ctx) } // TODO migrate chagnes from above { self.view_user_menu(ctx) } // TODO migrate chagnes from above
<DarkModeToggle /> <DarkModeToggle />
</div> </div>
@ -346,7 +303,7 @@ impl App {
html! { html! {
<div class="dropdown text-end"> <div class="dropdown text-end">
<a href="#" <a href="#"
class="d-block link-dark text-decoration-none dropdown-toggle" class="d-block text-body nav-link text-decoration-none dropdown-toggle"
id="dropdownUser" id="dropdownUser"
data-bs-toggle="dropdown" data-bs-toggle="dropdown"
aria-expanded="false"> aria-expanded="false">