Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Repairing paths and adding PathBase #6868

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/Libraries/Nop.Core/Configuration/HostingConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ public partial class HostingConfig : IConfig
/// <summary>
/// Gets or sets addresses of known networks to accept forwarded headers from
/// </summary>
public string KnownNetworks { get; protected set; } = string.Empty;
public string KnownNetworks { get; protected set; } = string.Empty;

/// <summary>
/// Ability to set a custom path base, for example domain.com/path/
/// </summary>
public string UsePathBase { get; protected set; } = "/";
}
}
9 changes: 9 additions & 0 deletions src/Libraries/Nop.Core/Infrastructure/NopEngine.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Nop.Core.Configuration;
using Nop.Core.Infrastructure.Mapper;

namespace Nop.Core.Infrastructure
Expand Down Expand Up @@ -147,6 +148,14 @@ public virtual void ConfigureRequestPipeline(IApplicationBuilder application)
.Select(startup => (INopStartup)Activator.CreateInstance(startup))
.OrderBy(startup => startup.Order);

var settings = ServiceProvider.GetService<AppSettings>().Get<HostingConfig>();

// Use Path Base
if (!string.IsNullOrEmpty(settings.UsePathBase))
{
application.UsePathBase(settings.UsePathBase);
}

//configure request pipeline
foreach (var instance in instances)
instance.Configure(application);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ public override void Up()
["Admin.ConfigurationSteps.Product.SettingsButton.Title"] = "“Settings” button",
["Admin.ConfigurationSteps.Product.SettingsButton.Text"] = "This “Settings” button allows you to set up the basic mode to choose which fields you want to be shown exactly on the product edit page.",
["Admin.ConfigurationSteps.Product.Details.Title"] = "Product details",
["Admin.ConfigurationSteps.Product.Details.Text"] = "Enter the relevant product details in these fields. The screenshot below shows how they will be displayed on the product page with the default nopCommerce theme: <div><img src=\"../../js/admintour/images/product-page.jpg\"/></div>",
["Admin.ConfigurationSteps.Product.Details.Text"] = "Enter the relevant product details in these fields. The screenshot below shows how they will be displayed on the product page with the default nopCommerce theme: <div><img src=\"js/admintour/images/product-page.jpg\"/></div>",
["Admin.ConfigurationSteps.Product.Price.Title"] = "Product price",
["Admin.ConfigurationSteps.Product.Price.Text"] = "Enter the product price in a predefined currency here. Read more on how to manage currencies <a href=\"{0}\" target=\"_blank\">here</a>.",
["Admin.ConfigurationSteps.Product.Tax.Title"] = "Product tax category",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10054,7 +10054,7 @@
<Value>“Powered by” link</Value>
</LocaleResource>
<LocaleResource Name="Admin.ConfigurationSteps.Product.Details.Text">
<Value><![CDATA[Enter the relevant product details in these fields. The screenshot below shows how they will be displayed on the product page with the default nopCommerce theme: <div><img src="../../js/admintour/images/product-page.jpg"/></div>]]></Value>
<Value><![CDATA[Enter the relevant product details in these fields. The screenshot below shows how they will be displayed on the product page with the default nopCommerce theme: <div><img src="js/admintour/images/product-page.jpg"/></div>]]></Value>
</LocaleResource>
<LocaleResource Name="Admin.ConfigurationSteps.Product.Details.Title">
<Value>Product details</Value>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
Title = T("Admin.Common.Edit").Text,
Width = "100",
ClassName = NopColumnClassDefaults.Button,
Render = new RenderButtonEdit(new DataUrl("Edit"))
Render = new RenderButtonEdit(new DataUrl("~/Admin/Affiliate/Edit"))
}
}
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
Title = T("Admin.Common.Edit").Text,
Width = "100",
ClassName = NopColumnClassDefaults.Button,
Render = new RenderButtonEdit(new DataUrl("Edit"))
Render = new RenderButtonEdit(new DataUrl("~/Admin/Campaign/Edit"))
}
}
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
Title = T("Admin.Common.Edit").Text,
Width = "100",
ClassName = NopColumnClassDefaults.Button,
Render = new RenderButtonEdit(new DataUrl("Edit"))
Render = new RenderButtonEdit(new DataUrl("~/Admin/Category/Edit"))
}
}
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
Title = T("Admin.Common.Edit").Text,
Width = "100",
ClassName = NopColumnClassDefaults.Button,
Render = new RenderButtonEdit(new DataUrl("Edit"))
Render = new RenderButtonEdit(new DataUrl("~/Admin/CheckoutAttribute/Edit"))
}
}
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
Title = T("Admin.Common.Edit").Text,
Width = "50",
ClassName = NopColumnClassDefaults.Button,
Render = new RenderButtonEdit(new DataUrl("Edit"))
Render = new RenderButtonEdit(new DataUrl("~/Admin/Country/Edit"))
}
}
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
Title = T("Admin.Common.Edit").Text,
Width = "80",
ClassName = NopColumnClassDefaults.Button,
Render = new RenderButtonEdit(new DataUrl("Edit"))
Render = new RenderButtonEdit(new DataUrl("~/Admin/Currency/Edit"))
}
}
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@
Title = T("Admin.Common.Edit").Text,
Width = "80",
ClassName = NopColumnClassDefaults.Button,
Render = new RenderButtonEdit(new DataUrl("Edit"))
Render = new RenderButtonEdit(new DataUrl("~/Admin/Customer/Edit"))
});
}
@await Html.PartialAsync("Table", gridModel)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
Title = T("Admin.Common.Edit").Text,
Width = "100",
ClassName = NopColumnClassDefaults.Button,
Render = new RenderButtonEdit(new DataUrl("Edit"))
Render = new RenderButtonEdit(new DataUrl("~/Admin/CustomerRole/Edit"))
}
}
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
Title = T("Admin.Common.Edit").Text,
Width = "100",
ClassName = NopColumnClassDefaults.Button,
Render = new RenderButtonEdit(new DataUrl("Edit"))
Render = new RenderButtonEdit(new DataUrl("~/Admin/Discount/Edit"))
}
}
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
Title = T("Admin.Common.Edit").Text,
Width = "100",
ClassName = NopColumnClassDefaults.Button,
Render = new RenderButtonEdit(new DataUrl("Edit"))
Render = new RenderButtonEdit(new DataUrl("~/Admin/GiftCard/Edit"))
}
}
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
Title = T("Admin.Common.Edit").Text,
Width = "100",
ClassName = NopColumnClassDefaults.Button,
Render = new RenderButtonEdit(new DataUrl("Edit"))
Render = new RenderButtonEdit(new DataUrl("~/Admin/Language/Edit"))
}
}
})
Expand Down
2 changes: 1 addition & 1 deletion src/Presentation/Nop.Web/Areas/Admin/Views/Log/List.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
Title = T("Admin.Common.View").Text,
Width = "100",
ClassName = NopColumnClassDefaults.Button,
Render = new RenderButtonView(new DataUrl("View"))
Render = new RenderButtonView(new DataUrl("~/Admin/Log/View"))
}
}
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
Title = T("Admin.Common.Edit").Text,
Width = "100",
ClassName = NopColumnClassDefaults.Button,
Render = new RenderButtonEdit(new DataUrl("Edit"))
Render = new RenderButtonEdit(new DataUrl("~/Admin/Manufacturer/Edit"))
}
}
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
Title = T("Admin.Common.Edit").Text,
Width = "100",
ClassName = NopColumnClassDefaults.Button,
Render = new RenderButtonEdit(new DataUrl("Edit"))
Render = new RenderButtonEdit(new DataUrl("~/Admin/MessageTemplate/Edit"))
}
}
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@
Title = T("Admin.Common.View").Text,
Width = "50",
ClassName = NopColumnClassDefaults.Button,
Render = new RenderButtonView(new DataUrl("Edit"))
Render = new RenderButtonView(new DataUrl("~/Admin/Order/Edit"))
});
var orderSummaryColumnNumber = 8;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
Title = T("Admin.Common.Edit").Text,
Width = "100",
ClassName = NopColumnClassDefaults.Button,
Render = new RenderButtonEdit(new DataUrl("Edit"))
Render = new RenderButtonEdit(new DataUrl("~/Admin/Poll/Edit"))
}
}
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@
Title = T("Admin.Common.Edit").Text,
Width = "80",
ClassName = NopColumnClassDefaults.Button,
Render = new RenderButtonEdit(new DataUrl("Edit"))
Render = new RenderButtonEdit(new DataUrl("~/Admin/Product/Edit"))
}
}
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
Title = T("Admin.Common.Edit").Text,
Width = "100",
ClassName = NopColumnClassDefaults.Button,
Render = new RenderButtonEdit(new DataUrl("Edit"))
Render = new RenderButtonEdit(new DataUrl("~/Admin/ProductAttribute/Edit"))
}
}
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@
Title = T("Admin.Common.Edit").Text,
Width = "100",
ClassName = NopColumnClassDefaults.Button,
Render = new RenderButtonEdit(new DataUrl("Edit"))
Render = new RenderButtonEdit(new DataUrl("~/Admin/ProductReview/Edit"))
}
}
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
Title = T("Admin.Common.Edit").Text,
Width = "50",
ClassName = NopColumnClassDefaults.Button,
Render = new RenderButtonEdit(new DataUrl("Edit"))
Render = new RenderButtonEdit(new DataUrl("~/Admin/QueuedEmail/Edit"))
}
}
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
Title = T("Admin.Common.Edit").Text,
Width = "100",
ClassName = NopColumnClassDefaults.Button,
Render = new RenderButtonEdit(new DataUrl("Edit"))
Render = new RenderButtonEdit(new DataUrl("~/Admin/RecurringPayment/Edit"))
}
}
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
Title = T("Admin.Common.Edit").Text,
Width = "100",
ClassName = NopColumnClassDefaults.Button,
Render = new RenderButtonEdit(new DataUrl("Edit"))
Render = new RenderButtonEdit(new DataUrl("~/Admin/ReturnRequest/Edit"))
}
}
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@
@inject LocalizationSettings localizationSettings
@inject StoreInformationSettings storeInformationSettings
@inject Nop.Services.Localization.ILanguageService languageService
@inject AppSettings appSettings

