From 3f7ffc9aa3270725e4929ee3ff21861d785e1edb Mon Sep 17 00:00:00 2001
From: Berkan Sasmaz <berkansasmazz@gmail.com>
Date: Wed, 12 May 2021 00:17:12 +0300
Subject: [PATCH] Improve MainNavbar and footer

---
 .../Themes/EventHub/Components/Footer/Default.cshtml      | 7 -------
 .../Themes/EventHub/Components/MainNavbar/Default.cshtml  | 8 ++++++--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/EventHub.Web.Theme/Themes/EventHub/Components/Footer/Default.cshtml b/src/EventHub.Web.Theme/Themes/EventHub/Components/Footer/Default.cshtml
index f6944a8..2b126ee 100644
--- a/src/EventHub.Web.Theme/Themes/EventHub/Components/Footer/Default.cshtml
+++ b/src/EventHub.Web.Theme/Themes/EventHub/Components/Footer/Default.cshtml
@@ -22,13 +22,6 @@
                     <a href="@Url.Page("/Help")" class="d-block">Help</a>
                 </div>
             </div>
-            <div class="col-md">
-                <h5>Organizations</h5>
-                <div class="footer-links">
-                    <a href="#" class="d-block">Nearby Events</a>
-                    <a href="#" class="d-block">Online Events</a>
-                </div>
-            </div>
             <div class="col-md">
                 <h5>Follow Us</h5>
                 @* ToDo: Social platform links *@
diff --git a/src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml b/src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml
index 59e88a6..b278147 100644
--- a/src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml
+++ b/src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml
@@ -56,9 +56,12 @@
                             </span>
                         </a>
                         <div class="dropdown-menu dropdown-menu-right">
-                            <a class="dropdown-item" href="@Url.Page("/Profile")" title="@L["Settings"]">
+                            <a class="dropdown-item" href="@(EventHubExternalUrls.EhAccount.EnsureEndsWith('/') + "Account/Manage")" target="_blank" title="@L["Settings"]">
                                 <i class="fas fa-cog"></i> @L["Settings"]
                             </a>
+                            <a class="dropdown-item" href="@Url.Page("/Profile")" title="@L["Profile"]">
+                                <i class="fas fa-user"></i> @L["Profile"]
+                            </a>
                             <a class="dropdown-item" href="/Account/Logout?returnUrl=@EventHubExternalUrls.EhWww@(System.Net.WebUtility.UrlEncode(Context.Request.GetEncodedPathAndQuery()))" title="@L["Logout"]">
                                 <i class="fas fa-sign-out-alt"></i> @L["Logout"]
                             </a>
@@ -107,6 +110,7 @@
 </nav>
 
 @functions{
+
     public string GetPageActiveClassOrEmpty(ViewContext viewContext, string pageUrl)
     {
         var activeRoute = viewContext?.RouteData.Values["page"]?.ToString()?.ToLowerInvariant();
@@ -127,7 +131,7 @@
 
         pageUrl = pageUrl.Replace("/index", "");
         var highLevelActiveRoute = GetHighLevelRoute(activeRoute); // "/organizations/ng-coders" => "organizations"
-        
+
         return highLevelActiveRoute.Contains(pageUrl) ? "active" : highLevelActiveRoute;
     }