Update to 0.3.0 (#6)

* Upgrade to Blazor 0.3.0 and Razor 2.1.0 * Upgrade to 0.3.0 * remove refs * remove test clickhandler * removing old event delegate syntax
torhovland · May 7, 2018 · 68c2d69 · 68c2d69
1 parent f4fdf90
commit 68c2d69
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 37 deletions.
diff --git a/src/BlazorRealworld/BlazorRealworld.csproj b/src/BlazorRealworld/BlazorRealworld.csproj
@@ -1,17 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk.Web;Microsoft.NET.Sdk.Razor/2.1.0-preview2-30230">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <RunCommand>dotnet</RunCommand>
     <RunArguments>blazor serve</RunArguments>
+    <LangVersion>7.3</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="CommonMark.NET" Version="0.15.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.1.0-preview2-30230" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Browser" Version="0.2.0-preview1-10155" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="0.2.0-preview1-10155" />
-    <DotNetCliToolReference Include="Microsoft.AspNetCore.Blazor.Cli" Version="0.2.0-preview1-10155" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Browser" Version="0.3.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="0.3.0" />
+    <DotNetCliToolReference Include="Microsoft.AspNetCore.Blazor.Cli" Version="0.3.0" />
   </ItemGroup>
-
 </Project>
diff --git a/src/BlazorRealworld/Pages/Article.cshtml b/src/BlazorRealworld/Pages/Article.cshtml
@@ -26,7 +26,7 @@
                         Edit Article
                     </a>
                     <text>&nbsp; &nbsp;</text>
-                    <button class="btn btn-outline-danger btn-sm" @onclick(async () => await DeleteArticle())>
+                    <button class="btn btn-outline-danger btn-sm" onclick="@DeleteArticle">
                         <i class="ion-trash-a"></i>
                         &nbsp;
                         Delete Article

diff --git a/src/BlazorRealworld/Pages/Counter.cshtml b/src/BlazorRealworld/Pages/Counter.cshtml
@@ -3,7 +3,7 @@
 
 <p>Current count: @currentCount</p>
 
-<button @onclick(IncrementCount)>Click me</button>
+<button onclick="@IncrementCount">Click me</button>
 
 @functions {
     int currentCount = 0;

diff --git a/src/BlazorRealworld/Pages/Editor.cshtml b/src/BlazorRealworld/Pages/Editor.cshtml
@@ -15,19 +15,19 @@
                 <form>
                     <fieldset>
                         <fieldset class="form-group">
-                            <input type="text" class="form-control form-control-lg" placeholder="Article Title" @bind(articleModel.title)>
+                            <input type="text" class="form-control form-control-lg" placeholder="Article Title" bind="@articleModel.title" />
                         </fieldset>
                         <fieldset class="form-group">
-                            <input type="text" class="form-control" placeholder="What's this article about?" @bind(articleModel.description)>
+                            <input type="text" class="form-control" placeholder="What's this article about?" bind="@articleModel.description" />
                         </fieldset>
                         <fieldset class="form-group">
-                            <textarea class="form-control" rows="8" placeholder="Write your article (in markdown)" @bind(articleModel.body)>@articleModel.body</textarea>
+                            <textarea class="form-control" rows="8" placeholder="Write your article (in markdown)" bind="@articleModel.body">@articleModel.body</textarea>
                         </fieldset>
                         <fieldset class="form-group">
-                            <input type="text" class="form-control" placeholder="Enter tags" @bind(tagString)><div class="tag-list"></div>
+                            <input type="text" class="form-control" placeholder="Enter tags" bind="@tagString" /><div class="tag-list"></div>
                         </fieldset>
-                        <button class="btn btn-lg pull-xs-right btn-primary" type="button" @onclick(async () => await Submit())>
-                            Publish Article
+                        <button class="btn btn-lg pull-xs-right btn-primary" type="button" onclick="@Submit">
+                            Publish
                         </button>
                     </fieldset>
                 </form>

diff --git a/src/BlazorRealworld/Pages/Index.cshtml b/src/BlazorRealworld/Pages/Index.cshtml
@@ -19,10 +19,10 @@
                 <div class="feed-toggle">
                     <ul class="nav nav-pills outline-active">
                         <li class="nav-item">
-                            <a href="" class="nav-link @FeedState" @onclick(async () => await YourFeedAsync())>Your Feed</a>
+                            <a href="" class="@($"nav-link {FeedState}")" onclick="@YourFeedAsync">Your Feed</a>
                         </li>
                         <li class="nav-item">
-                            <a href="" class="nav-link @GlobalState" @onclick(async () => await GlobalFeedAsync())>Global Feed</a>
+                            <a href="" class="@($"nav-link {GlobalState}")" onclick="@GlobalFeedAsync">Global Feed</a>
                         </li>
                         @if (selectedTab == SelectedTab.Tag)
                         {
@@ -46,7 +46,7 @@
                         {
                             foreach (var tag in tags)
                             {
-                                <a href="" class="tag-pill tag-default" @onclick(async () => await SelectTag(tag))>@tag</a>
+                                <a href="" class="tag-pill tag-default" onclick="@(() => SelectTag(tag))">@tag</a>
                             }
                         }
                     </div>

diff --git a/src/BlazorRealworld/Pages/Settings.cshtml b/src/BlazorRealworld/Pages/Settings.cshtml
@@ -16,21 +16,21 @@
                 <form>
                     <fieldset>
                         <fieldset class="form-group">
-                            <input class="form-control" type="text" placeholder="URL of profile picture" @bind(userModel.image)>
+                            <input class="form-control" type="text" placeholder="URL of profile picture" bind="@(userModel.image)"/>
                         </fieldset>
                         <fieldset class="form-group">
-                            <input class="form-control form-control-lg" type="text" placeholder="Your Name" @bind(userModel.username)>
+                            <input class="form-control form-control-lg" type="text" placeholder="Your Name" bind="@(userModel.username)"/>
                         </fieldset>
                         <fieldset class="form-group">
-                            <textarea class="form-control form-control-lg" rows="8" placeholder="Short bio about you" @bind(userModel.bio)>@userModel.bio</textarea>
+                            <textarea class="form-control form-control-lg" rows="8" placeholder="Short bio about you" bind="@(userModel.bio)">@userModel.bio</textarea>
                         </fieldset>
                         <fieldset class="form-group">
-                            <input class="form-control form-control-lg" type="email" placeholder="Email" @bind(userModel.email)>
+                            <input class="form-control form-control-lg" type="email" placeholder="Email" bind="@(userModel.email)" />
                         </fieldset>
                         <fieldset class="form-group">
-                            <input class="form-control form-control-lg" type="password" placeholder="Password" @bind(userModel.password)>
+                            <input class="form-control form-control-lg" type="password" placeholder="Password" bind="@(userModel.password)"/>
                         </fieldset>
-                        <button class="btn btn-lg btn-primary pull-xs-right" @onclick(async () => await Submit())>
+                        <button class="btn btn-lg btn-primary pull-xs-right" onclick="@Submit">
                             Update Settings
                         </button>
                     </fieldset>

diff --git a/src/BlazorRealworld/Pages/SignIn.cshtml b/src/BlazorRealworld/Pages/SignIn.cshtml
@@ -15,12 +15,12 @@
                     <ErrorMessages Errors=@response.errors />
                     <form>
                         <fieldset class="form-group">
-                            <input class="form-control form-control-lg" type="email" placeholder="Email" @bind(userModel.email)>
+                            <input class="form-control form-control-lg" type="email" placeholder="Email" bind="@(userModel.email)"/>
                         </fieldset>
                         <fieldset class="form-group">
-                            <input class="form-control form-control-lg" type="password" placeholder="Password" @bind(userModel.password)>
+                            <input class="form-control form-control-lg" type="password" placeholder="Password" bind="@(userModel.password)" />
                         </fieldset>
-                        <button class="btn btn-lg btn-primary pull-xs-right" type="submit" @onclick(async () => await Submit())>
+                        <button class="btn btn-lg btn-primary pull-xs-right" type="submit" onclick="@Submit">
                             Sign in
                         </button>
                     </form>

diff --git a/src/BlazorRealworld/Pages/SignUp.cshtml b/src/BlazorRealworld/Pages/SignUp.cshtml
@@ -14,15 +14,15 @@
                 <ErrorMessages Errors=@response.errors />
                 <form>
                     <fieldset class="form-group">
-                        <input class="form-control form-control-lg" type="text" placeholder="Your Name" @bind(userModel.username)>
+                        <input class="form-control form-control-lg" type="text" placeholder="Your Name" bind="@userModel.username"/>
                     </fieldset>
                     <fieldset class="form-group">
-                        <input class="form-control form-control-lg" type="email" placeholder="Email" @bind(userModel.email)>
+                        <input class="form-control form-control-lg" type="email" placeholder="Email" bind="@userModel.email"/>
                     </fieldset>
                     <fieldset class="form-group">
-                        <input class="form-control form-control-lg" type="password" placeholder="Password" @bind(userModel.password)>
+                        <input class="form-control form-control-lg" type="password" placeholder="Password" bind="@userModel.password"/>
                     </fieldset>
-                    <button class="btn btn-lg btn-primary pull-xs-right" type="submit" @onclick(async () => await Submit())>
+                    <button class="btn btn-lg btn-primary pull-xs-right" type="submit" onclick="@Submit">
                         Sign up
                     </button>
                 </form>

diff --git a/src/BlazorRealworld/Shared/ArticleList.cshtml b/src/BlazorRealworld/Shared/ArticleList.cshtml
@@ -40,8 +40,9 @@ else
 }
 
 @functions {
-    public IEnumerable<ArticleModel> Articles { get; set; }
-
+    [Parameter]
+    IEnumerable<ArticleModel> Articles { get; set; }
+
     static string Ordinal(int number)
     {
         var work = number.ToString();

diff --git a/src/BlazorRealworld/Shared/ErrorMessages.cshtml b/src/BlazorRealworld/Shared/ErrorMessages.cshtml
@@ -32,5 +32,6 @@
 </ul>
 
 @functions {
-    public ErrorsModel Errors { get; set; }
+    [Parameter]
+    ErrorsModel Errors { get; set; }
 }
diff --git a/src/BlazorRealworld/Shared/MainLayout.cshtml b/src/BlazorRealworld/Shared/MainLayout.cshtml
@@ -1,5 +1,5 @@
 @using System
-@implements ILayoutComponent
+@inherits BlazorLayoutComponent
 @inject AppState state
 @inject ApiClient api
 @inject IUriHelper uriHelper
@@ -35,7 +35,7 @@
                     </NavLink>
                 </li>
                 <li class="nav-item">
-                    <a class="nav-link" href="/" @onclick(SignOut)>
+                    <a class="nav-link" href="/" onclick="@(SignOut)">
                         Sign out
                     </a>
                 </li>
@@ -69,8 +69,6 @@
 </footer>
 
 @functions {
-    public RenderFragment Body { get; set; }
-
     void SignOut()
     {
         api.ClearToken();