generated from nhcarrigan/template
feat: multiple improvements to library functionality (#50)
## Summary This PR implements several improvements to the library application: - Added start and finish date tracking for media items - Added "Retired" category for abandoned media - Implemented avatar-based user menu with dropdown navigation - Added automatic background token refresh to prevent session expiry - Created centralised logging system with frontend-to-API log forwarding - Added toast notifications for error handling ## Changes ### Media Tracking (#41) - Added `dateStarted` and `dateFinished` fields to Books, Games, Manga, Music, and Shows - Updated TypeScript types, Prisma schema, and API services - Added manual date input fields to frontend forms - Properly converts HTML date strings to Date objects before API submission ### Retired Category (#43) - Added `RETIRED` status to all media type enums - Updated Prisma schema, frontend dropdowns, and filter buttons - Added status label handling for retired items ### User Menu (#46) - Replaced username text with avatar image in header - Created dropdown menu with navigation items (Users, Audit, Suggestions) - Added logout button to menu - Implemented keyboard accessibility (tabindex, role, keyup handlers) ### Token Refresh (#44) - Implemented automatic token refresh every 13 minutes in background - Added proactive refresh to prevent token expiry during form filling - Prevents users from losing form data due to expired sessions ### Centralised Logging (#1) - Created `/log` endpoint on API to receive frontend logs - Replaced API console.log calls with @nhcarrigan/logger - Created ConsoleLoggerService to intercept all console methods on frontend - Added global error handlers (window.error, unhandledrejection) on frontend - Added process error handlers (uncaughtException, unhandledRejection, SIGTERM, SIGINT) on API - All frontend console activity now forwarded to centralised logging ### Error Handling - Created ToastService and ToastComponent for displaying errors - Integrated with GlobalErrorHandler and HTTP interceptor - Added accessibility features (keyboard navigation, ARIA attributes) - Set toast opacity to 40% for optimal readability ### Testing & Build - Fixed pre-existing test failure for GET / route (now returns version info) - Added ESM module mocking (jsdom, marked, dompurify, @nhcarrigan/logger) - Configured Jest with isolatedModules to handle TypeScript errors - Excluded test-setup.ts from production build - All tests passing (123 total) - Build passing with no errors ## Test Plan - [x] All tests pass (123 tests) - [x] Build passes without errors - [x] Lint passes (only pre-existing warnings) - [x] Date fields work correctly on all media types - [x] Retired status displays and filters properly - [x] Avatar menu opens/closes correctly with keyboard and mouse - [x] Token refresh prevents session expiry - [x] Toast notifications appear for errors - [x] Frontend logs forward to API successfully - [x] Root route returns version information Closes #41 Closes #43 Closes #44 Closes #46 Closes #1 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: Hikari <hikari@nhcarrigan.com> Reviewed-on: #50 Co-authored-by: Naomi Carrigan <commits@nhcarrigan.com> Co-committed-by: Naomi Carrigan <commits@nhcarrigan.com>
This commit was merged in pull request #50.
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
* @author Naomi Carrigan
|
||||
*/
|
||||
|
||||
import { Injectable } from '@angular/core';
|
||||
import { Injectable, inject } from '@angular/core';
|
||||
import { Observable } from 'rxjs';
|
||||
import { ApiService } from './api.service';
|
||||
import { Art, CreateArtDto, UpdateArtDto } from '@library/shared-types';
|
||||
@@ -13,7 +13,8 @@ import { Art, CreateArtDto, UpdateArtDto } from '@library/shared-types';
|
||||
providedIn: 'root'
|
||||
})
|
||||
export class ArtService {
|
||||
constructor(private api: ApiService) {}
|
||||
private api = inject(ApiService);
|
||||
|
||||
|
||||
getAllArt(): Observable<Art[]> {
|
||||
return this.api.get<Art[]>('/art');
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* @author Naomi Carrigan
|
||||
*/
|
||||
|
||||
import { Injectable, signal } from '@angular/core';
|
||||
import { Injectable, signal, inject } from '@angular/core';
|
||||
import { Router } from '@angular/router';
|
||||
import { Observable, tap, catchError, switchMap, throwError, of } from 'rxjs';
|
||||
import { ApiService } from './api.service';
|
||||
@@ -16,15 +16,14 @@ import { HttpClient } from '@angular/common/http';
|
||||
providedIn: 'root'
|
||||
})
|
||||
export class AuthService {
|
||||
private api = inject(ApiService);
|
||||
private router = inject(Router);
|
||||
private http = inject(HttpClient);
|
||||
|
||||
private currentUser = signal<User | null>(null);
|
||||
public readonly user = this.currentUser.asReadonly();
|
||||
private refreshing = false;
|
||||
|
||||
constructor(
|
||||
private api: ApiService,
|
||||
private router: Router,
|
||||
private http: HttpClient
|
||||
) {}
|
||||
private refreshInterval?: ReturnType<typeof setInterval>;
|
||||
|
||||
login(): void {
|
||||
// Redirect to API login endpoint
|
||||
@@ -35,6 +34,7 @@ export class AuthService {
|
||||
return this.api.get<AuthResponse>('/auth/me').pipe(
|
||||
tap(response => {
|
||||
this.currentUser.set(response.user);
|
||||
this.startRefreshTimer();
|
||||
}),
|
||||
catchError(error => {
|
||||
if (error.status === 401) {
|
||||
@@ -42,9 +42,11 @@ export class AuthService {
|
||||
switchMap(() => this.api.get<AuthResponse>('/auth/me')),
|
||||
tap(response => {
|
||||
this.currentUser.set(response.user);
|
||||
this.startRefreshTimer();
|
||||
}),
|
||||
catchError(() => {
|
||||
this.currentUser.set(null);
|
||||
this.stopRefreshTimer();
|
||||
return throwError(() => error);
|
||||
})
|
||||
);
|
||||
@@ -68,20 +70,45 @@ export class AuthService {
|
||||
tap(response => {
|
||||
this.currentUser.set(response.user);
|
||||
this.refreshing = false;
|
||||
this.startRefreshTimer();
|
||||
}),
|
||||
catchError(error => {
|
||||
this.refreshing = false;
|
||||
this.currentUser.set(null);
|
||||
this.stopRefreshTimer();
|
||||
return throwError(() => error);
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
private startRefreshTimer(): void {
|
||||
this.stopRefreshTimer();
|
||||
|
||||
// Refresh token every 13 minutes (before 15-minute expiry)
|
||||
const refreshIntervalMs = 13 * 60 * 1000;
|
||||
this.refreshInterval = setInterval(() => {
|
||||
this.refreshToken().subscribe({
|
||||
error: (err) => {
|
||||
console.error('Background token refresh failed:', err);
|
||||
this.stopRefreshTimer();
|
||||
}
|
||||
});
|
||||
}, refreshIntervalMs);
|
||||
}
|
||||
|
||||
private stopRefreshTimer(): void {
|
||||
if (this.refreshInterval) {
|
||||
clearInterval(this.refreshInterval);
|
||||
this.refreshInterval = undefined;
|
||||
}
|
||||
}
|
||||
|
||||
logout(): Observable<{ message: string }> {
|
||||
return this.api.post<{ message: string }>('/auth/logout', {}).pipe(
|
||||
tap(() => {
|
||||
this.currentUser.set(null);
|
||||
this.api.clearCsrfToken();
|
||||
this.stopRefreshTimer();
|
||||
this.router.navigate(['/']);
|
||||
})
|
||||
);
|
||||
@@ -89,6 +116,7 @@ export class AuthService {
|
||||
|
||||
clearUser(): void {
|
||||
this.currentUser.set(null);
|
||||
this.stopRefreshTimer();
|
||||
}
|
||||
|
||||
isAuthenticated(): boolean {
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* @author Naomi Carrigan
|
||||
*/
|
||||
|
||||
import { Injectable } from '@angular/core';
|
||||
import { Injectable, inject } from '@angular/core';
|
||||
import { Observable } from 'rxjs';
|
||||
import { ApiService } from './api.service';
|
||||
import { Book, CreateBookDto, UpdateBookDto } from '@library/shared-types';
|
||||
@@ -13,7 +13,8 @@ import { Book, CreateBookDto, UpdateBookDto } from '@library/shared-types';
|
||||
providedIn: 'root'
|
||||
})
|
||||
export class BooksService {
|
||||
constructor(private api: ApiService) {}
|
||||
private api = inject(ApiService);
|
||||
|
||||
|
||||
getAllBooks(): Observable<Book[]> {
|
||||
return this.api.get<Book[]>('/books');
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* @author Naomi Carrigan
|
||||
*/
|
||||
|
||||
import { Injectable } from '@angular/core';
|
||||
import { Injectable, inject } from '@angular/core';
|
||||
import { Observable } from 'rxjs';
|
||||
import { ApiService } from './api.service';
|
||||
import { Comment, CreateCommentDto } from '@library/shared-types';
|
||||
@@ -13,7 +13,8 @@ import { Comment, CreateCommentDto } from '@library/shared-types';
|
||||
providedIn: 'root'
|
||||
})
|
||||
export class CommentsService {
|
||||
constructor(private api: ApiService) {}
|
||||
private api = inject(ApiService);
|
||||
|
||||
|
||||
getCommentsForGame(gameId: string): Observable<Comment[]> {
|
||||
return this.api.get<Comment[]>(`/games/${gameId}/comments`);
|
||||
|
||||
@@ -0,0 +1,127 @@
|
||||
/**
|
||||
* @copyright 2026 NHCarrigan
|
||||
* @license Naomi's Public License
|
||||
* @author Naomi Carrigan
|
||||
*/
|
||||
|
||||
import { Injectable, inject } from '@angular/core';
|
||||
import { HttpClient } from '@angular/common/http';
|
||||
import { environment } from '../../environments/environment';
|
||||
|
||||
interface LogPayload {
|
||||
level: 'debug' | 'info' | 'warn' | 'error';
|
||||
message: string;
|
||||
context?: string;
|
||||
error?: {
|
||||
name: string;
|
||||
message: string;
|
||||
stack?: string;
|
||||
};
|
||||
}
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
})
|
||||
export class ConsoleLoggerService {
|
||||
private http = inject(HttpClient);
|
||||
private originalConsole = {
|
||||
log: console.log.bind(console),
|
||||
error: console.error.bind(console),
|
||||
warn: console.warn.bind(console),
|
||||
debug: console.debug.bind(console),
|
||||
info: console.info.bind(console)
|
||||
};
|
||||
|
||||
/**
|
||||
* Initialises the console override to pipe logs to the API.
|
||||
*/
|
||||
initialise(): void {
|
||||
console.log = (...args: unknown[]) => {
|
||||
this.originalConsole.log(...args);
|
||||
this.sendLog('info', this.formatArgs(args));
|
||||
};
|
||||
|
||||
console.info = (...args: unknown[]) => {
|
||||
this.originalConsole.info(...args);
|
||||
this.sendLog('info', this.formatArgs(args));
|
||||
};
|
||||
|
||||
console.debug = (...args: unknown[]) => {
|
||||
this.originalConsole.debug(...args);
|
||||
this.sendLog('debug', this.formatArgs(args));
|
||||
};
|
||||
|
||||
console.warn = (...args: unknown[]) => {
|
||||
this.originalConsole.warn(...args);
|
||||
this.sendLog('warn', this.formatArgs(args));
|
||||
};
|
||||
|
||||
console.error = (...args: unknown[]) => {
|
||||
this.originalConsole.error(...args);
|
||||
|
||||
// Check if the first argument is an Error object
|
||||
if (args[0] instanceof Error) {
|
||||
const error = args[0];
|
||||
this.sendLog('error', error.message, 'Console', {
|
||||
name: error.name,
|
||||
message: error.message,
|
||||
stack: error.stack
|
||||
});
|
||||
} else {
|
||||
this.sendLog('error', this.formatArgs(args));
|
||||
}
|
||||
};
|
||||
|
||||
// Global error handlers
|
||||
window.addEventListener('error', (event: ErrorEvent) => {
|
||||
this.originalConsole.error('Uncaught Error:', event.error);
|
||||
this.sendLog('error', event.message, 'Window Error', {
|
||||
name: event.error?.name || 'Error',
|
||||
message: event.message,
|
||||
stack: event.error?.stack
|
||||
});
|
||||
});
|
||||
|
||||
window.addEventListener('unhandledrejection', (event: PromiseRejectionEvent) => {
|
||||
this.originalConsole.error('Unhandled Promise Rejection:', event.reason);
|
||||
|
||||
const error = event.reason instanceof Error ? event.reason : new Error(String(event.reason));
|
||||
this.sendLog('error', error.message, 'Unhandled Rejection', {
|
||||
name: error.name,
|
||||
message: error.message,
|
||||
stack: error.stack
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
private formatArgs(args: unknown[]): string {
|
||||
return args.map(arg => {
|
||||
if (typeof arg === 'string') {
|
||||
return arg;
|
||||
}
|
||||
if (arg instanceof Error) {
|
||||
return `${arg.name}: ${arg.message}`;
|
||||
}
|
||||
try {
|
||||
return JSON.stringify(arg);
|
||||
} catch {
|
||||
return String(arg);
|
||||
}
|
||||
}).join(' ');
|
||||
}
|
||||
|
||||
private sendLog(level: LogPayload['level'], message: string, context?: string, error?: LogPayload['error']): void {
|
||||
const payload: LogPayload = {
|
||||
level,
|
||||
message,
|
||||
context,
|
||||
error
|
||||
};
|
||||
|
||||
this.http.post(`${environment.apiUrl}/log`, payload).subscribe({
|
||||
error: (err) => {
|
||||
this.originalConsole.error('Failed to send log to API:', err);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -4,7 +4,7 @@
|
||||
* @author Naomi Carrigan
|
||||
*/
|
||||
|
||||
import { Injectable } from '@angular/core';
|
||||
import { Injectable, inject } from '@angular/core';
|
||||
import { Observable } from 'rxjs';
|
||||
import { ApiService } from './api.service';
|
||||
import { Game, CreateGameDto, UpdateGameDto } from '@library/shared-types';
|
||||
@@ -13,7 +13,8 @@ import { Game, CreateGameDto, UpdateGameDto } from '@library/shared-types';
|
||||
providedIn: 'root'
|
||||
})
|
||||
export class GamesService {
|
||||
constructor(private api: ApiService) {}
|
||||
private api = inject(ApiService);
|
||||
|
||||
|
||||
getAllGames(): Observable<Game[]> {
|
||||
return this.api.get<Game[]>('/games');
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
/**
|
||||
* @copyright 2026 NHCarrigan
|
||||
* @license Naomi's Public License
|
||||
* @author Naomi Carrigan
|
||||
*/
|
||||
|
||||
import { ErrorHandler, Injectable, inject } from '@angular/core';
|
||||
import { ToastService } from './toast.service';
|
||||
|
||||
@Injectable()
|
||||
export class GlobalErrorHandler implements ErrorHandler {
|
||||
private toast = inject(ToastService);
|
||||
|
||||
handleError(error: Error): void {
|
||||
console.error('Global error caught:', error);
|
||||
|
||||
// Show user-friendly error message
|
||||
const message = this.getUserFriendlyMessage(error);
|
||||
this.toast.error(message);
|
||||
}
|
||||
|
||||
private getUserFriendlyMessage(error: Error): string {
|
||||
// Check for common error types
|
||||
if (error.message.includes('Http failure')) {
|
||||
return 'Network error. Please check your connection.';
|
||||
}
|
||||
|
||||
if (error.message.includes('401') || error.message.includes('403')) {
|
||||
return 'Your session has expired. Please refresh the page.';
|
||||
}
|
||||
|
||||
if (error.message.includes('404')) {
|
||||
return 'Resource not found.';
|
||||
}
|
||||
|
||||
if (error.message.includes('500')) {
|
||||
return 'Server error. Please try again later.';
|
||||
}
|
||||
|
||||
// Generic error message
|
||||
return 'Something went wrong. Please try again.';
|
||||
}
|
||||
}
|
||||
@@ -4,7 +4,7 @@
|
||||
* @author Naomi Carrigan
|
||||
*/
|
||||
|
||||
import { Injectable } from '@angular/core';
|
||||
import { Injectable, inject } from '@angular/core';
|
||||
import { Observable } from 'rxjs';
|
||||
import { ApiService } from './api.service';
|
||||
import { Manga, CreateMangaDto, UpdateMangaDto } from '@library/shared-types';
|
||||
@@ -13,7 +13,8 @@ import { Manga, CreateMangaDto, UpdateMangaDto } from '@library/shared-types';
|
||||
providedIn: 'root'
|
||||
})
|
||||
export class MangaService {
|
||||
constructor(private api: ApiService) {}
|
||||
private api = inject(ApiService);
|
||||
|
||||
|
||||
getAllManga(): Observable<Manga[]> {
|
||||
return this.api.get<Manga[]>('/manga');
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* @author Naomi Carrigan
|
||||
*/
|
||||
|
||||
import { Injectable } from '@angular/core';
|
||||
import { Injectable, inject } from '@angular/core';
|
||||
import { Observable } from 'rxjs';
|
||||
import { ApiService } from './api.service';
|
||||
import { Music, CreateMusicDto, UpdateMusicDto } from '@library/shared-types';
|
||||
@@ -13,7 +13,8 @@ import { Music, CreateMusicDto, UpdateMusicDto } from '@library/shared-types';
|
||||
providedIn: 'root'
|
||||
})
|
||||
export class MusicService {
|
||||
constructor(private api: ApiService) {}
|
||||
private api = inject(ApiService);
|
||||
|
||||
|
||||
getAllMusic(): Observable<Music[]> {
|
||||
return this.api.get<Music[]>('/music');
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* @author Naomi Carrigan
|
||||
*/
|
||||
|
||||
import { Injectable } from '@angular/core';
|
||||
import { Injectable, inject } from '@angular/core';
|
||||
import { Observable } from 'rxjs';
|
||||
import { ApiService } from './api.service';
|
||||
import { Show, CreateShowDto, UpdateShowDto } from '@library/shared-types';
|
||||
@@ -13,7 +13,8 @@ import { Show, CreateShowDto, UpdateShowDto } from '@library/shared-types';
|
||||
providedIn: 'root'
|
||||
})
|
||||
export class ShowsService {
|
||||
constructor(private api: ApiService) {}
|
||||
private api = inject(ApiService);
|
||||
|
||||
|
||||
getAllShows(): Observable<Show[]> {
|
||||
return this.api.get<Show[]>('/shows');
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
/**
|
||||
* @copyright 2026 NHCarrigan
|
||||
* @license Naomi's Public License
|
||||
* @author Naomi Carrigan
|
||||
*/
|
||||
|
||||
import { Injectable, signal } from '@angular/core';
|
||||
|
||||
export interface Toast {
|
||||
id: number;
|
||||
message: string;
|
||||
type: 'error' | 'success' | 'info' | 'warning';
|
||||
duration: number;
|
||||
}
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
})
|
||||
export class ToastService {
|
||||
private toasts = signal<Toast[]>([]);
|
||||
public readonly toastList = this.toasts.asReadonly();
|
||||
private nextId = 0;
|
||||
|
||||
/**
|
||||
* Show an error toast notification.
|
||||
*/
|
||||
error(message: string, duration = 5000): void {
|
||||
this.addToast(message, 'error', duration);
|
||||
}
|
||||
|
||||
/**
|
||||
* Show a success toast notification.
|
||||
*/
|
||||
success(message: string, duration = 3000): void {
|
||||
this.addToast(message, 'success', duration);
|
||||
}
|
||||
|
||||
/**
|
||||
* Show an info toast notification.
|
||||
*/
|
||||
info(message: string, duration = 3000): void {
|
||||
this.addToast(message, 'info', duration);
|
||||
}
|
||||
|
||||
/**
|
||||
* Show a warning toast notification.
|
||||
*/
|
||||
warning(message: string, duration = 4000): void {
|
||||
this.addToast(message, 'warning', duration);
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove a toast by ID.
|
||||
*/
|
||||
remove(id: number): void {
|
||||
this.toasts.update(toasts => toasts.filter(t => t.id !== id));
|
||||
}
|
||||
|
||||
private addToast(message: string, type: Toast['type'], duration: number): void {
|
||||
const id = this.nextId++;
|
||||
const toast: Toast = { id, message, type, duration };
|
||||
|
||||
this.toasts.update(toasts => [...toasts, toast]);
|
||||
|
||||
// Auto-remove after duration
|
||||
setTimeout(() => {
|
||||
this.remove(id);
|
||||
}, duration);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user