updated docs

docker ready

Author: brunobritodev

CHANGELOG.md

@@ -1,13 +1,49 @@
-## v1.1.0
+# v1.1.0
+
+## User Management
+
+* docker environment config
+* Some bug fix for users that doesn't have picture
+* @angular/cli to 7.3.6
+* @angular/core to 7.2.11 (ng update @angular/core, then updated other dep's by itself)|
+    * @angular/language-service @ "7.2.11" (was "6.0.0")...
+    * @angular/compiler-cli @ "7.2.11" (was "6.0.0")...
+    * @angular/animations @ "7.2.11" (was "6.0.0")...
+    * @angular/compiler @ "7.2.11" (was "6.0.0")...
+    * @angular/common @ "7.2.11" (was "6.0.0")...
+    * @angular/core @ "7.2.11" (was "6.0.0")...
+    * @angular/http @ "7.2.11" (was "6.0.0")...
+    * @angular/forms @ "7.2.11" (was "6.0.0")...
+    * @angular/platform-browser-dynamic @ "7.2.11" (was "6.0.0")...
+    * @angular/platform-browser @ "7.2.11" (was "6.0.0")...
+    * @angular/router @ "7.2.11" (was "6.0.0")...
+    * zone.js @ "0.8.29" (was "0.8.26")...
+    * rxjs @ "6.4.0" (was "6.0.0")...
+    * typescript @ "3.2.4" (was "2.7.2")
+ * ngx-image-cropper @ 1.3.8 (was 1.0.2)
+
+## SSO 
+
+* Updated SSO with latest version of QuickStart UI
+    * Device flow
+    * [email protected]
+
+## Docker support
 
 * Now you can run through a docker! ❤️
     * 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.
 
-* Pagination for Users and Persisted Grants
+## API
 
+* ASP.NET Core 2.2
+* Support for [email protected]
 * Update of main DbContext, JpProject
 * Removed previous components from MySql.IdentityServer and Sql.IdentityServer. Unifying them at same project.
 
+## Admin UI - Updates
+
+* Pagination for Users and Persisted Grants
+
 * Client Page:
     * Changed Claims button to be under Token - Following Docs from [IdentityServer4](https://identityserver4.readthedocs.io/en/latest/reference/client.html#token)
     * Included Device Flow options
@@ -69,6 +105,14 @@ Updated components from UI:
 |ts-node| 5.0.1| → 8.0.3|
 |tslint| 5.9.1| → 5.14.0|
 
-## v1.0.0
+## Other
+
+* Minor bugs correction
+    * .dockerignore
+    * clone client
+* Added bat to change hosts file
+
+
+# v1.0.0
 
 - First release

admin-ui.dockerfile

@@ -30,7 +30,7 @@ FROM nginx:1.13.3-alpine
 RUN rm -rf /usr/share/nginx/html/*
 
 # copy artifact build from the 'build environment'
-COPY --from=builder /app/nginx/nginx.conf /etc/nginx/conf.d/
+COPY --from=builder /app/nginx/nginx.conf /etc/nginx/conf.d/default.conf
 COPY --from=builder /app/dist /usr/share/nginx/html
 
 

build/update-host.bat

@@ -0,0 +1,16 @@
+@echo off
+TITLE Modifying your HOSTS file
+COLOR 03
+ECHO.
+
+SET NEWLINE=^& echo.
+ECHO Carrying out requested modifications to your HOSTS file
+FIND /C /I "jpproject" %WINDIR%\system32\drivers\etc\hosts
+IF %ERRORLEVEL% NEQ 0 ECHO %NEWLINE%>>%WINDIR%\system32\drivers\etc\hosts
+IF %ERRORLEVEL% NEQ 0 ECHO 127.0.0.1    jpproject>>%WINDIR%\system32\drivers\etc\hosts
+ECHO Finished
+GOTO END
+
+:END
+ECHO.
+PAUSE

docker-compose.yml

@@ -24,66 +24,60 @@ services:
           context: .
           dockerfile: sso.dockerfile
         ports:
-            - "5000:80"
-            - "5001:443"
+            - "5000:5000"
         links:
             - jpdatabase
         depends_on:
             - jpdatabase
         environment: 
             DATABASE_TYPE: "MySql"
             CUSTOMCONNSTR_DATABASE_CONNECTION: "server=jpdatabase,port=3306;database=jpproject;user=jp;password=10203040"
-            ASPNETCORE_Kestrel__Certificates__Default__Password: ".pxCpE]yttwC&b&hriw#,7K^_}A7xezRH3=EisJKn3]8.H}^Unzd+ebw]zzv_=d3"
-            ASPNETCORE_Kestrel__Certificates__Default__Path: "/root/.dotnet/https/jpproject.pfx"
             ASPNETCORE_ENVIRONMENT: "Development"
-            ASPNETCORE_URLS: http://+;https://+
+            ASPNETCORE_URLS: http://+:5000
 
     # #############################
     # # Management API
     # #############################
-    # jpproject-api:
-    #     container_name: jpproject-api
-    #     build: 
-    #       context: .
-    #       dockerfile: user-management.dockerfile
-    #     ports:
-    #         - "5003:443"
-    #         - "5002:80"
-    #     depends_on:
-    #         - jpdatabase
-    #     environment: 
-    #         DATABASE_TYPE: "MySql"
-    #         CUSTOMCONNSTR_DATABASE_CONNECTION: "server=jpdatabase,port=3306;database=jpproject;user=jp;password=10203040"
-    #         ASPNETCORE_Kestrel__Certificates__Default__Password: ".pxCpE]yttwC&b&hriw#,7K^_}A7xezRH3=EisJKn3]8.H}^Unzd+ebw]zzv_=d3"
-    #         ASPNETCORE_Kestrel__Certificates__Default__Path: "/root/.dotnet/https/jpproject.pfx"
-    #         ASPNETCORE_ENVIRONMENT: "Development"
-    #         AUTHORITY: "http://jpproject:5000"
-    #         ASPNETCORE_URLS: https://+;http://+
+    jpproject-api:
+        container_name: jpproject-api
+        build: 
+          context: .
+          dockerfile: user-management.dockerfile
+        ports:
+            - "5003:80"
+        depends_on:
+            - jpdatabase
+        environment: 
+            DATABASE_TYPE: "MySql"
+            CUSTOMCONNSTR_DATABASE_CONNECTION: "server=jpdatabase,port=3306;database=jpproject;user=jp;password=10203040"
+            ASPNETCORE_ENVIRONMENT: "Development"
+            AUTHORITY: "http://jpproject:5000"
+            ASPNETCORE_URLS: http://+
 
-    # #############################
-    # # User management UI
-    # #############################
-    # user-ui:
-    #     container_name: jpproject-user-management-ui
-    #     build: 
-    #       context: .
-    #       dockerfile: ui-user-management.dockerfile
-    #     depends_on:
-    #         - jpproject-api
-    #         - jpproject
-    #     ports:
-    #         - 4200:80
+    #############################
+    # User management UI
+    #############################
+    user-ui:
+        container_name: jpproject-user-management-ui
+        build: 
+          context: .
+          dockerfile: ui-user-management.dockerfile
+        depends_on:
+            - jpproject-api
+            - jpproject
+        ports:
+            - 4200:80
 
-    # #############################
-    # # Admin Ui
-    # #############################
-    # admin-ui:
-    #     container_name: jpproject-admin-ui
-    #     build: 
-    #       context: .
-    #       dockerfile: ui-user-management.dockerfile
-    #     depends_on:
-    #         - jpproject-api
-    #         - jpproject
-    #     ports:
-    #         - 4300:80
+    #############################
+    # Admin Ui
+    #############################
+    admin-ui:
+        container_name: jpproject-admin-ui
+        build: 
+          context: .
+          dockerfile: admin-ui.dockerfile
+        depends_on:
+            - jpproject-api
+            - jpproject
+        ports:
+            - 4300:80

docs/index.rst

@@ -6,9 +6,9 @@ Getting Started
 .. image:: images/logo.png
     :align: center
 
-Jp Project is a Open Source Quickstart for IdentityServer4. 
+Jp Project is a Open Source Quickstart for IdentityServer4 v2 - release 2.4.0. 
 
-Built with ASP.NET Core and Angular 6.
+Built with ASP.NET Core 2.2 and Angular 7.
 
 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.
 
@@ -29,6 +29,11 @@ Give a Star ⭐!
 
 Do you love it? give us a :yellow:`Star!` ⭐
 
+.. raw:: html 
+    
+    <iframe src="https://ghbtns.com/github-btn.html?user=brunohbrito&repo=JP-Project&type=star&size=large" frameborder="0" scrolling="0" width="160px" height="30px"></iframe>
+
+
 Contributing
 ------------
 Wanna contribute? Feel free to do that!
@@ -62,9 +67,10 @@ There are several ways we can help you out.
    :caption: Get Start
 
    quickstarts/build
+   quickstarts/docker_support
+   quickstarts/vs_vscode
    quickstarts/ambient_variables
    quickstarts/app_settings
-   quickstarts/docker_support
 
 .. toctree::
    :maxdepth: 2

docs/intro/architecture.rst

@@ -42,9 +42,8 @@ ASP.NET CORE
 * Repository and Generic Repository
 * Serilog
 
-Angular 6
+Angular 7
 ^^^^^^^^^^
 
 * OpenId Connect throug angular-oauth2-oidc plugin to manage login.
 * Bootstrap 4
-* angular-6-social-login-v2 to take profile from Google and Facebook before register new users

docs/intro/big_picture.rst

@@ -21,7 +21,7 @@ A SPA application responsible for create and manager users. Send reset links. E-
 Management API
 -------------------
 
-This API serve UI.
+API to serve UI's.
 
 Admin UI
 --------