github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-13 00:32:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sorted out that stupid fucking navigation, that must be a bug in angular !wip

Browse source
This commit is contained in:
tidusjar 2019-01-26 22:32:42 +00:00
parent f44eba5e0c
commit b14ac0074d
3 changed files with 30 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Ombi/ClientApp/src/app/app.component.html
View file

@ -165,7 +165,7 @@
</nav> --> </nav> -->
<app-my-nav [showNav]="showNav" [loggedIn]="user != undefined" [username]="user.name" (logoutClick)="logOut();"></app-my-nav> <app-my-nav [showNav]="showNav" [username]="user.name" (logoutClick)="logOut();"></app-my-nav>
</div> </div>

27
src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html
View file

@ -1,19 +1,23 @@
<mat-sidenav-container *ngIf="isLoggedIn()" class="sidenav-container"> <mat-sidenav-container *ngIf="showNav" class="sidenav-container">
<mat-sidenav #drawer class="sidenav" fixedInViewport="true" [attr.role]="(isHandset$ | async) ? 'dialog' : 'navigation'" <mat-sidenav #drawer class="sidenav" fixedInViewport="true" [attr.role]="(isHandset$ | async) ? 'dialog' : 'navigation'"
[mode]="(isHandset$ | async) ? 'over' : 'side'" [opened]="!(isHandset$ | async)"> [mode]="(isHandset$ | async) ? 'over' : 'side'" [opened]="!(isHandset$ | async)">
<mat-toolbar>Ombi</mat-toolbar> <mat-toolbar>Ombi</mat-toolbar>
<mat-nav-list> <mat-nav-list>
<a mat-list-item routerLink="/discover"> <a mat-list-item routerLink="/discover">
<mat-icon aria-label="Side nav toggle icon">find_replace</mat-icon> <mat-icon aria-label="Side nav toggle icon">find_replace</mat-icon>
Discover</a> Discover
</a>
<a mat-list-item routerLink="/search"> <a mat-list-item routerLink="/search">
<mat-icon aria-label="Side nav toggle icon">search</mat-icon> Search</a> <mat-icon aria-label="Side nav toggle icon">search</mat-icon> Search
</a>
<a mat-list-item routerLink="/requests"> <a mat-list-item routerLink="/requests">
<mat-icon aria-label="Side nav toggle icon">list</mat-icon> Requests</a> <mat-icon aria-label="Side nav toggle icon">list</mat-icon> Requests
</a>
<a mat-list-item routerLink="/Settings/About"> <a mat-list-item routerLink="/Settings/About">
<mat-icon aria-label="Side nav toggle icon">settings</mat-icon> Settings</a> <mat-icon aria-label="Side nav toggle icon">settings</mat-icon> Settings
</a>
<a mat-list-item aria-label="Toggle sidenav" (click)="logOut();" *ngIf="loggedIn"> <a mat-list-item aria-label="Toggle sidenav" (click)="logOut();">
<mat-icon aria-label="Side nav toggle icon">exit_to_app</mat-icon> <mat-icon aria-label="Side nav toggle icon">exit_to_app</mat-icon>
{{ 'NavigationBar.Logout' | translate }} {{ 'NavigationBar.Logout' | translate }}
</a> </a>
@ -37,12 +41,17 @@
<!-- Page --> <!-- Page -->
<div class="container top-spacing"> <div class="container top-spacing">
<router-outlet></router-outlet> <ng-container *ngTemplateOutlet="template"></ng-container>
</div> </div>
</mat-sidenav-content> </mat-sidenav-content>
</mat-sidenav-container> </mat-sidenav-container>
<div *ngIf="!isLoggedIn();"> <div *ngIf="!showNav">
<router-outlet></router-outlet> <ng-container *ngTemplateOutlet="template"></ng-container>
</div> </div>
<ng-template #template>
<router-outlet>
</router-outlet>
</ng-template>

5
src/Ombi/ClientApp/src/app/my-nav/my-nav.component.ts
View file

@ -17,7 +17,6 @@ export class MyNavComponent {
); );
@Input() public showNav: boolean; @Input() public showNav: boolean;
@Input() public loggedIn: boolean;
@Input() public username: string; @Input() public username: string;
@Output() public logoutClick = new EventEmitter(); @Output() public logoutClick = new EventEmitter();
@ -27,8 +26,4 @@ export class MyNavComponent {
public logOut() { public logOut() {
this.logoutClick.emit(); this.logoutClick.emit();
} }
public isLoggedIn(): boolean {
return this.loggedIn;
}
} }