Merge pull request #1 from riccardone/privacy-page

privacy page; remove pwa
riccardone · Oct 11, 2020 · 0a2b2f4 · 0a2b2f4
2 parents e48b4ba + fb43efa
commit 0a2b2f4
Show file tree

Hide file tree

Showing 11 changed files with 172 additions and 113 deletions.
diff --git a/PingPong.Web.sln b/PingPong.Web.sln
@@ -3,18 +3,18 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30503.244
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PingPong.Web", "PingPong.Web\PingPong.Web.csproj", "{F8445645-4B59-43B5-82E0-7F6C9A5BEE38}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PingPong.Web", "PingPong.Web\PingPong.Web.csproj", "{8A177167-FE01-44E4-A364-C942AE049615}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F8445645-4B59-43B5-82E0-7F6C9A5BEE38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F8445645-4B59-43B5-82E0-7F6C9A5BEE38}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F8445645-4B59-43B5-82E0-7F6C9A5BEE38}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F8445645-4B59-43B5-82E0-7F6C9A5BEE38}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8A177167-FE01-44E4-A364-C942AE049615}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8A177167-FE01-44E4-A364-C942AE049615}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8A177167-FE01-44E4-A364-C942AE049615}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8A177167-FE01-44E4-A364-C942AE049615}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/PingPong.Web/Pages/Privacy.razor b/PingPong.Web/Pages/Privacy.razor
diff --git a/PingPong.Web/PingPong.Web.csproj b/PingPong.Web/PingPong.Web.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.1" PrivateAssets="all" />
     <PackageReference Include="System.Net.Http.Json" Version="3.2.0" />
   </ItemGroup>
 

diff --git a/PingPong.Web/Program.cs b/PingPong.Web/Program.cs
@@ -17,7 +17,7 @@ public static async Task Main(string[] args)
             var builder = WebAssemblyHostBuilder.CreateDefault(args);
             builder.RootComponents.Add<App>("app");
 
-            builder.Services.AddTransient(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
+            builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 
             await builder.Build().RunAsync();
         }

diff --git a/PingPong.Web/Properties/launchSettings.json b/PingPong.Web/Properties/launchSettings.json
@@ -3,8 +3,8 @@
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:56832",
-      "sslPort": 44396
+      "applicationUrl": "http://localhost:50483",
+      "sslPort": 44331
     }
   },
   "profiles": {
@@ -19,7 +19,7 @@
     "PingPong.Web": {
       "commandName": "Project",
       "launchBrowser": true,
-      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/PingPong.Web/_framework/debug/ws-proxy?browser={browserInspectUri}",
+      "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
       "applicationUrl": "https://localhost:5001;http://localhost:5000",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"

diff --git a/PingPong.Web/Shared/NavMenu.razor b/PingPong.Web/Shared/NavMenu.razor
@@ -6,24 +6,25 @@
 
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
         <ul class="navbar-nav mr-auto">
-            <li class="nav-item active">
+            @*<li class="nav-item active">
                 <a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a>
             </li>
             <li class="nav-item">
-                <a class="nav-link" href="about">What is this?</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="video">Video</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="roadmap">Roadmap</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="privacy">Privacy</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="contacts">Contacts</a>
+            <a class="nav-link" href="about">What is this?</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link" href="video">Video</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link" href="roadmap">Roadmap</a>
+        </li>
+            *@
+            <li class="nav-item" active>
+                <a class="nav-link" href="privacy">Privacy <span class="sr-only">(current)</span></a>
             </li>
+            @*<li class="nav-item">
+            <a class="nav-link" href="contacts">Contacts</a>
+        </li>*@
         </ul>
     </div>
 </nav>
diff --git a/PingPong.Web/Shared/SurveyPrompt.razor b/PingPong.Web/Shared/SurveyPrompt.razor
diff --git a/PingPong.Web/wwwroot/.nojekyll b/PingPong.Web/wwwroot/.nojekyll
diff --git a/PingPong.Web/wwwroot/404.html b/PingPong.Web/wwwroot/404.html
diff --git a/PingPong.Web/wwwroot/index.html b/PingPong.Web/wwwroot/index.html
@@ -5,7 +5,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
     <title>PingPong.Web</title>
-    <base href="/PingPong.Web/" />
+    <base href="/" />
     <link href="css/bootstrap/bootstrap.min.css" rel="stylesheet" />
     <!--<link href="css/app.css" rel="stylesheet" />-->
     <link href="css/catchme.css" rel="stylesheet" />

diff --git a/PingPong.Web/wwwroot/sample-data/weather.json b/PingPong.Web/wwwroot/sample-data/weather.json