Merge pull request #171 from brunohbrito/dev

bug fix + prd setts

Author: brunobritodev

README.md

@@ -27,7 +27,7 @@ Linux users:
 
 ## Light Install
 
-You will need to create a Client and API resources in you IdentityServer4. At the end of this section have some shortcuts.
+You will need to create a Client and API resources in you 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.
@@ -144,7 +144,7 @@ Api resource configuration
   - [Light version](#light-version)
   - [Admin UI](#admin-ui)
 - [Demo](#demo)
-  - [We are online at Azure.](#we-are-online-at-azure)
+  - [We are online](#we-are-online)
 - [Technologies](#technologies)
   - [Architecture](#architecture)
   - [Give a Star! ⭐](#give-a-star-%e2%ad%90)
@@ -171,7 +171,6 @@ The full version is for those who don't have an IdentityServer up and running. S
 
 For those who already have an IdentityServer4. This panel has features to manage an existing **IdentityServer4** database.
 
-
 Here some screenshots
 
 ## Admin UI ##
@@ -181,13 +180,13 @@ Here some screenshots
 
 Check our full demo online.
 
-## We are online at Azure. 
+## We are online
 
 <img align="right" width="100px" src="https://www.developpez.net/forums/attachments/p289604d1/a/a/a" />
 
-Check it now at [Jp Project](https://jpproject.azurewebsites.net/admin-ui/).
+Check it now at [Admin Panel](https://admin.jpproject.net).
 
-You can check also [SSO](https://jpproject.azurewebsites.net/sso/) and [User Management](https://jpproject.azurewebsites.net/user-management/)
+You can check also [SSO](https://sso.jpproject.net) and [Profile Manager](https://user.jpproject.net)
 
 _New users are readonly_
 

admin-ui.dockerfile

@@ -14,6 +14,7 @@ WORKDIR /app
 COPY ["src/Frontend/Jp.AdminUI/", "/app"]
 COPY ["environment.ts", "src/environments/environment.prod.ts"]
 # rebuild node
+RUN cat src/environments/environment.prod.ts
 RUN npm rebuild node-sass
 # generate build
 RUN npm run ng build -- --configuration=production

azure-pipelines.yml

@@ -0,0 +1,100 @@
+# ASP.NET Core
+# Build and test ASP.NET Core projects targeting .NET Core.
+# Add steps that run tests, create a NuGet package, deploy, and more:
+# https://docs.microsoft.com/azure/devops/pipelines/languages/dotnet-core
+
+trigger:
+- master
+
+variables:
+  BuildConfiguration: 'Release'
+
+jobs:
+
+  - job: 'net_core'
+    displayName: '.NET Core Build'
+    pool:
+      vmImage: 'ubuntu-latest'
+    steps:
+      - task: DotNetCoreCLI@2
+        displayName: '.NET Core - Restore'
+        inputs:
+          command: 'restore'
+          projects: './src'
+          feedsToUse: 'select'
+
+      - task: DotNetCoreCLI@2
+        displayName: '.NET Core - Build'
+        inputs:
+          command: 'build'
+          arguments: '-c $(BuildConfiguration) --no-restore'
+          projects: './src'
+
+      - task: DotNetCoreCLI@2
+        displayName: '.NET Core - Run Tests'
+        inputs:
+          command: 'test'
+          projects: './src'
+        
+      - task: DotNetCoreCLI@2
+        displayName: 'Publish - API'
+        inputs:
+          command: 'publish'
+          publishWebProjects: false
+          projects: '**/JPProject.Admin.Api.csproj'
+          arguments: '-c $(BuildConfiguration) -o $(Build.StagingDirectory)/api --no-build'
+          zipAfterPublish: false
+          modifyOutputPath: false
+          workingDirectory: './src/Backend/JPProject.Admin.Api'
+ 
+      - task: ArchiveFiles@2
+        displayName: 'Zip - API'
+        inputs:
+          rootFolderOrFile: '$(Build.StagingDirectory)/api/'
+          includeRootFolder: false
+          archiveType: 'zip'
+          archiveFile: '$(Build.ArtifactStagingDirectory)/jpproject.api.$(Build.BuildNumber).zip'
+          replaceExistingArchive: true
+
+      - task: PublishBuildArtifacts@1
+        displayName: 'Artifact - Generate API'
+        inputs:
+          PathtoPublish: '$(Build.ArtifactStagingDirectory)/jpproject.api.$(Build.BuildNumber).zip'
+          ArtifactName: 'jpproject.api.$(Build.BuildNumber)'
+          publishLocation: 'Container'
+
+  # Angular APP
+  - job: 'angular'
+    displayName: 'Angular Build'
+    pool:
+      vmImage: 'ubuntu-latest'
+    steps:
+      # Admin UI
+      - task: Npm@1
+        displayName: 'NPM - Install - AdminUI'
+        inputs:
+          command: install
+          workingDir: src/Frontend/Jp.AdminUI
+
+      - task: Npm@1
+        displayName: 'NPM - Build Prod - AdminUI'
+        inputs:
+          command: custom
+          customCommand: 'run build -- --base-href=/admin-ui/'
+          workingDir: src/Frontend/Jp.AdminUI
+
+      - task: ArchiveFiles@2
+        displayName: 'ZIP - AdminUI'
+        inputs:
+          rootFolderOrFile: 'src/Frontend/Jp.AdminUI/dist/'
+          includeRootFolder: false
+          archiveType: 'zip'
+          archiveFile: '$(Build.ArtifactStagingDirectory)/jpproject.admin-ui.$(Build.BuildNumber).zip'
+          replaceExistingArchive: true
+
+      - task: PublishBuildArtifacts@1
+        displayName: 'Artifact - Generate - AdminUI'
+        inputs:
+          PathtoPublish: '$(Build.ArtifactStagingDirectory)/jpproject.admin-ui.$(Build.BuildNumber).zip'
+          ArtifactName: 'jpproject.admin-ui.$(Build.BuildNumber)'
+          publishLocation: 'Container'

build/continuous-delivery/admin-prod.dockerfile

@@ -15,7 +15,7 @@ COPY ["src/Frontend/Jp.AdminUI/", "/app"]
 # rebuild node
 RUN npm rebuild node-sass
 # generate build
-RUN npm run ng build -- --configuration=production
+RUN npm run ng build
 
 ##################
 ### production ###

environment.ts

@@ -1,5 +1,5 @@
 export const environment = {
-    production: false,
+    production: true,
     IssuerUri:  "http://jpproject-sso:5001",
     ResourceServer: "http://localhost:5002/",
     RequireHttps: false,