diff --git a/charts/traction/templates/ui/configmap.yaml b/charts/traction/templates/ui/configmap.yaml index 0d4c20537..44b73289d 100644 --- a/charts/traction/templates/ui/configmap.yaml +++ b/charts/traction/templates/ui/configmap.yaml @@ -32,4 +32,7 @@ data: UX_COVERIMAGE_COPYRIGHT: {{ .Values.ui.ux.coverImageCopyright | quote }} UX_OWNER: {{ .Values.ui.ux.owner | quote }} UX_SIDEBAR_TITLE: {{ .Values.ui.ux.sidebarTitle | quote }} + UX_INFO_BANNER_MESSAGE: {{ .Values.ui.ux.infoBanner.message | quote }} + UX_INFO_BANNER_MESSAGE_LEVEL: {{ .Values.ui.ux.infoBanner.messageLevel | quote }} + UX_INFO_BANNER_SHOW_MESSAGE: {{ .Values.ui.ux.infoBanner.showMessage | quote }} {{- end -}} diff --git a/charts/traction/values.yaml b/charts/traction/values.yaml index d2c391787..4c4568f7c 100644 --- a/charts/traction/values.yaml +++ b/charts/traction/values.yaml @@ -147,7 +147,7 @@ acapy: is_production: true is_write: true genesis_url: "http://dev.bcovrin.vonx.io/genesis" - endorser_did: "VGA8QzjQaL5xkXRHjAgQcj" + endorser_did: "N5bxk3jWkpZ2tEaMtjPjPa" endorser_alias: "bcovrin-dev-endorser" ## @section Wallet Storage configuration @@ -612,6 +612,20 @@ ui: ## @param ui.ux.coverImageCopyright coverImageCopyright: "Photo by Kristoffer Fredriksson on StockSnap" + ## Information banner settings + ## + infoBanner: + ## @param ui.ux.infoBanner.message + message: "" + ## @param ui.ux.infoBanner.messageLevel + messageLevel: info + ## @param ui.ux.infoBanner.showMessage Show the info banner + showMessage: false + ## @param ui.ux.infoBanner.environmentName Environment name to be displayed eg. "Development" + environmentName: "" + ## @param ui.ux.infoBanner.showEnvironmentName Show the environment name + showEnvironmentName: false + ariesDetails: ## @param ui.ariesDetails.ledgerDescription Ledger description ledgerDescription: "bcovrin-test" diff --git a/deploy/traction/values-development.yaml b/deploy/traction/values-development.yaml index 49c0b5b81..a541a36a2 100644 --- a/deploy/traction/values-development.yaml +++ b/deploy/traction/values-development.yaml @@ -7,6 +7,25 @@ acapy: generated: true pluginInnkeeper: generated: true + ledgers.yml: + - id: bcovrin-test + is_production: true + is_write: true + genesis_url: "http://test.bcovrin.vonx.io/genesis" + endorser_did: "Ket75eV5UQvVkW2XBjgDH7" + endorser_alias: "bcovrin-test-endorser" + - id: bcovrin-dev + is_production: true + is_write: true + genesis_url: "http://dev.bcovrin.vonx.io/genesis" + endorser_did: "N5bxk3jWkpZ2tEaMtjPjPa" + endorser_alias: "bcovrin-dev-endorser" + - id: sovrin-testnet + is_production: true + is_write: true + genesis_url: "https://raw.githubusercontent.com/sovrin-foundation/sovrin/stable/sovrin/pool_transactions_sandbox_genesis" + endorser_did: "EZpKx6nT56Hv83JmNz7ik8" + endorser_alias: "sovrin-testnet-endorser" plugin-config.yml: traction_innkeeper: innkeeper_wallet: @@ -17,9 +36,12 @@ acapy: ledger_id: bcovrin-test - endorser_alias: bcovrin-dev-endorser ledger_id: bcovrin-dev + - endorser_alias: sovrin-testnet-endorser + ledger_id: sovrin-testnet create_public_did: - bcovrin-test - bcovrin-dev + - sovrin-testnet reservation: expiry_minutes: 7200 walletStorageConfig: diff --git a/deploy/traction/values-pr.yaml b/deploy/traction/values-pr.yaml index acb8ca2d8..635bf28f7 100644 --- a/deploy/traction/values-pr.yaml +++ b/deploy/traction/values-pr.yaml @@ -12,6 +12,25 @@ acapy: tenantid: "innkeeper" argfile.yml: wallet-name: default + ledgers.yml: + - id: bcovrin-test + is_production: true + is_write: true + genesis_url: "http://test.bcovrin.vonx.io/genesis" + endorser_did: "Ket75eV5UQvVkW2XBjgDH7" + endorser_alias: "bcovrin-test-endorser" + - id: bcovrin-dev + is_production: true + is_write: true + genesis_url: "http://dev.bcovrin.vonx.io/genesis" + endorser_did: "N5bxk3jWkpZ2tEaMtjPjPa" + endorser_alias: "bcovrin-dev-endorser" + - id: sovrin-testnet + is_production: true + is_write: true + genesis_url: "https://raw.githubusercontent.com/sovrin-foundation/sovrin/stable/sovrin/pool_transactions_sandbox_genesis" + endorser_did: "EZpKx6nT56Hv83JmNz7ik8" + endorser_alias: "sovrin-testnet-endorser" plugin-config.yml: traction_innkeeper: innkeeper_wallet: @@ -22,12 +41,15 @@ acapy: ledger_id: bcovrin-test - endorser_alias: bcovrin-dev-endorser ledger_id: bcovrin-dev + - endorser_alias: sovrin-testnet-endorser + ledger_id: sovrin-testnet create_public_did: - bcovrin-test - bcovrin-dev + - sovrin-testnet reservation: expiry_minutes: 2880 - auto_approve: true + auto_approve: false auto_issuer: true resources: limits: diff --git a/services/tenant-ui/config/custom-environment-variables.json b/services/tenant-ui/config/custom-environment-variables.json index 4ce89a9b7..ead467c14 100644 --- a/services/tenant-ui/config/custom-environment-variables.json +++ b/services/tenant-ui/config/custom-environment-variables.json @@ -29,6 +29,11 @@ "linkTitle": "UX_ABOUT_LINK_TITLE", "linkText": "UX_ABOUT_LINK_TEXT", "imageUrl": "UX_ABOUT_IMAGE_URL" + }, + "infoBanner": { + "message": "UX_INFO_BANNER_MESSAGE", + "messageLevel": "UX_INFO_BANNER_MESSAGE_LEVEL", + "showMessage": "UX_INFO_BANNER_SHOW_MESSAGE" } }, "ariesDetails": { diff --git a/services/tenant-ui/config/default.json b/services/tenant-ui/config/default.json index 9392518da..fcc2230ec 100644 --- a/services/tenant-ui/config/default.json +++ b/services/tenant-ui/config/default.json @@ -31,6 +31,13 @@ "linkTitle": "BC Digital Trust Service Agreement", "link": "https://github.com/bcgov/bc-vcpedia/blob/main/agents/bc-gov-agent-service.md", "imageUrl": "/img/bc/bc_logo.png" + }, + "infoBanner": { + "message": "", + "messageLevel": "info", + "showMessage": false, + "environmentName": "", + "showEnvironmentName": false } }, "ariesDetails": { diff --git a/services/tenant-ui/frontend/src/assets/layout.scss b/services/tenant-ui/frontend/src/assets/layout.scss index c1832abac..6a3274a53 100644 --- a/services/tenant-ui/frontend/src/assets/layout.scss +++ b/services/tenant-ui/frontend/src/assets/layout.scss @@ -7,14 +7,16 @@ body { } // The app layout -.layout-container { +.alert-container { display: flex; - flex-direction: row; - align-items: flex-start; + flex-direction: column; min-height: 100vh; +} +.layout-container { + flex-grow: 1; + display: flex; width: 100%; .layout-sidebar { - align-self: stretch; background-color: $tenant-ui-primary-color; color: $tenant-ui-text-on-primary; min-width: 20em; @@ -27,13 +29,11 @@ body { .layout-page { width: 100%; - min-height: 100vh; display: flex; flex-direction: column; } .layout-header { - flex: 0; background-color: white; } diff --git a/services/tenant-ui/frontend/src/components/Login.vue b/services/tenant-ui/frontend/src/components/Login.vue index 02ecb6e7b..e9558c52e 100644 --- a/services/tenant-ui/frontend/src/components/Login.vue +++ b/services/tenant-ui/frontend/src/components/Login.vue @@ -1,5 +1,6 @@