Skip to content
This repository was archived by the owner on Aug 1, 2021. It is now read-only.

Commit c74fb25

Browse files
committed
Merge remote-tracking branch 'remotes/origin/dev' into dev
# Conflicts: # src/Backend/Jp.Domain/Jp.Domain.csproj # src/Backend/Jp.Infra.CrossCutting.Database/DbSettingsConfig.cs # src/Backend/Jp.Infra.CrossCutting.Database/Jp.Infra.CrossCutting.Database.csproj # src/Backend/Jp.Infra.CrossCutting.Identity/Jp.Infra.CrossCutting.Identity.csproj # src/Backend/Jp.Infra.CrossCutting.IdentityServer/Configuration/IdentityServerConfig.cs # src/Backend/Jp.Infra.CrossCutting.IdentityServer/Jp.Infra.CrossCutting.IdentityServer.csproj # src/Backend/Jp.Infra.CrossCutting.Tools/Jp.Infra.CrossCutting.Tools.csproj # src/Backend/Jp.Infra.Data.Sql/Jp.Infra.Data.Sql.csproj # src/Backend/Jp.Infra.Data.Sqlite/Configuration/IdentityConfig.cs # src/Backend/Jp.Infra.Data.Sqlite/Jp.Infra.Data.Sqlite.csproj # src/Backend/Jp.Infra.Data/Jp.Infra.Data.csproj # src/Backend/Jp.UserManagement/Jp.Management.csproj # src/Backend/Jp.UserManagement/appsettings.json # src/Frontend/Jp.AdminUI/src/app/shared/shared.module.ts # src/Frontend/Jp.UI.SSO/Configuration/FederationGatewayConfig.cs # src/Frontend/Jp.UI.SSO/Jp.UI.SSO.csproj # src/Frontend/Jp.UI.SSO/Startup.cs # src/Frontend/Jp.UI.SSO/Util/DbMigrationHelpers.cs # src/Frontend/Jp.UI.SSO/appsettings.json # tests/JpProject.Domain.Tests/JpProject.Domain.Tests.csproj
2 parents 06972cc + 8d82ba7 commit c74fb25

25 files changed

Lines changed: 130 additions & 58 deletions

File tree

README.md

Lines changed: 71 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,53 @@
88
Jp Project is a Open Source UI Administration Tools for IdentityServer4 v2 - release 2.4.0.
99

1010