@using Nop.Core.Domain
@using Nop.Core.Domain.Localization
@using Nop.Core.Configuration
@using Nop.Services.Customers
@using Nop.Services.Helpers
@using Nop.Services.Security
Expand All @@ -26,6 +29,9 @@
//avatar
var currentCustomer = await workContext.GetCurrentCustomerAsync();

// Custom path base
var usePathBase = appSettings.Get<HostingConfig>().UsePathBase;

//event
await eventPublisher.PublishAsync(new PageRenderingEvent(NopHtml));

Expand All @@ -37,6 +43,9 @@
<title>@adminPageTitle</title>
<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">

<base href="@usePathBase" />

@NopHtml.GenerateHeadCustom()

@* CSS & Script resources *@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
@inject IEventPublisher eventPublisher
@inject LocalizationSettings localizationSettings
@inject AppSettings appSettings

@using Nop.Core.Domain.Localization
@using Nop.Core.Configuration
@{
//page title
string adminPageTitle = !string.IsNullOrWhiteSpace(ViewBag.PageTitle) ? ViewBag.PageTitle + " / " : "";
adminPageTitle += T("Admin.PageTitle").Text;

var usePathBase = appSettings.Get<HostingConfig>().UsePathBase;

//event
await eventPublisher.PublishAsync(new PageRenderingEvent(NopHtml));
}
Expand All @@ -15,6 +20,9 @@
<title>@adminPageTitle</title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />

