Skip to content

Commit cdc60cf

Browse files
committed
feat: refactored asset management
1 parent 5e2df13 commit cdc60cf

2 files changed

Lines changed: 27 additions & 34 deletions

File tree

Lines changed: 26 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
3+
<PropertyGroup>
44
<OutputType>Library</OutputType>
55
<Title>WebExpress.WebApp</Title>
66
<Version>0.0.9.0</Version>
@@ -24,47 +24,40 @@
2424
<IsPackable>true</IsPackable>
2525
</PropertyGroup>
2626

27-
<ItemGroup>
28-
<None Remove="Assets\js\i18n\de.js" />
29-
<None Remove="Assets\js\i18n\en.js" />
30-
<None Remove="Assets\js\webexpress.webapp.modalform.js" />
31-
</ItemGroup>
27+
<ItemGroup>
28+
<None Remove="Assets\js\i18n\de.js" />
29+
<None Remove="Assets\js\i18n\en.js" />
30+
<None Remove="Assets\js\webexpress.webapp.modalform.js" />
31+
</ItemGroup>
32+
33+
<ItemGroup>
34+
<EmbeddedResource Include="Assets/**/*.*">
35+
<LogicalName>$(MSBuildProjectName).Assets.%(RecursiveDir)%(Filename)%(Extension)</LogicalName>
36+
</EmbeddedResource>
37+
</ItemGroup>
3238

3339
<ItemGroup>
34-
<EmbeddedResource Include="Assets\css\webexpress.webapp.css" />
35-
<EmbeddedResource Include="Assets\css\webexpress.webapp.popupnotification.css" />
36-
<EmbeddedResource Include="Assets\css\webexpress.webapp.table.css" />
37-
<EmbeddedResource Include="Assets\css\webexpress.webapp.taskprogressbar.css" />
38-
<EmbeddedResource Include="Assets\css\webexpress.webapp.theme.css" />
39-
<EmbeddedResource Include="Assets\js\i18n\de.js" />
40-
<EmbeddedResource Include="Assets\js\i18n\en.js" />
41-
<EmbeddedResource Include="Assets\js\webexpress.webapp.modalform.js" />
42-
<EmbeddedResource Include="Assets\js\webexpress.webapp.popupnotification.js" />
43-
<EmbeddedResource Include="Assets\js\webexpress.webapp.table.js" />
44-
<EmbeddedResource Include="Assets\js\webexpress.webapp.selection.js" />
45-
<EmbeddedResource Include="Assets\js\webexpress.webapp.js" />
46-
<EmbeddedResource Include="Assets\js\webexpress.webapp.taskprogressbar.js" />
4740
<EmbeddedResource Include="Internationalization\de" />
4841
<EmbeddedResource Include="Internationalization\en" />
4942
</ItemGroup>
5043

5144
<ItemGroup>
52-
<None Include="..\..\icon.png" Link="icon.png">
53-
<PackagePath>\</PackagePath>
54-
<Pack>True</Pack>
55-
</None>
56-
<None Include="..\..\README.md" Link="README.md">
57-
<PackagePath>\</PackagePath>
58-
<Pack>True</Pack>
59-
</None>
60-
<None Include="WebRestApi\RestApiCrudTableCell.cs" />
61-
<None Include="WebRestApi\RestApiCrudTableRow.cs" />
45+
<None Include="..\..\icon.png" Link="icon.png">
46+
<PackagePath>\</PackagePath>
47+
<Pack>True</Pack>
48+
</None>
49+
<None Include="..\..\README.md" Link="README.md">
50+
<PackagePath>\</PackagePath>
51+
<Pack>True</Pack>
52+
</None>
53+
<None Include="WebRestApi\RestApiCrudTableCell.cs" />
54+
<None Include="WebRestApi\RestApiCrudTableRow.cs" />
6255
</ItemGroup>
6356

6457
<ItemGroup>
65-
<PackageReference Include="WebExpress.WebCore" Version="0.0.9-alpha" />
66-
<PackageReference Include="WebExpress.WebUI" Version="0.0.9-alpha" />
67-
<PackageReference Include="WebExpress.WebIndex" Version="0.0.9-alpha" />
58+
<PackageReference Include="WebExpress.WebCore" Version="0.0.9-alpha" />
59+
<PackageReference Include="WebExpress.WebUI" Version="0.0.9-alpha" />
60+
<PackageReference Include="WebExpress.WebIndex" Version="0.0.9-alpha" />
6861
</ItemGroup>
6962

70-
</Project>
63+
</Project>

src/WebExpress.WebApp/WebPage/VisualTreeWebApp.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public VisualTreeWebApp(IComponentHub componentHub, IPageContext pageContext)
7676
: base(componentHub, pageContext)
7777
{
7878
var applicationContext = pageContext?.ApplicationContext;
79-
var baseUri = RouteEndpoint.Combine(applicationContext?.Route, "assets");
79+
var baseUri = RouteEndpoint.Combine(applicationContext?.Route, "webexpress.webapp/assets");
8080

8181
Header.Fixed = TypeFixed.Top;
8282
Header.Styles = ["position: sticky; top: 0; z-index: 99;"];

0 commit comments

Comments
 (0)