11-
## Admin UI
11+
## Table of Contents ##
12+
13+
- [Presentation](#presentation)
14+
- [Admin UI](#admin-ui)
15+
- [Login page](#login-page)
16+
- [Consent page](#consent-page)
17+
- [Profile](#profile)
18+
- [Demo](#demo)
19+
- [We are online at Azure.](#we-are-online-at-azure)
20+
- [Docker](#docker)
21+
- [Technologies](#technologies)
22+
- [Architecture](#architecture)
23+
- [Give a Star! ⭐](#give-a-star-%e2%ad%90)
24+
- [How to build](#how-to-build)
25+
- [Docs](#docs)
26+
- [Contributing](#contributing)
27+
- [Free](#free)
28+
- [v1.4.5](#v145)
29+
- [v1.4.0](#v140)
30+
- [v1.3](#v13)
31+
- [v1.2](#v12)
32+
- [What comes next?](#what-comes-next)
33+
- [License](#license)
34+
35+
------------------
36+
37+
# Presentation
38+
39+
Here some screenshots
40+
41+
## Admin UI ##
1242
<img src="https://github.com/brunohbrito/JP-Project/blob/master/docs/images/jp-adminui.gif" width="480" />
1343

14-
## Login page
44+
## Login page ##
1545
<img src="https://github.com/brunohbrito/JP-Project/blob/master/docs/images/login.JPG?raw=true" width="480" />
1646

17-
## Consent page
47+
## Consent page ##
1848
<img src="https://github.com/brunohbrito/JP-Project/blob/master/docs/images/consent-page.JPG?raw=true" width="480" />
1949

20-
## Profile
50+
## Profile ##
2151
<img src="https://github.com/brunohbrito/JP-Project/blob/master/docs/images/jp-usermanagement.gif" width="480" />
2252

53+
# Demo #
2354

24-
# We are online at Azure.
55+
Check our demo online.
56+
57+
## We are online at Azure.
2558

2659
<img align="right" width="100px" src="https://www.developpez.net/forums/attachments/p289604d1/a/a/a" />
2760

@@ -31,7 +64,9 @@ You can check also [SSO](https://jpproject.azurewebsites.net/sso/) and [User Man
3164

3265
_New users are readonly_
3366

34-
# Docker Ready ❤️
67+
# Docker #
68+
69+
Run through docker compose ❤️
3570

3671
Wanna try? As easy as:
3772

@@ -45,31 +80,37 @@ Linux users:
4580
* `docker-compose up`
4681

4782

48-
# How it was made
83+
# Technologies #
4984

50-
Written in ASP.NET Core and Angular 6.
85+
Check below how it was developed.
86+
87+
Written in ASP.NET Core and Angular 8.
5188
The main goal of project is to be a Management Ecosystem for IdentityServer4. Helping Startup's and Organization to Speed Up the Setup of User Management. Helping teams and entrepreneurs to achieve the company's primary purpose: Maximize shareholder value.
5289

53-
- Angular 7
90+
- Angular 8
5491
- Rich UI interface
5592
- ASP.NET Core 2.2
5693
- ASP.NET MVC Core
5794
- ASP.NET WebApi Core
5895
- ASP.NET Identity Core
96+
- Argon2 Password Hashing
5997
- MySql Ready
6098
- Sql Ready
99+
- Postgree Ready
100+
- SQLite Ready
61101
- Entity Framework Core 2.2
62102
- .NET Core Native DI
63103
- AutoMapper
64104
- FluentValidator
65105
- MediatR
66106
- Swagger UI
67107
- High customizable
68-
- Translation for English / Spanish (Autogenerated) / Portuguese (Autogenerated)
108+
- Translation for 7 different languages
109+
69110

70-
## Architecture:
111+
## Architecture
71112

72-
- Full architecture with responsibility separation concerns, SOLID and Clean Code
113+
- Architecture with responsibility separation concerns, SOLID and Clean Code
73114
- Domain Driven Design (Layers and Domain Model Pattern)
74115
- Domain Events
75116
- Domain Notification
@@ -98,19 +139,28 @@ Wait for ng to complete his proccess then go to http://localhost:5000!
98139

99140
Any doubts? Go to docs
100141

101-
## Docs
142+
# Docs #
102143

103144
Wanna start? please [Read the docs](https://jp-project.readthedocs.io/en/latest/index.html)
104145

105146
## Contributing
106147

107148
We'll love it! Please [Read the docs](https://jp-project.readthedocs.io/en/latest/index.html)
108149

109-
## Free
150+
## Free ##
110151

111152
If you need help building or running your Jp Project platform
112153
There are several ways we can help you out.
113154

155+
## v1.4.5
156+
157+
Breaking change: **Argon2 password hashing**. Be careful before update. If you are using the old version all users must need to update their passwords.
158+
159+
1. Bug fixes:
160+
1. Tooltip for admin-ui
161+
2. Argon2 Password Hasher
162+
3. Show version at footer
163+
114164
## v1.4.0
115165

116166
1. Added :boom: **New Translations** (auto-generate) :green_heart: :blue_heart:
@@ -125,7 +175,7 @@ There are several ways we can help you out.
125175

126176
2. Added integration with Azure DevOps for full CI/CD. ASAP SonarQube
127177

128-
3. Bug fixesz
178+
3. Bug fixes
129179

130180
## v1.3
131181

@@ -148,8 +198,11 @@ Check [Changelog.md](https://github.com/brunohbrito/JP-Project/blob/master/CHANG
148198

149199
# What comes next?
150200

151-
Code coverage
201+
* Code coverage
202+
* UI for Device codes
203+
* CI with SonarCloud
204+
152205

153-
UI for Device codes
206+
# License
154207

155-
CI with SonarCloud
208+
Jp Project is Open Source software and is released under the MIT license. This license allow the use of Jp Project in free and commercial applications and libraries without restrictions.

docs/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ There are several ways we can help you out.
6060
intro/contributing
6161
intro/code_of_conduct
6262
intro/contributors.md
63-
intro/stress_test_results
63+
intro/stresstest_results
6464

6565
.. toctree::
6666
:maxdepth: 2
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ The steps of testing was:
2121
6. Load login page
2222

2323
Machine config:
24-
^^^^^^^^^^^^^^
24+
^^^^^^^^^^^^^^^
2525

2626
Azure B1, it's the most basic Machine of Azure.
2727
* 100 ACU
@@ -41,13 +41,16 @@ During tests, average CPU utilization was 13,58% and Memory consumption was abou
4141

4242
.. image:: ../images/stress/during-blazemeter.png
4343

44+
4445
Timeline report
4546
^^^^^^^^^^^^^^^
47+
4648
.. image:: ../images/stress/timelinegraph.jpg
4749

4850

4951
Aggregate report
5052
^^^^^^^^^^^^^^^^
53+
5154
.. image:: ../images/stress/agreggatereport.JPG
5255

5356

src/Backend/Jp.Infra.CrossCutting.Identity/Services/MessageServices.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using System.Threading.Tasks;
2-
using MailKit.Net.Smtp;
1+
using MailKit.Net.Smtp;
32
using MimeKit;
43
using MimeKit.Text;
4+
using System.Threading.Tasks;
55

66
namespace Jp.Infra.CrossCutting.Identity.Services
77
{
@@ -16,9 +16,9 @@ public AuthEmailMessageSender(IEmailConfiguration emailConfiguration)
1616
}
1717
public async Task SendEmailAsync(string email, string subject, string message)
1818
{
19-
if(!_emailConfiguration.SendEmail)
19+
if (!_emailConfiguration.SendEmail)
2020
return;
21-
21+
2222
var mimeMessage = new MimeMessage();
2323
mimeMessage.To.Add(new MailboxAddress(email));
2424
mimeMessage.From.Add(new MailboxAddress(_emailConfiguration.FromName, _emailConfiguration.FromAddress));

src/Backend/Jp.Infra.Data.PostgreSQL/Jp.Infra.Data.PostgreSQL.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66

77
<ItemGroup>
88
<PackageReference Include="IdentityServer4.EntityFramework" Version="3.0.1" />
9-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0">
10-
<PrivateAssets>all</PrivateAssets>
11-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
12-
</PackageReference>
139
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.0.1" />
1410
</ItemGroup>
1511

src/Frontend/Jp.AdminUI/package-lock.json

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Frontend/Jp.AdminUI/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@
6767
"ng2-file-upload": "1.3.0",
6868
"ng2-img-cropper": "0.9.0",
6969
"ng2-material-dropdown": "^0.10.1",
70+
"ng2-tooltip-directive": "^2.1.9",
7071
"ng2-validation": "4.2.0",
7172
"ngx-bootstrap": "^5.1.0",
7273
"ngx-chips": "^2.0.0-beta.0",

src/Frontend/Jp.AdminUI/src/app/core/settings/settings.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export class SettingsService {
3030
name: "Jp Project - IS4Admin",
3131
description: "IdentityServer4 Admin Panel",
3232
year: ((new Date()).getFullYear()),
33-
version: "1.0.0"
33+
version: "1.4.5"
3434
};
3535

3636
// Layout Settings

src/Frontend/Jp.AdminUI/src/app/shared/shared.module.ts

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ import { ProgressbarModule } from "ngx-bootstrap/progressbar";
1717
import { RatingModule } from "ngx-bootstrap/rating";
1818
import { TabsModule } from "ngx-bootstrap/tabs";
1919
import { TimepickerModule } from "ngx-bootstrap/timepicker";
20-
import { PopoverModule, PopoverConfig } from "ngx-bootstrap/popover";
20+
import { PopoverModule } from "ngx-bootstrap/popover";
2121
import { TypeaheadModule } from "ngx-bootstrap/typeahead";
2222
import { DatepickerModule } from "ngx-bootstrap/datepicker";
2323
import { BsDatepickerModule } from 'ngx-bootstrap/datepicker';
24-
import { TooltipModule } from 'ng2-tooltip-directive';
24+
import {TooltipModule} from 'ng2-tooltip-directive';
2525

2626
import { FlotDirective } from "./directives/flot/flot.directive";
2727
import { SparklineDirective } from "./directives/sparkline/sparkline.directive";
@@ -32,16 +32,10 @@ import { NowDirective } from "./directives/now/now.directive";
3232
import { ScrollableDirective } from "./directives/scrollable/scrollable.directive";
3333
import { JqcloudDirective } from "./directives/jqcloud/jqcloud.directive";
3434
import { ColorsService } from "./services/colors.service";
35-
import { TextMaskModule } from "angular2-text-mask";
35+
import {TextMaskModule} from "angular2-text-mask";
3636
import { SpinnersComponent } from "./components/spinners/spinners.component";
3737
import { NumberDirective } from "./directives/numberCheck/numbers-only.directive";
3838

39-
export function getPopoverConfig(): PopoverConfig {
40-
return Object.assign(new PopoverConfig(), {
41-
adaptivePosition: false,
42-
container: 'body'
43-
});
44-
}
4539

4640
// https://angular.io/styleguide#!#04-10
4741
@NgModule({
@@ -64,15 +58,14 @@ export function getPopoverConfig(): PopoverConfig {
6458
RatingModule.forRoot(),
6559
TabsModule.forRoot(),
6660
TimepickerModule.forRoot(),
67-
TooltipModule.forRoot(),
61+
TooltipModule,
6862
PopoverModule.forRoot(),
6963
TypeaheadModule.forRoot(),
7064
ToasterModule,
7165
BsDatepickerModule.forRoot(),
7266
],
7367
providers: [
74-
ColorsService,
75-
[{ provide: PopoverConfig, useFactory: getPopoverConfig }]
68+
ColorsService
7669
],
7770
declarations: [
7871
FlotDirective,

src/Frontend/Jp.UI.SSO/Configuration/SocialIntegrationConfig.cs renamed to src/Frontend/Jp.UI.SSO/Configuration/FederationGatewayConfig.cs

File renamed without changes.

0 commit comments

Comments
 (0)