Skip to content

Commit f0e5012

Browse files
i4004i4004
committed
Merge branch '10'
# Conflicts: # src/SampleApps/SampleApp.SelfHosted/Templates/Master.tpl
2 parents 7e5b642 + d469d5c commit f0e5012

17 files changed

+60
-30566
lines changed

‎src/SampleApps/SampleApp.SelfHosted/Content/bootstrap-theme.css‎

Lines changed: 0 additions & 587 deletions
This file was deleted.

‎src/SampleApps/SampleApp.SelfHosted/Content/bootstrap-theme.min.css‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/SampleApps/SampleApp.SelfHosted/Content/bootstrap.css‎

Lines changed: 0 additions & 6757 deletions
This file was deleted.

‎src/SampleApps/SampleApp.SelfHosted/Content/bootstrap.min.css‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/SampleApps/SampleApp.SelfHosted/Controllers/HttpErrors/Http404Controller.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class Http404Controller : Controller
99
{
1010
public override ControllerResponse Invoke()
1111
{
12-
return new StaticTpl("HttpErrors/Http404", StringTable.PageTitle404);
12+
return new StaticTpl("HttpErrors/Http404", StringTable.PageTitle404, 404);
1313
}
1414
}
1515
}

‎src/SampleApps/SampleApp.SelfHosted/SampleApp.SelfHosted.csproj‎

Lines changed: 18 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk" InitialTargets="BeforeBuild">
22
<PropertyGroup>
33
<TargetFrameworks>netcoreapp2.2</TargetFrameworks>
44
<Authors>Alexander Krylkov</Authors>
@@ -12,126 +12,42 @@
1212
<ItemGroup>
1313
<PackageReference Include="Microsoft.AspNetCore.App" />
1414
<PackageReference Include="bootstrap" Version="3.3.7" PrivateAssets="All" />
15-
<PackageReference Include="jQuery" Version="3.1.0" PrivateAssets="All" />
15+
<PackageReference Include="jQuery" Version="3.4.1" PrivateAssets="All" />
1616
<ProjectReference Include="..\..\Simplify.Web\Simplify.Web.csproj" />
1717
</ItemGroup>
1818
<ItemGroup>
1919
<None Update="appsettings.json">
2020
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2121
</None>
22-
<None Update="App_Data\Messages.en.xml">
22+
<None Update="node_modules\**\*min.css">
2323
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2424
</None>
25-
<None Update="App_Data\Titles.en.xml">
25+
<None Update="node_modules\**\*min.js">
2626
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2727
</None>
28-
<None Update="Content\bootstrap-theme.css">
28+
<None Update="App_Data\*">
2929
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3030
</None>
31-
<None Update="Content\bootstrap-theme.css.map">
31+
<None Update="fonts\*">
3232
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3333
</None>
34-
<None Update="Content\bootstrap-theme.min.css">
34+
<None Update="Images\*">
3535
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3636
</None>
37-
<None Update="Content\bootstrap.css">
37+
<None Update="Styles\*.css">
3838
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3939
</None>
40-
<None Update="Content\bootstrap.css.map">
41-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
42-
</None>
43-
<None Update="Content\bootstrap.min.css">
44-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
45-
</None>
46-
<None Update="Content\bootstrapValidator\bootstrapValidator.css">
47-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
48-
</None>
49-
<None Update="Content\bootstrapValidator\bootstrapValidator.min.css">
50-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
51-
</None>
52-
<None Update="fonts\glyphicons-halflings-regular.eot">
53-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
54-
</None>
55-
<None Update="fonts\glyphicons-halflings-regular.svg">
56-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
57-
</None>
58-
<None Update="fonts\glyphicons-halflings-regular.ttf">
59-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
60-
</None>
61-
<None Update="fonts\glyphicons-halflings-regular.woff">
62-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
63-
</None>
64-
<None Update="fonts\glyphicons-halflings-regular.woff2">
65-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
66-
</None>
67-
<None Update="Images\IconMedium.png">
68-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
69-
</None>
70-
<None Update="scripts\bootstrap.js">
71-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
72-
</None>
73-
<None Update="scripts\bootstrap.min.js">
74-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
75-
</None>
76-
<None Update="scripts\bootstrapValidator\bootstrapValidator.js">
77-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
78-
</None>
79-
<None Update="scripts\bootstrapValidator\bootstrapValidator.min.js">
80-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
81-
</None>
82-
<None Update="scripts\jquery-3.1.0.intellisense.js">
83-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
84-
</None>
85-
<None Update="scripts\jquery-3.1.0.js">
86-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
87-
</None>
88-
<None Update="scripts\jquery-3.1.0.min.js">
89-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
90-
</None>
91-
<None Update="scripts\jquery-3.1.0.slim.js">
92-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
93-
</None>
94-
<None Update="scripts\jquery-3.1.0.slim.min.js">
95-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
96-
</None>
97-
<None Update="Styles\Main.min.css">
98-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
99-
</None>
100-
<None Update="Templates\Accounts\LoginPage.tpl">
101-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
102-
</None>
103-
<None Update="Templates\Accounts\LoginPage.tpl.en.xml">
104-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
105-
</None>
106-
<None Update="Templates\Default.tpl">
107-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
108-
</None>
109-
<None Update="Templates\HttpErrors\Http404.tpl">
110-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
111-
</None>
112-
<None Update="Templates\Master.tpl">
113-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
114-
</None>
115-
<None Update="Templates\Master.tpl.en.xml">
116-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
117-
</None>
118-
<None Update="Templates\MessageBox.tpl">
119-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
120-
</None>
121-
<None Update="Templates\Navbar.tpl">
122-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
123-
</None>
124-
<None Update="Templates\Shared\LoginPanel\GuestPanel.tpl">
125-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
126-
</None>
127-
<None Update="Templates\Shared\LoginPanel\LoggedUserPanel.tpl">
128-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
129-
</None>
130-
<None Update="Templates\Static\About.tpl">
131-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
132-
</None>
133-
<None Update="Templates\User\Profile.tpl">
40+
<None Update="Templates\**\*">
13441
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
13542
</None>
13643
</ItemGroup>
44+
<Target Name="BeforeBuild" Condition=" '$(Configuration)' == 'Debug' And !Exists('node_modules') ">
45+
<!-- Ensure Node.js is installed -->
46+
<Exec Command="node --version" ContinueOnError="true">
47+
<Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
48+
</Exec>
49+
<Error Condition="'$(ErrorCode)' != '0'" Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE." />
50+
<Message Importance="high" Text="Restoring dependencies using 'npm'. This may take several minutes..." />
51+
<Exec Command="npm install" />
52+
</Target>
13753
</Project>

