- bug fix

brunobritodev · brunobritodev · commit 78b667d6023b · 2019-06-25T14:20:36.000-03:00
- upgraded some dependencies
diff --git a/db.json b/db.json
@@ -0,0 +1,9 @@
+{
+	"notifications": [
+		{ "icon": "text-info fas fa-kiwi-bird", "title": "Session", "description": "2019-05 UI Session improvements" },
+		{ "icon": "text-warning fab fa-docker", "title": "Docker", "description": "2019-04 Docker Ready" },
+		{ "icon": "text-info fas fa-code-branch", "title": "NET Core 2.2", "description": "2019-03 Updated to ASP.NET Core 2.2" },
+		{ "icon": "text-success fas fa-id-card", "title": "ID4", "description": "2019-03 IdentityServer4 2.4 Components" },
+		{ "icon": "text-danger fas fa-rocket", "title": "Launch", "description": "2018-10 first release" }
+	]
+}
diff --git a/src/Backend/Jp.Domain.Core/Jp.Domain.Core.csproj b/src/Backend/Jp.Domain.Core/Jp.Domain.Core.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="mediatr" Version="6.0.0" />
-    <PackageReference Include="FluentValidation" Version="8.2.0" />
+    <PackageReference Include="mediatr" Version="7.0.0" />
+    <PackageReference Include="FluentValidation" Version="8.4.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Backend/Jp.Domain/Jp.Domain.csproj b/src/Backend/Jp.Domain/Jp.Domain.csproj
@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentValidation" Version="8.2.0" />
+    <PackageReference Include="FluentValidation" Version="8.4.0" />
     <PackageReference Include="IdentityServer4.EntityFramework" Version="2.4.0" />
   </ItemGroup>
 
diff --git a/src/Backend/Jp.Infra.CrossCutting.Bus/Jp.Infra.CrossCutting.Bus.csproj b/src/Backend/Jp.Infra.CrossCutting.Bus/Jp.Infra.CrossCutting.Bus.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="mediatr" Version="6.0.0" />
+    <PackageReference Include="mediatr" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Backend/Jp.Infra.CrossCutting.Identity/Jp.Infra.CrossCutting.Identity.csproj b/src/Backend/Jp.Infra.CrossCutting.Identity/Jp.Infra.CrossCutting.Identity.csproj
@@ -18,7 +18,7 @@
     
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="MailKit" Version="2.1.3" />
+    <PackageReference Include="MailKit" Version="2.2.0" />
     <PackageReference Include="ServiceStack.Text.Core" Version="5.5.0" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Backend/Jp.Infra.CrossCutting.IdentityServer/Jp.Infra.CrossCutting.IdentityServer.csproj b/src/Backend/Jp.Infra.CrossCutting.IdentityServer/Jp.Infra.CrossCutting.IdentityServer.csproj
@@ -14,8 +14,8 @@
   <ItemGroup>
     <PackageReference Include="IdentityServer4.AspNetIdentity" Version="2.4.0" />
     <PackageReference Include="IdentityServer4.EntityFramework" Version="2.4.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.3">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.4" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/src/Backend/Jp.Infra.Data/Jp.Infra.Data.csproj b/src/Backend/Jp.Infra.Data/Jp.Infra.Data.csproj
@@ -7,7 +7,7 @@
 
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.2.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.2.4" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
     
   </ItemGroup>
diff --git a/src/Backend/Jp.Infra.Migrations.Sql/Jp.Infra.Data.Sql.csproj b/src/Backend/Jp.Infra.Migrations.Sql/Jp.Infra.Data.Sql.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Backend/Jp.UserManagement/Jp.Management.csproj b/src/Backend/Jp.UserManagement/Jp.Management.csproj
@@ -10,13 +10,13 @@
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="IdentityServer4" Version="2.4.0" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.7.0" />
-    <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="6.0.1" />
-    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.6.1" />
+    <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.7.1" />
     <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.4.10" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.7.10" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.3" />
     <PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
-    <PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="3.0.2" />
+    <PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="3.0.3" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="4.0.1" />
diff --git a/src/Frontend/Jp.AdminUI/package-lock.json b/src/Frontend/Jp.AdminUI/package-lock.json
diff --git a/src/Frontend/Jp.AdminUI/package.json b/src/Frontend/Jp.AdminUI/package.json
@@ -33,7 +33,7 @@
     "@angular/platform-browser": "7.2.10",
     "@angular/platform-browser-dynamic": "7.2.10",
     "@angular/router": "7.2.10",
-    "@fortawesome/fontawesome-free": "^5.3.1",
+    "@fortawesome/fontawesome-free": "^5.9.0",
     "@ng-bootstrap/ng-bootstrap": "^4.1.0",
     "@ngx-translate/core": "^11.0.1",
     "@ngx-translate/http-loader": "^4.0.0",
diff --git a/src/Frontend/Jp.AdminUI/src/app/shared/layout/header/notifications/notification.model.ts b/src/Frontend/Jp.AdminUI/src/app/shared/layout/header/notifications/notification.model.ts
@@ -0,0 +1,5 @@
+export class NotificationViewModel {
+    title: string;
+    description: string;
+    icon: string;
+}
diff --git a/src/Frontend/Jp.AdminUI/src/app/shared/layout/header/notifications/notifications.component.html b/src/Frontend/Jp.AdminUI/src/app/shared/layout/header/notifications/notifications.component.html
@@ -3,53 +3,17 @@
         <!-- START list group-->
         <div class="list-group">
             <!-- list item-->
