diff --git a/dmp-frontend/package.json b/dmp-frontend/package.json index fef6812eb..8195c4bd9 100644 --- a/dmp-frontend/package.json +++ b/dmp-frontend/package.json @@ -31,7 +31,6 @@ "@types/file-saver": "1.3.0", "core-js": "^2.4.1", "file-saver": "1.3.3", - "ngx-breadcrumbs": "0.0.3", "rxjs": "^5.6.0-forward-compat.4", "zone.js": "^0.8.19" }, diff --git a/dmp-frontend/src/app/app.module.ts b/dmp-frontend/src/app/app.module.ts index f8f974aa3..e038c01f2 100644 --- a/dmp-frontend/src/app/app.module.ts +++ b/dmp-frontend/src/app/app.module.ts @@ -41,7 +41,6 @@ import { UsersModule } from './users/users.module'; import { HelpContentComponent } from './shared/help-content/help-content.component'; import { AuthGuard } from './shared/guards/auth.guard'; import { UrlUtilities } from './utilities/UrlUtilities'; -import { BreadcrumbComponent } from './shared/components/breadcrumb/breadcrumb.component'; import { BreadCrumbResolverService } from './services/breadcrumb/breadcrumb-resolver.service'; import { McBreadcrumbsModule } from 'ngx-breadcrumbs'; @@ -54,7 +53,6 @@ import { McBreadcrumbsModule } from 'ngx-breadcrumbs'; WelcomepageComponent, HelpContentComponent, B2AccessLoginComponent, - BreadcrumbComponent ], imports: [ BrowserModule, diff --git a/dmp-frontend/src/app/services/breadcrumb/breadcrumb-resolver.service.ts b/dmp-frontend/src/app/services/breadcrumb/breadcrumb-resolver.service.ts index a2ed5a33e..2a078adac 100644 --- a/dmp-frontend/src/app/services/breadcrumb/breadcrumb-resolver.service.ts +++ b/dmp-frontend/src/app/services/breadcrumb/breadcrumb-resolver.service.ts @@ -55,7 +55,6 @@ export class BreadCrumbResolverService { let parentComponent = item.parentComponentName ? this.findComponent(item.parentComponentName) : null if (parentComponent && parentComponent.hasOwnProperty('breadCrumbs')) { components = this.pushToStart(components, this.resolveDependentComponents((parentComponent).breadCrumbs, components)) - console.log({ componentName: item.parentComponentName, components: components }) } else if (item.notFoundResolver) { components = this.pushToStart(components, item.notFoundResolver) //components = this.pushToStart(components, [unresolvedComponentItems]) @@ -74,10 +73,10 @@ export class BreadCrumbResolverService { } pushToStart(first: any[], second: any[]) { - return [].concat(second.filter(x => first.map(firstX => firstX.parentComponentName).indexOf(x.parentComponentName) == -1), first); + return [].concat(second.filter(x => first.map(firstX => firstX.label).indexOf(x.label) == -1), first); } pushToEnd(first: any[], second: any[]) { - return [].concat(first, second.filter(x => first.map(firstX => firstX.parentComponentName).indexOf(x.parentComponentName) == -1)); + return [].concat(first, second.filter(x => first.map(firstX => firstX.label).indexOf(x.label) == -1)); } } diff --git a/dmp-frontend/src/app/shared/components/breadcrumb/breadcrumb.component.html b/dmp-frontend/src/app/shared/components/breadcrumb/breadcrumb.component.html index e9b466a5d..21affeb1f 100644 --- a/dmp-frontend/src/app/shared/components/breadcrumb/breadcrumb.component.html +++ b/dmp-frontend/src/app/shared/components/breadcrumb/breadcrumb.component.html @@ -1,7 +1,16 @@ -
    -
  1. - - {{ breadcrumb.label }} - -
    2. -
+ + +
    +
    +
    +
  1. + + {{ breadcrumb.label }} + +
    2. + chevron_right +
    +
    +
+ + diff --git a/dmp-frontend/src/app/shared/components/breadcrumb/breadcrumb.component.scss b/dmp-frontend/src/app/shared/components/breadcrumb/breadcrumb.component.scss index 3b59b7e0f..dfee11f93 100644 --- a/dmp-frontend/src/app/shared/components/breadcrumb/breadcrumb.component.scss +++ b/dmp-frontend/src/app/shared/components/breadcrumb/breadcrumb.component.scss @@ -1,16 +1,5 @@ -.breadcrumb li { - display: inline; -} - -.breadcrumb li+li:before { - content: " > "; - color: white; -} - -.breadcrumb { - background-color: #8d0000; - padding: 20px; - a { - color: white; - } +ol.no-style { + li { + list-style-type: none; + } } diff --git a/dmp-frontend/src/app/shared/components/breadcrumb/definition/breadcrumb-chain-item.ts b/dmp-frontend/src/app/shared/components/breadcrumb/definition/breadcrumb-chain-item.ts deleted file mode 100644 index 399292996..000000000 --- a/dmp-frontend/src/app/shared/components/breadcrumb/definition/breadcrumb-chain-item.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { BreadcrumbItem } from "./breadcrumb-item"; - -export class BreadCrumbChainItem { - public chainedItemId: string; - public itemId: string; - public items: BreadcrumbItem[] -} diff --git a/dmp-frontend/src/app/shared/shared.module.ts b/dmp-frontend/src/app/shared/shared.module.ts index 83eeaa13e..520a5ee10 100644 --- a/dmp-frontend/src/app/shared/shared.module.ts +++ b/dmp-frontend/src/app/shared/shared.module.ts @@ -22,6 +22,7 @@ import { DataManagementPlanProfileCriteriaComponent } from './components/criteri import { AutoCompleteComponent } from './components/auto-complete/auto-complete.component'; import { ExternalItemListingComponent } from './components/external-items/external-item-listing/external-item-listing.component'; import { ExternalItemComponent } from './components/external-items/external-item/external-item.component'; +import { BreadcrumbComponent } from './components/breadcrumb/breadcrumb.component'; @NgModule({ imports: [ @@ -29,7 +30,6 @@ import { ExternalItemComponent } from './components/external-items/external-item RouterModule, MaterialModule, FlexLayoutModule, - TranslateModule, FormsModule, ReactiveFormsModule @@ -51,7 +51,9 @@ import { ExternalItemComponent } from './components/external-items/external-item NgForLimitPipe, AutoCompleteComponent, ExternalItemListingComponent, - ExternalItemComponent + ExternalItemComponent, + BreadcrumbComponent + ], exports: [ @@ -73,7 +75,8 @@ import { ExternalItemComponent } from './components/external-items/external-item NgForLimitPipe, AutoCompleteComponent, ExternalItemListingComponent, - ExternalItemComponent + ExternalItemComponent, + BreadcrumbComponent ], entryComponents: [ ] diff --git a/dmp-frontend/src/styles.scss b/dmp-frontend/src/styles.scss index 401553fbd..2243763c2 100644 --- a/dmp-frontend/src/styles.scss +++ b/dmp-frontend/src/styles.scss @@ -1,30 +1,26 @@ /* @import "~@angular/material/prebuilt-themes/indigo-pink.css"; */ + @import '~@angular/material/theming'; @import '~@covalent/core/theming/all-theme'; - @include mat-core(); - // Define a theme. $primary: mat-palette($mat-indigo); -$accent: mat-palette($mat-pink, A200, A100, A400); - +$accent : mat-palette($mat-pink, A200, A100, A400); $theme: mat-light-theme($primary, $accent); - // Include all theme styles for the components. @include angular-material-theme($theme); @include covalent-theme($theme); - -.snackbar-warning{ - background-color: #F39010; - color: #F3EFEF; +.snackbar-warning { + background-color: #F39010; + color: #F3EFEF; } -.snackbar-success{ - background-color: #109204; - color: #F3EFEF; +.snackbar-success { + background-color: #109204; + color: #F3EFEF; } -.snackbar-error{ - background-color: #CF1407; - color: #111010; -} \ No newline at end of file +.snackbar-error { + background-color: #CF1407; + color: #111010; +}