From 462f68a0d192d13b3877075909e44e4d28588e8a Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Tue, 20 Feb 2024 00:29:21 -0500 Subject: [PATCH 1/3] Added footer component --- .../Components/Toolbar/Footer/Default.cshtml | 10 ++++++++++ .../Toolbar/Footer/FooterComponent.cs | 13 +++++++++++++ .../EShopOnAbpPublicWebModule.cs | 17 ++++++++++++++--- 3 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Footer/Default.cshtml create mode 100644 apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Footer/FooterComponent.cs 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 new file mode 100644 index 00000000..459b25d9 --- /dev/null +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Footer/Default.cshtml @@ -0,0 +1,10 @@ +
+
+
+ This website is built on top of the + ABP Framework + and the source code is available at + github.com/abpframework/eShopOnAbp +
+
+
\ No newline at end of file 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 new file mode 100644 index 00000000..464d529a --- /dev/null +++ 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 index 30afa968..90f81b5d 100644 --- 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(); Configure(options => { options.AddMaps(validate: true); }); + Configure(options => + { + options.Add( + LayoutHooks.Body.Last, + typeof(FooterComponent) + ); + }); + Configure(options => { options.StyleBundles.Configure( LeptonXLiteThemeBundles.Styles.Global, - bundle => { + bundle => + { bundle.AddContributors(typeof(CartWidgetStyleContributor)); - bundle.AddFiles("/global.css"); - } + bundle.AddFiles("/global.css"); + } ); }); From afce5437fa2bab4740df7d63ab17e582122a11b2 Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Tue, 20 Feb 2024 00:53:55 -0500 Subject: [PATCH 2/3] Styling update --- .../Pages/_ViewStart.cshtml | 10 --------- .../src/EShopOnAbp.PublicWeb/Pages/index.css | 12 +---------- .../EShopOnAbp.PublicWeb/wwwroot/global.css | 21 +++++++++++++++++-- 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/_ViewStart.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/_ViewStart.cshtml index a1ac2988..8382ec3f 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/_ViewStart.cshtml +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/_ViewStart.cshtml @@ -8,13 +8,3 @@ - diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.css b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.css index 901524dd..f52dd896 100644 --- 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 index 6dc46ff7..6bfaa57e 100644 --- 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; +} \ No newline at end of file From 19e05bab4496afeca258988d8bb8a514c7b3dd80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alper=20Ebi=C3=A7o=C4=9Flu?= <9526587+ebicoglu@users.noreply.github.com> Date: Tue, 20 Feb 2024 09:03:07 +0300 Subject: [PATCH 3/3] change ABP Framework URL --- .../Components/Toolbar/Footer/Default.cshtml | 4 ++-- 1 file changed, 2 insertions(+), 2 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 index 459b25d9..1c257ba6 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Footer/Default.cshtml +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Footer/Default.cshtml @@ -2,9 +2,9 @@
This website is built on top of the - ABP Framework + ABP Framework and the source code is available at github.com/abpframework/eShopOnAbp
- \ No newline at end of file +