Skip to content

217 - Fixed build error #218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thekevinm merged 1 commit into from
May 9, 2024
Merged

217 - Fixed build error #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions src/app/shared/components/df-side-nav/df-side-nav.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,16 +109,15 @@ <h1 class="page-header">
<a [routerLink]="breadcrumb.path" class="breadcrumb-link"
><ng-component
*ngTemplateOutlet="breadcrumbLabel"></ng-component>
</ng-template>
<ng-template #breadcrumbLabel>
<ng-container *ngIf="breadcrumb.translationKey; else label">
<span>{{ breadcrumb.translationKey | transloco }}</span>
</ng-container>
<ng-template #label>
<span>{{ breadcrumb.label }}</span>
<ng-template #breadcrumbLabel>
<ng-container *ngIf="breadcrumb.translationKey; else label">
<span>{{ breadcrumb.translationKey | transloco }}</span>
</ng-container>
<ng-template #label>
<span>{{ breadcrumb.label }}</span>
</ng-template>
</ng-template>
</ng-template>
<span *ngIf="i !== breadCrumbs.length - 1"> / </span>
<span *ngIf="i !== breadCrumbs.length - 1"> / </span>
</a>
</ng-container>

Expand Down
7 changes: 4 additions & 3 deletions src/app/shared/components/df-side-nav/df-side-nav.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
faMagnifyingGlass,
faUser,
faRefresh,
faPlus,
} from '@fortawesome/free-solid-svg-icons';
import { routes } from 'src/app/routes';
import {
Expand All @@ -37,7 +38,7 @@ import { DfSearchDialogComponent } from '../df-search-dialog/df-search-dialog.co
import { UntilDestroy } from '@ngneat/until-destroy';
import { CommonModule } from '@angular/common';
import { DfSearchService } from '../../services/df-search.service';
import { FormControl, ReactiveFormsModule } from '@angular/forms';
import { FormControl } from '@angular/forms';
import { DfThemeToggleComponent } from '../df-theme-toggle/df-theme-toggle.component';

@UntilDestroy({ checkProperties: true })
Expand Down Expand Up @@ -79,7 +80,6 @@ export class DfSideNavComponent implements OnInit {
faLanguage = faLanguage;
search = new FormControl();
results$ = this.searchService.results$;
recents$ = this.searchService.recents$;
smallScreen$ = this.breakpointService.isSmallScreen;
faPlus = faPlus;
faRefresh = faRefresh;
Expand All @@ -93,7 +93,8 @@ export class DfSideNavComponent implements OnInit {
private licenseCheckService: DfLicenseCheckService,
private dialog: MatDialog,
private transloco: TranslocoService,
private themeService: DfThemeService
private themeService: DfThemeService,
private searchService: DfSearchService
) {}

ngOnInit(): void {
Expand Down