-            <div class="list-group-item list-group-item-action">
-                <div class="media">
-                    <div class="align-self-start mr-2">
-                        <em class="fas fa-kiwi-bird text-info"></em>
-                    </div>
-                    <div class="media-body">
-                        <p class="m-0">Session</p>
-                        <p class="m-0 text-muted text-sm">2019-05 UI Session improvements</p>
-                    </div>
-                </div>
-                <div class="media">
-                    <div class="align-self-start mr-2">
-                        <em class="fas fa-docker text-info"></em>
-                    </div>
-                    <div class="media-body">
-                        <p class="m-0">Docker</p>
-                        <p class="m-0 text-muted text-sm">2019-04 Docker Ready</p>
-                    </div>
-                </div>
+            <div class="list-group-item list-group-item-action" *ngFor="let notification of notifications | async">
                 <div class="media">
-                    <div class="align-self-start mr-2">
-                        <em class="fas fa-code-branch text-info"></em>
-                    </div>
-                    <div class="media-body">
-                        <p class="m-0">NET Core 2.2</p>
-                        <p class="m-0 text-muted text-sm">2019-03 Updated to ASP.NET Core 2.2</p>
-                    </div>
+                   <div class="align-self-start mr-2">
+                      <em class="fa-2x" [ngClass]="notification.icon"></em>
+                   </div>
+                   <div class="media-body">
+                    <p class="m-0">{{notification.title}}</p>
+                    <p class="m-0 text-muted text-sm">{{notification.description}}</p>
+                   </div>
                 </div>
-                <div class="media">
-                    <div class="align-self-start mr-2">
-                        <em class="fas fa-id-card text-info"></em>
-                    </div>
-                    <div class="media-body">
-                        <p class="m-0">Id4</p>
-                        <p class="m-0 text-muted text-sm">2019-03 IdentityServer4 2.4 Components</p>
-                    </div>
-                </div>
-                <div class="media">
-                    <div class="align-self-start mr-2">
-                        <em class="fas fa-rocket text-info"></em>
-                    </div>
-                    <div class="media-body">
-                        <p class="m-0">Launch</p>
-                        <p class="m-0 text-muted text-sm">2018-10 first release</p>
-                    </div>
-                </div>
-            </div>
+             </div>
             <!-- last list item-->
             <div class="list-group-item list-group-item-action">
                 <span class="d-flex align-items-center">
diff --git a/src/Frontend/Jp.AdminUI/src/app/shared/layout/header/notifications/notifications.component.ts b/src/Frontend/Jp.AdminUI/src/app/shared/layout/header/notifications/notifications.component.ts
@@ -1,4 +1,7 @@
 import { Component, OnInit, ViewEncapsulation } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { NotificationViewModel } from './notification.model';
+import { Observable, of } from 'rxjs';
 
 @Component({
     selector: 'app-notifications',
@@ -7,8 +10,13 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core';
 })
 export class NotificationsComponent implements OnInit {
 
-    constructor() { }
+    notifications: Observable<Array<NotificationViewModel>>;
+
+    constructor(private http: HttpClient) { }
+
+    ngOnInit() {
+        //this.notifications = of<Array<NotificationViewModel>>( JSON.parse('{"notifications":[{"icon":"text-info fas fa-kiwi-bird","title":"Session","description":"2019-05 UI Session improvements"},{"icon":"text-warning fab fa-docker","title":"Docker","description":"2019-04 Docker Ready"},{"icon":"text-info fas fa-code-branch","title":"NET Core 2.2","description":"2019-03 Updated to ASP.NET Core 2.2"},{"icon":"text-success fas fa-id-card","title":"ID4","description":"2019-03 IdentityServer4 2.4 Components"},{"icon":"text-info fas fa-rocket","title":"Launch","description":"2018-10 first release"}]}').notifications);
+        this.notifications = this.http.get<NotificationViewModel[]>('my-json-server.typicode.com/brunohbrito/JPProject.IdentityServer4.AdminUI/notifications');
+    }
 
-    ngOnInit() { }
-    
 }
diff --git a/src/Frontend/Jp.UI.SSO/Jp.UI.SSO.csproj b/src/Frontend/Jp.UI.SSO/Jp.UI.SSO.csproj
diff --git a/src/Frontend/Jp.UI.SSO/Resources/Views/Shared/_SelectLanguagePartial.pt-BR.resx b/src/Frontend/Jp.UI.SSO/Resources/Views/Shared/_SelectLanguagePartial.pt-BR.resx
diff --git a/src/Frontend/Jp.UI.SSO/Util/Clients.cs b/src/Frontend/Jp.UI.SSO/Util/Clients.cs
diff --git a/tests/JpProject.Domain.Tests/JpProject.Domain.Tests.csproj b/tests/JpProject.Domain.Tests/JpProject.Domain.Tests.csproj
