diff --git a/src/main/webapp/app/config/app-properties.ts b/src/main/webapp/app/config/app-properties.ts index 403d7a5..9996df9 100644 --- a/src/main/webapp/app/config/app-properties.ts +++ b/src/main/webapp/app/config/app-properties.ts @@ -1,4 +1,5 @@ export class appProperties { - public static BASEURL_API = "http://localhost:8080/api/"; + public static BASEURL_API = "http://localhost:8081/api/"; + //public static BASEURL_API = "http://localhost:8080/api/"; } \ No newline at end of file diff --git a/src/main/webapp/app/rsc-tree/rsc-tree.component.html b/src/main/webapp/app/rsc-tree/rsc-tree.component.html index 0aa7b37..55cf6e5 100644 --- a/src/main/webapp/app/rsc-tree/rsc-tree.component.html +++ b/src/main/webapp/app/rsc-tree/rsc-tree.component.html @@ -1,19 +1,19 @@ - - -
+
-
diff --git a/src/main/webapp/app/rsc-tree/rsc-tree.component.scss b/src/main/webapp/app/rsc-tree/rsc-tree.component.scss index 207b819..01e0b4b 100644 --- a/src/main/webapp/app/rsc-tree/rsc-tree.component.scss +++ b/src/main/webapp/app/rsc-tree/rsc-tree.component.scss @@ -1,12 +1,3 @@ -@import url('https://fonts.googleapis.com/css?family=Roboto:400,700|Material+Icons'); -@import '~@angular/material/theming'; - - -#tree-title { - text-align: left; - color: teal; - padding-bottom: 3%; -} .example-tree-invisible { display: none; @@ -19,6 +10,15 @@ list-style-type: none; } +.example-tree .mat-tree-node { + width: 300px; +} + + +.example-tree .mat-tree-node :hover { + background-color: bisque; +} + /* * This padding sets alignment of the nested nodes. */ @@ -26,6 +26,7 @@ padding-left: 25px; } + /* * Padding for leaf nodes. * Leaf nodes need to have padding so as to align with other non-leaf nodes @@ -34,3 +35,14 @@ .example-tree div[role='group'] > .mat-tree-node { padding-left: 25px; } + +/* +.active{ + background-color: bisque; +} +*/ +/* +.not-active{ + background-color: transparent; +} +*/ \ No newline at end of file diff --git a/src/main/webapp/app/rsc-tree/rsc-tree.component.ts b/src/main/webapp/app/rsc-tree/rsc-tree.component.ts index 4698193..514b5bd 100644 --- a/src/main/webapp/app/rsc-tree/rsc-tree.component.ts +++ b/src/main/webapp/app/rsc-tree/rsc-tree.component.ts @@ -16,8 +16,7 @@ import { IResource } from 'app/services/i-resource'; export class RscTreeComponent implements OnInit{ nestedTreeControl = new NestedTreeControl(node => node.children); nestedDataSource = new MatTreeNestedDataSource(); - - activeNode:any; + statusClass = 'not-active'; @Output() public resourceTypeEm = new EventEmitter(); @@ -43,9 +42,12 @@ hasNestedChild(_: number, node: IResource): boolean { //TODO: InformationSystemResourceClient shoud pass a code, not a name! onClickNodeTree(node:IResource):void{ + //this.setActiveClass(); this.resourceTypeEm.emit(node.name); - } + setActiveClass():void{ + this.statusClass = 'active'; + } } diff --git a/src/main/webapp/app/table-screen-es/table-screen-es.component.html b/src/main/webapp/app/table-screen-es/table-screen-es.component.html index 65f38f8..0c340f9 100644 --- a/src/main/webapp/app/table-screen-es/table-screen-es.component.html +++ b/src/main/webapp/app/table-screen-es/table-screen-es.component.html @@ -28,6 +28,7 @@ {{ item.lastMod }} + Endpoint diff --git a/src/main/webapp/app/table-screen-es/table-screen-es.component.ts b/src/main/webapp/app/table-screen-es/table-screen-es.component.ts index 28ef3bc..2ab9289 100644 --- a/src/main/webapp/app/table-screen-es/table-screen-es.component.ts +++ b/src/main/webapp/app/table-screen-es/table-screen-es.component.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/explicit-function-return-type */ /* eslint-disable no-console */ import { Component, @@ -31,7 +32,8 @@ import { ResourcesImplService } from 'app/services/resources-impl.service'; export class TableScreenEsComponent implements OnInit, AfterViewInit, OnChanges { //NB 'actions' CI DEVE ESSERE, altrimenti la tabella non viene visualizzata - displayedColumns: string[] = ['name', 'id', 'status', 'lastMod', 'artifact', 'group', 'version', 'endpoint','actions']; + //displayedColumns: string[] = ['name', 'id', 'status', 'lastMod', 'artifact', 'group', 'version', 'endpoint','actions']; + displayedColumns: string[] = ['name', 'id', 'status', 'lastMod', 'endpoint','actions']; dataFromService: IEService[]; dataSource = new MatTableDataSource(); tableDetail: IEService; @@ -96,10 +98,20 @@ export class TableScreenEsComponent implements OnInit, AfterViewInit, OnChanges applyFilter(event: Event): void { const filterValue = (event.target as HTMLInputElement).value; + console.debug("++++++DATASOURCE:"); + console.debug(this.dataSource); this.dataSource.filter = filterValue.trim().toLowerCase(); } - - + /* + filterTable(): void { + this.dataSource.filterPredicate = (data: IEService, filter: string): boolean => { + return ( + data.name.toLocaleLowerCase().includes(filter) + ) + } + } + */ + // per tabbed pane (versione con aggiunta dinamica) removeTab(index: number): void { diff --git a/src/main/webapp/content/images/logo-jhipster.png b/src/main/webapp/content/images/logo-jhipster.png index f66319a..559e684 100644 Binary files a/src/main/webapp/content/images/logo-jhipster.png and b/src/main/webapp/content/images/logo-jhipster.png differ diff --git a/src/main/webapp/favicon.ico b/src/main/webapp/favicon.ico index 4179874..0404a7d 100644 Binary files a/src/main/webapp/favicon.ico and b/src/main/webapp/favicon.ico differ