Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.

Commit a92c48e

Browse files
author
Ramón Tomás
committed
Removed bower from WebStatus app
Migrated WebStatus app to Bootstrap 4
1 parent 70d7cc9 commit a92c48e

29 files changed

+11445
-18462
lines changed

‎src/Web/WebMVC/WebMVC.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
<ItemGroup>
2222
<PackageReference Include="BuildBundlerMinifier" Version="2.6.375" />
23-
<PackageReference Include="BuildWebCompiler" Version="1.11.326" />
2423
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.2.1" />
2524
<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.6.1" />
2625
<PackageReference Include="Microsoft.ApplicationInsights.Kubernetes" Version="1.0.0-beta8" />
@@ -31,6 +30,7 @@
3130
<PackageReference Include="Microsoft.AspNetCore.DataProtection.Redis" Version="0.3.3" />
3231
<PackageReference Include="Microsoft.VisualStudio.Azure.Fabric.MSBuild" Version="1.6.5" />
3332
<PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="1.0.163" />
33+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.5.180" />
3434
</ItemGroup>
3535

3636
<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">

‎src/Web/WebStatus/.bowerrc‎

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

‎src/Web/WebStatus/Views/Shared/_Layout.cshtml‎

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<link rel="stylesheet" href="~/css/site.css" />
1111
</environment>
1212
<environment names="Staging,Production">
13-
<link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/css/bootstrap.min.css"
13+
<link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/bootstrap/4.1.1/css/bootstrap.min.css"
1414
asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
1515
asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
1616
<link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
@@ -23,24 +23,12 @@
2323

2424
</head>
2525
<body>
26-
<nav class="navbar navbar-inverse navbar-fixed-top">
27-
<div class="container">
28-
<div class="navbar-header">
29-
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
30-
<span class="sr-only">Toggle navigation</span>
31-
<span class="icon-bar"></span>
32-
<span class="icon-bar"></span>
33-
<span class="icon-bar"></span>
34-
</button>
35-
<a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand">WebStatus</a>
36-
</div>
37-
<div class="navbar-collapse collapse">
38-
<ul class="nav navbar-nav">
39-
<li><a asp-area="" asp-controller="Home" asp-action="Index">Home</a></li>
40-
</ul>
41-
</div>
42-
</div>
26+
<nav class="navbar navbar-dark bg-dark fixed-top">
27+
<a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand">
28+
&nbsp<b>eShopOnContainers</b> WebStatus
29+
</a>
4330
</nav>
31+
<br />
4432
<div class="container body-content">
4533
@RenderBody()
4634
</div>
@@ -51,17 +39,17 @@
5139

5240

5341
<environment names="Development">
54-
<script src="~/lib/jquery/dist/jquery.js"></script>
42+
<script src="~/lib/jquery/jquery.js"></script>
5543
<script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
5644
</environment>
5745
<environment names="Staging,Production">
5846
<script src="https://ajax.aspnetcdn.com/ajax/jquery/jquery-2.2.0.min.js"
59-
asp-fallback-src="~/lib/jquery/dist/jquery.min.js"
47+
asp-fallback-src="~/lib/jquery/jquery.min.js"
6048
asp-fallback-test="window.jQuery"
6149
crossorigin="anonymous"
6250
integrity="sha384-K+ctZQ+LL8q6tP7I94W+qzQsfRV2a+AfHIi9k8z8l9ggpc8X+Ytst4yBo/hH+8Fk">
6351
</script>
64-
<script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/bootstrap.min.js"
52+
<script src="https://ajax.aspnetcdn.com/ajax/bootstrap/4.1.1/bootstrap.min.js"
6553
asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.min.js"
6654
asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal"
6755
crossorigin="anonymous"

‎src/Web/WebStatus/WebStatus.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<PackageReference Include="Microsoft.ApplicationInsights.ServiceFabric" Version="2.1.1-beta1" />
1212
<PackageReference Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.0" />
1313
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" />
14+
<PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="1.0.163" />
1415
</ItemGroup>
1516

1617
<ItemGroup>

‎src/Web/WebStatus/bower.json‎

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

‎src/Web/WebStatus/libman.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"version": "1.0",
3+
"defaultProvider": "cdnjs",
4+
"libraries": [
5+
{
6+
"library": "[email protected]",
7+
"destination": "wwwroot/lib/jquery/"
8+
},
9+
{
10+
"provider": "unpkg",
11+
"library": "[email protected]",
12+
"files": [
13+
"dist/css/bootstrap.css",
14+
"dist/css/bootstrap.css.map",
15+
"dist/css/bootstrap.min.css",
16+
"dist/css/bootstrap.min.css.map",
17+
"dist/js/bootstrap.js",
18+
"dist/js/bootstrap.min.js"
19+
],
20+
"destination": "wwwroot/lib/bootstrap/"
21+
}
22+
]
23+
}

‎src/Web/WebStatus/wwwroot/lib/bootstrap/.bower.json‎

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

‎src/Web/WebStatus/wwwroot/lib/bootstrap/LICENSE‎

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

0 commit comments

Comments
 (0)