Merge pull request #186 from brunohbrito/dev

v3.0.2

Author: brunobritodev

README.md

@@ -8,19 +8,19 @@ This is an Administrator Panel for IdentityServer4. It's available in 2 versions
 
 # Several break changes
 
-The version ASP.NET Core 3.0 have changed a lot. So before upgrade read differences between light and full version. At the end it's the same project . But splited repo's.
+The new version, written in ASP.NET Core 3.0, changed a lot. So before upgrade read differences between light and full version. If have the past version, don't worry. It's the same project at all. But splited repo's.
 
 # Installation
 
-If you know the differences between Light and Full. Check the installation instructions below. If wanna understand, check more here [Presentation](#presentation) version.
+If you know the differences between Light and Full. Check the installation instructions below. If wanna understand, check more here at[Presentation](#presentation) section.
 
 ## Full Install
 
 Go to this [repo](https://github.com/brunohbrito/JPProject.IdentityServer4.SSO) and follow instructions there.
 
 ## Light Install
 
-You will need to create a Client and API resources in you IdentityServer4. At the end of this section there are some shortcuts.
+You will need to create a Client and API resources in your IdentityServer4. At the end of this section there are some shortcuts.
 
 1. [Download](https://github.com/brunohbrito/JPProject.IdentityServer4.AdminUI/archive/master.zip)/Clone or [Fork](https://github.com/brunohbrito/JPProject.IdentityServer4.AdminUI/fork) this repository.
 2. Open `environment.ts` and change settings for you SSO.
@@ -82,6 +82,7 @@ Client configuration
         IdentityTokenLifetime = 3600,
         LogoUri = "https://jpproject.azurewebsites.net/sso/images/brand/logo.png",
         AuthorizationCodeLifetime = 3600,
+        PostLogoutRedirectUris = {$"{configuration["ApplicationSettings:IS4AdminUi"]}",},
         AllowedScopes =
         {
             IdentityServerConstants.StandardScopes.OpenId,
@@ -145,6 +146,7 @@ Api resource configuration
 - [Docs](#docs)
   - [Contributing](#contributing)
   - [Free](#free)
+  - [3.0.2](#302)
   - [3.0.1](#301)
   - [v1.4.5](#v145)
 - [What comes next?](#what-comes-next)
@@ -252,6 +254,12 @@ We'll love it! Please [Read the docs](https://jp-project.readthedocs.io/en/lates
 If you need help building or running your Jp Project platform
 There are several ways we can help you out.
 
+## 3.0.2
+
+1. Menu translation
+2. Email support for full version
+3. Email configuration settings (SMTP / Password) for full version
+
 ## 3.0.1
 
 1. ASP.NET Core 3.0 support

azure-pipelines.pr.yml

@@ -53,7 +53,7 @@ jobs:
         displayName: 'NPM - Build Prod - AdminUI'
         inputs:
           command: custom
-          customCommand: 'run build -- --base-href=/admin-ui/'
+          customCommand: 'run build'
           workingDir: src/Frontend/Jp.AdminUI
 
   - job: 'docker'

azure-pipelines.yml

@@ -80,7 +80,7 @@ jobs:
         displayName: 'NPM - Build Prod - AdminUI'
         inputs:
           command: custom
-          customCommand: 'run build -- --base-href=/admin-ui/'
+          customCommand: 'run build'
           workingDir: src/Frontend/Jp.AdminUI
 
       - task: ArchiveFiles@2

build/build docker for jpproject.net.ps1

@@ -0,0 +1,4 @@
+Set-Location ..
+docker build -f .\build\continuous-delivery\admin-prod.dockerfile -t bhdebrito/jpproject-admin-ui:prd .
+docker push bhdebrito/jpproject-admin-ui:prd
+

build/image002.jpg

@@ -10,20 +10,20 @@
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
     <PackageReference Include="Hellang.Middleware.ProblemDetails" Version="3.1.0" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
-    <PackageReference Include="JPProject.Admin.Application" Version="3.0.1" />
-    <PackageReference Include="JPProject.Admin.Database" Version="3.0.1" />
-    <PackageReference Include="JPProject.AspNet.Core" Version="3.0.1" />
+    <PackageReference Include="JPProject.Admin.Application" Version="3.0.3" />
+    <PackageReference Include="JPProject.Admin.Database" Version="3.0.3" />
+    <PackageReference Include="JPProject.AspNet.Core" Version="3.0.3" />
     <PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.8.2" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.0.1" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.9.5" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.0.0" />
-    <PackageReference Include="Serilog.AspNetCore" Version="3.1.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
 	<PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="3.0.0" />
     <PackageReference Include="Serilog.Sinks.ApplicationInsights" Version="3.0.4" />
     <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />

src/Backend/JPProject.Admin.Api/JPProject.Admin.Api.csproj

@@ -28,7 +28,7 @@
                         "polyfills": "src/polyfills.ts",
                         "assets": [
                             "src/assets",
-                            "src/silent-refresh.html",
+                            "src/silent-refresh.html"
                         ],
                         "styles": [
                             "src/app/core/preloader/preloader.scss",

src/Frontend/Jp.AdminUI/Translate.json

@@ -34,12 +34,14 @@
     "@angular/platform-browser-dynamic": "^8.1.3",
     "@angular/router": "^8.1.3",
     "@fortawesome/fontawesome-free": "^5.9.0",
+    "@kolkov/angular-editor": "^1.0.0-rc.1",
     "@ng-bootstrap/ng-bootstrap": "^5.1.0",
     "@ngx-translate/core": "^11.0.1",
     "@ngx-translate/http-loader": "^4.0.0",
     "@swimlane/ngx-datatable": "^15.0.2",
     "ag-grid": "^18.1.2",
     "ag-grid-angular": "^21.1.0",
+    "angular-froala-wysiwyg": "^3.0.6",
     "angular-oauth2-oidc": "^8.0.2",
     "angular-tree-component": "^8.3.0",
     "angular2-text-mask": "9.0.0",
@@ -82,7 +84,6 @@
     "simple-line-icons": "2.4.1",
     "source-sans-pro": "^2.20.2",
     "spinkit": "1.2.5",
-    "summernote": "^0.8.11",
     "sweetalert": "2.1.2",
     "sweetalert2": "^8.15.1",
     "weather-icons": "1.3.2",