Preview 7 & minor changes

enkodellc · Jul 26, 2019 · 23c0b6f · 23c0b6f
1 parent 7db453c
commit 23c0b6f
Show file tree

Hide file tree

Showing 9 changed files with 83 additions and 47 deletions.
diff --git a/README.md b/README.md
@@ -17,18 +17,16 @@ A repository that is not controlled by a corporation but by a community. Javascr
 [Blazor Boilerplate](https://blazorboilerplate.com) - Kick the tires. The functionality grows every week. 
 
 ## Prerequisites
-
 Don't know what Blazor is? Read [here](https://docs.microsoft.com/en-us/aspnet/core/blazor/?view=aspnetcore-3.0)
 
 Complete all Blazor dependencies.
 
-- .NET Core 3.0 Preview 6 SDK (3.0.100-preview6-012264)
+- .NET Core 3.0 Preview 7 SDK 3.0.100-preview7-012821
 - Visual Studio 2019 Preview  with the ASP.NET and web development workload selected.
-- The latest Blazor extension from the Visual Studio Marketplace.
-- The Blazor templates on the command-line: **Install-Package Microsoft.AspNetCore.Blazor.Templates -Version 3.0.0-preview6.19307.2**
+- The Blazor templates on the command-line: **dotnet new -i Microsoft.AspNetCore.Blazor.Templates::3.0.0-preview7.19365.7**
 
 ### How to run
-1. Install **dotnet-sdk-3.0.100-preview6-012264** and the latest **Visual Studio 2019 Preview**.
+1. Install **dotnet-sdk 3.0.100-preview7-012821** and the latest **Visual Studio 2019 Preview**.
 2. Clone or download.
 3. Open the solution in Visual Studio and press F5.
 4. Create a user using the `Create Account` button in the login page or login if you have already created a user.
@@ -48,8 +46,7 @@ Complete all Blazor dependencies.
 Please star, watch and fork! We'd greatly appreciate any contribution you make. I am very open to updates and features, though most feature requests 
 will be depending on how much community support for it is.
 
-## Completed
-
+## Completed 
  - Basic Login / User Creation
  - Admin Theme using Material Design / MatBlazor - Free to use.
  - Log Files
@@ -58,23 +55,21 @@ will be depending on how much community support for it is.
  - Forgot Password Functionality
 
 ## Road map
-
 - User [rofile & settings management.
 - User, role, permission and organization unit management.
 - Real time chat and notification system. Slack Communication clone?
 - Blog or other real world functionality.
 - Audit log report UI.
 
 ## License
-
 This project is licensed under the terms of the [MIT license](LICENSE).
 
 ## News
-### 0.1.7 - In Progress
+### 0.1.7
 - User Profile Management
 - Refactor Email Settings and API
-- Error Handling Middleware to Propagating Errors properly to Toasts
-
+- MatBlazor 1.3.0
+- Migrate to .NET Core 3.0
 
 ### 0.1.6 
 - Email confirmation on Registration 

diff --git a/src/BlazorBoilerplate.Client/BlazorBoilerplate.Client.csproj b/src/BlazorBoilerplate.Client/BlazorBoilerplate.Client.csproj
@@ -9,13 +9,22 @@
     </RestoreAdditionalProjectSources>
     <LangVersion>7.3</LangVersion>
     <RazorLangVersion>3.0</RazorLangVersion>
+    <Version>0.1.7</Version>
+    <Authors>Keith Fimreite</Authors>
+    <Company>EnkodeLLC</Company>
+    <Title>Blazor Boilerplate Client</Title>
+    <Description>Blazor Boilerplate is starter kit / SPA Admin Template for Blazor</Description>
+    <WebPage>https://blazorboilerplate.com/</WebPage>
+    <PackageProjectUrl>https://blazorboilerplate.com/</PackageProjectUrl>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/enkodellc/blazorboilerplate</RepositoryUrl>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview6.19307.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview6.19307.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview7.19365.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview7.19365.7" PrivateAssets="all" />
     <PackageReference Include="Toolbelt.Blazor.LoadingBar" Version="6.0.0" />
-    <!--<PackageReference Include="MatBlazor" Version="1.2.1" /> -->
+    <PackageReference Include="MatBlazor" Version="1.3.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -27,10 +36,4 @@
     <Folder Include="wwwroot\javascript\" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="MatBlazor">
-      <HintPath>wwwroot\MatBlazor\MatBlazor.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
 </Project>
diff --git a/src/BlazorBoilerplate.Client/wwwroot/css/site.css b/src/BlazorBoilerplate.Client/wwwroot/css/site.css
@@ -490,3 +490,15 @@ ul.breadcrumb {
 /* Large devices (desktops, less than 1200px) */
 @media (max-width: 1199.98px) {
 }
+
+
+/* MatBlazor temp */
+.mat-toast-body{
+  padding: 8px 5px;
+}
+.mat-toast-icon{
+  padding-left: 5px;
+}
+.mat-toast-close-button .material-icons{
+  color: white;
+}
diff --git a/src/BlazorBoilerplate.Server/BlazorBoilerplate.Server.csproj b/src/BlazorBoilerplate.Server/BlazorBoilerplate.Server.csproj
@@ -7,29 +7,37 @@
       https://dotnet.myget.org/F/blazor-dev/api/v3/index.json;
     </RestoreAdditionalProjectSources>
     <LangVersion>7.3</LangVersion>
-    <Version>1.1.5</Version>
+    <Version>0.1.7</Version>
+    <Authors>Keith Fimreite</Authors>
+    <Company>EnkodeLLC</Company>
+    <Title>Blazor Boilerplate Server</Title>
+    <Description>Blazor Boilerplate is starter kit / SPA Admin Template for Blazor</Description>
+    <WebPage>https://blazorboilerplate.com/</WebPage>
+    <PackageProjectUrl>https://blazorboilerplate.com/</PackageProjectUrl>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/enkodellc/blazorboilerplate</RepositoryUrl>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Server" Version="3.0.0-preview6.19307.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0-preview6.19307.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.0-preview6.19304.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.0.0-preview6.19304.10">
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Server" Version="3.0.0-preview7.19365.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0-preview7.19365.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.0-preview7.19362.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.0.0-preview7.19362.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0-preview6.19304.10" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.0.0-preview6.19307.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0-preview6.19304.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0-preview6.19304.10">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0-preview7.19362.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.0.0-preview7.19365.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0-preview7.19362.6" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0-preview7.19362.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NSwag.AspNetCore" Version="13.0.3" />
-    <PackageReference Include="Serilog" Version="2.9.0-dev-01102" />
-    <PackageReference Include="Serilog.AspNetCore" Version="3.0.0-dev-00058" />
+    <PackageReference Include="NSwag.AspNetCore" Version="13.0.4" />
+    <PackageReference Include="Serilog" Version="2.9.0-dev-01116" />
+    <PackageReference Include="Serilog.AspNetCore" Version="3.0.0-dev-00059" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="3.1.1-dev-00209" />
-    <PackageReference Include="Serilog.Sinks.File" Version="4.1.0-dev-00838" />
+    <PackageReference Include="Serilog.Sinks.File" Version="4.1.0-dev-00847" />
     <PackageReference Include="MailKit" Version="2.2.0" />
   </ItemGroup>
 

diff --git a/src/BlazorBoilerplate.Server/Controllers/SampleDataController.cs b/src/BlazorBoilerplate.Server/Controllers/SampleDataController.cs
@@ -1,15 +1,13 @@
-using BlazorBoilerplate.Shared;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.Http;
 using System.Threading.Tasks;
-using BlazorBoilerplate.Server.Models;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
-using BlazorBoilerplate.Server.Services;
 using Newtonsoft.Json;
-using System.Net.Http;
+using BlazorBoilerplate.Shared;
 
 namespace BlazorBoilerplate.Server.Controllers
 {

diff --git a/src/BlazorBoilerplate.Server/Helpers/Templates/TestEmail.template b/src/BlazorBoilerplate.Server/Helpers/Templates/TestEmail.template
@@ -4,7 +4,11 @@
   </h1>
   <p>Hello {user},</p>
   <p>
-    This is a <strong>TEST</strong> email.
+    This is a <strong>TEST</strong> email. If you are using Blazor Boilerplate please <a href="https://github.com/enkodellc/blazorboilerplate">star the repo on Github</a>.
+    We are looking for more contributors to grow the project. There are several areas of improvement needed and if you are using the repo in your project please submit your PR's or suggestions.
+  </p>
+  <p>
+    Join our <a href="https://gitter.im/blazorboilerplate/community">chat on Gitter</a> to disucss future project features, timelines and to get involved.
   </p>
   <p>The email was on {testDate}.</p>
   <p>

diff --git a/src/BlazorBoilerplate.Server/Services/EmailService.cs b/src/BlazorBoilerplate.Server/Services/EmailService.cs
@@ -4,15 +4,13 @@
 using System.Net.Security;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading.Tasks;
-using BlazorBoilerplate.Server.Models;
-using MailKit.Net.Smtp;
 using Microsoft.Extensions.Logging;
 using MimeKit;
-using MimeKit.Text;
+using MailKit.Net.Smtp;
+using BlazorBoilerplate.Server.Models;
 
 namespace BlazorBoilerplate.Server.Services
 {
-
     public interface IEmailService
     {
         Task<(bool success, string errorMsg)> SendEmailAsync(EmailMessage emailMessage);

diff --git a/src/BlazorBoilerplate.Server/Startup.cs b/src/BlazorBoilerplate.Server/Startup.cs
@@ -19,6 +19,7 @@
 using Microsoft.AspNetCore.Authentication.Cookies;
 using System.Net;
 using BlazorBoilerplate.Server.Helpers;
+//using BlazorBoilerplate.Server.Middleware;
 
 namespace BlazorBoilerplate.Server
 {
@@ -138,15 +139,23 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             }
 
             app.UseResponseCompression();
+            //app.UseMiddleware(typeof(ErrorHandlingMiddleware));
 
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
                 app.UseBlazorDebugging();
             }
+//            else
+//            {
+//                // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+//                app.UseHsts(); //HSTS Middleware (UseHsts) to send HTTP Strict Transport Security Protocol (HSTS) headers to clients.
+//            }
+
 
             app.UseClientSideBlazorFiles<Client.Startup>();
 
+            //app.UseHttpsRedirection();
             app.UseRouting();
             app.UseAuthentication();
             app.UseAuthorization();

diff --git a/src/BlazorBoilerplate.Shared/BlazorBoilerplate.Shared.csproj b/src/BlazorBoilerplate.Shared/BlazorBoilerplate.Shared.csproj
@@ -3,11 +3,20 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>7.3</LangVersion>
+    <Version>0.1.7</Version>
+    <Authors>Keith Fimreite</Authors>
+    <Company>EnkodeLLC</Company>   
+    <Title>Blazor Boilerplate Shared</Title>
+    <Description>Blazor Boilerplate is starter kit / SPA Admin Template for Blazor</Description>
+    <WebPage>https://blazorboilerplate.com/</WebPage>
+    <PackageProjectUrl>https://blazorboilerplate.com/</PackageProjectUrl>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/enkodellc/blazorboilerplate</RepositoryUrl>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="4.6.0-preview6.19303.8" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.6.0-preview7.19362.9" />
   </ItemGroup>
 
 </Project>