arbetsformedlingen/mina-sidor-fa-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature(digi-migrering): Flytta in digi-ng-navigation-breadcrumbs till vårt ui. (TV-867)

Browse Source 
Merge in TEA/mina-sidor-fa-web from feature/TV-867-digi-ng-navigation-breadcrumbs to develop

Squashed commit of the following:

commit bbb1c239a796479d783d664fad3567eb7a7f45c5
Merge: 7418748b dc1523d7
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se>
Date:   Fri Nov 26 09:33:06 2021 +0100

    Merge branch 'develop' into feature/TV-867-digi-ng-navigation-breadcrumbs

commit 7418748b553a7749c734cf36fa849103acd7e61a
Merge: 729f5ec4 d307bd13
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se>
Date:   Wed Nov 24 11:08:20 2021 +0100

    Merge branch 'develop' into feature/TV-867-digi-ng-navigation-breadcrumbs

commit 729f5ec4dde250ddfbf709f554c981f94bc1048e
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se>
Date:   Wed Nov 24 11:08:10 2021 +0100

    Amends from PR

commit d32a5a0554d5d0d274c3a9c97fb6e13d638b48e5
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se>
Date:   Tue Nov 23 16:00:27 2021 +0100

    Amends after PR

commit af988214e2cccbea445b5f2b68454243afc8c645
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se>
Date:   Tue Nov 23 10:48:12 2021 +0100

    Created ui-breadcrumbs and replaced digi-ng´s breadcrumbs with it.
This commit is contained in:
Nikola Holst Nikolic
2021-11-26 09:47:07 +01:00
parent dc1523d725
commit 05575e6ac8
10 changed files with 209 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/mina-sidor-fa/src/app/shared/components/layout/layout.component.html
View File

@@ -7,12 +7,7 @@
<msfa-sidebar class="msfa__sidebar" [userRoles]="roles$ | async"></msfa-sidebar>
<main id="msfa-main-content" class="msfa__content">
<digi-ng-navigation-breadcrumbs
*ngIf="showBreadCrumbs"
class="msfa__breadcrumbs"
[afItems]="breadcrumbsItems"
></digi-ng-navigation-breadcrumbs>
<ui-breadcrumbs *ngIf="showBreadCrumbs" class="msfa__breadcrumbs" [uiItems]="breadcrumbsItems"></ui-breadcrumbs>
<ng-content></ng-content>
</main>

4
apps/mina-sidor-fa/src/app/shared/components/layout/layout.module.ts
View File

@@ -1,9 +1,9 @@
import { DigiNgNavigationBreadcrumbsModule } from '@af/digi-ng/_navigation/navigation-breadcrumbs';
import { CommonModule } from '@angular/common';
import { HttpClient } from '@angular/common/http';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { UiLoaderModule } from '@ui/loader/loader.module';
import { UiBreadcrumbsModule } from '@ui/breadcrumbs/breadcrumbs.module';
import { MarkdownModule } from 'ngx-markdown';
import { FooterModule } from './components/footer/footer.module';
import { NavigationModule } from './components/navigation/navigation.module';
@@ -22,8 +22,8 @@ import { LayoutComponent } from './layout.component';
SidebarModule,
FooterModule,
MarkdownModule.forRoot({ loader: HttpClient }),
DigiNgNavigationBreadcrumbsModule,
UiLoaderModule,
UiBreadcrumbsModule,
],
exports: [LayoutComponent],
})