From 2c1c39cf07837e19ed7cc96354f7054cea4b607d Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Fri, 18 Jan 2019 09:03:41 -0800 Subject: [PATCH] Clean up templates --- .../BlazorHosted-CSharp.Client/App.cshtml | 2 +- .../BlazorHosted-CSharp.Client/Pages/FetchData.cshtml | 4 ++-- .../BlazorHosted-CSharp.Client/Shared/NavMenu.cshtml | 8 +++++--- .../BlazorHosted-CSharp.Client/Shared/SurveyPrompt.cshtml | 6 +++--- .../BlazorHosted-CSharp.Shared/WeatherForecast.cs | 3 +++ .../src/content/BlazorStandalone-CSharp/App.cshtml | 2 +- .../BlazorStandalone-CSharp/Pages/FetchData.cshtml | 3 +++ .../content/BlazorStandalone-CSharp/Shared/NavMenu.cshtml | 8 +++++--- .../BlazorStandalone-CSharp/Shared/SurveyPrompt.cshtml | 6 +++--- .../content/BlazorStandalone-CSharp/wwwroot/index.html | 2 +- .../RazorComponentsWeb-CSharp.App/App.cshtml | 2 +- .../Services/WeatherForecast.cs | 3 +++ .../RazorComponentsWeb-CSharp.App/Shared/NavMenu.cshtml | 8 +++++--- .../RazorComponentsWeb-CSharp.Server/wwwroot/index.html | 2 +- 14 files changed, 37 insertions(+), 22 deletions(-) diff --git a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/App.cshtml b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/App.cshtml index 59be8326e1..38b8459ec4 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/App.cshtml +++ b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/App.cshtml @@ -2,4 +2,4 @@ Configuring this here is temporary. Later we'll move the app config into Program.cs, and it won't be necessary to specify AppAssembly. --> - + diff --git a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Pages/FetchData.cshtml b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Pages/FetchData.cshtml index 623bcf1771..2f8e580529 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Pages/FetchData.cshtml +++ b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Pages/FetchData.cshtml @@ -1,5 +1,5 @@ -@using BlazorHosted_CSharp.Shared -@page "/fetchdata" +@page "/fetchdata" +@using BlazorHosted_CSharp.Shared @inject HttpClient Http

Weather forecast

diff --git a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/NavMenu.cshtml b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/NavMenu.cshtml index b29ab68e03..6fd8763b01 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/NavMenu.cshtml +++ b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/NavMenu.cshtml @@ -1,14 +1,14 @@ 
BlazorHosted-CSharp -
-
+
  • - + Home
    • @@ -28,6 +28,8 @@ @functions { bool collapseNavMenu = true; + string NavMenuCssClass => collapseNavMenu ? "collapse" : null; + void ToggleNavMenu() { collapseNavMenu = !collapseNavMenu; diff --git a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/SurveyPrompt.cshtml b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/SurveyPrompt.cshtml index 936495a744..126d7257fe 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/SurveyPrompt.cshtml +++ b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/Shared/SurveyPrompt.cshtml @@ -1,5 +1,5 @@  @functions { - [Parameter] - string Title { get; set; } // Demonstrates how a parent component can supply parameters + // Demonstrates how a parent component can supply parameters + [Parameter] string Title { get; set; } } diff --git a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Shared/WeatherForecast.cs b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Shared/WeatherForecast.cs index da152b2049..c6b4e46d05 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Shared/WeatherForecast.cs +++ b/src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Shared/WeatherForecast.cs @@ -7,8 +7,11 @@ namespace BlazorHosted_CSharp.Shared public class WeatherForecast { public DateTime Date { get; set; } + public int TemperatureC { get; set; } + public string Summary { get; set; } + public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); } } diff --git a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/App.cshtml b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/App.cshtml index 59be8326e1..38b8459ec4 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/App.cshtml +++ b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/App.cshtml @@ -2,4 +2,4 @@ Configuring this here is temporary. Later we'll move the app config into Program.cs, and it won't be necessary to specify AppAssembly. --> - + diff --git a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Pages/FetchData.cshtml b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Pages/FetchData.cshtml index 7fee4d681c..3f5b9a9e49 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Pages/FetchData.cshtml +++ b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Pages/FetchData.cshtml @@ -45,8 +45,11 @@ else class WeatherForecast { public DateTime Date { get; set; } + public int TemperatureC { get; set; } + public int TemperatureF { get; set; } + public string Summary { get; set; } } } diff --git a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Shared/NavMenu.cshtml b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Shared/NavMenu.cshtml index 436dbded17..c5904d3bd6 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Shared/NavMenu.cshtml +++ b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Shared/NavMenu.cshtml @@ -1,14 +1,14 @@ 
    BlazorStandalone-CSharp -
    -
    +
    • - + Home
      • @@ -28,6 +28,8 @@ @functions { bool collapseNavMenu = true; + string NavMenuCssClass => collapseNavMenu ? "collapse" : null; + void ToggleNavMenu() { collapseNavMenu = !collapseNavMenu; diff --git a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Shared/SurveyPrompt.cshtml b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Shared/SurveyPrompt.cshtml index 936495a744..126d7257fe 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Shared/SurveyPrompt.cshtml +++ b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/Shared/SurveyPrompt.cshtml @@ -1,5 +1,5 @@  @functions { - [Parameter] - string Title { get; set; } // Demonstrates how a parent component can supply parameters + // Demonstrates how a parent component can supply parameters + [Parameter] string Title { get; set; } } diff --git a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/wwwroot/index.html b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/wwwroot/index.html index 88d5d43394..17ce31fd47 100644 --- a/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/wwwroot/index.html +++ b/src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/wwwroot/index.html @@ -2,7 +2,7 @@ - + BlazorStandalone-CSharp diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/App.cshtml b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/App.cshtml index 60214f82cf..03eee81cef 100644 --- a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/App.cshtml +++ b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/App.cshtml @@ -2,4 +2,4 @@ The Router component displays whichever component has a @page directive matching the current URI. *@ - + diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/Services/WeatherForecast.cs b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/Services/WeatherForecast.cs index 37c61eb01d..a643680841 100644 --- a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/Services/WeatherForecast.cs +++ b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/Services/WeatherForecast.cs @@ -5,8 +5,11 @@ namespace RazorComponentsWeb_CSharp.App.Services public class WeatherForecast { public DateTime Date { get; set; } + public int TemperatureC { get; set; } + public int TemperatureF { get; set; } + public string Summary { get; set; } } } diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/Shared/NavMenu.cshtml b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/Shared/NavMenu.cshtml index 681f41192d..4cb19c9ec1 100644 --- a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/Shared/NavMenu.cshtml +++ b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.App/Shared/NavMenu.cshtml @@ -1,14 +1,14 @@ 
      RazorComponentsWeb-CSharp -
      -
      +
      • - + Home
        • @@ -28,6 +28,8 @@ @functions { bool collapseNavMenu = true; + string NavMenuCssClass => collapseNavMenu ? "collapse" : null; + void ToggleNavMenu() { collapseNavMenu = !collapseNavMenu; diff --git a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/index.html b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/index.html index f3719772e3..dbec2f1a8f 100644 --- a/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/index.html +++ b/src/Templating/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/RazorComponentsWeb-CSharp.Server/wwwroot/index.html @@ -2,7 +2,7 @@ - + RazorComponentsWeb-CSharp