<base href="@usePathBase" />

@NopHtml.GenerateHeadCustom()

@* CSS & Script resources *@
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
Title = T("Admin.Common.Edit").Text,
Width = "50",
ClassName = NopColumnClassDefaults.Button,
Render = new RenderButtonEdit(new DataUrl("EditSpecificationAttribute"))
Render = new RenderButtonEdit(new DataUrl("~/Admin/SpecificationAttribute/EditSpecificationAttribute"))
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
Title = T("Admin.Common.Edit").Text,
Width = "100",
ClassName = NopColumnClassDefaults.Button,
Render = new RenderButtonEdit(new DataUrl("Edit"))
Render = new RenderButtonEdit(new DataUrl("~/Admin/Store/Edit"))
}
}
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
Title = T("Admin.Common.Edit").Text,
Width = "50",
ClassName = NopColumnClassDefaults.Button,
Render = new RenderButtonEdit(new DataUrl("Edit"))
Render = new RenderButtonEdit(new DataUrl("~/Admin/Vendor/Edit"))
}
}
})
Expand Down
8 changes: 8 additions & 0 deletions src/Presentation/Nop.Web/Views/Install/Index.cshtml
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
@model InstallModel

@inject AppSettings appSettings

@using Nop.Core.Configuration
@{
Layout = null;
var usePathBase = appSettings.Get<HostingConfig>().UsePathBase;
}

<!DOCTYPE html>
<html>
<head>
<title>@ILS.GetResource("Title")</title>

<base href="@usePathBase" />

<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic" />
<link rel="shortcut icon" href="/icons/icons_0/favicon.ico" />
Expand Down
8 changes: 8 additions & 0 deletions src/Presentation/Nop.Web/Views/Shared/_Print.cshtml
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
@inject Nop.Core.Domain.Common.CommonSettings commonSettings
@inject IThemeContext themeContext
@inject AppSettings appSettings

@using Nop.Core.Configuration

@{
var themeName = await themeContext.GetWorkingThemeNameAsync();
var title = await NopHtml.GenerateTitleAsync();
var usePathBase = appSettings.Get<HostingConfig>().UsePathBase;
}
<!DOCTYPE html>
<html lang="@CultureInfo.CurrentUICulture.TwoLetterISOLanguageName" class="@NopHtml.GeneratePageCssClasses()">
<head>
<title>@title</title>
<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />

<base href="@usePathBase" />

<link href="~/Themes/@themeName/Content/css/print.css" rel="stylesheet" type="text/css" />

@NopHtml.GenerateCssFiles()
Expand Down