no message
This commit is contained in:
parent
b7d5dfb198
commit
92ddb33eb8
|
@ -31,7 +31,6 @@
|
||||||
"@types/file-saver": "1.3.0",
|
"@types/file-saver": "1.3.0",
|
||||||
"core-js": "^2.4.1",
|
"core-js": "^2.4.1",
|
||||||
"file-saver": "1.3.3",
|
"file-saver": "1.3.3",
|
||||||
"ngx-breadcrumbs": "0.0.3",
|
|
||||||
"rxjs": "^5.6.0-forward-compat.4",
|
"rxjs": "^5.6.0-forward-compat.4",
|
||||||
"zone.js": "^0.8.19"
|
"zone.js": "^0.8.19"
|
||||||
},
|
},
|
||||||
|
|
|
@ -41,7 +41,6 @@ import { UsersModule } from './users/users.module';
|
||||||
import { HelpContentComponent } from './shared/help-content/help-content.component';
|
import { HelpContentComponent } from './shared/help-content/help-content.component';
|
||||||
import { AuthGuard } from './shared/guards/auth.guard';
|
import { AuthGuard } from './shared/guards/auth.guard';
|
||||||
import { UrlUtilities } from './utilities/UrlUtilities';
|
import { UrlUtilities } from './utilities/UrlUtilities';
|
||||||
import { BreadcrumbComponent } from './shared/components/breadcrumb/breadcrumb.component';
|
|
||||||
import { BreadCrumbResolverService } from './services/breadcrumb/breadcrumb-resolver.service';
|
import { BreadCrumbResolverService } from './services/breadcrumb/breadcrumb-resolver.service';
|
||||||
import { McBreadcrumbsModule } from 'ngx-breadcrumbs';
|
import { McBreadcrumbsModule } from 'ngx-breadcrumbs';
|
||||||
|
|
||||||
|
@ -54,7 +53,6 @@ import { McBreadcrumbsModule } from 'ngx-breadcrumbs';
|
||||||
WelcomepageComponent,
|
WelcomepageComponent,
|
||||||
HelpContentComponent,
|
HelpContentComponent,
|
||||||
B2AccessLoginComponent,
|
B2AccessLoginComponent,
|
||||||
BreadcrumbComponent
|
|
||||||
],
|
],
|
||||||
imports: [
|
imports: [
|
||||||
BrowserModule,
|
BrowserModule,
|
||||||
|
|
|
@ -55,7 +55,6 @@ export class BreadCrumbResolverService {
|
||||||
let parentComponent = item.parentComponentName ? this.findComponent(item.parentComponentName) : null
|
let parentComponent = item.parentComponentName ? this.findComponent(item.parentComponentName) : null
|
||||||
if (parentComponent && parentComponent.hasOwnProperty('breadCrumbs')) {
|
if (parentComponent && parentComponent.hasOwnProperty('breadCrumbs')) {
|
||||||
components = this.pushToStart(components, this.resolveDependentComponents((<IBreadCrumbComponent>parentComponent).breadCrumbs, components))
|
components = this.pushToStart(components, this.resolveDependentComponents((<IBreadCrumbComponent>parentComponent).breadCrumbs, components))
|
||||||
console.log({ componentName: item.parentComponentName, components: components })
|
|
||||||
} else if (item.notFoundResolver) {
|
} else if (item.notFoundResolver) {
|
||||||
components = this.pushToStart(components, item.notFoundResolver)
|
components = this.pushToStart(components, item.notFoundResolver)
|
||||||
//components = this.pushToStart(components, [unresolvedComponentItems])
|
//components = this.pushToStart(components, [unresolvedComponentItems])
|
||||||
|
@ -74,10 +73,10 @@ export class BreadCrumbResolverService {
|
||||||
}
|
}
|
||||||
|
|
||||||
pushToStart(first: any[], second: any[]) {
|
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[]) {
|
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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,16 @@
|
||||||
<ol class="breadcrumb">
|
<mat-card>
|
||||||
<li *ngFor="let breadcrumb of buildBreadCrumb(this.activatedRoute) | async" class="breadcrumb-item">
|
<mat-card-content aria-label="breadcrumb">
|
||||||
<a [routerLink]="[breadcrumb.url]" [queryParams]="breadcrumb.params">
|
<ol class="no-style" fxLayout="row">
|
||||||
|
<div fxFlex="nogrow" *ngFor="let breadcrumb of buildBreadCrumb(this.activatedRoute) | async ; let i = index; let length = count ">
|
||||||
|
<div fxLayout="row" fxLayoutAlign="start center">
|
||||||
|
<li fxFlex>
|
||||||
|
<a fxFlex [routerLink]="[breadcrumb.url]" [queryParams]="breadcrumb.params">
|
||||||
{{ breadcrumb.label }}
|
{{ breadcrumb.label }}
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
<mat-icon fxFlex *ngIf="length > 1 && i != ( length - 1 )">chevron_right</mat-icon>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</ol>
|
</ol>
|
||||||
|
</mat-card-content>
|
||||||
|
</mat-card>
|
||||||
|
|
|
@ -1,16 +1,5 @@
|
||||||
.breadcrumb li {
|
ol.no-style {
|
||||||
display: inline;
|
li {
|
||||||
}
|
list-style-type: none;
|
||||||
|
|
||||||
.breadcrumb li+li:before {
|
|
||||||
content: " > ";
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.breadcrumb {
|
|
||||||
background-color: #8d0000;
|
|
||||||
padding: 20px;
|
|
||||||
a {
|
|
||||||
color: white;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
import { BreadcrumbItem } from "./breadcrumb-item";
|
|
||||||
|
|
||||||
export class BreadCrumbChainItem {
|
|
||||||
public chainedItemId: string;
|
|
||||||
public itemId: string;
|
|
||||||
public items: BreadcrumbItem[]
|
|
||||||
}
|
|
|
@ -22,6 +22,7 @@ import { DataManagementPlanProfileCriteriaComponent } from './components/criteri
|
||||||
import { AutoCompleteComponent } from './components/auto-complete/auto-complete.component';
|
import { AutoCompleteComponent } from './components/auto-complete/auto-complete.component';
|
||||||
import { ExternalItemListingComponent } from './components/external-items/external-item-listing/external-item-listing.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 { ExternalItemComponent } from './components/external-items/external-item/external-item.component';
|
||||||
|
import { BreadcrumbComponent } from './components/breadcrumb/breadcrumb.component';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
|
@ -29,7 +30,6 @@ import { ExternalItemComponent } from './components/external-items/external-item
|
||||||
RouterModule,
|
RouterModule,
|
||||||
MaterialModule,
|
MaterialModule,
|
||||||
FlexLayoutModule,
|
FlexLayoutModule,
|
||||||
|
|
||||||
TranslateModule,
|
TranslateModule,
|
||||||
FormsModule,
|
FormsModule,
|
||||||
ReactiveFormsModule
|
ReactiveFormsModule
|
||||||
|
@ -51,7 +51,9 @@ import { ExternalItemComponent } from './components/external-items/external-item
|
||||||
NgForLimitPipe,
|
NgForLimitPipe,
|
||||||
AutoCompleteComponent,
|
AutoCompleteComponent,
|
||||||
ExternalItemListingComponent,
|
ExternalItemListingComponent,
|
||||||
ExternalItemComponent
|
ExternalItemComponent,
|
||||||
|
BreadcrumbComponent
|
||||||
|
|
||||||
],
|
],
|
||||||
|
|
||||||
exports: [
|
exports: [
|
||||||
|
@ -73,7 +75,8 @@ import { ExternalItemComponent } from './components/external-items/external-item
|
||||||
NgForLimitPipe,
|
NgForLimitPipe,
|
||||||
AutoCompleteComponent,
|
AutoCompleteComponent,
|
||||||
ExternalItemListingComponent,
|
ExternalItemListingComponent,
|
||||||
ExternalItemComponent
|
ExternalItemComponent,
|
||||||
|
BreadcrumbComponent
|
||||||
],
|
],
|
||||||
entryComponents: [
|
entryComponents: [
|
||||||
]
|
]
|
||||||
|
|
|
@ -1,19 +1,15 @@
|
||||||
/* @import "~@angular/material/prebuilt-themes/indigo-pink.css"; */
|
/* @import "~@angular/material/prebuilt-themes/indigo-pink.css"; */
|
||||||
|
|
||||||
@import '~@angular/material/theming';
|
@import '~@angular/material/theming';
|
||||||
@import '~@covalent/core/theming/all-theme';
|
@import '~@covalent/core/theming/all-theme';
|
||||||
|
|
||||||
@include mat-core();
|
@include mat-core();
|
||||||
|
|
||||||
// Define a theme.
|
// Define a theme.
|
||||||
$primary: mat-palette($mat-indigo);
|
$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);
|
$theme: mat-light-theme($primary, $accent);
|
||||||
|
|
||||||
// Include all theme styles for the components.
|
// Include all theme styles for the components.
|
||||||
@include angular-material-theme($theme);
|
@include angular-material-theme($theme);
|
||||||
@include covalent-theme($theme);
|
@include covalent-theme($theme);
|
||||||
|
|
||||||
.snackbar-warning {
|
.snackbar-warning {
|
||||||
background-color: #F39010;
|
background-color: #F39010;
|
||||||
color: #F3EFEF;
|
color: #F3EFEF;
|
||||||
|
|
Loading…
Reference in New Issue