From f1bd4dddaa85ac910f8408a7b98a30ffa9277251 Mon Sep 17 00:00:00 2001 From: suvarnakale Date: Wed, 18 Oct 2023 18:03:45 +0530 Subject: [PATCH 1/2] #846 - Dashboard changes- done --- .../configurations.component.html | 4 +- .../configurations.component.ts | 15 ++-- src/app/admin/help/help.component.html | 26 +++++++ src/app/admin/help/help.component.ts | 15 ++++ src/app/admin/roles/roles.component.html | 69 +------------------ .../admin/sidemenu/sidemenu.component.html | 29 ++++---- src/app/admin/sidemenu/sidemenu.component.ts | 9 +++ src/app/app.module.ts | 4 +- src/assets/i18n/global/en-global.json | 7 ++ src/assets/i18n/global/hi-global.json | 7 ++ 10 files changed, 99 insertions(+), 86 deletions(-) create mode 100644 src/app/admin/help/help.component.html create mode 100644 src/app/admin/help/help.component.ts diff --git a/src/app/admin/configurations/configurations.component.html b/src/app/admin/configurations/configurations.component.html index 0ad0806..29058ea 100644 --- a/src/app/admin/configurations/configurations.component.html +++ b/src/app/admin/configurations/configurations.component.html @@ -59,7 +59,7 @@

{{'SCHEMA' | translate}}

{{'VERIFIABLE_CREDENTIAL' | translate}}

-
@@ -75,7 +75,7 @@

{{'SCHEMA' | translate}}

{{ item?.name }}

- + {{certName.key}} diff --git a/src/app/admin/configurations/configurations.component.ts b/src/app/admin/configurations/configurations.component.ts index 62e5318..74931e4 100644 --- a/src/app/admin/configurations/configurations.component.ts +++ b/src/app/admin/configurations/configurations.component.ts @@ -41,14 +41,14 @@ export class ConfigurationsComponent implements OnInit { }) } - addVC() { + addVC(schemaName) { if (this.res.length === 1) { const temp = JSON.parse(this.res[0]['schema']); if (temp.hasOwnProperty('isRefSchema')) { alert('Only Common Schema exists, please add other schema!'); } else { this.entityKey = temp.title; - this.navigateToCreateVC(); + this.navigateToCreateVC(schemaName); } } else { for (let i = 0; i < this.res.length; i++) { @@ -58,11 +58,11 @@ export class ConfigurationsComponent implements OnInit { break; } } - this.navigateToCreateVC(); + this.navigateToCreateVC(schemaName); } } - navigateToCreateVC() { + navigateToCreateVC(schemaName) { Object.keys(this.allUsecases).forEach((key) => { if (key === this.usecase) { this.allUsecases[key]['steps']?.forEach((step, i) => { @@ -72,7 +72,14 @@ export class ConfigurationsComponent implements OnInit { }); } }); + if(schemaName == ''){ this.router.navigateByUrl('/create/' + this.currentTab + '/' + this.usecase + '/' + this.entityKey); + } + if(schemaName !== ''){ + this.entityKey = schemaName; + this.router.navigateByUrl('/create/' + this.currentTab + '/' + this.usecase + '/' + this.entityKey); + } + } viewOrEditSchema(status: string, schemaName : string) { diff --git a/src/app/admin/help/help.component.html b/src/app/admin/help/help.component.html new file mode 100644 index 0000000..63c51c8 --- /dev/null +++ b/src/app/admin/help/help.component.html @@ -0,0 +1,26 @@ + +
+
+
+
+

{{'NEED_HELP' | translate}}

+
+
+ +
+
+

{{'GET_HELP' | translate}}

+
+ {{'OFFICIAL_DOCUMENTATION' | translate}} +

{{ 'SBRC_OFFICIAL_DOC' | translate}}

+ {{ 'EXPLORE_OFFICIAL_DOC' | translate}} +
+
+ {{ 'COMMUNITY_DISCUSSION' | translate}} +

{{ 'SBRC_GITHUB_COMMUNITY' | translate}}

+ {{ 'EXPLORE_GITHUB_COMMUNITY' | translate}} +
+
+
+
+
diff --git a/src/app/admin/help/help.component.ts b/src/app/admin/help/help.component.ts new file mode 100644 index 0000000..4c99656 --- /dev/null +++ b/src/app/admin/help/help.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; +import { TranslateService } from '@ngx-translate/core'; + +@Component({ + selector: 'app-help', + templateUrl: './help.component.html' +}) +export class HelpComponent implements OnInit { + + constructor(public translate: TranslateService) { } + + ngOnInit(): void { + } + +} diff --git a/src/app/admin/roles/roles.component.html b/src/app/admin/roles/roles.component.html index 5e4e90b..828c3d8 100644 --- a/src/app/admin/roles/roles.component.html +++ b/src/app/admin/roles/roles.component.html @@ -1,77 +1,12 @@ -
- -
-
+

Roles

-
diff --git a/src/app/admin/sidemenu/sidemenu.component.html b/src/app/admin/sidemenu/sidemenu.component.html index 0ebc560..ab00308 100644 --- a/src/app/admin/sidemenu/sidemenu.component.html +++ b/src/app/admin/sidemenu/sidemenu.component.html @@ -6,8 +6,8 @@ -
  • - {{'DASHBOARD' | translate}} +
  • + {{'DASHBOARD' | translate}}
  • {{'SCHEMA' | translate}} @@ -24,18 +24,17 @@ {{'OWNERSHIP' | translate}}
  • - {{'ROLES' | translate}} -
    • -
  • - {{'THEME' | translate}} + {{'ROLES' | translate}}
    • -
  • - {{'HELP' | translate}} + {{'HELP' | translate}}
    • -
  • + + @@ -48,8 +47,14 @@
    -
    - +
    + +
    +
    + +
    +
    +