RSS-Reader is upgraded

describeme · Sep 6, 2019 · f1505c2 · f1505c2
1 parent c7ec1b1
commit f1505c2
Show file tree

Hide file tree

Showing 14 changed files with 49 additions and 35 deletions.
diff --git a/projects/blazor-ss/DependencyInjection/Components/_Imports.razor b/projects/blazor-ss/DependencyInjection/Components/_Imports.razor
@@ -3,4 +3,6 @@
 
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.JSInterop
-@using DependencyInjection.Services
+@using DependencyInjection.Services
+@using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.Authorization
diff --git a/projects/blazor-ss/JsIntegration/Components/_Imports.razor b/projects/blazor-ss/JsIntegration/Components/_Imports.razor
@@ -2,4 +2,6 @@
 @using Microsoft.AspNetCore.Components.Forms
 
 @using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.JSInterop
+@using Microsoft.JSInterop
+@using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.Authorization
diff --git a/projects/blazor-ss/JsIntegration/Pages/Index.cshtml b/projects/blazor-ss/JsIntegration/Pages/Index.cshtml
@@ -15,7 +15,7 @@
 </head>
 <body>
     <div class="container">
-        <app></app>
+        <app>@(await Html.RenderComponentAsync<App>(RenderMode.ServerPrerendered))</app>
     </div>
     <script src="_framework/blazor.server.js"></script>
 </body>

diff --git a/projects/blazor-ss/Layout/Components/_Imports.razor b/projects/blazor-ss/Layout/Components/_Imports.razor
@@ -3,3 +3,5 @@
 
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.JSInterop
+@using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.Authorization
diff --git a/projects/blazor-ss/Layout/Pages/Index.cshtml b/projects/blazor-ss/Layout/Pages/Index.cshtml
@@ -14,7 +14,7 @@
     <link href="css/site.css" rel="stylesheet" />
 </head>
 <body>
-    <app></app>
+    <app>@(await Html.RenderComponentAsync<App>(RenderMode.ServerPrerendered))</app>
 
     <script src="_framework/blazor.server.js"></script>
 </body>

diff --git a/projects/blazor-ss/Layout/Program.cs b/projects/blazor-ss/Layout/Program.cs
@@ -31,11 +31,11 @@ public void Configure(IApplicationBuilder app, IHostEnvironment env)
             app.UseStaticFiles();
 
             app.UseRouting();
-            app.UseEndpoints(routes =>
+            app.UseEndpoints(endpoints =>
             {
-                routes.MapRazorPages();
-                routes.MapFallbackToPage("/Index");
-                routes.MapBlazorHub<App>("app");
+                endpoints.MapRazorPages();
+                endpoints.MapFallbackToPage("/Index");
+                endpoints.MapBlazorHub();
             });
         }
     }

diff --git a/projects/blazor-ss/RssReader-2/Components/App.razor b/projects/blazor-ss/RssReader-2/Components/App.razor
@@ -1,7 +1,9 @@
-<CascadingAuthenticationState>
-    <Router AppAssembly="typeof(Startup).Assembly">
-        <NotFoundContent>
-            <p>Sorry, there's nothing at this address.</p>
-        </NotFoundContent>
-    </Router>
-</CascadingAuthenticationState>
+<Router AppAssembly="typeof(Program).Assembly">
+    <Found Context="routeData">
+        <RouteView RouteData="routeData" />
+    </Found>
+    <NotFound>
+        <h1>Page not found</h1>
+        <p>Sorry, but there's nothing here!</p>
+    </NotFound>
+</Router>
diff --git a/projects/blazor-ss/RssReader-2/Components/_Imports.razor b/projects/blazor-ss/RssReader-2/Components/_Imports.razor
@@ -3,4 +3,6 @@
 
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.JSInterop
-@using RssReader.Services
+@using RssReader.Services
+@using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.Authorization
diff --git a/projects/blazor-ss/RssReader-2/Pages/Index.cshtml b/projects/blazor-ss/RssReader-2/Pages/Index.cshtml
@@ -14,8 +14,7 @@
     <link href="css/site.css" rel="stylesheet" />
 </head>
 <body>
-    <app></app>
-
+    <app>@(await Html.RenderComponentAsync<App>(RenderMode.ServerPrerendered))</app>
     <script src="_framework/blazor.server.js"></script>
 </body>
 </html>
diff --git a/projects/blazor-ss/RssReader-2/Program.cs b/projects/blazor-ss/RssReader-2/Program.cs
@@ -34,11 +34,11 @@ public void Configure(IApplicationBuilder app, IHostEnvironment env)
             app.UseStaticFiles();
 
             app.UseRouting();
-            app.UseEndpoints(routes =>
+            app.UseEndpoints(endpoints =>
             {
-                routes.MapRazorPages();
-                routes.MapFallbackToPage("/Index");
-                routes.MapBlazorHub<App>("app");
+                endpoints.MapRazorPages();
+                endpoints.MapFallbackToPage("/Index");
+                endpoints.MapBlazorHub();
             });
         }
     }

diff --git a/projects/blazor-ss/RssReader/Components/App.razor b/projects/blazor-ss/RssReader/Components/App.razor
@@ -1,7 +1,9 @@
-<CascadingAuthenticationState>
-    <Router AppAssembly="typeof(Startup).Assembly">
-        <NotFoundContent>
-            <p>Sorry, there's nothing at this address.</p>
-        </NotFoundContent>
-    </Router>
-</CascadingAuthenticationState>
+<Router AppAssembly="typeof(Program).Assembly">
+    <Found Context="routeData">
+        <RouteView RouteData="routeData" />
+    </Found>
+    <NotFound>
+        <h1>Page not found</h1>
+        <p>Sorry, but there's nothing here!</p>
+    </NotFound>
+</Router>
diff --git a/projects/blazor-ss/RssReader/Components/_Imports.razor b/projects/blazor-ss/RssReader/Components/_Imports.razor
@@ -3,4 +3,6 @@
 
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.JSInterop
-@using RssReader.Services
+@using RssReader.Services
+@using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.Authorization
diff --git a/projects/blazor-ss/RssReader/Pages/Index.cshtml b/projects/blazor-ss/RssReader/Pages/Index.cshtml
@@ -14,7 +14,8 @@
     <link href="css/site.css" rel="stylesheet" />
 </head>
 <body>
-    <app></app>
+    <app>@(await Html.RenderComponentAsync<App>(RenderMode.ServerPrerendered))</app>
+
 
     <script src="_framework/blazor.server.js"></script>
 </body>

diff --git a/projects/blazor-ss/RssReader/Program.cs b/projects/blazor-ss/RssReader/Program.cs
@@ -34,11 +34,11 @@ public void Configure(IApplicationBuilder app, IHostEnvironment env)
             app.UseStaticFiles();
 
             app.UseRouting();
-            app.UseEndpoints(routes =>
+            app.UseEndpoints(endpoints =>
             {
-                routes.MapRazorPages();
-                routes.MapFallbackToPage("/Index");
-                routes.MapBlazorHub<App>("app");
+                endpoints.MapRazorPages();
+                endpoints.MapFallbackToPage("/Index");
+                endpoints.MapBlazorHub();
             });
         }
     }