Skip to content

Commit ea2b4bd

Browse files
AlexanderKovalenkoAlexanderKovalenko
committed
Update client resources loading
1 parent 6cfb35d commit ea2b4bd

File tree

9 files changed

+58560
-10
lines changed

9 files changed

+58560
-10
lines changed

‎CS/NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<configuration>
33
<packageSources>
4-
<add key="DevExpress-Local" value="C:\Program Files (x86)\DevExpress 19.2\Components\System\Components\packages" />
4+
<add key="DevExpress-Local" value="C:\Program Files (x86)\DevExpress 20.1\Components\System\Components\packages" />
55
</packageSources>
66
</configuration>

‎CS/WebDashboardDataSources/Pages/_Layout.cshtml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
1-
<!DOCTYPE html>
1+
<!DOCTYPE html>
22

33
<html>
44
<head>
55
<meta charset="UTF-8" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
77
<title>Dashboard Web Application</title>
88

9-
@Html.DevExpress().StyleSheets()
9+
<link href="~/css/site.min.css" rel="stylesheet" />
10+
<script src="~/js/site.min.js"></script>
1011

1112
<script type="text/javascript">
12-
function onBeforeRender(dashboardControl) {
13-
dashboardControl.registerExtension(new DevExpress.Dashboard.DashboardPanelExtension(dashboardControl, { dashboardThumbnail: "./DashboardThumbnail/{0}.png" }));
14-
}
13+
function onBeforeRender(dashboardControl) {
14+
dashboardControl.registerExtension(new DevExpress.Dashboard.DashboardPanelExtension(dashboardControl, { dashboardThumbnail: "./DashboardThumbnail/{0}.png" }));
15+
}
1516
</script>
1617
</head>
1718
<body>
1819
@RenderBody()
19-
20-
@Html.DevExpress().Scripts()
2120
</body>
2221
</html>

‎CS/WebDashboardDataSources/Startup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void ConfigureServices(IServiceCollection services) {
4747
configurator.ConfigureDataConnection += Configurator_ConfigureDataConnection;
4848
});
4949

50-
services.AddDevExpressControls(options => options.Resources = ResourcesType.ThirdParty | ResourcesType.DevExtreme);
50+
services.AddDevExpressControls();
5151
}
5252

5353
public DataSourceInMemoryStorage CreateDataSourceStorage() {

‎CS/WebDashboardDataSources/WebDashboardDataSources.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
<ItemGroup>
77
<PackageReference Include="EntityFramework" Version="6.3.0" />
88
<PackageReference Include="Microsoft.AspNetCore.App" />
9-
<PackageReference Include="DevExpress.AspNetCore.Dashboard" Version="19.2.9" />
9+
<PackageReference Include="DevExpress.AspNetCore.Dashboard" Version="20.1.7" />
1010
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.1" />
1111
<PackageReference Include="System.Data.SQLite" Version="1.0.111" />
12+
<PackageReference Include="BuildBundlerMinifier" Version="3.0.415" />
1213
</ItemGroup>
1314
<ItemGroup>
1415
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />

‎CS/WebDashboardDataSources/bundleconfig.json

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
[
2+
{
3+
"outputFileName": "wwwroot/css/site.min.css",
4+
"inputFiles": [
5+
"node_modules/devextreme/dist/css/dx.common.css",
6+
"node_modules/devextreme/dist/css/dx.light.css",
7+
"node_modules/@devexpress/analytics-core/dist/css/dx-analytics.common.css",
8+
"node_modules/@devexpress/analytics-core/dist/css/dx-analytics.light.css",
9+
"node_modules/@devexpress/analytics-core/dist/css/dx-querybuilder.css",
10+
"node_modules/devexpress-dashboard/dist/css/dx-dashboard.light.min.css"
11+
],
12+
"minify": {
13+
"enabled": false,
14+
"adjustRelativePaths": false
15+
}
16+
},
17+
{
18+
"outputFileName": "wwwroot/js/site.min.js",
19+
"inputFiles": [
20+
"node_modules/jquery/dist/jquery.js",
21+
"node_modules/jquery-ui-dist/jquery-ui.js",
22+
"node_modules/knockout/build/output/knockout-latest.js",
23+
"node_modules/ace-builds/src-min-noconflict/ace.js",
24+
"node_modules/ace-builds/src-min-noconflict/ext-language_tools.js",
25+
"node_modules/ace-builds/src-min-noconflict/theme-dreamweaver.js",
26+
"node_modules/ace-builds/src-min-noconflict/theme-ambiance.js",
27+
"node_modules/devextreme/dist/js/dx.all.js",
28+
"node_modules/@devexpress/analytics-core/dist/js/dx-analytics-core.min.js",
29+
"node_modules/@devexpress/analytics-core/dist/js/dx-querybuilder.min.js",
30+
"node_modules/devexpress-dashboard/dist/js/dx-dashboard.min.js"
31+
],
32+
"minify": {
33+
"enabled": false
34+
},
35+
"sourceMap": false
36+
}
37+
]

0 commit comments

Comments
 (0)