Merge pull request #108 from martincostello/Remove-Status

Remove status and update Bootstrap
martincostello · Mar 10, 2019 · 05f8a66 · 05f8a66
2 parents 9f7b773 + 02c8439
commit 05f8a66
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 44 deletions.
diff --git a/Build.ps1 b/Build.ps1
@@ -81,7 +81,7 @@ function DotNetTest {
         $openCoverVersion = "4.7.922"
         $openCoverPath = Join-Path $nugetPath "OpenCover\$openCoverVersion\tools\OpenCover.Console.exe"
 
-        $reportGeneratorVersion = "4.0.11"
+        $reportGeneratorVersion = "4.0.15"
         $reportGeneratorPath = Join-Path $nugetPath "ReportGenerator\$reportGeneratorVersion\tools\netcoreapp2.0\ReportGenerator.dll"
 
         $coverageOutput = Join-Path $OutputPath "code-coverage.xml"

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,7 +4,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)CommonAssemblyInfo.cs" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All" />
     <PackageReference Include="OpenCover" Version="4.7.922" PrivateAssets="All" />
-    <PackageReference Include="ReportGenerator" Version="4.0.11" PrivateAssets="All" />
+    <PackageReference Include="ReportGenerator" Version="4.0.15" PrivateAssets="All" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="All" />
   </ItemGroup>
   <PropertyGroup>

diff --git a/src/API/Options/ExternalLinksOptions.cs b/src/API/Options/ExternalLinksOptions.cs
@@ -20,11 +20,6 @@ public sealed class ExternalLinksOptions
         /// </summary>
         public Uri Cdn { get; set; }
 
-        /// <summary>
-        /// Gets or sets the URI of the status website.
-        /// </summary>
-        public Uri Status { get; set; }
-
         /// <summary>
         /// Gets or sets the options for the URIs to use for reports.
         /// </summary>

diff --git a/src/API/Views/Shared/_Footer.cshtml b/src/API/Views/Shared/_Footer.cshtml
@@ -3,10 +3,7 @@
 <footer>
     <p>
         &copy; @Options.Metadata.Author.Name @DateTimeOffset.UtcNow.Year |
-        <a href="@Options.ExternalLinks.Status.AbsoluteUri" rel="noopener" target="_blank" title="View site uptime information">
+        Built from
-            Site Status &amp; Uptime
-        </a>
-        | Built from
         <a href="@Options.Metadata.Repository/commit/@GitMetadata.Commit" title="View commit @GitMetadata.Commit on GitHub">
             @string.Join(string.Empty, GitMetadata.Commit.Take(7))
         </a>

diff --git a/src/API/Views/Shared/_Scripts.cshtml b/src/API/Views/Shared/_Scripts.cshtml
@@ -1,7 +1,7 @@
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous" defer></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous" defer></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous" defer></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous" defer></script>
-<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/js/bootstrap.min.js" integrity="sha384-uefMccjFJAIv6A+rW+L4AHf99KvxDjWSu1z9VI8SKNVmz4sk7buKt/6v9KI65qnm" crossorigin="anonymous" defer></script>
+<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous" defer></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.1/moment.min.js" integrity="sha256-L3S3EDEk31HcLA5C6T2ovHvOcD80+fgqaCDt2BAi92o=" crossorigin="anonymous" defer></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment.min.js" integrity="sha256-4iQZ6BVL4qNKlQ27TExEhBN1HFPvAvAMbFavKKosSWQ=" crossorigin="anonymous" defer></script>
 <environment names="Development">
     <script src="~/assets/js/site.js" asp-append-version="true" defer></script>
 </environment>

diff --git a/src/API/Views/Shared/_Styles.cshtml b/src/API/Views/Shared/_Styles.cshtml
@@ -1,4 +1,4 @@
-<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootswatch/4.1.0/flatly/bootstrap.min.css" integrity="sha384-kCsv8pSAWtRge/+zcLDeqwoWhTQSUX2esQPYOsocgrg1eMj7T2wrTJP348T3mpBU" crossorigin="anonymous">
+<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootswatch/4.3.1/flatly/bootstrap.min.css" integrity="sha384-T5jhQKMh96HMkXwqVMSjF3CmLcL1nT9//tCqu9By5XSdj7CwR0r+F3LTzUdfkkQf" crossorigin="anonymous">
 <environment names="Development">
     <link rel="stylesheet" href="~/assets/css/site.css" asp-append-version="true" />
 </environment>