‎src/SampleApps/SampleApp.SelfHosted/Templates/Master.tpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
<meta charset="utf-8" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<title>{Title}</title>
8-
<link rel="stylesheet" type="text/css" href="{~}/content/bootstrap.min.css" />
9-
<link rel="stylesheet" type="text/css" href="{~}/content/bootstrap-theme.min.css" />
8+
<link rel="stylesheet" type="text/css" href="{~}/node_modules/bootstrap/dist/css/bootstrap.min.css" />
9+
<link rel="stylesheet" type="text/css" href="{~}/node_modules/bootstrap/dist/css/bootstrap-theme.min.css" />
1010
<link rel="stylesheet" type="text/css" href="{~}/styles/Main.min.css" />
1111
</head>
1212

1313
<body>
14-
<script type="text/javascript" src="{~}/scripts/jquery-3.1.0.min.js"></script>
15-
<script type="text/javascript" src="{~}/scripts/bootstrap.min.js"></script>
14+
<script type="text/javascript" src="{~}/node_modules/jquery/dist/jquery.min.js"></script>
15+
<script type="text/javascript" src="{~}/node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
1616

1717
<div class="Title">
1818
<img class="Logo" src="{~}/images/IconMedium.png" alt="Simplify.Web" />Your Simplify.Web application

‎src/SampleApps/SampleApp.SelfHosted/appsettings.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"SimplifyWebSettings":
33
{
4-
"StringTableFiles": "Titles.xml, Messages.xml"
4+
"StringTableFiles": "Titles.xml, Messages.xml",
5+
"StaticFilesPaths": "styles, scripts, images, content, fonts, node_modules"
56
}
67
}

‎src/SampleApps/SampleApp.SelfHosted/package-lock.json‎

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/SampleApps/SampleApp.SelfHosted/package.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"name": "sampleapp.selfhosted",
3+
"version": "1.0.0",
4+
"description": "",
5+
"dependencies": {},
6+
"devDependencies": {
7+
"bootstrap": "^3.4.1",
8+
"jquery": "^3.4.1"
9+
},
10+
"scripts": {
11+
"test": "echo \"Error: no test specified\" && exit 1"
12+
},
13+
"author": "",
14+
"license": "ISC"
15+
}

0 commit comments

Comments
 (0)