Merge pull request #236 from abpframework/gterdem/ui_update

Add demo website GitHub link to the footer
abpframework · Feb 20, 2024 · c99310e · c99310e
2 parents 4f8ef45 + 19e05ba
commit c99310e
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 26 deletions.
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Footer/Default.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Footer/Default.cshtml
@@ -0,0 +1,10 @@
+<div class="lpx-footbar-container" style="z-index: 10000; background: none !important;">
+    <div class="lpx-footbar">
+        <div class="lpx-footbar-copyright">
+            <span>This website is built on top of the </span>
+            <a href="https://abp.io/" target="_blank">ABP Framework</a>
+            <span> and the source code is available at </span>
+            <a href="https://github.com/abpframework/eShopOnAbp" target="_blank">github.com/abpframework/eShopOnAbp</a>
+        </div>
+    </div>
+</div>
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Footer/FooterComponent.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Footer/FooterComponent.cs
@@ -0,0 +1,13 @@
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc;
+
+namespace EShopOnAbp.PublicWeb.Components.Toolbar.Footer
+{
+    public class FooterComponent : AbpViewComponent
+    {
+        public virtual IViewComponentResult Invoke()
+        {
+            return View("~/Components/Toolbar/Footer/Default.cshtml");
+        }
+    }
+}
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicWebModule.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/EShopOnAbpPublicWebModule.cs
@@ -26,6 +26,7 @@
 using System.Linq;
 using System.Net.Http.Headers;
 using System.Security.Claims;
+using EShopOnAbp.PublicWeb.Components.Toolbar.Footer;
 using Microsoft.AspNetCore.Authentication.OAuth.Claims;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
@@ -51,6 +52,7 @@
 using Volo.Abp.Modularity;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.Security.Claims;
+using Volo.Abp.Ui.LayoutHooks;
 using Volo.Abp.UI.Navigation;
 using Volo.Abp.UI.Navigation.Urls;
 using Volo.Abp.VirtualFileSystem;
@@ -117,14 +119,23 @@ public override void ConfigureServices(ServiceConfigurationContext context)
         context.Services.AddAutoMapperObjectMapper<EShopOnAbpPublicWebModule>();
         Configure<AbpAutoMapperOptions>(options => { options.AddMaps<EShopOnAbpPublicWebModule>(validate: true); });
 
+        Configure<AbpLayoutHookOptions>(options =>
+        {
+            options.Add(
+                LayoutHooks.Body.Last,
+                typeof(FooterComponent)
+            );
+        });
+
         Configure<AbpBundlingOptions>(options =>
         {
             options.StyleBundles.Configure(
                 LeptonXLiteThemeBundles.Styles.Global,
-                bundle => { 
+                bundle =>
+                {
                     bundle.AddContributors(typeof(CartWidgetStyleContributor));
-					bundle.AddFiles("/global.css");
-				}
+                    bundle.AddFiles("/global.css");
+                }
             );
         });
 

diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/_ViewStart.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/_ViewStart.cshtml
@@ -8,13 +8,3 @@
         <img src="/logo.png" style="height: 2.2rem" />
     </a>
 </div>
-<style>
-    .logo {
-        width: fit-content;
-        position: sticky;
-        top: 0;
-        z-index: 101;
-        padding-bottom: 2em;
-        margin-top: -5.2em;
-    }
-</style>
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.css b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.css
@@ -1,14 +1,4 @@
-body {
-    background-color: #f9f9f9;
-}
-
-a, a:hover, a:visited, a:active {
-    color: inherit;
-    text-decoration: none;
-    padding-bottom: 1em;
-}
-
-.product-list {
+.product-list {
     display: flex;
     flex-direction: row;
     flex-wrap: wrap;

diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/global.css b/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/global.css
@@ -1,5 +1,22 @@
-.lpx-content-container {
+/* hide sidebar */
+.lpx-sidebar-container {
+    z-index: 0;
+}
+
+.lpx-content-container {
     margin: 0 !important;
-    z-index: 1100 !important;
     position: relative !important;
 }
+
+.lpx-topbar-content {
+    padding-right: 1rem;
+}
+
+.logo {
+    width: fit-content;
+    position: sticky;
+    top: 0;
+    z-index: 101;
+    padding-bottom: 2em;
+    margin-top: -5.2em;
+}