diff --git a/src/API/appsettings.json b/src/API/appsettings.json
@@ -1,15 +1,4 @@
 {
-  "IpRateLimiting": {
-    "RealIpHeader": "X-Forwarded-For",
-    "IpWhitelist": [ "127.0.0.1", "::1/10", "192.168.0.0/24" ],
-    "GeneralRules": [
-      {
-        "Endpoint": "*",
-        "Period": "15m",
-        "Limit": 100
-      }
-    ]
-  },
   "Logging": {
     "IncludeScopes": false,
     "LogLevel": {
@@ -32,9 +21,18 @@
           "X-Request-Duration",
           "X-Request-Id"
         ],
-        "Headers": [ "Content-Type" ],
+        "Headers": [
-        "Methods": [ "GET", "POST" ],
+          "Content-Type"
-        "Origins": [ "https://martincostello.com", "https://dev.martincostello.com", "https://staging.martincostello.com" ]
+        ],
+        "Methods": [
+          "GET",
+          "POST"
+        ],
+        "Origins": [
+          "https://martincostello.com",
+          "https://dev.martincostello.com",
+          "https://staging.martincostello.com"
+        ]
       },
       "Documentation": {
         "Location": "docs"
@@ -47,7 +45,6 @@
     "ExternalLinks": {
       "Blog": "https://blog.martincostello.com/",
       "Cdn": "https://martincostello.azureedge.net/",
-      "Status": "http://status.martincostello.com/",
       "Reports": {
         "ContentSecurityPolicy": "https://martincostello.report-uri.io/r/default/csp/enforce",
         "ContentSecurityPolicyReportOnly": "https://martincostello.report-uri.io/r/default/csp/reportOnly"

diff --git a/src/API/package-lock.json b/src/API/package-lock.json
diff --git a/src/API/package.json b/src/API/package.json
@@ -3,7 +3,7 @@
   "private": true,
   "version": "2.2.0",
   "devDependencies": {
-    "bootstrap": "4.1.3",
+    "bootstrap": ">=4.3.1",
     "cryptiles": "4.1.2",
     "del": "3.0.0",
     "debug": "3.1.0",

diff --git a/src/API/wwwroot/error.html b/src/API/wwwroot/error.html
@@ -10,7 +10,7 @@
     <meta name="language" content="en" />
     <meta name="robots" content="NOINDEX" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1, maximum-scale=1" />
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootswatch/4.1.0/flatly/bootstrap.min.css" integrity="sha384-kCsv8pSAWtRge/+zcLDeqwoWhTQSUX2esQPYOsocgrg1eMj7T2wrTJP348T3mpBU" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootswatch/4.3.1/flatly/bootstrap.min.css" integrity="sha384-T5jhQKMh96HMkXwqVMSjF3CmLcL1nT9//tCqu9By5XSdj7CwR0r+F3LTzUdfkkQf" crossorigin="anonymous">
     <script type="text/javascript">
         if (self == top) {
             document.documentElement.className = document.documentElement.className.replace(/\bjs-flash\b/, '');
@@ -46,15 +46,12 @@ <h2 class="text-danger">An error occurred while processing your request.</h2>
         <hr />
         <footer>
             <p>
-                &copy; Martin Costello 2016 |
+                &copy; Martin Costello 2019
-                <a id="link-status" href="http://status.martincostello.com/" target="_blank" title="View site uptime information">
-                    Site Status &amp; Uptime
-                </a>
             </p>
         </footer>
     </div>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous" defer></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous" defer></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous" defer></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous" defer></script>
-    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/js/bootstrap.min.js" integrity="sha384-uefMccjFJAIv6A+rW+L4AHf99KvxDjWSu1z9VI8SKNVmz4sk7buKt/6v9KI65qnm" crossorigin="anonymous" defer></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous" defer></script>
 </body>
 </html>
diff --git a/tests/API.Tests/API.Tests.csproj b/tests/API.Tests/API.Tests.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="MartinCostello.Logging.XUnit" Version="0.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="2.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
     <PackageReference Include="NodaTime.Testing" Version="2.4.4" />
     <PackageReference Include="Shouldly" Version="3.0.2" />
     <PackageReference Include="xunit" Version="2.4.1" />