AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UX Pass 5 (#3128)

Browse source 
Co-authored-by: Robbie Davis <robbie@therobbiedavis.com>
This commit is contained in:
Joe Milazzo 2024-08-24 19:23:57 -05:00 • committed by GitHub
parent dbc4f35107
commit c93af3e56f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
126 changed files with 1989 additions and 2877 deletions
Download patch file Download diff file Expand all files Collapse all files

3
UI/Web/src/app/nav/_components/nav-header/nav-header.component.html
View file

@ -5,10 +5,9 @@
<a class="visually-hidden-focusable focus-visible" href="javascript:void(0);" (click)="moveFocus()">{{t('skip-alt')}}</a>
@if (navService.sideNavVisibility$ | async) {
<a class="side-nav-toggle" (click)="hideSideNav()"><i class="fas fa-bars"></i></a>
<a class="side-nav-toggle" (click)="toggleSideNav($event)"><i class="fas fa-bars" aria-hidden="true"></i></a>
}
<a class="navbar-brand dark-exempt" routerLink="/home" routerLinkActive="active">
<app-image width="28px" height="28px" imageUrl="assets/images/logo-32.png" classes="logo" />
<span class="d-none d-md-inline logo"> Kavita</span>

3
UI/Web/src/app/nav/_components/nav-header/nav-header.component.ts
View file

@ -296,7 +296,8 @@ export class NavHeaderComponent implements OnInit {
this.cdRef.markForCheck();
}
hideSideNav() {
toggleSideNav(event: any) {
event.stopPropagation();
this.navService.toggleSideNav();
}

2
UI/Web/src/app/nav/_components/nav-link-modal/nav-link-modal.component.html
View file

@ -7,7 +7,7 @@
</div>
<div class="modal-body">
<div class="mb-3">
<a routerLink="/settings" [fragment]="SettingsTabId.Preferences" [title]="t('settings')">{{t('settings')}}</a>
<a routerLink="/settings" [fragment]="SettingsTabId.Preferences" (click)="closeIfOnSettings()" [title]="t('settings')">{{t('settings')}}</a>
</div>
<div class="mb-3">
<a routerLink="/all-filters/">{{t('all-filters')}}</a>

15
UI/Web/src/app/nav/_components/nav-link-modal/nav-link-modal.component.ts
View file

@ -1,7 +1,7 @@
import {Component, inject, Input} from '@angular/core';
import {WikiLink} from "../../../_models/wiki";
import {NgbActiveModal, NgbDropdownItem} from "@ng-bootstrap/ng-bootstrap";
import {RouterLink} from "@angular/router";
import {ActivatedRoute, Router, RouterLink, UrlSegment} from "@angular/router";
import {FilterPipe} from "../../../_pipes/filter.pipe";
import {ReactiveFormsModule} from "@angular/forms";
import {Select2Module} from "ng-select2-component";
@ -27,8 +27,10 @@ export class NavLinkModalComponent {
@Input({required: true}) logoutFn!: () => void;
private readonly modal = inject(NgbActiveModal);
private readonly router = inject(Router);
protected readonly WikiLink = WikiLink;
protected readonly SettingsTabId = SettingsTabId;
close() {
this.modal.close();
@ -38,5 +40,14 @@ export class NavLinkModalComponent {
this.logoutFn();
}
protected readonly SettingsTabId = SettingsTabId;
closeIfOnSettings() {
setTimeout(() => {
const currentUrl = this.router.url;
if (currentUrl.startsWith('/settings')) {
this.close();
}
}, 10);
}
}