Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Changes in WwwRoot path - project Grand.SharedUIResources

supporte54bbe99c6df
diff --git a/src/Web/Grand.SharedUIResources/Constants.cs b/src/Web/Grand.SharedUIResources/Constants.cs
new file mode 100644
index 000000000..979157b57
--- /dev/null
+++ b/src/Web/Grand.SharedUIResources/Constants.cs
@@ -0,0 +1,6 @@
+namespace Grand.SharedUIResources;
+
+public static class Constants
+{
+ public static string WwwRoot { get; set; } = "/_content/Grand.SharedUIResources";
+}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/Partials/CreateOrUpdate.cshtml
index 437e25d4c..2a78aa910 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/Partials/CreateOrUpdate.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Blog/Partials/CreateOrUpdate.cshtml
@@ -45,6 +45,6 @@
</items>
</admin-tabstrip>
-<link rel="stylesheet" type="text/css" asp-src="@(Common.WwwRoot)/administration/tagEditor/jquery.tag-editor.css" />
-<script asp-location="Footer" asp-src="@(Common.WwwRoot)/administration/tagEditor/jquery.tag-editor.min.js"></script>
-<script asp-location="Footer" asp-src="@(Common.WwwRoot)/administration/tagEditor/jquery.caret.min.js"></script>
\ No newline at end of file
+<link rel="stylesheet" type="text/css" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/tagEditor/jquery.tag-editor.css" />
+<script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/tagEditor/jquery.tag-editor.min.js"></script>
+<script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/tagEditor/jquery.caret.min.js"></script>
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Campaign/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Campaign/Partials/CreateOrUpdate.TabInfo.cshtml
index ba5c76ce6..33524c4e5 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Campaign/Partials/CreateOrUpdate.TabInfo.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Campaign/Partials/CreateOrUpdate.TabInfo.cshtml
@@ -1,8 +1,8 @@
@model CampaignModel
-<link rel="stylesheet" type="text/css" asp-src="@(Common.WwwRoot)/administration/codemirror/codemirror.css" />
-<script asp-location="Head" asp-src="@(Common.WwwRoot)/administration/codemirror/codemirror.js"></script>
-<script asp-location="Head" asp-src="@(Common.WwwRoot)/administration/codemirror/mode/xml/xml.js"></script>
+<link rel="stylesheet" type="text/css" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/codemirror/codemirror.css" />
+<script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/codemirror/codemirror.js"></script>
+<script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/codemirror/mode/xml/xml.js"></script>
<div class="form-horizontal">
<div class="form-body">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/CreateOrUpdateValue.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/CreateOrUpdateValue.cshtml
index d93d83006..eb2885038 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/CreateOrUpdateValue.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ContactAttribute/Partials/CreateOrUpdateValue.cshtml
@@ -1,8 +1,8 @@
@model ContactAttributeValueModel
@using Microsoft.AspNetCore.Mvc.Razor;
-<link rel="stylesheet" type="text/css" asp-src="@(Common.WwwRoot)/administration/farbtastic/farbtastic.css" />
-<script asp-location="Footer" asp-src="@(Common.WwwRoot)/administration/farbtastic/farbtastic.js"></script>
+<link rel="stylesheet" type="text/css" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/farbtastic/farbtastic.css" />
+<script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/farbtastic/farbtastic.js"></script>
<div asp-validation-summary="All"></div>
<input asp-for="Id" type="hidden" />
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/Partials/CreateOrUpdate.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/Partials/CreateOrUpdate.cshtml
index 3c7deb839..cb43b9d49 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/Partials/CreateOrUpdate.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Customer/Partials/CreateOrUpdate.cshtml
@@ -7,9 +7,9 @@
<div asp-validation-summary="All"></div>
<input asp-for="Id" type="hidden" />
-<link rel="stylesheet" type="text/css" asp-src="@(Common.WwwRoot)/administration/tagEditor/jquery.tag-editor.css" />
-<script asp-location="Footer" asp-src="@(Common.WwwRoot)/administration/tagEditor/jquery.tag-editor.min.js"></script>
-<script asp-location="Footer" asp-src="@(Common.WwwRoot)/administration/tagEditor/jquery.caret.min.js"></script>
+<link rel="stylesheet" type="text/css" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/tagEditor/jquery.tag-editor.css" />
+<script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/tagEditor/jquery.tag-editor.min.js"></script>
+<script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/tagEditor/jquery.caret.min.js"></script>
<script>
//tags
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Home/Index.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Home/Index.cshtml
index 5744d3ce1..6a2dcd771 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Home/Index.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Home/Index.cshtml
@@ -121,7 +121,7 @@
</div>
<div class="x_content-body">
<div class="partialContents" data-url="@Url.Action("DashboardActivity", new { area = Constants.AreaAdmin })">
- <img src="@(Common.WwwRoot)/administration/build/images/loading.gif"/> Loading ...
+ <img src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/build/images/loading.gif"/> Loading ...
</div>
</div>
</div>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/List.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/List.cshtml
index b3382daca..075b1a637 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/List.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Knowledgebase/List.cshtml
@@ -2,7 +2,7 @@
//page title
ViewBag.Title = Loc["Admin.Content.Knowledgebase.Manage"];
}
-<script asp-location="Footer" asp-src="@(Common.WwwRoot)/administration/bootstrap-treeview.js"></script>
+<script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/bootstrap-treeview.js"></script>
<div class="row">
<div class="col-md-12">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Maintenance/CustomCss.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Maintenance/CustomCss.cshtml
index 1071a0626..f32d2e94d 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Maintenance/CustomCss.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Maintenance/CustomCss.cshtml
@@ -4,13 +4,13 @@
ViewBag.Title = Loc["Admin.System.CustomCss"];
}
-<link rel="stylesheet" type="text/css" asp-src="@(Common.WwwRoot)/administration/codemirror/codemirror.css" />
-<link rel="stylesheet" type="text/css" asp-src="@(Common.WwwRoot)/administration/codemirror/hint/show-hint.css" />
-<script asp-location="Head" asp-src="@(Common.WwwRoot)/administration/codemirror/codemirror.js"></script>
-<script asp-location="Head" asp-src="@(Common.WwwRoot)/administration/codemirror/mode/css/css.js"></script>
-<script asp-location="Head" asp-src="@(Common.WwwRoot)/administration/codemirror/hint/show-hint.js"></script>
-<script asp-location="Head" asp-src="@(Common.WwwRoot)/administration/codemirror/hint/css-hint.js"></script>
-<script asp-location="Head" asp-src="@(Common.WwwRoot)/administration/codemirror/edit/matchbrackets.js"></script>
+<link rel="stylesheet" type="text/css" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/codemirror/codemirror.css" />
+<link rel="stylesheet" type="text/css" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/codemirror/hint/show-hint.css" />
+<script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/codemirror/codemirror.js"></script>
+<script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/codemirror/mode/css/css.js"></script>
+<script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/codemirror/hint/show-hint.js"></script>
+<script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/codemirror/hint/css-hint.js"></script>
+<script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/codemirror/edit/matchbrackets.js"></script>
<style>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Maintenance/CustomJs.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Maintenance/CustomJs.cshtml
index 1559d8a1f..bcbdf9e21 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Maintenance/CustomJs.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Maintenance/CustomJs.cshtml
@@ -4,14 +4,14 @@
ViewBag.Title = Loc["Admin.System.CustomJs"];
}
-<link rel="stylesheet" type="text/css" asp-src="@(Common.WwwRoot)/administration/codemirror/codemirror.css" />
-<link rel="stylesheet" type="text/css" asp-src="@(Common.WwwRoot)/administration/codemirror/hint/show-hint.css" />
+<link rel="stylesheet" type="text/css" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/codemirror/codemirror.css" />
+<link rel="stylesheet" type="text/css" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/codemirror/hint/show-hint.css" />
-<script asp-location="Head" asp-src="@(Common.WwwRoot)/administration/codemirror/codemirror.js"></script>
-<script asp-location="Head" asp-src="@(Common.WwwRoot)/administration/codemirror/mode/javascript/javascript.js"></script>
-<script asp-location="Head" asp-src="@(Common.WwwRoot)/administration/codemirror/hint/show-hint.js"></script>
-<script asp-location="Head" asp-src="@(Common.WwwRoot)/administration/codemirror/hint/javascript-hint.js"></script>
-<script asp-location="Head" asp-src="@(Common.WwwRoot)/administration/codemirror/edit/matchbrackets.js"></script>
+<script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/codemirror/codemirror.js"></script>
+<script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/codemirror/mode/javascript/javascript.js"></script>
+<script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/codemirror/hint/show-hint.js"></script>
+<script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/codemirror/hint/javascript-hint.js"></script>
+<script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/codemirror/edit/matchbrackets.js"></script>
<style>
.CodeMirror {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Maintenance/RobotsTxt.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Maintenance/RobotsTxt.cshtml
index 88dec9df1..90b4c74bc 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Maintenance/RobotsTxt.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Maintenance/RobotsTxt.cshtml
@@ -3,8 +3,8 @@
//page title
ViewBag.Title = Loc["Admin.System.RobotsTxt"];
}
-<link rel="stylesheet" type="text/css" asp-src="@(Common.WwwRoot)/administration/codemirror/codemirror.css" />
-<script asp-location="Head" asp-src="@(Common.WwwRoot)/administration/codemirror/codemirror.js"></script>
+<link rel="stylesheet" type="text/css" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/codemirror/codemirror.css" />
+<script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/codemirror/codemirror.js"></script>
<style>
.CodeMirror {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/MessageTemplate/Partials/CreateOrUpdate.TabInfo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/MessageTemplate/Partials/CreateOrUpdate.TabInfo.cshtml
index 88f068d50..e081ddb2f 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/MessageTemplate/Partials/CreateOrUpdate.TabInfo.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/MessageTemplate/Partials/CreateOrUpdate.TabInfo.cshtml
@@ -4,9 +4,9 @@
ViewData["DownloadType"] = Grand.Domain.Media.DownloadType.MessageTemplate;
ViewData["ReferenceId"] = Model.Id;
}
-<link rel="stylesheet" type="text/css" asp-src="@(Common.WwwRoot)/administration/codemirror/codemirror.css" />
-<script asp-location="Head" asp-src="@(Common.WwwRoot)/administration/codemirror/codemirror.js"></script>
-<script asp-location="Head" asp-src="@(Common.WwwRoot)/administration/codemirror/mode/xml/xml.js"></script>
+<link rel="stylesheet" type="text/css" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/codemirror/codemirror.css" />
+<script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/codemirror/codemirror.js"></script>
+<script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/codemirror/mode/xml/xml.js"></script>
@{ Func<int, HelperResult>
template = @<div class="form-body">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Addresses.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Addresses.cshtml
index eb2568e2e..b6b401292 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Addresses.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Addresses.cshtml
@@ -305,7 +305,7 @@
</table>
<div style="padding-top: 15px;">
- <img alt="google maps" src="@Url.Content($"{Common.WwwRoot}/administration/build/images/google-maps.gif")"/>
+ <img alt="google maps" src="@Url.Content($"{Grand.SharedUIResources.Constants.WwwRoot}/administration/build/images/google-maps.gif")"/>
<a href="@Html.Raw(Model.ShippingAddressGoogleMapsUrl)" target="_blank">@Loc["Admin.Orders.Fields.ShippingAddress.ViewOnGoogleMaps"]</a>
</div>
}
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Info.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Info.cshtml
index e3951ec1f..b14a9c683 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Info.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Order/Partials/OrderDetails.Info.cshtml
@@ -4,9 +4,9 @@
@using Grand.Business.Core.Interfaces.Checkout.Orders;
-<link rel="stylesheet" type="text/css" asp-src="@(Common.WwwRoot)/administration/tagEditor/jquery.tag-editor.css" />
-<script asp-location="Footer" asp-src="@(Common.WwwRoot)/administration/tagEditor/jquery.tag-editor.min.js"></script>
-<script asp-location="Footer" asp-src="@(Common.WwwRoot)/administration/tagEditor/jquery.caret.min.js"></script>
+<link rel="stylesheet" type="text/css" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/tagEditor/jquery.tag-editor.css" />
+<script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/tagEditor/jquery.tag-editor.min.js"></script>
+<script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/tagEditor/jquery.caret.min.js"></script>
@{
//tags
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Info.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Info.cshtml
index 62de28134..d359067b1 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Info.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Product/Partials/CreateOrUpdate.Info.cshtml
@@ -3,9 +3,9 @@
@inject Grand.Business.Core.Interfaces.Catalog.Products.IProductTagService productTagService
@{
//resources for product tags input
- <link rel="stylesheet" type="text/css" asp-src="@(Common.WwwRoot)/administration/tagEditor/jquery.tag-editor.css" />
- <script asp-location="Footer" asp-src="@(Common.WwwRoot)/administration/tagEditor/jquery.caret.min.js"></script>
- <script asp-location="Footer" asp-src="@(Common.WwwRoot)/administration/tagEditor/jquery.tag-editor.min.js"></script>
+ <link rel="stylesheet" type="text/css" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/tagEditor/jquery.tag-editor.css" />
+ <script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/tagEditor/jquery.caret.min.js"></script>
+ <script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/tagEditor/jquery.tag-editor.min.js"></script>
}
<script>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PushNotifications/Messages.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PushNotifications/Messages.cshtml
index 99ffd9e69..d9680e291 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PushNotifications/Messages.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PushNotifications/Messages.cshtml
@@ -6,7 +6,7 @@
ViewBag.Title = Loc["Admin.PushNotifications.Messages"];
}
-<script asp-src="@(Common.WwwRoot)/administration/chart.min.js"></script>
+<script asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/chart.min.js"></script>
<div class="row">
<div class="col-md-12">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PushNotifications/Receivers.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PushNotifications/Receivers.cshtml
index 37da1009a..2e072416f 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/PushNotifications/Receivers.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/PushNotifications/Receivers.cshtml
@@ -119,7 +119,7 @@ $(document).ready(function() {
@if (!(Model.Allowed == 0 && Model.Denied == 0))
{
- <script asp-src="@(Common.WwwRoot)/administration/chart.min.js"></script>
+ <script asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/chart.min.js"></script>
<script>
$(document).ready(function () {
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/Components/CustomerReportTimeChart/Default.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/Components/CustomerReportTimeChart/Default.cshtml
index 1bab0c13e..8bef6ee7f 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/Components/CustomerReportTimeChart/Default.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/Components/CustomerReportTimeChart/Default.cshtml
@@ -2,7 +2,7 @@
<canvas id="canvasReportCustomerTimeChart"></canvas>
</div>
-<script src="@(Common.WwwRoot)/administration/chart.min.js" type="text/javascript"></script>
+<script src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/chart.min.js" type="text/javascript"></script>
<script>
$(document).ready(function () {
initReportCustomerTimeChart(true);
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/Components/OrderTimeChart/Default.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/Components/OrderTimeChart/Default.cshtml
index 2e48549f1..2e2a1579d 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/Components/OrderTimeChart/Default.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/Components/OrderTimeChart/Default.cshtml
@@ -10,7 +10,7 @@
<canvas id="canvasReportOrderTimeChart"></canvas>
</div>
-<script src="@(Common.WwwRoot)/administration/chart.min.js" type="text/javascript"></script>
+<script src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/chart.min.js" type="text/javascript"></script>
<script>
$(document).ready(function () {
initReportOrderTimeChart(true);
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Download.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Download.cshtml
index d08050d94..e102532a7 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Download.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Download.cshtml
@@ -1,8 +1,8 @@
@model string
@inject Grand.Business.Core.Interfaces.Storage.IDownloadService downloadService
@{
- <link rel="stylesheet" type="text/css" asp-src="@(Common.WwwRoot)/administration/fineuploader/fineuploader-4.2.2.min.css" />
- <script asp-location="Footer" asp-src="@(Common.WwwRoot)/administration/fineuploader/jquery.fineuploader-4.2.2.min.js"></script>
+ <link rel="stylesheet" type="text/css" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/fineuploader/fineuploader-4.2.2.min.css" />
+ <script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/fineuploader/jquery.fineuploader-4.2.2.min.js"></script>
var randomNumber = CommonHelper.GenerateRandomInteger();
var clientId = "download" + randomNumber;
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Editor.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Editor.cshtml
index eda3be90e..acf78cd9b 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Editor.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Editor.cshtml
@@ -15,7 +15,7 @@
function elfinderDialog@(random)(context) { // <------------------ +context
var fm = $('<div/>').dialogelfinder({
url: '@Url.Action("Connector", "ElFinder")',
- baseUrl: '@(Common.WwwRoot)/administration/elfinder/',
+ baseUrl: '@(Grand.SharedUIResources.Constants.WwwRoot)/administration/elfinder/',
lang: 'en',
width: 840,
height: 450,
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/MultiPicture.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/MultiPicture.cshtml
index f2135aefc..d9e79dc79 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/MultiPicture.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/MultiPicture.cshtml
@@ -8,8 +8,8 @@
var endpoint = ViewData["Endpoint"];
var click = ViewData["Click"];
}
-<link rel="stylesheet" type="text/css" asp-src="@(Common.WwwRoot)/administration/fineuploader/fineuploader-4.2.2.min.css" />
-<script asp-location="Footer" asp-src="@(Common.WwwRoot)/administration/fineuploader/jquery.fineuploader-4.2.2.min.js"></script>
+<link rel="stylesheet" type="text/css" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/fineuploader/fineuploader-4.2.2.min.css" />
+<script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/fineuploader/jquery.fineuploader-4.2.2.min.js"></script>
<div id="@clientId"></div>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Picture.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Picture.cshtml
index 99aa30f8b..27e91868a 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Picture.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/EditorTemplates/Picture.cshtml
@@ -7,8 +7,8 @@
var targetPictureSize = 100;
}
-<link rel="stylesheet" type="text/css" asp-src="@(Common.WwwRoot)/administration/fineuploader/fineuploader-4.2.2.min.css" />
-<script asp-location="Footer" asp-src="@(Common.WwwRoot)/administration/fineuploader/jquery.fineuploader-4.2.2.min.js"></script>
+<link rel="stylesheet" type="text/css" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/fineuploader/fineuploader-4.2.2.min.css" />
+<script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/fineuploader/jquery.fineuploader-4.2.2.min.js"></script>
<div id="@(clientId + "value")">
<input asp-for="@Model" type="hidden" />
</div>
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/Partials/HeadAdmin.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/Partials/HeadAdmin.cshtml
index e859beb80..07f39ba43 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/Partials/HeadAdmin.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/Partials/HeadAdmin.cshtml
@@ -1,63 +1,63 @@
@inject Grand.Domain.Localization.LanguageSettings languageSettings
@inject IWorkContext workContext
<script>
- const wwwrootpath = '@(Common.WwwRoot)';
+ const wwwrootpath = '@(Grand.SharedUIResources.Constants.WwwRoot)';
</script>
@{
var supportRtl = workContext.WorkingLanguage.Rtl &&
!languageSettings.IgnoreRtlPropertyForAdminArea;
var kendoVersion = "2021.3.914";
- <link rel="stylesheet" type="text/css" href="@(Common.WwwRoot)/administration/bootstrap/css/daterangepicker.min.css" />
- <link rel="stylesheet" type="text/css" href="@(Common.WwwRoot)/administration/build/css/font-awesome.min.css" />
- <link rel="stylesheet" type="text/css" href="@(Common.WwwRoot)/administration/simple-line-icons/simple-line-icons.min.css" />
- <link rel="stylesheet" type="text/css" href="@(Common.WwwRoot)/administration/bootstrap/css/bootstrap.min.css" />
- <link rel="stylesheet" type="text/css" href="@(Common.WwwRoot)/administration/magnific-popup/magnific-popup.min.css" />
- <link rel="stylesheet" type="text/css" href="@(Common.WwwRoot)/administration/summernote/summernote.min.css" />
- <link rel="stylesheet" type="text/css" href="@(Common.WwwRoot)/administration/jquery-ui-themes/smoothness/jquery-ui-1.10.3.custom.min.css" />
- <link rel="stylesheet" type="text/css" href="@(Common.WwwRoot)/administration/elfinder/css/elfinder.full.min.css" />
- <link rel="stylesheet" type="text/css" href="@(Common.WwwRoot)/administration/elfinder/css/theme.css" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/bootstrap/css/daterangepicker.min.css" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/build/css/font-awesome.min.css" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/simple-line-icons/simple-line-icons.min.css" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/bootstrap/css/bootstrap.min.css" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/magnific-popup/magnific-popup.min.css" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/summernote/summernote.min.css" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/jquery-ui-themes/smoothness/jquery-ui-1.10.3.custom.min.css" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/elfinder/css/elfinder.full.min.css" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/elfinder/css/theme.css" />
- <link rel="stylesheet" type="text/css" href="@string.Format(Common.WwwRoot+"/administration/kendo/styles/{0}/kendo.material.mobile.min.css", kendoVersion)" />
- <link rel="stylesheet" type="text/css" href="@string.Format(Common.WwwRoot+"/administration/kendo/styles/{0}/kendo.material.min.css", kendoVersion)" />
- <link rel="stylesheet" type="text/css" href="@string.Format(Common.WwwRoot+"/administration/kendo/styles/{0}/kendo.common-material.min.css", kendoVersion)" />
+ <link rel="stylesheet" type="text/css" href="@string.Format(Grand.SharedUIResources.Constants.WwwRoot+"/administration/kendo/styles/{0}/kendo.material.mobile.min.css", kendoVersion)" />
+ <link rel="stylesheet" type="text/css" href="@string.Format(Grand.SharedUIResources.Constants.WwwRoot+"/administration/kendo/styles/{0}/kendo.material.min.css", kendoVersion)" />
+ <link rel="stylesheet" type="text/css" href="@string.Format(Grand.SharedUIResources.Constants.WwwRoot+"/administration/kendo/styles/{0}/kendo.common-material.min.css", kendoVersion)" />
- <link rel="stylesheet" type="text/css" asp-src="@(Common.WwwRoot)/administration/farbtastic/farbtastic.css" />
+ <link rel="stylesheet" type="text/css" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/farbtastic/farbtastic.css" />
//CSS
if (supportRtl)
{
- <link rel="stylesheet" type="text/css" href="@(Common.WwwRoot)/administration/bootstrap/css/bootstrap-rtl.min.css" />
- <link rel="stylesheet" type="text/css" href="@(Common.WwwRoot)/administration/build/css/custom-rtl.css" />
- <link rel="stylesheet" type="text/css" href="@string.Format(Common.WwwRoot+"/administration/kendo/styles/{0}/kendo.rtl.min.css", kendoVersion)" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/bootstrap/css/bootstrap-rtl.min.css" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/build/css/custom-rtl.css" />
+ <link rel="stylesheet" type="text/css" href="@string.Format(Grand.SharedUIResources.Constants.WwwRoot+"/administration/kendo/styles/{0}/kendo.rtl.min.css", kendoVersion)" />
}
else
{
- <link rel="stylesheet" type="text/css" href="@(Common.WwwRoot)/administration/build/css/custom.css" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/build/css/custom.css" />
}
- <script asp-location="Head" asp-src="@(Common.WwwRoot)/administration/build/js/jquery.min.js"></script>
- <script asp-location="Head" asp-src="@(Common.WwwRoot)/administration/jquery-ui/jquery-ui.min.js"></script>
- <script asp-location="Head" asp-src="@(Common.WwwRoot)/administration/build/js/moment.min.js"></script>
- <script asp-location="Head" asp-src="@(Common.WwwRoot)/administration/bootstrap/js/daterangepicker.min.js"></script>
- <script asp-location="Head" asp-src="@(Common.WwwRoot)/administration/typeahead.js"></script>
- <script asp-location="Head" asp-src="@(Common.WwwRoot)/administration/admin.search.js"></script>
- <script asp-location="Head" asp-src="@(Common.WwwRoot)/administration/jquery.validate.min.js"></script>
- <script asp-location="Head" asp-src="@(Common.WwwRoot)/administration/jquery.validate.unobtrusive.min.js"></script>
- <script asp-location="Head" asp-src="@(Common.WwwRoot)/administration/admin.common.js"></script>
- <script asp-location="Head" asp-src="@string.Format(Common.WwwRoot+"/administration/kendo/scripts/{0}/kendo.ui.core.min.js", kendoVersion)"></script>
- <script asp-location="Head" asp-src="@string.Format(Common.WwwRoot+"/administration/kendo/scripts/{0}/kendo.grid.js", kendoVersion)"></script>
- <script asp-location="Head" asp-src="@string.Format(Common.WwwRoot+"/administration/kendo/scripts/{0}/cultures/kendo.culture.{1}.js", kendoVersion, CultureInfo.CurrentCulture.Name)"></script>
-
-
- <script asp-location="Footer" asp-src="@(Common.WwwRoot)/administration/bootstrap/js/popper.min.js"></script>
- <script asp-location="Footer" asp-src="@(Common.WwwRoot)/administration/bootstrap/js/bootstrap.min.js"></script>
- <script asp-location="Footer" asp-src="@(Common.WwwRoot)/administration/build/js/smartresize.js"></script>
- <script asp-location="Footer" asp-src="@(Common.WwwRoot)/administration/build/js/custom.js"></script>
- <script asp-location="Footer" asp-src="@(Common.WwwRoot)/administration/summernote/summernote.min.js"></script>
- <script asp-location="Footer" asp-src="@(Common.WwwRoot)/administration/elfinder/js/elfinder.min.js"></script>
- <script asp-location="Footer" asp-src="@(Common.WwwRoot)/administration/magnific-popup/jquery.magnific-popup.min.js"></script>
- <script asp-location="Footer" asp-src="@(Common.WwwRoot)/administration/jquery.tmpl.min.js"></script>
- <script asp-location="Footer" asp-src="@(Common.WwwRoot)/administration/farbtastic/farbtastic.js"></script>
+ <script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/build/js/jquery.min.js"></script>
+ <script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/jquery-ui/jquery-ui.min.js"></script>
+ <script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/build/js/moment.min.js"></script>
+ <script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/bootstrap/js/daterangepicker.min.js"></script>
+ <script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/typeahead.js"></script>
+ <script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/admin.search.js"></script>
+ <script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/jquery.validate.min.js"></script>
+ <script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/jquery.validate.unobtrusive.min.js"></script>
+ <script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/admin.common.js"></script>
+ <script asp-location="Head" asp-src="@string.Format(Grand.SharedUIResources.Constants.WwwRoot+"/administration/kendo/scripts/{0}/kendo.ui.core.min.js", kendoVersion)"></script>
+ <script asp-location="Head" asp-src="@string.Format(Grand.SharedUIResources.Constants.WwwRoot+"/administration/kendo/scripts/{0}/kendo.grid.js", kendoVersion)"></script>
+ <script asp-location="Head" asp-src="@string.Format(Grand.SharedUIResources.Constants.WwwRoot+"/administration/kendo/scripts/{0}/cultures/kendo.culture.{1}.js", kendoVersion, CultureInfo.CurrentCulture.Name)"></script>
+
+
+ <script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/bootstrap/js/popper.min.js"></script>
+ <script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/bootstrap/js/bootstrap.min.js"></script>
+ <script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/build/js/smartresize.js"></script>
+ <script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/build/js/custom.js"></script>
+ <script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/summernote/summernote.min.js"></script>
+ <script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/elfinder/js/elfinder.min.js"></script>
+ <script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/magnific-popup/jquery.magnific-popup.min.js"></script>
+ <script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/jquery.tmpl.min.js"></script>
+ <script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/farbtastic/farbtastic.js"></script>
}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/Partials/Menu.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/Partials/Menu.cshtml
index 4edf4aeca..a0fdc54be 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/Partials/Menu.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/Partials/Menu.cshtml
@@ -17,7 +17,7 @@
<div class="col-md-3 left_col">
<div class="left_col scroll-view">
<div class="navbar nav_title">
- <a href="~/Admin" class="site_title"><img src="@(Common.WwwRoot)/administration/build/images/grandLogo.png" width="35" height="35" /> <span>GrandNode</span></a>
+ <a href="~/Admin" class="site_title"><img src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/build/images/grandLogo.png" width="35" height="35" /> <span>GrandNode</span></a>
</div>
<div class="clearfix"></div>
<div class="main_menu_side hidden-print main_menu" id="sidebar-menu">
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/_AdminLayout.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/_AdminLayout.cshtml
index 9af926d66..889fac911 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/_AdminLayout.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/_AdminLayout.cshtml
@@ -155,7 +155,7 @@
}
<li>
<a href="javascript:;" class="user-profile dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
- <img src="@(Common.WwwRoot)/administration/build/images/avatar.png" alt="">
+ <img src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/build/images/avatar.png" alt="">
@if (currentCustomer != null && await groupService.IsRegistered(currentCustomer))
{
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/_AdminLoginLayout.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/_AdminLoginLayout.cshtml
index d7b2e1248..0d3332541 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/_AdminLoginLayout.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/_AdminLoginLayout.cshtml
@@ -21,18 +21,18 @@
<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">
- <link rel="stylesheet" type="text/css" href="@(Common.WwwRoot)/administration/build/css/font-awesome.min.css" />
- <link rel="stylesheet" type="text/css" href="@(Common.WwwRoot)/administration/simple-line-icons/simple-line-icons.min.css" />
- <link rel="stylesheet" type="text/css" href="@(Common.WwwRoot)/administration/bootstrap/css/bootstrap.min.css" />
- <link rel="stylesheet" type="text/css" href="@(Common.WwwRoot)/administration/build/css/custom.css" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/build/css/font-awesome.min.css" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/simple-line-icons/simple-line-icons.min.css" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/bootstrap/css/bootstrap.min.css" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/build/css/custom.css" />
- <script src="@(Common.WwwRoot)/administration/build/js/jquery.min.js"></script>
- <script src="@(Common.WwwRoot)/administration/build/js/moment.min.js"></script>
- <script src="@(Common.WwwRoot)/administration/jquery.validate.min.js"></script>
- <script src="@(Common.WwwRoot)/administration/jquery.validate.unobtrusive.min.js"></script>
- <script src="@(Common.WwwRoot)/administration/jquery-ui/jquery-ui.min.js"></script>
- <script src="@(Common.WwwRoot)/administration/bootstrap/js/popper.min.js"></script>
- <script src="@(Common.WwwRoot)/administration/bootstrap/js/bootstrap.min.js"></script>
+ <script src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/build/js/jquery.min.js"></script>
+ <script src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/build/js/moment.min.js"></script>
+ <script src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/jquery.validate.min.js"></script>
+ <script src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/jquery.validate.unobtrusive.min.js"></script>
+ <script src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/jquery-ui/jquery-ui.min.js"></script>
+ <script src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/bootstrap/js/popper.min.js"></script>
+ <script src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/bootstrap/js/bootstrap.min.js"></script>
</head>
<body>
@Html.AntiForgeryToken()
diff --git a/src/Web/Grand.Web.Admin/Extensions/Common.cs b/src/Web/Grand.Web.Admin/Extensions/Common.cs
deleted file mode 100644
index 4c679e352..000000000
--- a/src/Web/Grand.Web.Admin/Extensions/Common.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Grand.Web.Admin.Extensions
-{
- public static class Common
- {
- public static string WwwRoot { get; set; } = "/_content/Grand.SharedUIResources";
- }
-}
diff --git a/src/Web/Grand.Web.Admin/Program.cs b/src/Web/Grand.Web.Admin/Program.cs
index 01dc4d210..cb249e639 100644
--- a/src/Web/Grand.Web.Admin/Program.cs
+++ b/src/Web/Grand.Web.Admin/Program.cs
@@ -3,7 +3,7 @@ using Grand.Web.Common.Extensions;
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.Hosting;
-Common.WwwRoot = "";
+Grand.SharedUIResources.Constants.WwwRoot = "";
var builder = WebApplication.CreateBuilder(args);
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Order/Partials/OrderDetails.Addresses.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Order/Partials/OrderDetails.Addresses.cshtml
index a7592f649..8e0fa8918 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Order/Partials/OrderDetails.Addresses.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Order/Partials/OrderDetails.Addresses.cshtml
@@ -290,7 +290,7 @@
}
</table>
<div style="padding-top: 15px;">
- <img alt="google maps" src="@Url.Content($"{Constants.WwwRoot}/administration/build/images/google-maps.gif")" />
+ <img alt="google maps" src="@Url.Content($"{Grand.SharedUIResources.Constants.WwwRoot}/administration/build/images/google-maps.gif")" />
<a href="@Html.Raw(Model.ShippingAddressGoogleMapsUrl)" target="_blank">@Loc["Vendor.Orders.Fields.ShippingAddress.ViewOnGoogleMaps"]</a>
</div>
}
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shared/EditorTemplates/MultiPicture.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shared/EditorTemplates/MultiPicture.cshtml
index 2b141c30e..d9e79dc79 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shared/EditorTemplates/MultiPicture.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shared/EditorTemplates/MultiPicture.cshtml
@@ -8,8 +8,8 @@
var endpoint = ViewData["Endpoint"];
var click = ViewData["Click"];
}
-<link rel="stylesheet" type="text/css" asp-src="@(Constants.WwwRoot)/administration/fineuploader/fineuploader-4.2.2.min.css" />
-<script asp-location="Footer" asp-src="@(Constants.WwwRoot)/administration/fineuploader/jquery.fineuploader-4.2.2.min.js"></script>
+<link rel="stylesheet" type="text/css" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/fineuploader/fineuploader-4.2.2.min.css" />
+<script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/fineuploader/jquery.fineuploader-4.2.2.min.js"></script>
<div id="@clientId"></div>
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shared/EditorTemplates/Picture.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shared/EditorTemplates/Picture.cshtml
index c12b86462..a761c3834 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shared/EditorTemplates/Picture.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shared/EditorTemplates/Picture.cshtml
@@ -7,8 +7,8 @@
var targetPictureSize = 100;
}
-<link rel="stylesheet" type="text/css" asp-src="@(Constants.WwwRoot)/administration/fineuploader/fineuploader-4.2.2.min.css" />
-<script asp-location="Footer" asp-src="@(Constants.WwwRoot)/administration/fineuploader/jquery.fineuploader-4.2.2.min.js"></script>
+<link rel="stylesheet" type="text/css" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/fineuploader/fineuploader-4.2.2.min.css" />
+<script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/fineuploader/jquery.fineuploader-4.2.2.min.js"></script>
<div id="@(clientId + "value")">
<input asp-for="@Model" type="hidden" />
</div>
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shared/Partials/HeadVendor.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shared/Partials/HeadVendor.cshtml
index 6f9f0a09d..c38bb42f9 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shared/Partials/HeadVendor.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shared/Partials/HeadVendor.cshtml
@@ -1,59 +1,59 @@
@inject Grand.Domain.Localization.LanguageSettings languageSettings
@inject IWorkContext workContext
<script>
- const wwwrootpath = '@(Constants.WwwRoot)';
+ const wwwrootpath = '@(Grand.SharedUIResources.Constants.WwwRoot)';
</script>
@{
var supportRtl = workContext.WorkingLanguage.Rtl &&
!languageSettings.IgnoreRtlPropertyForAdminArea;
var kendoVersion = "2021.3.914";
- <link rel="stylesheet" type="text/css" href="@(Constants.WwwRoot)/administration/bootstrap/css/daterangepicker.min.css" />
- <link rel="stylesheet" type="text/css" href="@(Constants.WwwRoot)/administration/build/css/font-awesome.min.css" />
- <link rel="stylesheet" type="text/css" href="@(Constants.WwwRoot)/administration/simple-line-icons/simple-line-icons.min.css" />
- <link rel="stylesheet" type="text/css" href="@(Constants.WwwRoot)/administration/bootstrap/css/bootstrap.min.css" />
- <link rel="stylesheet" type="text/css" href="@(Constants.WwwRoot)/administration/magnific-popup/magnific-popup.min.css" />
- <link rel="stylesheet" type="text/css" href="@(Constants.WwwRoot)/administration/summernote/summernote.min.css" />
- <link rel="stylesheet" type="text/css" href="@(Constants.WwwRoot)/administration/jquery-ui-themes/smoothness/jquery-ui-1.10.3.custom.min.css" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/bootstrap/css/daterangepicker.min.css" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/build/css/font-awesome.min.css" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/simple-line-icons/simple-line-icons.min.css" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/bootstrap/css/bootstrap.min.css" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/magnific-popup/magnific-popup.min.css" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/summernote/summernote.min.css" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/jquery-ui-themes/smoothness/jquery-ui-1.10.3.custom.min.css" />
- <link rel="stylesheet" type="text/css" href="@string.Format(Constants.WwwRoot+"/administration/kendo/styles/{0}/kendo.material.mobile.min.css", kendoVersion)" />
- <link rel="stylesheet" type="text/css" href="@string.Format(Constants.WwwRoot+"/administration/kendo/styles/{0}/kendo.material.min.css", kendoVersion)" />
- <link rel="stylesheet" type="text/css" href="@string.Format(Constants.WwwRoot+"/administration/kendo/styles/{0}/kendo.common-material.min.css", kendoVersion)" />
+ <link rel="stylesheet" type="text/css" href="@string.Format(Grand.SharedUIResources.Constants.WwwRoot+"/administration/kendo/styles/{0}/kendo.material.mobile.min.css", kendoVersion)" />
+ <link rel="stylesheet" type="text/css" href="@string.Format(Grand.SharedUIResources.Constants.WwwRoot+"/administration/kendo/styles/{0}/kendo.material.min.css", kendoVersion)" />
+ <link rel="stylesheet" type="text/css" href="@string.Format(Grand.SharedUIResources.Constants.WwwRoot+"/administration/kendo/styles/{0}/kendo.common-material.min.css", kendoVersion)" />
- <link rel="stylesheet" type="text/css" asp-src="@(Constants.WwwRoot)/administration/farbtastic/farbtastic.css" />
+ <link rel="stylesheet" type="text/css" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/farbtastic/farbtastic.css" />
//CSS
if (supportRtl)
{
- <link rel="stylesheet" type="text/css" href="@(Constants.WwwRoot)/administration/bootstrap/css/bootstrap-rtl.min.css" />
- <link rel="stylesheet" type="text/css" href="@(Constants.WwwRoot)/administration/build/css/custom-rtl.css" />
- <link rel="stylesheet" type="text/css" href="@string.Format(Constants.WwwRoot+"/administration/kendo/styles/{0}/kendo.rtl.min.css", kendoVersion)" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/bootstrap/css/bootstrap-rtl.min.css" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/build/css/custom-rtl.css" />
+ <link rel="stylesheet" type="text/css" href="@string.Format(Grand.SharedUIResources.Constants.WwwRoot+"/administration/kendo/styles/{0}/kendo.rtl.min.css", kendoVersion)" />
}
else
{
- <link rel="stylesheet" type="text/css" href="@(Constants.WwwRoot)/administration/build/css/custom.css" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/build/css/custom.css" />
}
- <script asp-location="Head" asp-src="@(Constants.WwwRoot)/administration/build/js/jquery.min.js"></script>
- <script asp-location="Head" asp-src="@(Constants.WwwRoot)/administration/jquery-ui/jquery-ui.min.js"></script>
- <script asp-location="Head" asp-src="@(Constants.WwwRoot)/administration/build/js/moment.min.js"></script>
- <script asp-location="Head" asp-src="@(Constants.WwwRoot)/administration/bootstrap/js/daterangepicker.min.js"></script>
- <script asp-location="Head" asp-src="@(Constants.WwwRoot)/administration/typeahead.js"></script>
- <script asp-location="Head" asp-src="@(Constants.WwwRoot)/administration/jquery.validate.min.js"></script>
- <script asp-location="Head" asp-src="@(Constants.WwwRoot)/administration/jquery.validate.unobtrusive.min.js"></script>
- <script asp-location="Head" asp-src="@(Constants.WwwRoot)/administration/admin.common.js"></script>
- <script asp-location="Head" asp-src="@string.Format(Constants.WwwRoot+"/administration/kendo/scripts/{0}/kendo.ui.core.min.js", kendoVersion)"></script>
- <script asp-location="Head" asp-src="@string.Format(Constants.WwwRoot+"/administration/kendo/scripts/{0}/kendo.grid.js", kendoVersion)"></script>
- <script asp-location="Head" asp-src="@string.Format(Constants.WwwRoot+"/administration/kendo/scripts/{0}/cultures/kendo.culture.{1}.js", kendoVersion, CultureInfo.CurrentCulture.Name)"></script>
-
-
- <script asp-location="Footer" asp-src="@(Constants.WwwRoot)/administration/bootstrap/js/popper.min.js"></script>
- <script asp-location="Footer" asp-src="@(Constants.WwwRoot)/administration/bootstrap/js/bootstrap.min.js"></script>
- <script asp-location="Footer" asp-src="@(Constants.WwwRoot)/administration/build/js/smartresize.js"></script>
- <script asp-location="Footer" asp-src="@(Constants.WwwRoot)/administration/build/js/custom.js"></script>
- <script asp-location="Footer" asp-src="@(Constants.WwwRoot)/administration/summernote/summernote.min.js"></script>
- <script asp-location="Footer" asp-src="@(Constants.WwwRoot)/administration/magnific-popup/jquery.magnific-popup.min.js"></script>
- <script asp-location="Footer" asp-src="@(Constants.WwwRoot)/administration/jquery.tmpl.min.js"></script>
- <script asp-location="Footer" asp-src="@(Constants.WwwRoot)/administration/farbtastic/farbtastic.js"></script>
+ <script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/build/js/jquery.min.js"></script>
+ <script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/jquery-ui/jquery-ui.min.js"></script>
+ <script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/build/js/moment.min.js"></script>
+ <script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/bootstrap/js/daterangepicker.min.js"></script>
+ <script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/typeahead.js"></script>
+ <script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/jquery.validate.min.js"></script>
+ <script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/jquery.validate.unobtrusive.min.js"></script>
+ <script asp-location="Head" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/admin.common.js"></script>
+ <script asp-location="Head" asp-src="@string.Format(Grand.SharedUIResources.Constants.WwwRoot+"/administration/kendo/scripts/{0}/kendo.ui.core.min.js", kendoVersion)"></script>
+ <script asp-location="Head" asp-src="@string.Format(Grand.SharedUIResources.Constants.WwwRoot+"/administration/kendo/scripts/{0}/kendo.grid.js", kendoVersion)"></script>
+ <script asp-location="Head" asp-src="@string.Format(Grand.SharedUIResources.Constants.WwwRoot+"/administration/kendo/scripts/{0}/cultures/kendo.culture.{1}.js", kendoVersion, CultureInfo.CurrentCulture.Name)"></script>
+
+
+ <script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/bootstrap/js/popper.min.js"></script>
+ <script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/bootstrap/js/bootstrap.min.js"></script>
+ <script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/build/js/smartresize.js"></script>
+ <script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/build/js/custom.js"></script>
+ <script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/summernote/summernote.min.js"></script>
+ <script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/magnific-popup/jquery.magnific-popup.min.js"></script>
+ <script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/jquery.tmpl.min.js"></script>
+ <script asp-location="Footer" asp-src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/farbtastic/farbtastic.js"></script>
}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shared/Partials/Menu.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shared/Partials/Menu.cshtml
index d1b522721..7ce59aa9d 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shared/Partials/Menu.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shared/Partials/Menu.cshtml
@@ -17,7 +17,7 @@
<div class="col-md-3 left_col">
<div class="left_col scroll-view">
<div class="navbar nav_title">
- <a href="~/Vendor" class="site_title"><img src="@(Constants.WwwRoot)/administration/build/images/grandLogo.png" width="35" height="35" /> <span>GrandNode</span></a>
+ <a href="~/Vendor" class="site_title"><img src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/build/images/grandLogo.png" width="35" height="35" /> <span>GrandNode</span></a>
</div>
<div class="clearfix"></div>
<div class="main_menu_side hidden-print main_menu" id="sidebar-menu">
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shared/_VendorLayout.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shared/_VendorLayout.cshtml
index ebdedd96a..c05472a9f 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shared/_VendorLayout.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shared/_VendorLayout.cshtml
@@ -107,7 +107,7 @@
<li>
<a href="javascript:;" class="user-profile dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
- <img src="@(Constants.WwwRoot)/administration/build/images/avatar.png" alt="">
+ <img src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/build/images/avatar.png" alt="">
<div class="username-hide-on-mobile">
@(currentCustomer.Email)
</div>
diff --git a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shared/_VendorLoginLayout.cshtml b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shared/_VendorLoginLayout.cshtml
index 24bae3dc2..cb8d3640f 100644
--- a/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shared/_VendorLoginLayout.cshtml
+++ b/src/Web/Grand.Web.Vendor/Areas/Vendor/Views/Shared/_VendorLoginLayout.cshtml
@@ -21,18 +21,18 @@
<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">
- <link rel="stylesheet" type="text/css" href="@(Constants.WwwRoot)/administration/build/css/font-awesome.min.css" />
- <link rel="stylesheet" type="text/css" href="@(Constants.WwwRoot)/administration/simple-line-icons/simple-line-icons.min.css" />
- <link rel="stylesheet" type="text/css" href="@(Constants.WwwRoot)/administration/bootstrap/css/bootstrap.min.css" />
- <link rel="stylesheet" type="text/css" href="@(Constants.WwwRoot)/administration/build/css/custom.css" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/build/css/font-awesome.min.css" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/simple-line-icons/simple-line-icons.min.css" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/bootstrap/css/bootstrap.min.css" />
+ <link rel="stylesheet" type="text/css" href="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/build/css/custom.css" />
- <script src="@(Constants.WwwRoot)/administration/build/js/jquery.min.js"></script>
- <script src="@(Constants.WwwRoot)/administration/build/js/moment.min.js"></script>
- <script src="@(Constants.WwwRoot)/administration/jquery.validate.min.js"></script>
- <script src="@(Constants.WwwRoot)/administration/jquery.validate.unobtrusive.min.js"></script>
- <script src="@(Constants.WwwRoot)/administration/jquery-ui/jquery-ui.min.js"></script>
- <script src="@(Constants.WwwRoot)/administration/bootstrap/js/popper.min.js"></script>
- <script src="@(Constants.WwwRoot)/administration/bootstrap/js/bootstrap.min.js"></script>
+ <script src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/build/js/jquery.min.js"></script>
+ <script src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/build/js/moment.min.js"></script>
+ <script src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/jquery.validate.min.js"></script>
+ <script src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/jquery.validate.unobtrusive.min.js"></script>
+ <script src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/jquery-ui/jquery-ui.min.js"></script>
+ <script src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/bootstrap/js/popper.min.js"></script>
+ <script src="@(Grand.SharedUIResources.Constants.WwwRoot)/administration/bootstrap/js/bootstrap.min.js"></script>
</head>
<body>
@Html.AntiForgeryToken()
diff --git a/src/Web/Grand.Web.Vendor/Extensions/Constants.cs b/src/Web/Grand.Web.Vendor/Extensions/Constants.cs
index 08d8d05f9..fcab1988b 100644
--- a/src/Web/Grand.Web.Vendor/Extensions/Constants.cs
+++ b/src/Web/Grand.Web.Vendor/Extensions/Constants.cs
@@ -3,10 +3,7 @@
public static class Constants
{
public const string AreaVendor = "Vendor";
-
public static string LayoutVendor => $"~/Areas/{AreaVendor}/Views/Shared/_VendorLayout.cshtml";
public static string LayoutVendorLogin => $"~/Areas/{AreaVendor}/Views/Shared/_VendorLoginLayout.cshtml";
- public static string WwwRoot { get; set; } = "/_content/Grand.SharedUIResources";
-
}
}
diff --git a/src/Web/Grand.Web.Vendor/Program.cs b/src/Web/Grand.Web.Vendor/Program.cs
index d12c93314..86b4ee692 100644
--- a/src/Web/Grand.Web.Vendor/Program.cs
+++ b/src/Web/Grand.Web.Vendor/Program.cs
@@ -1,10 +1,7 @@
using Grand.Web.Common.Extensions;
-using Grand.Web.Vendor.Extensions;
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.Hosting;
-Constants.WwwRoot = "";
-
var builder = WebApplication.CreateBuilder(args);
builder.Host.UseDefaultServiceProvider((_, options) =>