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

Commit 0352f46

Browse files
brunobritodevbrunobritodev
authored
Merge pull request #5 from brunohbrito/v1.2
V1.2
2 parents 8bca0b3 + b3d52a2 commit 0352f46

File tree

305 files changed

+57004
-8890
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

305 files changed

+57004
-8890
lines changed

‎.dockerignore‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
1-
.dockerignore
2-
.env
1+
*.dockerignore
2+
*.env
33
.git
4-
.gitignore
5-
.vs/
6-
.vscode
7-
*/bin
8-
*/obj
9-
**/.toolstarget
10-
node_modules/
4+
*.gitignore
5+
**/.vs
6+
**/.vscode
7+
docker-compose.yml
8+
docker-compose.*.yml
9+
**/*log*.txt
10+
**/*log*.log
11+
**/bin
12+
**/obj
13+
**/node_modules
14+
**/packages
15+
16+
# current folder
17+
.github
18+
build
19+
docs

‎CHANGELOG.md‎

Lines changed: 123 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,125 @@
1-
## v1.0.0
1+
# v1.2.0
2+
3+
## User Management
4+
5+
* docker environment config
6+
* Some bug fix for users that doesn't have picture
7+
* @angular/cli to 7.3.6
8+
* @angular/core to 7.2.11 (ng update @angular/core, then updated other dep's by itself)|
9+
* @angular/language-service @ "7.2.11" (was "6.0.0")...
10+
* @angular/compiler-cli @ "7.2.11" (was "6.0.0")...
11+
* @angular/animations @ "7.2.11" (was "6.0.0")...
12+
* @angular/compiler @ "7.2.11" (was "6.0.0")...
13+
* @angular/common @ "7.2.11" (was "6.0.0")...
14+
* @angular/core @ "7.2.11" (was "6.0.0")...
15+
* @angular/http @ "7.2.11" (was "6.0.0")...
16+
* @angular/forms @ "7.2.11" (was "6.0.0")...
17+
* @angular/platform-browser-dynamic @ "7.2.11" (was "6.0.0")...
18+
* @angular/platform-browser @ "7.2.11" (was "6.0.0")...
19+
* @angular/router @ "7.2.11" (was "6.0.0")...
20+
* zone.js @ "0.8.29" (was "0.8.26")...
21+
* rxjs @ "6.4.0" (was "6.0.0")...
22+
* typescript @ "3.2.4" (was "2.7.2")
23+
* ngx-image-cropper @ 1.3.8 (was 1.0.2)
24+
25+
## SSO
26+
27+
* Updated SSO with latest version of QuickStart UI
28+
* Device flow
29+
* [email protected]
30+
31+
## Docker support
32+
33+
* Now you can run through a docker! ❤️
34+
* Unfortunately you need to change hosts for it. Because Authority URL. I can't do anything to face it. It's security feature from OAuth2 to keep same Authority name for each Token.
35+
36+
## API
37+
38+
* ASP.NET Core 2.2
39+
* Support for [email protected]
40+
* Update of main DbContext, JpProject
41+
* Removed previous components from MySql.IdentityServer and Sql.IdentityServer. Unifying them at same project.
42+
43+
## Admin UI - Updates
44+
45+
* Pagination for Users and Persisted Grants
46+
47+
* Client Page:
48+
* Changed Claims button to be under Token - Following Docs from [IdentityServer4](https://identityserver4.readthedocs.io/en/latest/reference/client.html#token)
49+
* Included Device Flow options
50+
51+
Updates:
52+
* @angular/cli to 7.3.6
53+
* @angular/core to 7.2.10 (ng update @angular/core, then updated other dep's by itself)|
54+
* @angular/language-service @ "7.2.10" (was "6.0.0")...
55+
* @angular/compiler-cli @ "7.2.10" (was "6.0.0")...
56+
* @angular/animations @ "7.2.10" (was "6.0.0")...
57+
* @angular/compiler @ "7.2.10" (was "6.0.0")...
58+
* @angular/common @ "7.2.10" (was "6.0.0")...
59+
* @angular/core @ "7.2.10" (was "6.0.0")...
60+
* @angular/http @ "7.2.10" (was "6.0.0")...
61+
* @angular/forms @ "7.2.10" (was "6.0.0")...
62+
* @angular/platform-browser-dynamic @ "7.2.10" (was "6.0.0")...
63+
* @angular/platform-browser @ "7.2.10" (was "6.0.0")...
64+
* @angular/router @ "7.2.10" (was "6.0.0")...
65+
* zone.js @ "0.8.29" (was "0.8.26")...
66+
* rxjs @ "6.4.0" (was "6.0.0")...
67+
* typescript @ "3.2.4" (was "2.7.2")
68+
69+
Updated components from UI:
70+
71+
|dependency|old version| new version|
72+
|----------|-----------|------------|
73+
|@agm/core| 1.0.0-beta.2| → 1.0.0-beta.5|
74+
|@ng-bootstrap/ng-bootstrap |^3.2.2| → ^4.1.0|
75+
|@ngx-translate/core| 10.0.1| → 11.0.1|
76+
|@ngx-translate/http-loader| 3.0.1| → 4.0.0|
77+
|@swimlane/ngx-datatable| 12.0.0| → 14.0.0|
78+
|ag-grid| 17.1.1| → 18.1.2|
79+
|ag-grid-angular| 17.1.0| → 20.2.0|
80+
|angular-oauth2-oidc |^4.0.2| → ^5.0.2|
81+
|angular-tree-component| 7.0.1| → 8.3.0|
82+
|bootstrap| 4.1.1| → 4.3.1|
83+
|chart.js| 2.7.2| → 2.8.0|
84+
|codemirror| 5.37.0| → 5.45.0|
85+
|enhanced-resolve| 3.3.0| → 4.1.0|
86+
|fullcalendar| 3.9.0| → 3.10.0|
87+
|lodash| 4.17.10| → 4.17.11|
88+
|modernizr| 3.6.0| → 3.7.1|
89+
|moment| 2.22.1| → 2.24.0|
90+
|ng2-charts| 1.6.0| → 2.0.4|
91+
|ng2-material-dropdown| 0.9.5| → 0.10.1|
92+
|ngx-chips |^1.9.8| → ^2.0.0-beta.0|
93+
|ngx-color-picker| 6.0.0| → 7.4.0|
94+
|ngx-infinite-scroll| 0.8.4| → 7.1.0|
95+
|popper.js| 1.14.3| → 1.14.7|
96+
|screenfull| 3.3.2| → 4.1.0|
97+
|summernote| 0.8.10| → 0.8.11|
98+
|sweetalert| 1.1.3| → 2.1.2|
99+
|ts-helpers| 1.1.1| **removed**|
100+
|web-animations-js| 2.2.1| → 2.3.1|
101+
|zone.js| 0.8.29| → 0.9.0|
102+
|@angular-devkit/build-angular| 0.6.1| → 0.13.6|
103+
|@types/lodash| 4.14.108| → 4.14.123|
104+
|codelyzer| 4.2.1| → 5.0.0-beta.2|
105+
|ts-node| 5.0.1| → 8.0.3|
106+
|tslint| 5.9.1| → 5.14.0|
107+
108+
## Other
109+
110+
* Minor bugs correction
111+
* .dockerignore
112+
* clone client
113+
* Added bat to change hosts file
114+
115+
# v1.1.0
116+
117+
- Minor bugs correction
118+
- Added localization feature to SSO
119+
- Added translation feature to User Management
120+
- Silent refresh for angular-oauth2-oidc both for User Management and Admin
121+
- Changed Security Headers to accept Azure Application Insights
122+
123+
# v1.0.0
2124

3125
- First release

‎README.md‎

Lines changed: 28 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,47 @@
55
[![License](https://img.shields.io/github/license/brunohbrito/jp-project.svg)](LICENSE)
66
![DOCS](https://readthedocs.org/projects/jp-project/badge/?version=latest&style=flat)
77

8-
Jp Project is a Open Source Admin UI for IdentityServer4.
8+
Jp Project is a Open Source UI Administration Tools for IdentityServer4 v2 - release 2.4.0.
9+
10+
11+
## Admin UI
12+
<img src="https://github.com/brunohbrito/JP-Project/blob/master/docs/images/jp-adminui.gif" width="480" />
13+
14+
## Login page
15+
<img src="https://github.com/brunohbrito/JP-Project/blob/master/docs/images/login.JPG?raw=true" width="480" />
16+
17+
## Consent page
18+
<img src="https://github.com/brunohbrito/JP-Project/blob/master/docs/images/consent-page.JPG?raw=true" width="480" />
19+
20+
## Profile
21+
<img src="https://github.com/brunohbrito/JP-Project/blob/master/docs/images/jp-usermanagement.gif" width="480" />
22+
923

1024
# We are online at Azure.
1125

26+
<img align="right" width="100px" src="https://www.developpez.net/forums/attachments/p289604d1/a/a/a" />
27+
1228
Check it now at [Jp Project](https://jpproject.azurewebsites.net/admin-ui/).
1329

1430
You can check also [SSO](https://jpproject.azurewebsites.net/sso/) and [User Management](https://jpproject.azurewebsites.net/user-management/)
1531

1632
_New users are readonly_
1733

18-
<img align="right" width="100px" src="https://www.developpez.net/forums/attachments/p289604d1/a/a/a" />
34+
# Docker Ready ❤️
35+
36+
Wanna try? As easy as:
37+
* download docker.zip
38+
* Unzip and execute docker-build.bat (As administrator)
39+
40+
41+
# How it was made
42+
1943
Written in ASP.NET Core and Angular 6.
2044
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.
2145

22-
# Features
2346
- Angular 6
2447
- Rich UI interface
25-
- ASP.NET Core 2.1
48+
- ASP.NET Core 2.2
2649
- ASP.NET MVC Core
2750
- ASP.NET WebApi Core
2851
- ASP.NET Identity Core
@@ -60,19 +83,7 @@ Jp Project is built against ASP.NET Core 2.1.
6083

6184
Wait for ng to complete his proccess then go to http://localhost:5000!
6285

63-
# Screen Shots.
64-
65-
## Admin UI
66-
<img src="https://github.com/brunohbrito/JP-Project/blob/master/docs/images/admin-home.jpg?raw=true" width="480" />
67-
68-
## Login page
69-
<img src="https://github.com/brunohbrito/JP-Project/blob/master/docs/images/login.JPG?raw=true" width="480" />
7086

71-
## Consent page
72-
<img src="https://github.com/brunohbrito/JP-Project/blob/master/docs/images/consent-page.JPG?raw=true" width="480" />
73-
74-
## Profile
75-
<img src="https://github.com/brunohbrito/JP-Project/blob/master/docs/images/profile.JPG?raw=true" width="480" />
7687

7788
Any doubts? Go to docs
7889

@@ -104,4 +115,4 @@ There are several ways we can help you out.
104115

105116
Code coverage
106117

107-
Thinking about create separated repo's for each part of solution.
118+
Thinking about create separated repo's for each part of solution.

‎admin-ui.dockerfile‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# base image
2+
FROM node:10-alpine as builder
3+
4+
# install and cache app dependencies
5+
COPY ["src/Frontend/Jp.AdminUI/package.json", "./"]
6+
COPY ["src/Frontend/Jp.AdminUI/package-lock.json", "./"]
7+
8+
## Storing node modules on a separate layer will prevent unnecessary npm installs at each build
9+
10+
RUN npm ci && mkdir /app && mv ./node_modules ./app/
11+
12+
WORKDIR /app
13+
14+
# add app
15+
COPY ["src/Frontend/Jp.AdminUI/", "/app"]
16+
17+
# rebuild node
18+
RUN npm rebuild node-sass
19+
# generate build
20+
RUN npm run ng build -- --configuration=docker
21+
22+
##################
23+
### production ###
24+
##################
25+
26+
# base image
27+
FROM nginx:1.13.3-alpine
28+
29+
## Remove default nginx website
30+
RUN rm -rf /usr/share/nginx/html/*
31+
32+
# copy artifact build from the 'build environment'
33+
COPY --from=builder /app/nginx/nginx.conf /etc/nginx/conf.d/default.conf
34+
COPY --from=builder /app/dist /usr/share/nginx/html
35+
36+
37+
# expose port 80
38+
EXPOSE 80/tcp
39+
40+
# run nginx
41+
CMD ["nginx", "-g", "daemon off;"]

‎build/update-host.bat‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
@echo off
2+
TITLE Modifying your HOSTS file
3+
COLOR 03
4+
ECHO.
5+
6+
SET NEWLINE=^& echo.
7+
ECHO Carrying out requested modifications to your HOSTS file
8+
FIND /C /I "jpproject" %WINDIR%\system32\drivers\etc\hosts
9+
IF %ERRORLEVEL% NEQ 0 ECHO %NEWLINE%>>%WINDIR%\system32\drivers\etc\hosts
10+
IF %ERRORLEVEL% NEQ 0 ECHO 127.0.0.1 jpproject>>%WINDIR%\system32\drivers\etc\hosts
11+
ECHO Finished
12+
GOTO END
13+
14+
:END
15+
ECHO.
16+
PAUSE

0 commit comments

Comments
 (0)