From a7b7a10209385c4cbe5fe91956db550055d9e1af Mon Sep 17 00:00:00 2001
From: Austin <pixelrazor@gmail.com>
Date: Mon, 20 Mar 2023 19:28:48 +0000
Subject: [PATCH] Sort out merge changes

---
 app/src/components/app.rs | 45 +--------------------------------------
 1 file changed, 1 insertion(+), 44 deletions(-)

diff --git a/app/src/components/app.rs b/app/src/components/app.rs
index 222397f..640b1ab 100644
--- a/app/src/components/app.rs
+++ b/app/src/components/app.rs
@@ -289,49 +289,6 @@ impl App {
                     </>
                   } } else { html!{} } }
                 </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
                 <DarkModeToggle />
               </div>
@@ -346,7 +303,7 @@ impl App {
             html! {
               <div class="dropdown text-end">
                 <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"
                   data-bs-toggle="dropdown"
                   aria-expanded="false">