diff --git a/frontends/dnet-is-application/src/app/app-routing.module.ts b/frontends/dnet-is-application/src/app/app-routing.module.ts index 16f82460..0167562b 100644 --- a/frontends/dnet-is-application/src/app/app-routing.module.ts +++ b/frontends/dnet-is-application/src/app/app-routing.module.ts @@ -3,11 +3,13 @@ import { RouterModule, Routes } from '@angular/router'; import { InfoComponent } from './info/info.component'; import { ProtocolsComponent } from './protocols/protocols.component'; import { WfHistoryComponent } from './wf-history/wf-history.component'; +import { ResourcesComponent } from './resources/resources.component'; const routes: Routes = [ { path:"info" , component:InfoComponent}, { path:"adv_resources/protocol" , component:ProtocolsComponent}, - { path:"wf_history" , component:WfHistoryComponent} + { path:"wf_history" , component:WfHistoryComponent}, + { path:"resources/:type" , component:ResourcesComponent} ]; @NgModule({ diff --git a/frontends/dnet-is-application/src/app/app.component.html b/frontends/dnet-is-application/src/app/app.component.html index 104f1eed..0ce85cdd 100644 --- a/frontends/dnet-is-application/src/app/app.component.html +++ b/frontends/dnet-is-application/src/app/app.component.html @@ -1,5 +1,5 @@ - @@ -12,8 +12,7 @@ type="button" aria-label="Toggle sidenav" mat-icon-button - (click)="drawer.toggle()" - *ngIf="isHandset$ | async"> + (click)="drawer.toggle()"> menu {{title}} diff --git a/frontends/dnet-is-application/src/app/app.module.ts b/frontends/dnet-is-application/src/app/app.module.ts index 29c4a6a1..5b183555 100644 --- a/frontends/dnet-is-application/src/app/app.module.ts +++ b/frontends/dnet-is-application/src/app/app.module.ts @@ -25,7 +25,8 @@ import { MainMenuPanelsComponent } from './main-menu-panels/main-menu-panels.com import { MatExpansionModule } from '@angular/material/expansion'; import { WfDialog, WfHistoryComponent } from './wf-history/wf-history.component'; import { MatDialogModule } from '@angular/material/dialog'; -import {MatSortModule} from '@angular/material/sort' +import {MatSortModule} from '@angular/material/sort'; +import { ResourcesComponent } from './resources/resources.component' @NgModule({ @@ -36,7 +37,8 @@ import {MatSortModule} from '@angular/material/sort' InfoComponent, ProtocolsComponent, WfHistoryComponent, - WfDialog + WfDialog, + ResourcesComponent ], imports: [ BrowserModule, diff --git a/frontends/dnet-is-application/src/app/main-menu-panels/main-menu-panels.component.css b/frontends/dnet-is-application/src/app/main-menu-panels/main-menu-panels.component.css index 024bc9b7..c6d4c582 100644 --- a/frontends/dnet-is-application/src/app/main-menu-panels/main-menu-panels.component.css +++ b/frontends/dnet-is-application/src/app/main-menu-panels/main-menu-panels.component.css @@ -4,14 +4,35 @@ padding-left: 0.4em; padding-right: 0.4em; border-radius: 1em; - font-size: 0.7em; color: #fff; background-color:cornflowerblue; - width: 2em; text-align: center; - float: right; + } .collapse-buttons { text-align: right; } .collapse-buttons button { font-size: 0.6em; } .mat-expansion-panel-spacing { margin: 0; } + +.menu-item { + padding-top: 0.3em; + padding-bottom: 0.3em; + padding-left: 7%; + padding-right: 3%; + font-size: 0.9em; + width: 90%; + color: #696969; + text-decoration: none !important; + display: inline-block; +} + +.menu-item:hover { + color: #999; + background-color: #eaeaea; +} + +.menu-item .badge-label { + font-size: 0.6em; + float: right; + width: 2em; +} \ No newline at end of file diff --git a/frontends/dnet-is-application/src/app/main-menu-panels/main-menu-panels.component.html b/frontends/dnet-is-application/src/app/main-menu-panels/main-menu-panels.component.html index 296d335b..903b5073 100644 --- a/frontends/dnet-is-application/src/app/main-menu-panels/main-menu-panels.component.html +++ b/frontends/dnet-is-application/src/app/main-menu-panels/main-menu-panels.component.html @@ -9,15 +9,15 @@ Home -

...

+
...
Datasources - - Search - +
+ Search +
@@ -25,39 +25,49 @@ Simple Resources - +
- {{r.name}} {{r.count}} + - +
Advanced Resources - + Logs - - Workflow History - +
+ Workflow History +
Info - - Container Info - +
+ Container Info +
- \ No newline at end of file + diff --git a/frontends/dnet-is-application/src/app/main-menu-panels/main-menu-panels.component.ts b/frontends/dnet-is-application/src/app/main-menu-panels/main-menu-panels.component.ts index bf0046b7..cb8a0bc2 100644 --- a/frontends/dnet-is-application/src/app/main-menu-panels/main-menu-panels.component.ts +++ b/frontends/dnet-is-application/src/app/main-menu-panels/main-menu-panels.component.ts @@ -1,8 +1,9 @@ -import {Component, ViewChild} from '@angular/core'; +import {Component, ViewChild, ViewEncapsulation} from '@angular/core'; import { ResourceType } from '../model/controller.model'; import { ISService } from '../is.service'; import {MatAccordion} from '@angular/material/expansion'; + @Component({ selector: 'app-main-menu-panels', templateUrl: './main-menu-panels.component.html', diff --git a/frontends/dnet-is-application/src/app/resources/resources.component.css b/frontends/dnet-is-application/src/app/resources/resources.component.css new file mode 100644 index 00000000..e69de29b diff --git a/frontends/dnet-is-application/src/app/resources/resources.component.html b/frontends/dnet-is-application/src/app/resources/resources.component.html new file mode 100644 index 00000000..f081ce30 --- /dev/null +++ b/frontends/dnet-is-application/src/app/resources/resources.component.html @@ -0,0 +1 @@ +

resources works!

diff --git a/frontends/dnet-is-application/src/app/resources/resources.component.spec.ts b/frontends/dnet-is-application/src/app/resources/resources.component.spec.ts new file mode 100644 index 00000000..636bc3d8 --- /dev/null +++ b/frontends/dnet-is-application/src/app/resources/resources.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ResourcesComponent } from './resources.component'; + +describe('ResourcesComponent', () => { + let component: ResourcesComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ ResourcesComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(ResourcesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontends/dnet-is-application/src/app/resources/resources.component.ts b/frontends/dnet-is-application/src/app/resources/resources.component.ts new file mode 100644 index 00000000..4e313a7e --- /dev/null +++ b/frontends/dnet-is-application/src/app/resources/resources.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-resources', + templateUrl: './resources.component.html', + styleUrls: ['./resources.component.css'] +}) +export class ResourcesComponent { + +} diff --git a/frontends/dnet-is-application/src/styles.css b/frontends/dnet-is-application/src/styles.css index dc1ecaae..4f8289b6 100644 --- a/frontends/dnet-is-application/src/styles.css +++ b/frontends/dnet-is-application/src/styles.css @@ -67,4 +67,8 @@ th, td { .badge-warning { background-color:darkorange; +} + +.badge-info { + background-color: cornflowerblue } \ No newline at end of file