nhcarrigan/library
9
0
Fork 0
generated from nhcarrigan/template
Code Issues Pull Requests 54 Actions Releases 3 Activity

feat: multiple improvements to library functionality #50

Merged
naomi merged 12 commits from feat/tickets into main 2026-02-19 16:52:43 -08:00
Conversation 0 Commits 12 Files Changed 93
+4297 -645
93 changed files with 4297 additions and 645 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/jest.config.cts
+5 -1
View File
@@ -3,8 +3,12 @@ module.exports = {
preset: '../jest.preset.js', preset: '../jest.preset.js',
testEnvironment: 'node', testEnvironment: 'node',
transform: { transform: {
'^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }], '^.+\\.[tj]s$': ['ts-jest', {
tsconfig: '<rootDir>/tsconfig.spec.json',
isolatedModules: true,
}],
}, },
moduleFileExtensions: ['ts', 'js', 'html'], moduleFileExtensions: ['ts', 'js', 'html'],
coverageDirectory: '../coverage/api', coverageDirectory: '../coverage/api',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
}; };
api/prisma/schema.prisma
+14
View File
@@ -24,7 +24,9 @@ model Game {
platform String? platform String?
status GameStatus status GameStatus
dateAdded DateTime @default(now()) dateAdded DateTime @default(now())
dateStarted DateTime?
dateCompleted DateTime? dateCompleted DateTime?
dateFinished DateTime?
rating Int? @db.Int @default(0) rating Int? @db.Int @default(0)
notes String? notes String?
coverImage String? coverImage String?
@@ -39,6 +41,7 @@ enum GameStatus {
PLAYING PLAYING
COMPLETED COMPLETED
BACKLOG BACKLOG
RETIRED
} }
model Book { model Book {
@@ -48,6 +51,7 @@ model Book {
isbn String? isbn String?
status BookStatus status BookStatus
dateAdded DateTime @default(now()) dateAdded DateTime @default(now())
dateStarted DateTime?
dateFinished DateTime? dateFinished DateTime?
rating Int? @db.Int @default(0) rating Int? @db.Int @default(0)
notes String? notes String?
@@ -63,6 +67,7 @@ enum BookStatus {
READING READING
FINISHED FINISHED
TO_READ TO_READ
RETIRED
} }
model Music { model Music {
@@ -72,7 +77,9 @@ model Music {
type MusicType type MusicType
status MusicStatus status MusicStatus
dateAdded DateTime @default(now()) dateAdded DateTime @default(now())
dateStarted DateTime?
dateCompleted DateTime? dateCompleted DateTime?
dateFinished DateTime?
rating Int? @db.Int @default(0) rating Int? @db.Int @default(0)
notes String? notes String?
coverArt String? coverArt String?
@@ -93,6 +100,7 @@ enum MusicStatus {
LISTENING LISTENING
COMPLETED COMPLETED
WANT_TO_LISTEN WANT_TO_LISTEN
RETIRED
} }
model Art { model Art {
@@ -115,7 +123,9 @@ model Show {
type ShowType type ShowType
status ShowStatus status ShowStatus
dateAdded DateTime @default(now()) dateAdded DateTime @default(now())
dateStarted DateTime?
dateCompleted DateTime? dateCompleted DateTime?
dateFinished DateTime?
rating Int? @db.Int @default(0) rating Int? @db.Int @default(0)
notes String? notes String?
coverImage String? coverImage String?
@@ -137,6 +147,7 @@ enum ShowStatus {
WATCHING WATCHING
COMPLETED COMPLETED
WANT_TO_WATCH WANT_TO_WATCH
RETIRED
} }
model Manga { model Manga {
@@ -145,7 +156,9 @@ model Manga {
author String author String
status MangaStatus status MangaStatus
dateAdded DateTime @default(now()) dateAdded DateTime @default(now())
dateStarted DateTime?
dateCompleted DateTime? dateCompleted DateTime?
dateFinished DateTime?
rating Int? @db.Int @default(0) rating Int? @db.Int @default(0)
notes String? notes String?
coverImage String? coverImage String?
@@ -160,6 +173,7 @@ enum MangaStatus {
READING READING
COMPLETED COMPLETED
WANT_TO_READ WANT_TO_READ
RETIRED
} }
model User { model User {
api/src/app/app.spec.ts
+1 -1
View File
@@ -15,6 +15,6 @@ describe('GET /', () => {
url: '/', url: '/',
}); });
expect(response.json()).toEqual({ message: 'Hello API' }); expect(response.json()).toEqual({ version: expect.any(String) });
}); });
}); });
api/src/app/app.ts
+12 -4
View File
@@ -13,8 +13,8 @@ export async function app(fastify: FastifyInstance, opts: AppOptions) {
// Log CSRF validation failures // Log CSRF validation failures
if (error.code === 'FST_CSRF_INVALID_TOKEN' || error.code === 'FST_CSRF_MISSING_SECRET') { if (error.code === 'FST_CSRF_INVALID_TOKEN' || error.code === 'FST_CSRF_MISSING_SECRET') {
await AuditService.log({ await AuditService.log({
action: AuditAction.CSRF_VALIDATION_FAILED, action: AuditAction.csrfValidationFailed,
category: AuditCategory.SECURITY, category: AuditCategory.security,
details: `CSRF validation failed: ${error.message}, URL: ${request.url}`, details: `CSRF validation failed: ${error.message}, URL: ${request.url}`,
success: false, success: false,
}, request).catch(() => { }, request).catch(() => {
@@ -25,8 +25,8 @@ export async function app(fastify: FastifyInstance, opts: AppOptions) {
// Log unauthorized access attempts // Log unauthorized access attempts
if (error.statusCode === 401 || error.statusCode === 403) { if (error.statusCode === 401 || error.statusCode === 403) {
await AuditService.log({ await AuditService.log({
action: AuditAction.UNAUTHORIZED_ACCESS, action: AuditAction.unauthorizedAccess,
category: AuditCategory.SECURITY, category: AuditCategory.security,
details: `Unauthorized access attempt: ${error.message}, URL: ${request.url}`, details: `Unauthorized access attempt: ${error.message}, URL: ${request.url}`,
success: false, success: false,
}, request).catch(() => { }, request).catch(() => {
@@ -57,5 +57,13 @@ export async function app(fastify: FastifyInstance, opts: AppOptions) {
fastify.register(AutoLoad, { fastify.register(AutoLoad, {
dir: path.join(__dirname, 'routes'), dir: path.join(__dirname, 'routes'),
options: { ...opts, prefix: '/api' }, options: { ...opts, prefix: '/api' },
ignorePattern: /root\.ts$/,
});
// Register root route without prefix
fastify.register(AutoLoad, {
dir: path.join(__dirname, 'routes'),
options: { ...opts },
matchFilter: /root\.ts$/,
}); });
} }
api/src/app/plugins/auth.ts
+3 -1
View File
@@ -82,7 +82,9 @@ const authPlugin: FastifyPluginAsync = async (app) => {
try { try {
await request.jwtVerify(); await request.jwtVerify();
} catch (err) { } catch (err) {
throw app.httpErrors.unauthorized("Invalid token"); const error = new Error("Invalid token");
(error as any).statusCode = 401;
throw error;
} }
}); });
}; };
api/src/app/plugins/rate-limit.ts
+2 -2
View File
@@ -17,8 +17,8 @@ const rateLimitPlugin: FastifyPluginAsync = async (app) => {
errorResponseBuilder: (request) => { errorResponseBuilder: (request) => {
// Log rate limit exceeded event // Log rate limit exceeded event
AuditService.log({ AuditService.log({
action: AuditAction.RATE_LIMIT_EXCEEDED, action: AuditAction.rateLimitExceeded,
category: AuditCategory.SECURITY, category: AuditCategory.security,
details: `Rate limit exceeded for URL: ${request.url}`, details: `Rate limit exceeded for URL: ${request.url}`,
success: false, success: false,
}, request).catch(() => { }, request).catch(() => {
api/src/app/routes/art/index.ts
+12 -12
View File
@@ -46,8 +46,8 @@ const artRoutes: FastifyPluginAsync = async (app) => {
async (request) => { async (request) => {
const art = await artService.createArt(request.body); const art = await artService.createArt(request.body);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.ENTRY_CREATE, action: AuditAction.entryCreate,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "art", resourceType: "art",
resourceId: art.id, resourceId: art.id,
details: `Created art: ${art.title}`, details: `Created art: ${art.title}`,
@@ -74,8 +74,8 @@ const artRoutes: FastifyPluginAsync = async (app) => {
const art = await artService.updateArt(id, request.body); const art = await artService.updateArt(id, request.body);
if (art) { if (art) {
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.ENTRY_UPDATE, action: AuditAction.entryUpdate,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "art", resourceType: "art",
resourceId: id, resourceId: id,
details: `Updated art: ${art.title}`, details: `Updated art: ${art.title}`,
@@ -98,8 +98,8 @@ const artRoutes: FastifyPluginAsync = async (app) => {
const { id } = request.params; const { id } = request.params;
await artService.deleteArt(id); await artService.deleteArt(id);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.ENTRY_DELETE, action: AuditAction.entryDelete,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "art", resourceType: "art",
resourceId: id, resourceId: id,
details: `Deleted art with ID: ${id}`, details: `Deleted art with ID: ${id}`,
@@ -133,8 +133,8 @@ const artRoutes: FastifyPluginAsync = async (app) => {
const userId = request.user.id; const userId = request.user.id;
const comment = await commentService.createCommentForArt(id, userId, request.body); const comment = await commentService.createCommentForArt(id, userId, request.body);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.COMMENT_CREATE, action: AuditAction.commentCreate,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "art", resourceType: "art",
resourceId: id, resourceId: id,
details: `Added comment to art`, details: `Added comment to art`,
@@ -169,8 +169,8 @@ const artRoutes: FastifyPluginAsync = async (app) => {
const comment = await commentService.updateComment(commentId, request.body.content); const comment = await commentService.updateComment(commentId, request.body.content);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.COMMENT_UPDATE, action: AuditAction.commentUpdate,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "art", resourceType: "art",
resourceId: id, resourceId: id,
details: `Updated comment ${commentId} on art`, details: `Updated comment ${commentId} on art`,
@@ -205,8 +205,8 @@ const artRoutes: FastifyPluginAsync = async (app) => {
await commentService.deleteComment(commentId); await commentService.deleteComment(commentId);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.COMMENT_DELETE, action: AuditAction.commentDelete,
category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.ADMIN : AuditCategory.CONTENT, category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.admin : AuditCategory.content,
resourceType: "art", resourceType: "art",
resourceId: id, resourceId: id,
details: `Deleted comment ${commentId} from art`, details: `Deleted comment ${commentId} from art`,
api/src/app/routes/auth/index.ts
+6 -6
View File
@@ -85,8 +85,8 @@ const authRoutes: FastifyPluginAsync = async (app) => {
// Log successful login // Log successful login
await AuditService.log({ await AuditService.log({
action: AuditAction.LOGIN, action: AuditAction.login,
category: AuditCategory.AUTH, category: AuditCategory.auth,
userId: user.id, userId: user.id,
details: `User ${user.username} logged in via Discord`, details: `User ${user.username} logged in via Discord`,
success: true, success: true,
@@ -114,8 +114,8 @@ const authRoutes: FastifyPluginAsync = async (app) => {
} catch (error) { } catch (error) {
// Log failed login attempt // Log failed login attempt
await AuditService.log({ await AuditService.log({
action: AuditAction.LOGIN_FAILED, action: AuditAction.loginFailed,
category: AuditCategory.SECURITY, category: AuditCategory.security,
details: error instanceof Error ? error.message : String(error), details: error instanceof Error ? error.message : String(error),
success: false, success: false,
}, request); }, request);
@@ -229,8 +229,8 @@ const authRoutes: FastifyPluginAsync = async (app) => {
const user = request.user as { id?: string; username?: string }; const user = request.user as { id?: string; username?: string };
if (user?.id) { if (user?.id) {
await AuditService.log({ await AuditService.log({
action: AuditAction.LOGOUT, action: AuditAction.logout,
category: AuditCategory.AUTH, category: AuditCategory.auth,
userId: user.id, userId: user.id,
details: `User ${user.username ?? "unknown"} logged out`, details: `User ${user.username ?? "unknown"} logged out`,
success: true, success: true,
api/src/app/routes/books/index.ts
+12 -12
View File
@@ -46,8 +46,8 @@ const booksRoutes: FastifyPluginAsync = async (app) => {
async (request) => { async (request) => {
const book = await bookService.createBook(request.body); const book = await bookService.createBook(request.body);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.ENTRY_CREATE, action: AuditAction.entryCreate,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "book", resourceType: "book",
resourceId: book.id, resourceId: book.id,
details: `Created book: ${book.title}`, details: `Created book: ${book.title}`,
@@ -74,8 +74,8 @@ const booksRoutes: FastifyPluginAsync = async (app) => {
const book = await bookService.updateBook(id, request.body); const book = await bookService.updateBook(id, request.body);
if (book) { if (book) {
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.ENTRY_UPDATE, action: AuditAction.entryUpdate,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "book", resourceType: "book",
resourceId: id, resourceId: id,
details: `Updated book: ${book.title}`, details: `Updated book: ${book.title}`,
@@ -98,8 +98,8 @@ const booksRoutes: FastifyPluginAsync = async (app) => {
const { id } = request.params; const { id } = request.params;
await bookService.deleteBook(id); await bookService.deleteBook(id);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.ENTRY_DELETE, action: AuditAction.entryDelete,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "book", resourceType: "book",
resourceId: id, resourceId: id,
details: `Deleted book with ID: ${id}`, details: `Deleted book with ID: ${id}`,
@@ -133,8 +133,8 @@ const booksRoutes: FastifyPluginAsync = async (app) => {
const userId = request.user.id; const userId = request.user.id;
const comment = await commentService.createCommentForBook(id, userId, request.body); const comment = await commentService.createCommentForBook(id, userId, request.body);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.COMMENT_CREATE, action: AuditAction.commentCreate,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "book", resourceType: "book",
resourceId: id, resourceId: id,
details: `Added comment to book`, details: `Added comment to book`,
@@ -169,8 +169,8 @@ const booksRoutes: FastifyPluginAsync = async (app) => {
const comment = await commentService.updateComment(commentId, request.body.content); const comment = await commentService.updateComment(commentId, request.body.content);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.COMMENT_UPDATE, action: AuditAction.commentUpdate,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "book", resourceType: "book",
resourceId: id, resourceId: id,
details: `Updated comment ${commentId} on book`, details: `Updated comment ${commentId} on book`,
@@ -205,8 +205,8 @@ const booksRoutes: FastifyPluginAsync = async (app) => {
await commentService.deleteComment(commentId); await commentService.deleteComment(commentId);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.COMMENT_DELETE, action: AuditAction.commentDelete,
category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.ADMIN : AuditCategory.CONTENT, category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.admin : AuditCategory.content,
resourceType: "book", resourceType: "book",
resourceId: id, resourceId: id,
details: `Deleted comment ${commentId} from book`, details: `Deleted comment ${commentId} from book`,
api/src/app/routes/games/index.ts
+12 -12
View File
@@ -40,8 +40,8 @@ const gamesRoutes: FastifyPluginAsync = async (app) => {
async (request) => { async (request) => {
const game = await gameService.createGame(request.body); const game = await gameService.createGame(request.body);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.ENTRY_CREATE, action: AuditAction.entryCreate,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "game", resourceType: "game",
resourceId: game.id, resourceId: game.id,
details: `Created game: ${game.title}`, details: `Created game: ${game.title}`,
@@ -66,8 +66,8 @@ const gamesRoutes: FastifyPluginAsync = async (app) => {
const game = await gameService.updateGame(id, request.body); const game = await gameService.updateGame(id, request.body);
if (game) { if (game) {
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.ENTRY_UPDATE, action: AuditAction.entryUpdate,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "game", resourceType: "game",
resourceId: id, resourceId: id,
details: `Updated game: ${game.title}`, details: `Updated game: ${game.title}`,
@@ -88,8 +88,8 @@ const gamesRoutes: FastifyPluginAsync = async (app) => {
const { id } = request.params; const { id } = request.params;
await gameService.deleteGame(id); await gameService.deleteGame(id);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.ENTRY_DELETE, action: AuditAction.entryDelete,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "game", resourceType: "game",
resourceId: id, resourceId: id,
details: `Deleted game with ID: ${id}`, details: `Deleted game with ID: ${id}`,
@@ -119,8 +119,8 @@ const gamesRoutes: FastifyPluginAsync = async (app) => {
const userId = request.user.id; const userId = request.user.id;
const comment = await commentService.createCommentForGame(id, userId, request.body); const comment = await commentService.createCommentForGame(id, userId, request.body);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.COMMENT_CREATE, action: AuditAction.commentCreate,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "game", resourceType: "game",
resourceId: id, resourceId: id,
details: `Added comment to game`, details: `Added comment to game`,
@@ -153,8 +153,8 @@ const gamesRoutes: FastifyPluginAsync = async (app) => {
const comment = await commentService.updateComment(commentId, request.body.content); const comment = await commentService.updateComment(commentId, request.body.content);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.COMMENT_UPDATE, action: AuditAction.commentUpdate,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "game", resourceType: "game",
resourceId: id, resourceId: id,
details: `Updated comment ${commentId} on game`, details: `Updated comment ${commentId} on game`,
@@ -187,8 +187,8 @@ const gamesRoutes: FastifyPluginAsync = async (app) => {
await commentService.deleteComment(commentId); await commentService.deleteComment(commentId);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.COMMENT_DELETE, action: AuditAction.commentDelete,
category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.ADMIN : AuditCategory.CONTENT, category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.admin : AuditCategory.content,
resourceType: "game", resourceType: "game",
resourceId: id, resourceId: id,
details: `Deleted comment ${commentId} from game`, details: `Deleted comment ${commentId} from game`,
api/src/app/routes/log/index.ts
+40
View File
@@ -0,0 +1,40 @@
/**
* @copyright 2026 NHCarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import { FastifyInstance, FastifyRequest } from 'fastify';
import { logger } from '../../utils/logger';
interface LogBody {
level: 'debug' | 'info' | 'warn' | 'error';
message: string;
context?: string;
error?: {
name: string;
message: string;
stack?: string;
};
}
export default async function (fastify: FastifyInstance) {
fastify.post('/log', async function (request: FastifyRequest<{ Body: LogBody }>) {
const { level, message, context, error } = request.body;
if (level === 'error' && error) {
const errorObj = new Error(error.message);
errorObj.name = error.name;
if (error.stack) {
errorObj.stack = error.stack;
}
await logger.error(context || 'Frontend', errorObj);
} else if (level === 'error') {
await logger.log('warn', `[Frontend Error] ${message}`);
} else {
await logger.log(level, `[Frontend] ${message}`);
}
return { success: true };
});
}
api/src/app/routes/manga/index.ts
+12 -12
View File
@@ -37,8 +37,8 @@ const mangaRoutes: FastifyPluginAsync = async (app) => {
async (request) => { async (request) => {
const manga = await mangaService.createManga(request.body); const manga = await mangaService.createManga(request.body);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.ENTRY_CREATE, action: AuditAction.entryCreate,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "manga", resourceType: "manga",
resourceId: manga.id, resourceId: manga.id,
details: `Created manga: ${manga.title}`, details: `Created manga: ${manga.title}`,
@@ -62,8 +62,8 @@ const mangaRoutes: FastifyPluginAsync = async (app) => {
const manga = await mangaService.updateManga(id, request.body); const manga = await mangaService.updateManga(id, request.body);
if (manga) { if (manga) {
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.ENTRY_UPDATE, action: AuditAction.entryUpdate,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "manga", resourceType: "manga",
resourceId: id, resourceId: id,
details: `Updated manga: ${manga.title}`, details: `Updated manga: ${manga.title}`,
@@ -83,8 +83,8 @@ const mangaRoutes: FastifyPluginAsync = async (app) => {
const { id } = request.params; const { id } = request.params;
await mangaService.deleteManga(id); await mangaService.deleteManga(id);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.ENTRY_DELETE, action: AuditAction.entryDelete,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "manga", resourceType: "manga",
resourceId: id, resourceId: id,
details: `Deleted manga with ID: ${id}`, details: `Deleted manga with ID: ${id}`,
@@ -112,8 +112,8 @@ const mangaRoutes: FastifyPluginAsync = async (app) => {
const userId = request.user.id; const userId = request.user.id;
const comment = await commentService.createCommentForManga(id, userId, request.body); const comment = await commentService.createCommentForManga(id, userId, request.body);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.COMMENT_CREATE, action: AuditAction.commentCreate,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "manga", resourceType: "manga",
resourceId: id, resourceId: id,
details: `Added comment to manga`, details: `Added comment to manga`,
@@ -145,8 +145,8 @@ const mangaRoutes: FastifyPluginAsync = async (app) => {
const comment = await commentService.updateComment(commentId, request.body.content); const comment = await commentService.updateComment(commentId, request.body.content);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.COMMENT_UPDATE, action: AuditAction.commentUpdate,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "manga", resourceType: "manga",
resourceId: id, resourceId: id,
details: `Updated comment ${commentId} on manga`, details: `Updated comment ${commentId} on manga`,
@@ -178,8 +178,8 @@ const mangaRoutes: FastifyPluginAsync = async (app) => {
await commentService.deleteComment(commentId); await commentService.deleteComment(commentId);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.COMMENT_DELETE, action: AuditAction.commentDelete,
category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.ADMIN : AuditCategory.CONTENT, category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.admin : AuditCategory.content,
resourceType: "manga", resourceType: "manga",
resourceId: id, resourceId: id,
details: `Deleted comment ${commentId} from manga`, details: `Deleted comment ${commentId} from manga`,
api/src/app/routes/music/index.ts
+12 -12
View File
@@ -46,8 +46,8 @@ const musicRoutes: FastifyPluginAsync = async (app) => {
async (request) => { async (request) => {
const music = await musicService.createMusic(request.body); const music = await musicService.createMusic(request.body);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.ENTRY_CREATE, action: AuditAction.entryCreate,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "music", resourceType: "music",
resourceId: music.id, resourceId: music.id,
details: `Created music: ${music.title}`, details: `Created music: ${music.title}`,
@@ -74,8 +74,8 @@ const musicRoutes: FastifyPluginAsync = async (app) => {
const music = await musicService.updateMusic(id, request.body); const music = await musicService.updateMusic(id, request.body);
if (music) { if (music) {
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.ENTRY_UPDATE, action: AuditAction.entryUpdate,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "music", resourceType: "music",
resourceId: id, resourceId: id,
details: `Updated music: ${music.title}`, details: `Updated music: ${music.title}`,
@@ -98,8 +98,8 @@ const musicRoutes: FastifyPluginAsync = async (app) => {
const { id } = request.params; const { id } = request.params;
await musicService.deleteMusic(id); await musicService.deleteMusic(id);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.ENTRY_DELETE, action: AuditAction.entryDelete,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "music", resourceType: "music",
resourceId: id, resourceId: id,
details: `Deleted music with ID: ${id}`, details: `Deleted music with ID: ${id}`,
@@ -133,8 +133,8 @@ const musicRoutes: FastifyPluginAsync = async (app) => {
const userId = request.user.id; const userId = request.user.id;
const comment = await commentService.createCommentForMusic(id, userId, request.body); const comment = await commentService.createCommentForMusic(id, userId, request.body);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.COMMENT_CREATE, action: AuditAction.commentCreate,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "music", resourceType: "music",
resourceId: id, resourceId: id,
details: `Added comment to music`, details: `Added comment to music`,
@@ -169,8 +169,8 @@ const musicRoutes: FastifyPluginAsync = async (app) => {
const comment = await commentService.updateComment(commentId, request.body.content); const comment = await commentService.updateComment(commentId, request.body.content);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.COMMENT_UPDATE, action: AuditAction.commentUpdate,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "music", resourceType: "music",
resourceId: id, resourceId: id,
details: `Updated comment ${commentId} on music`, details: `Updated comment ${commentId} on music`,
@@ -205,8 +205,8 @@ const musicRoutes: FastifyPluginAsync = async (app) => {
await commentService.deleteComment(commentId); await commentService.deleteComment(commentId);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.COMMENT_DELETE, action: AuditAction.commentDelete,
category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.ADMIN : AuditCategory.CONTENT, category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.admin : AuditCategory.content,
resourceType: "music", resourceType: "music",
resourceId: id, resourceId: id,
details: `Deleted comment ${commentId} from music`, details: `Deleted comment ${commentId} from music`,
api/src/app/routes/root.ts
+24 -1
View File
@@ -1,7 +1,30 @@
import { FastifyInstance } from 'fastify'; import { FastifyInstance } from 'fastify';
import { readFileSync } from 'fs';
import { join } from 'path';
interface PackageJson {
version: string;
}
let cachedVersion: string | null = null;
function getVersion(): string {
if (cachedVersion) {
return cachedVersion;
}
try {
const packageJsonPath = join(process.cwd(), 'package.json');
const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf-8')) as PackageJson;
cachedVersion = packageJson.version;
return cachedVersion;
} catch {
return 'unknown';
}
}
export default async function (fastify: FastifyInstance) { export default async function (fastify: FastifyInstance) {
fastify.get('/', async function () { fastify.get('/', async function () {
return { message: 'Hello API' }; return { version: getVersion() };
}); });
} }
api/src/app/routes/shows/index.ts
+12 -12
View File
@@ -37,8 +37,8 @@ const showsRoutes: FastifyPluginAsync = async (app) => {
async (request) => { async (request) => {
const show = await showService.createShow(request.body); const show = await showService.createShow(request.body);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.ENTRY_CREATE, action: AuditAction.entryCreate,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "show", resourceType: "show",
resourceId: show.id, resourceId: show.id,
details: `Created show: ${show.title}`, details: `Created show: ${show.title}`,
@@ -62,8 +62,8 @@ const showsRoutes: FastifyPluginAsync = async (app) => {
const show = await showService.updateShow(id, request.body); const show = await showService.updateShow(id, request.body);
if (show) { if (show) {
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.ENTRY_UPDATE, action: AuditAction.entryUpdate,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "show", resourceType: "show",
resourceId: id, resourceId: id,
details: `Updated show: ${show.title}`, details: `Updated show: ${show.title}`,
@@ -83,8 +83,8 @@ const showsRoutes: FastifyPluginAsync = async (app) => {
const { id } = request.params; const { id } = request.params;
await showService.deleteShow(id); await showService.deleteShow(id);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.ENTRY_DELETE, action: AuditAction.entryDelete,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "show", resourceType: "show",
resourceId: id, resourceId: id,
details: `Deleted show with ID: ${id}`, details: `Deleted show with ID: ${id}`,
@@ -112,8 +112,8 @@ const showsRoutes: FastifyPluginAsync = async (app) => {
const userId = request.user.id; const userId = request.user.id;
const comment = await commentService.createCommentForShow(id, userId, request.body); const comment = await commentService.createCommentForShow(id, userId, request.body);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.COMMENT_CREATE, action: AuditAction.commentCreate,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "show", resourceType: "show",
resourceId: id, resourceId: id,
details: `Added comment to show`, details: `Added comment to show`,
@@ -145,8 +145,8 @@ const showsRoutes: FastifyPluginAsync = async (app) => {
const comment = await commentService.updateComment(commentId, request.body.content); const comment = await commentService.updateComment(commentId, request.body.content);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.COMMENT_UPDATE, action: AuditAction.commentUpdate,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "show", resourceType: "show",
resourceId: id, resourceId: id,
details: `Updated comment ${commentId} on show`, details: `Updated comment ${commentId} on show`,
@@ -178,8 +178,8 @@ const showsRoutes: FastifyPluginAsync = async (app) => {
await commentService.deleteComment(commentId); await commentService.deleteComment(commentId);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.COMMENT_DELETE, action: AuditAction.commentDelete,
category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.ADMIN : AuditCategory.CONTENT, category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.admin : AuditCategory.content,
resourceType: "show", resourceType: "show",
resourceId: id, resourceId: id,
details: `Deleted comment ${commentId} from show`, details: `Deleted comment ${commentId} from show`,
api/src/app/routes/suggestions/index.ts
+10 -10
View File
@@ -85,8 +85,8 @@ export default async function (app: FastifyInstance): Promise<void> {
); );
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.ENTRY_CREATE, action: AuditAction.entryCreate,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: "Suggestion", resourceType: "Suggestion",
resourceId: suggestion.id, resourceId: suggestion.id,
details: `Created ${suggestion.entityType} suggestion: ${suggestion.title}`, details: `Created ${suggestion.entityType} suggestion: ${suggestion.title}`,
@@ -115,8 +115,8 @@ export default async function (app: FastifyInstance): Promise<void> {
const suggestion = await SuggestionService.acceptSuggestion(id); const suggestion = await SuggestionService.acceptSuggestion(id);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.ENTRY_UPDATE, action: AuditAction.entryUpdate,
category: AuditCategory.ADMIN, category: AuditCategory.admin,
resourceType: "Suggestion", resourceType: "Suggestion",
resourceId: suggestion.id, resourceId: suggestion.id,
details: `Accepted ${suggestion.entityType} suggestion: ${suggestion.title}`, details: `Accepted ${suggestion.entityType} suggestion: ${suggestion.title}`,
@@ -146,8 +146,8 @@ export default async function (app: FastifyInstance): Promise<void> {
const suggestion = await SuggestionService.acceptSuggestionWithEdits(id, editedData); const suggestion = await SuggestionService.acceptSuggestionWithEdits(id, editedData);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.ENTRY_UPDATE, action: AuditAction.entryUpdate,
category: AuditCategory.ADMIN, category: AuditCategory.admin,
resourceType: "Suggestion", resourceType: "Suggestion",
resourceId: suggestion.id, resourceId: suggestion.id,
details: `Accepted ${suggestion.entityType} suggestion with edits: ${suggestion.title}`, details: `Accepted ${suggestion.entityType} suggestion with edits: ${suggestion.title}`,
@@ -177,8 +177,8 @@ export default async function (app: FastifyInstance): Promise<void> {
const suggestion = await SuggestionService.declineSuggestion(id, reason); const suggestion = await SuggestionService.declineSuggestion(id, reason);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.ENTRY_UPDATE, action: AuditAction.entryUpdate,
category: AuditCategory.ADMIN, category: AuditCategory.admin,
resourceType: "Suggestion", resourceType: "Suggestion",
resourceId: suggestion.id, resourceId: suggestion.id,
details: `Declined ${suggestion.entityType} suggestion: ${suggestion.title}${reason ? ` (Reason: ${reason})` : ""}`, details: `Declined ${suggestion.entityType} suggestion: ${suggestion.title}${reason ? ` (Reason: ${reason})` : ""}`,
@@ -209,8 +209,8 @@ export default async function (app: FastifyInstance): Promise<void> {
const suggestion = await SuggestionService.deleteSuggestion(id, userId, isAdmin); const suggestion = await SuggestionService.deleteSuggestion(id, userId, isAdmin);
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.ENTRY_DELETE, action: AuditAction.entryDelete,
category: isAdmin ? AuditCategory.ADMIN : AuditCategory.CONTENT, category: isAdmin ? AuditCategory.admin : AuditCategory.content,
resourceType: "Suggestion", resourceType: "Suggestion",
resourceId: suggestion.id, resourceId: suggestion.id,
details: `Deleted ${suggestion.entityType} suggestion: ${suggestion.title}`, details: `Deleted ${suggestion.entityType} suggestion: ${suggestion.title}`,
api/src/app/routes/users/index.ts
+4 -4
View File
@@ -54,8 +54,8 @@ const usersRoutes: FastifyPluginAsync = async (app) => {
} }
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.USER_BAN, action: AuditAction.userBan,
category: AuditCategory.ADMIN, category: AuditCategory.admin,
targetUserId: id, targetUserId: id,
details: `Banned user: ${user.username}`, details: `Banned user: ${user.username}`,
}); });
@@ -78,8 +78,8 @@ const usersRoutes: FastifyPluginAsync = async (app) => {
} }
await AuditService.logFromRequest(request, { await AuditService.logFromRequest(request, {
action: AuditAction.USER_UNBAN, action: AuditAction.userUnban,
category: AuditCategory.ADMIN, category: AuditCategory.admin,
targetUserId: id, targetUserId: id,
details: `Unbanned user: ${user.username}`, details: `Unbanned user: ${user.username}`,
}); });
api/src/app/services/audit.service.ts
+1 -1
View File
@@ -36,7 +36,7 @@ export const AuditService = {
request: FastifyRequest, request: FastifyRequest,
data: Omit<AuditLogData, "userId"> data: Omit<AuditLogData, "userId">
) { ) {
const userId = (request.user as { id?: string } | undefined)?.id; const userId = ((request as any).user as { id?: string } | undefined)?.id;
return this.log( return this.log(
{ {
api/src/app/services/book.service.ts
+4
View File
@@ -24,6 +24,7 @@ export class BookService {
...book, ...book,
status: book.status as unknown as BookStatus, status: book.status as unknown as BookStatus,
dateAdded: book.dateAdded, dateAdded: book.dateAdded,
dateStarted: book.dateStarted || undefined,
dateFinished: book.dateFinished || undefined, dateFinished: book.dateFinished || undefined,
tags: book.tags ?? [], tags: book.tags ?? [],
links: book.links ?? [], links: book.links ?? [],
@@ -46,6 +47,7 @@ export class BookService {
...book, ...book,
status: book.status as unknown as BookStatus, status: book.status as unknown as BookStatus,
dateAdded: book.dateAdded, dateAdded: book.dateAdded,
dateStarted: book.dateStarted || undefined,
dateFinished: book.dateFinished || undefined, dateFinished: book.dateFinished || undefined,
tags: book.tags ?? [], tags: book.tags ?? [],
links: book.links ?? [], links: book.links ?? [],
@@ -69,6 +71,7 @@ export class BookService {
...book, ...book,
status: book.status as unknown as BookStatus, status: book.status as unknown as BookStatus,
dateAdded: book.dateAdded, dateAdded: book.dateAdded,
dateStarted: book.dateStarted || undefined,
dateFinished: book.dateFinished || undefined, dateFinished: book.dateFinished || undefined,
tags: book.tags ?? [], tags: book.tags ?? [],
links: book.links ?? [], links: book.links ?? [],
@@ -95,6 +98,7 @@ export class BookService {
...book, ...book,
status: book.status as unknown as BookStatus, status: book.status as unknown as BookStatus,
dateAdded: book.dateAdded, dateAdded: book.dateAdded,
dateStarted: book.dateStarted || undefined,
dateFinished: book.dateFinished || undefined, dateFinished: book.dateFinished || undefined,
tags: book.tags ?? [], tags: book.tags ?? [],
links: book.links ?? [], links: book.links ?? [],
api/src/app/services/game.service.ts
+8
View File
@@ -24,7 +24,9 @@ export class GameService {
...game, ...game,
status: game.status as unknown as GameStatus, status: game.status as unknown as GameStatus,
dateAdded: game.dateAdded, dateAdded: game.dateAdded,
dateStarted: game.dateStarted || undefined,
dateCompleted: game.dateCompleted || undefined, dateCompleted: game.dateCompleted || undefined,
dateFinished: game.dateFinished || undefined,
tags: game.tags ?? [], tags: game.tags ?? [],
links: game.links ?? [], links: game.links ?? [],
createdAt: game.createdAt, createdAt: game.createdAt,
@@ -46,7 +48,9 @@ export class GameService {
...game, ...game,
status: game.status as unknown as GameStatus, status: game.status as unknown as GameStatus,
dateAdded: game.dateAdded, dateAdded: game.dateAdded,
dateStarted: game.dateStarted || undefined,
dateCompleted: game.dateCompleted || undefined, dateCompleted: game.dateCompleted || undefined,
dateFinished: game.dateFinished || undefined,
tags: game.tags ?? [], tags: game.tags ?? [],
links: game.links ?? [], links: game.links ?? [],
createdAt: game.createdAt, createdAt: game.createdAt,
@@ -69,7 +73,9 @@ export class GameService {
...game, ...game,
status: game.status as unknown as GameStatus, status: game.status as unknown as GameStatus,
dateAdded: game.dateAdded, dateAdded: game.dateAdded,
dateStarted: game.dateStarted || undefined,
dateCompleted: game.dateCompleted || undefined, dateCompleted: game.dateCompleted || undefined,
dateFinished: game.dateFinished || undefined,
tags: game.tags ?? [], tags: game.tags ?? [],
links: game.links ?? [], links: game.links ?? [],
createdAt: game.createdAt, createdAt: game.createdAt,
@@ -95,7 +101,9 @@ export class GameService {
...game, ...game,
status: game.status as unknown as GameStatus, status: game.status as unknown as GameStatus,
dateAdded: game.dateAdded, dateAdded: game.dateAdded,
dateStarted: game.dateStarted || undefined,
dateCompleted: game.dateCompleted || undefined, dateCompleted: game.dateCompleted || undefined,
dateFinished: game.dateFinished || undefined,
tags: game.tags ?? [], tags: game.tags ?? [],
links: game.links ?? [], links: game.links ?? [],
createdAt: game.createdAt, createdAt: game.createdAt,
api/src/app/services/like.service.ts
+4 -4
View File
@@ -32,8 +32,8 @@ export class LikeService {
}); });
await AuditService.logFromRequest(req, { await AuditService.logFromRequest(req, {
action: AuditAction.UNLIKE, action: AuditAction.unlike,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: entityType, resourceType: entityType,
resourceId: entityId, resourceId: entityId,
details: `Unliked ${entityType}` details: `Unliked ${entityType}`
@@ -52,8 +52,8 @@ export class LikeService {
}); });
await AuditService.logFromRequest(req, { await AuditService.logFromRequest(req, {
action: AuditAction.LIKE, action: AuditAction.like,
category: AuditCategory.CONTENT, category: AuditCategory.content,
resourceType: entityType, resourceType: entityType,
resourceId: entityId, resourceId: entityId,
details: `Liked ${entityType}` details: `Liked ${entityType}`
api/src/app/services/manga.service.ts
+8
View File
@@ -21,7 +21,9 @@ export class MangaService {
...m, ...m,
status: m.status as unknown as MangaStatus, status: m.status as unknown as MangaStatus,
dateAdded: m.dateAdded, dateAdded: m.dateAdded,
dateStarted: m.dateStarted || undefined,
dateCompleted: m.dateCompleted || undefined, dateCompleted: m.dateCompleted || undefined,
dateFinished: m.dateFinished || undefined,
tags: m.tags ?? [], tags: m.tags ?? [],
links: m.links ?? [], links: m.links ?? [],
createdAt: m.createdAt, createdAt: m.createdAt,
@@ -40,7 +42,9 @@ export class MangaService {
...manga, ...manga,
status: manga.status as unknown as MangaStatus, status: manga.status as unknown as MangaStatus,
dateAdded: manga.dateAdded, dateAdded: manga.dateAdded,
dateStarted: manga.dateStarted || undefined,
dateCompleted: manga.dateCompleted || undefined, dateCompleted: manga.dateCompleted || undefined,
dateFinished: manga.dateFinished || undefined,
tags: manga.tags ?? [], tags: manga.tags ?? [],
links: manga.links ?? [], links: manga.links ?? [],
createdAt: manga.createdAt, createdAt: manga.createdAt,
@@ -60,7 +64,9 @@ export class MangaService {
...manga, ...manga,
status: manga.status as unknown as MangaStatus, status: manga.status as unknown as MangaStatus,
dateAdded: manga.dateAdded, dateAdded: manga.dateAdded,
dateStarted: manga.dateStarted || undefined,
dateCompleted: manga.dateCompleted || undefined, dateCompleted: manga.dateCompleted || undefined,
dateFinished: manga.dateFinished || undefined,
tags: manga.tags ?? [], tags: manga.tags ?? [],
links: manga.links ?? [], links: manga.links ?? [],
createdAt: manga.createdAt, createdAt: manga.createdAt,
@@ -83,7 +89,9 @@ export class MangaService {
...manga, ...manga,
status: manga.status as unknown as MangaStatus, status: manga.status as unknown as MangaStatus,
dateAdded: manga.dateAdded, dateAdded: manga.dateAdded,
dateStarted: manga.dateStarted || undefined,
dateCompleted: manga.dateCompleted || undefined, dateCompleted: manga.dateCompleted || undefined,
dateFinished: manga.dateFinished || undefined,
tags: manga.tags ?? [], tags: manga.tags ?? [],
links: manga.links ?? [], links: manga.links ?? [],
createdAt: manga.createdAt, createdAt: manga.createdAt,
api/src/app/services/music.service.ts
+8
View File
@@ -25,7 +25,9 @@ export class MusicService {
type: music.type as unknown as MusicType, type: music.type as unknown as MusicType,
status: music.status as unknown as MusicStatus, status: music.status as unknown as MusicStatus,
dateAdded: music.dateAdded, dateAdded: music.dateAdded,
dateStarted: music.dateStarted || undefined,
dateCompleted: music.dateCompleted || undefined, dateCompleted: music.dateCompleted || undefined,
dateFinished: music.dateFinished || undefined,
tags: music.tags ?? [], tags: music.tags ?? [],
links: music.links ?? [], links: music.links ?? [],
createdAt: music.createdAt, createdAt: music.createdAt,
@@ -48,7 +50,9 @@ export class MusicService {
type: music.type as unknown as MusicType, type: music.type as unknown as MusicType,
status: music.status as unknown as MusicStatus, status: music.status as unknown as MusicStatus,
dateAdded: music.dateAdded, dateAdded: music.dateAdded,
dateStarted: music.dateStarted || undefined,
dateCompleted: music.dateCompleted || undefined, dateCompleted: music.dateCompleted || undefined,
dateFinished: music.dateFinished || undefined,
tags: music.tags ?? [], tags: music.tags ?? [],
links: music.links ?? [], links: music.links ?? [],
createdAt: music.createdAt, createdAt: music.createdAt,
@@ -73,7 +77,9 @@ export class MusicService {
type: music.type as unknown as MusicType, type: music.type as unknown as MusicType,
status: music.status as unknown as MusicStatus, status: music.status as unknown as MusicStatus,
dateAdded: music.dateAdded, dateAdded: music.dateAdded,
dateStarted: music.dateStarted || undefined,
dateCompleted: music.dateCompleted || undefined, dateCompleted: music.dateCompleted || undefined,
dateFinished: music.dateFinished || undefined,
tags: music.tags ?? [], tags: music.tags ?? [],
links: music.links ?? [], links: music.links ?? [],
createdAt: music.createdAt, createdAt: music.createdAt,
@@ -103,7 +109,9 @@ export class MusicService {
type: music.type as unknown as MusicType, type: music.type as unknown as MusicType,
status: music.status as unknown as MusicStatus, status: music.status as unknown as MusicStatus,
dateAdded: music.dateAdded, dateAdded: music.dateAdded,
dateStarted: music.dateStarted || undefined,
dateCompleted: music.dateCompleted || undefined, dateCompleted: music.dateCompleted || undefined,
dateFinished: music.dateFinished || undefined,
tags: music.tags ?? [], tags: music.tags ?? [],
links: music.links ?? [], links: music.links ?? [],
createdAt: music.createdAt, createdAt: music.createdAt,
api/src/app/services/show.service.ts
+8
View File
@@ -22,7 +22,9 @@ export class ShowService {
type: show.type as unknown as ShowType, type: show.type as unknown as ShowType,
status: show.status as unknown as ShowStatus, status: show.status as unknown as ShowStatus,
dateAdded: show.dateAdded, dateAdded: show.dateAdded,
dateStarted: show.dateStarted || undefined,
dateCompleted: show.dateCompleted || undefined, dateCompleted: show.dateCompleted || undefined,
dateFinished: show.dateFinished || undefined,
tags: show.tags ?? [], tags: show.tags ?? [],
links: show.links ?? [], links: show.links ?? [],
createdAt: show.createdAt, createdAt: show.createdAt,
@@ -42,7 +44,9 @@ export class ShowService {
type: show.type as unknown as ShowType, type: show.type as unknown as ShowType,
status: show.status as unknown as ShowStatus, status: show.status as unknown as ShowStatus,
dateAdded: show.dateAdded, dateAdded: show.dateAdded,
dateStarted: show.dateStarted || undefined,
dateCompleted: show.dateCompleted || undefined, dateCompleted: show.dateCompleted || undefined,
dateFinished: show.dateFinished || undefined,
tags: show.tags ?? [], tags: show.tags ?? [],
links: show.links ?? [], links: show.links ?? [],
createdAt: show.createdAt, createdAt: show.createdAt,
@@ -64,7 +68,9 @@ export class ShowService {
type: show.type as unknown as ShowType, type: show.type as unknown as ShowType,
status: show.status as unknown as ShowStatus, status: show.status as unknown as ShowStatus,
dateAdded: show.dateAdded, dateAdded: show.dateAdded,
dateStarted: show.dateStarted || undefined,
dateCompleted: show.dateCompleted || undefined, dateCompleted: show.dateCompleted || undefined,
dateFinished: show.dateFinished || undefined,
tags: show.tags ?? [], tags: show.tags ?? [],
links: show.links ?? [], links: show.links ?? [],
createdAt: show.createdAt, createdAt: show.createdAt,
@@ -91,7 +97,9 @@ export class ShowService {
type: show.type as unknown as ShowType, type: show.type as unknown as ShowType,
status: show.status as unknown as ShowStatus, status: show.status as unknown as ShowStatus,
dateAdded: show.dateAdded, dateAdded: show.dateAdded,
dateStarted: show.dateStarted || undefined,
dateCompleted: show.dateCompleted || undefined, dateCompleted: show.dateCompleted || undefined,
dateFinished: show.dateFinished || undefined,
tags: show.tags ?? [], tags: show.tags ?? [],
links: show.links ?? [], links: show.links ?? [],
createdAt: show.createdAt, createdAt: show.createdAt,
api/src/app/utils/logger.ts
+9
View File
@@ -0,0 +1,9 @@
/**
* @copyright 2026 NHCarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import { Logger } from "@nhcarrigan/logger";
export const logger = new Logger("Library", process.env.LOG_TOKEN ?? "");
api/src/main.ts
+34 -1
View File
@@ -1,9 +1,42 @@
import Fastify from 'fastify'; import Fastify from 'fastify';
import { app } from './app/app'; import { app } from './app/app';
import { logger } from './app/utils/logger';
const host = process.env.HOST ?? 'localhost'; const host = process.env.HOST ?? 'localhost';
const port = process.env.PORT ? Number(process.env.PORT) : 12321; const port = process.env.PORT ? Number(process.env.PORT) : 12321;
// Global error handlers
process.on('uncaughtException', (error: Error) => {
void logger.error('Uncaught Exception', error);
process.exit(1);
});
process.on('unhandledRejection', (reason: unknown) => {
const error = reason instanceof Error ? reason : new Error(String(reason));
void logger.error('Unhandled Rejection', error);
process.exit(1);
});
process.on('warning', (warning: Error) => {
void logger.log('warn', `Process Warning: ${warning.name} - ${warning.message}`);
});
process.on('SIGTERM', () => {
void logger.log('info', 'SIGTERM signal received: closing HTTP server');
server.close(() => {
void logger.log('info', 'HTTP server closed');
process.exit(0);
});
});
process.on('SIGINT', () => {
void logger.log('info', 'SIGINT signal received: closing HTTP server');
server.close(() => {
void logger.log('info', 'HTTP server closed');
process.exit(0);
});
});
// Instantiate Fastify with some config // Instantiate Fastify with some config
const server = Fastify({ const server = Fastify({
logger: true, logger: true,
@@ -19,6 +52,6 @@ server.listen({ port, host }, (err) => {
server.log.error(err); server.log.error(err);
process.exit(1); process.exit(1);
} else { } else {
console.log(`[ ready ] http://${host}:${port}`); void logger.log('info', `Server ready at http://${host}:${port}`);
} }
}); });
api/src/test-setup.ts
+47
View File
@@ -0,0 +1,47 @@
/**
* @copyright NHCarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
// Set required environment variables for tests
process.env.JWT_SECRET = 'test-secret';
process.env.DISCORD_CLIENT_ID = 'test-client-id';
process.env.DISCORD_CLIENT_SECRET = 'test-client-secret';
process.env.DOMAIN = 'http://localhost:3000';
process.env.API_URL = 'http://localhost:3000/api';
process.env.DATABASE_URL = 'postgresql://test:test@localhost:5432/test';
process.env.BASE_URL = 'http://localhost:4200';
process.env.NODE_ENV = 'test';
// Mock ESM packages to avoid import issues in Jest
jest.mock('jsdom', () => ({
JSDOM: class {
window = {
document: {
createElement: jest.fn(() => ({})),
},
};
},
}));
jest.mock('marked', () => ({
marked: jest.fn((input: string) => `<p>${input}</p>`),
}));
jest.mock('dompurify', () => {
const mockDOMPurify = {
sanitize: jest.fn((input: string) => input),
addHook: jest.fn(),
};
const createDOMPurify = jest.fn(() => mockDOMPurify);
return createDOMPurify;
});
jest.mock('@nhcarrigan/logger', () => ({
Logger: class {
log = jest.fn().mockResolvedValue(undefined);
error = jest.fn().mockResolvedValue(undefined);
metric = jest.fn().mockResolvedValue(undefined);
},
}));
api/tsconfig.app.json
+2 -1
View File
@@ -10,6 +10,7 @@
"jest.config.ts", "jest.config.ts",
"jest.config.cts", "jest.config.cts",
"src/**/*.spec.ts", "src/**/*.spec.ts",
"src/**/*.test.ts" "src/**/*.test.ts",
"src/test-setup.ts"
] ]
} }
apps/frontend/src/app/app.config.ts
+14
View File
@@ -2,6 +2,7 @@ import {
ApplicationConfig, ApplicationConfig,
provideBrowserGlobalErrorListeners, provideBrowserGlobalErrorListeners,
APP_INITIALIZER, APP_INITIALIZER,
ErrorHandler,
} from '@angular/core'; } from '@angular/core';
import { provideRouter } from '@angular/router'; import { provideRouter } from '@angular/router';
import { provideHttpClient, withInterceptors, HTTP_INTERCEPTORS } from '@angular/common/http'; import { provideHttpClient, withInterceptors, HTTP_INTERCEPTORS } from '@angular/common/http';
@@ -9,12 +10,19 @@ import { appRoutes } from './app.routes';
import { AuthService } from './services/auth.service'; import { AuthService } from './services/auth.service';
import { AuthInterceptor } from './interceptors/auth.interceptor'; import { AuthInterceptor } from './interceptors/auth.interceptor';
import { initializeAuth } from './initializers/auth.initializer'; import { initializeAuth } from './initializers/auth.initializer';
import { GlobalErrorHandler } from './services/global-error-handler.service';
import { ConsoleLoggerService } from './services/console-logger.service';
import { initializeConsoleLogger } from './initializers/console-logger.initializer';
export const appConfig: ApplicationConfig = { export const appConfig: ApplicationConfig = {
providers: [ providers: [
provideBrowserGlobalErrorListeners(), provideBrowserGlobalErrorListeners(),
provideRouter(appRoutes), provideRouter(appRoutes),
provideHttpClient(), provideHttpClient(),
{
provide: ErrorHandler,
useClass: GlobalErrorHandler
},
{ {
provide: HTTP_INTERCEPTORS, provide: HTTP_INTERCEPTORS,
useClass: AuthInterceptor, useClass: AuthInterceptor,
@@ -25,6 +33,12 @@ export const appConfig: ApplicationConfig = {
useFactory: initializeAuth, useFactory: initializeAuth,
deps: [AuthService], deps: [AuthService],
multi: true multi: true
},
{
provide: APP_INITIALIZER,
useFactory: initializeConsoleLogger,
deps: [ConsoleLoggerService],
multi: true
} }
], ],
}; };
apps/frontend/src/app/app.html
+1
View File
@@ -3,3 +3,4 @@
<router-outlet></router-outlet> <router-outlet></router-outlet>
</main> </main>
<app-footer></app-footer> <app-footer></app-footer>
<app-toast></app-toast>
apps/frontend/src/app/app.ts
+2 -1
View File
@@ -2,10 +2,11 @@ import { Component, inject, OnInit } from '@angular/core';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
import { HeaderComponent } from './components/header/header.component'; import { HeaderComponent } from './components/header/header.component';
import { FooterComponent } from './components/footer/footer.component'; import { FooterComponent } from './components/footer/footer.component';
import { ToastComponent } from './components/toast/toast.component';
import { AnalyticsService } from './services/analytics.service'; import { AnalyticsService } from './services/analytics.service';
@Component({ @Component({
imports: [RouterModule, HeaderComponent, FooterComponent], imports: [RouterModule, HeaderComponent, FooterComponent, ToastComponent],
selector: 'app-root', selector: 'app-root',
templateUrl: './app.html', templateUrl: './app.html',
styleUrl: './app.scss', styleUrl: './app.scss',
apps/frontend/src/app/components/admin/admin-suggestions.component.ts
+38 -37
View File
@@ -39,22 +39,22 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared-
All ({{ suggestions().length }}) All ({{ suggestions().length }})
</button> </button>
<button <button
(click)="setFilter(SuggestionStatus.UNREVIEWED)" (click)="setFilter(SuggestionStatus.unreviewed)"
[class.active]="statusFilter() === SuggestionStatus.UNREVIEWED" [class.active]="statusFilter() === SuggestionStatus.unreviewed"
class="filter-btn pending" class="filter-btn pending"
> >
Pending ({{ unreviewedCount() }}) Pending ({{ unreviewedCount() }})
</button> </button>
<button <button
(click)="setFilter(SuggestionStatus.ACCEPTED)" (click)="setFilter(SuggestionStatus.accepted)"
[class.active]="statusFilter() === SuggestionStatus.ACCEPTED" [class.active]="statusFilter() === SuggestionStatus.accepted"
class="filter-btn accepted" class="filter-btn accepted"
> >
Accepted ({{ acceptedCount() }}) Accepted ({{ acceptedCount() }})
</button> </button>
<button <button
(click)="setFilter(SuggestionStatus.DECLINED)" (click)="setFilter(SuggestionStatus.declined)"
[class.active]="statusFilter() === SuggestionStatus.DECLINED" [class.active]="statusFilter() === SuggestionStatus.declined"
class="filter-btn declined" class="filter-btn declined"
> >
Declined ({{ declinedCount() }}) Declined ({{ declinedCount() }})
@@ -171,7 +171,7 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared-
} }
</div> </div>
@if (suggestion.status === SuggestionStatus.DECLINED && suggestion.declineReason) { @if (suggestion.status === SuggestionStatus.declined && suggestion.declineReason) {
<div class="decline-reason"> <div class="decline-reason">
<strong>Decline reason:</strong> {{ suggestion.declineReason }} <strong>Decline reason:</strong> {{ suggestion.declineReason }}
</div> </div>
@@ -180,7 +180,7 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared-
<div class="suggestion-footer"> <div class="suggestion-footer">
<span class="date">Suggested on {{ formatDate(suggestion.createdAt) }}</span> <span class="date">Suggested on {{ formatDate(suggestion.createdAt) }}</span>
@if (suggestion.status === SuggestionStatus.UNREVIEWED) { @if (suggestion.status === SuggestionStatus.unreviewed) {
<div class="actions"> <div class="actions">
<button (click)="acceptSuggestion(suggestion)" class="btn btn-accept"> <button (click)="acceptSuggestion(suggestion)" class="btn btn-accept">
Accept Accept
@@ -206,8 +206,8 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared-
} }
@if (showDeclineModal()) { @if (showDeclineModal()) {
<div class="modal-overlay" (click)="closeDeclineModal()"> <div class="modal-overlay" (click)="closeDeclineModal()" (keyup.escape)="closeDeclineModal()" tabindex="0" role="button">
<div class="modal" (click)="$event.stopPropagation()"> <div class="modal" (click)="$event.stopPropagation()" (keyup)="$event.stopPropagation()" tabindex="-1">
<h3>Decline Suggestion</h3> <h3>Decline Suggestion</h3>
<p>Are you sure you want to decline "{{ decliningsuggestion()?.title }}"?</p> <p>Are you sure you want to decline "{{ decliningsuggestion()?.title }}"?</p>
<div class="form-group"> <div class="form-group">
@@ -229,8 +229,8 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared-
} }
@if (showEditModal()) { @if (showEditModal()) {
<div class="modal-overlay" (click)="closeEditModal()"> <div class="modal-overlay" (click)="closeEditModal()" (keyup.escape)="closeEditModal()" tabindex="0" role="button">
<div class="modal edit-modal" (click)="$event.stopPropagation()"> <div class="modal edit-modal" (click)="$event.stopPropagation()" (keyup)="$event.stopPropagation()" tabindex="-1">
<h3>Review & Edit Before Accepting</h3> <h3>Review & Edit Before Accepting</h3>
<p>Review and edit the details before adding to your collection.</p> <p>Review and edit the details before adding to your collection.</p>
@@ -248,7 +248,7 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared-
</div> </div>
@switch (editingSuggestion()!.entityType) { @switch (editingSuggestion()!.entityType) {
@case ('BOOK') { @case (SuggestionEntity.book) {
<div class="form-group"> <div class="form-group">
<label for="edit-author">Author</label> <label for="edit-author">Author</label>
<input <input
@@ -269,7 +269,7 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared-
> >
</div> </div>
} }
@case ('GAME') { @case (SuggestionEntity.game) {
<div class="form-group"> <div class="form-group">
<label for="edit-platform">Platform</label> <label for="edit-platform">Platform</label>
<input <input
@@ -280,7 +280,7 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared-
> >
</div> </div>
} }
@case ('MUSIC') { @case (SuggestionEntity.music) {
<div class="form-group"> <div class="form-group">
<label for="edit-artist">Artist</label> <label for="edit-artist">Artist</label>
<input <input
@@ -300,7 +300,7 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared-
</select> </select>
</div> </div>
} }
@case ('ART') { @case (SuggestionEntity.art) {
<div class="form-group"> <div class="form-group">
<label for="edit-artist">Artist</label> <label for="edit-artist">Artist</label>
<input <input
@@ -331,7 +331,7 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared-
> >
</div> </div>
} }
@case ('SHOW') { @case (SuggestionEntity.show) {
<div class="form-group"> <div class="form-group">
<label for="edit-type">Type</label> <label for="edit-type">Type</label>
<select id="edit-type" [(ngModel)]="editedData.type" name="type" required> <select id="edit-type" [(ngModel)]="editedData.type" name="type" required>
@@ -342,7 +342,7 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared-
</select> </select>
</div> </div>
} }
@case ('MANGA') { @case (SuggestionEntity.manga) {
<div class="form-group"> <div class="form-group">
<label for="edit-author">Author</label> <label for="edit-author">Author</label>
<input <input
@@ -366,7 +366,7 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared-
></textarea> ></textarea>
</div> </div>
@if (editingSuggestion()!.entityType !== 'ART') { @if (editingSuggestion()!.entityType !== SuggestionEntity.art) {
<div class="form-group"> <div class="form-group">
<label for="edit-coverImage">Cover Image URL</label> <label for="edit-coverImage">Cover Image URL</label>
<input <input
@@ -727,10 +727,11 @@ export class AdminSuggestionsComponent implements OnInit {
pageSize = signal(25); pageSize = signal(25);
SuggestionStatus = SuggestionStatus; SuggestionStatus = SuggestionStatus;
SuggestionEntity = SuggestionEntity;
unreviewedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.UNREVIEWED).length; unreviewedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.unreviewed).length;
acceptedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.ACCEPTED).length; acceptedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.accepted).length;
declinedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.DECLINED).length; declinedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.declined).length;
filteredSuggestions = computed(() => { filteredSuggestions = computed(() => {
const filter = this.statusFilter(); const filter = this.statusFilter();
@@ -788,20 +789,20 @@ export class AdminSuggestionsComponent implements OnInit {
getStatusLabel(status: SuggestionStatus): string { getStatusLabel(status: SuggestionStatus): string {
switch (status) { switch (status) {
case SuggestionStatus.UNREVIEWED: return 'Pending'; case SuggestionStatus.unreviewed: return 'Pending';
case SuggestionStatus.ACCEPTED: return 'Accepted'; case SuggestionStatus.accepted: return 'Accepted';
case SuggestionStatus.DECLINED: return 'Declined'; case SuggestionStatus.declined: return 'Declined';
} }
} }
getEntityIcon(entityType: SuggestionEntity): string { getEntityIcon(entityType: SuggestionEntity): string {
switch (entityType) { switch (entityType) {
case SuggestionEntity.GAME: return '🎮'; case SuggestionEntity.game: return '🎮';
case SuggestionEntity.BOOK: return 'đź“š'; case SuggestionEntity.book: return 'đź“š';
case SuggestionEntity.MUSIC: return '🎵'; case SuggestionEntity.music: return '🎵';
case SuggestionEntity.MANGA: return 'đź“–'; case SuggestionEntity.manga: return 'đź“–';
case SuggestionEntity.SHOW: return 'đź“ş'; case SuggestionEntity.show: return 'đź“ş';
case SuggestionEntity.ART: return '🎨'; case SuggestionEntity.art: return '🎨';
} }
} }
@@ -822,39 +823,39 @@ export class AdminSuggestionsComponent implements OnInit {
// Add entity-specific data // Add entity-specific data
switch (suggestion.entityType) { switch (suggestion.entityType) {
case 'BOOK': case SuggestionEntity.book:
const bookData = suggestion.bookData as any; const bookData = suggestion.bookData as any;
this.editedData.author = bookData?.author || ''; this.editedData.author = bookData?.author || '';
this.editedData.isbn = bookData?.isbn || ''; this.editedData.isbn = bookData?.isbn || '';
this.editedData.notes = bookData?.notes || ''; this.editedData.notes = bookData?.notes || '';
this.editedData.coverImage = bookData?.coverImage || ''; this.editedData.coverImage = bookData?.coverImage || '';
break; break;
case 'GAME': case SuggestionEntity.game:
const gameData = suggestion.gameData as any; const gameData = suggestion.gameData as any;
this.editedData.platform = gameData?.platform || ''; this.editedData.platform = gameData?.platform || '';
this.editedData.notes = gameData?.notes || ''; this.editedData.notes = gameData?.notes || '';
this.editedData.coverImage = gameData?.coverImage || ''; this.editedData.coverImage = gameData?.coverImage || '';
break; break;
case 'MUSIC': case SuggestionEntity.music:
const musicData = suggestion.musicData as any; const musicData = suggestion.musicData as any;
this.editedData.artist = musicData?.artist || ''; this.editedData.artist = musicData?.artist || '';
this.editedData.type = musicData?.type || 'ALBUM'; this.editedData.type = musicData?.type || 'ALBUM';
this.editedData.notes = musicData?.notes || ''; this.editedData.notes = musicData?.notes || '';
this.editedData.coverArt = musicData?.coverArt || ''; this.editedData.coverArt = musicData?.coverArt || '';
break; break;
case 'ART': case SuggestionEntity.art:
const artData = suggestion.artData as any; const artData = suggestion.artData as any;
this.editedData.artist = artData?.artist || ''; this.editedData.artist = artData?.artist || '';
this.editedData.description = artData?.description || ''; this.editedData.description = artData?.description || '';
this.editedData.imageUrl = artData?.imageUrl || ''; this.editedData.imageUrl = artData?.imageUrl || '';
break; break;
case 'SHOW': case SuggestionEntity.show:
const showData = suggestion.showData as any; const showData = suggestion.showData as any;
this.editedData.type = showData?.type || 'TV_SERIES'; this.editedData.type = showData?.type || 'TV_SERIES';
this.editedData.notes = showData?.notes || ''; this.editedData.notes = showData?.notes || '';
this.editedData.coverImage = showData?.coverImage || ''; this.editedData.coverImage = showData?.coverImage || '';
break; break;
case 'MANGA': case SuggestionEntity.manga:
const mangaData = suggestion.mangaData as any; const mangaData = suggestion.mangaData as any;
this.editedData.author = mangaData?.author || ''; this.editedData.author = mangaData?.author || '';
this.editedData.notes = mangaData?.notes || ''; this.editedData.notes = mangaData?.notes || '';
apps/frontend/src/app/components/art/art-gallery.component.ts
+11 -11
View File
@@ -105,8 +105,7 @@ import { Art, CreateArtDto, UpdateArtDto, Comment, SuggestionEntity, Link } from
} }
<div class="form-group"> <div class="form-group">
<label>Tags</label> <div class="tags-input-container" aria-label="Tags">
<div class="tags-input-container">
@for (tag of newArt.tags; track tag; let i = $index) { @for (tag of newArt.tags; track tag; let i = $index) {
<span class="tag"> <span class="tag">
{{ tag }} {{ tag }}
@@ -123,8 +122,7 @@ import { Art, CreateArtDto, UpdateArtDto, Comment, SuggestionEntity, Link } from
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group" aria-label="External Links">
<label>External Links</label>
<div class="links-list"> <div class="links-list">
@for (link of newArt.links; track link.url; let i = $index) { @for (link of newArt.links; track link.url; let i = $index) {
<div class="link-item"> <div class="link-item">
@@ -280,8 +278,7 @@ import { Art, CreateArtDto, UpdateArtDto, Comment, SuggestionEntity, Link } from
} }
<div class="form-group"> <div class="form-group">
<label>Tags</label> <div class="tags-input-container" aria-label="Tags">
<div class="tags-input-container">
@for (tag of editArt.tags; track tag; let i = $index) { @for (tag of editArt.tags; track tag; let i = $index) {
<span class="tag"> <span class="tag">
{{ tag }} {{ tag }}
@@ -298,8 +295,7 @@ import { Art, CreateArtDto, UpdateArtDto, Comment, SuggestionEntity, Link } from
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group" aria-label="External Links">
<label>External Links</label>
<div class="links-list"> <div class="links-list">
@for (link of editArt.links; track link.url; let i = $index) { @for (link of editArt.links; track link.url; let i = $index) {
<div class="link-item"> <div class="link-item">
@@ -401,6 +397,10 @@ import { Art, CreateArtDto, UpdateArtDto, Comment, SuggestionEntity, Link } from
[alt]="art.description || art.title" [alt]="art.description || art.title"
class="art-image" class="art-image"
(click)="openLightbox(art)" (click)="openLightbox(art)"
(keyup.enter)="openLightbox(art)"
(keyup.space)="openLightbox(art)"
tabindex="0"
role="button"
> >
</div> </div>
@@ -536,8 +536,8 @@ import { Art, CreateArtDto, UpdateArtDto, Comment, SuggestionEntity, Link } from
} }
@if (lightboxArt()) { @if (lightboxArt()) {
<div class="lightbox" (click)="closeLightbox()"> <div class="lightbox" (click)="closeLightbox()" (keyup.escape)="closeLightbox()" tabindex="0" role="button">
<div class="lightbox-content" (click)="$event.stopPropagation()"> <div class="lightbox-content" (click)="$event.stopPropagation()" (keyup)="$event.stopPropagation()" tabindex="-1">
<button class="lightbox-close" (click)="closeLightbox()">&times;</button> <button class="lightbox-close" (click)="closeLightbox()">&times;</button>
<img [src]="lightboxArt()!.imageUrl" [alt]="lightboxArt()!.description || lightboxArt()!.title"> <img [src]="lightboxArt()!.imageUrl" [alt]="lightboxArt()!.description || lightboxArt()!.title">
<div class="lightbox-info"> <div class="lightbox-info">
@@ -1571,7 +1571,7 @@ export class ArtGalleryComponent implements OnInit {
try { try {
await this.suggestionService.createSuggestion({ await this.suggestionService.createSuggestion({
entityType: SuggestionEntity.ART, entityType: SuggestionEntity.art,
title: this.suggestedArt.title, title: this.suggestedArt.title,
artist: this.suggestedArt.artist, artist: this.suggestedArt.artist,
imageUrl: this.suggestedArt.imageUrl, imageUrl: this.suggestedArt.imageUrl,
apps/frontend/src/app/components/books/books-list.component.ts
+95 -14
View File
@@ -79,9 +79,30 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
<option [value]="BookStatus.reading">Currently Reading</option> <option [value]="BookStatus.reading">Currently Reading</option>
<option [value]="BookStatus.finished">Finished</option> <option [value]="BookStatus.finished">Finished</option>
<option [value]="BookStatus.toRead">To Read</option> <option [value]="BookStatus.toRead">To Read</option>
<option [value]="BookStatus.retired">Retired</option>
</select> </select>
</div> </div>
<div class="form-group">
<label for="dateStarted">Date Started</label>
<input
type="date"
id="dateStarted"
[(ngModel)]="newBook.dateStarted"
name="dateStarted"
>
</div>
<div class="form-group">
<label for="dateFinished">Date Finished</label>
<input
type="date"
id="dateFinished"
[(ngModel)]="newBook.dateFinished"
name="dateFinished"
>
</div>
<div class="form-group"> <div class="form-group">
<label for="rating">Rating (1-10)</label> <label for="rating">Rating (1-10)</label>
<input <input
@@ -126,8 +147,7 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Tags</label> <div class="tags-input-container" aria-label="Tags">
<div class="tags-input-container">
@for (tag of newBook.tags; track tag; let i = $index) { @for (tag of newBook.tags; track tag; let i = $index) {
<span class="tag"> <span class="tag">
{{ tag }} {{ tag }}
@@ -144,8 +164,7 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group" aria-label="External Links">
<label>External Links</label>
<div class="links-list"> <div class="links-list">
@for (link of newBook.links; track link.url; let i = $index) { @for (link of newBook.links; track link.url; let i = $index) {
<div class="link-item"> <div class="link-item">
@@ -222,9 +241,30 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
<option [value]="BookStatus.reading">Currently Reading</option> <option [value]="BookStatus.reading">Currently Reading</option>
<option [value]="BookStatus.finished">Finished</option> <option [value]="BookStatus.finished">Finished</option>
<option [value]="BookStatus.toRead">To Read</option> <option [value]="BookStatus.toRead">To Read</option>
<option [value]="BookStatus.retired">Retired</option>
</select> </select>
</div> </div>
<div class="form-group">
<label for="edit-dateStarted">Date Started</label>
<input
type="date"
id="edit-dateStarted"
[(ngModel)]="editBook.dateStarted"
name="dateStarted"
>
</div>
<div class="form-group">
<label for="edit-dateFinished">Date Finished</label>
<input
type="date"
id="edit-dateFinished"
[(ngModel)]="editBook.dateFinished"
name="dateFinished"
>
</div>
<div class="form-group"> <div class="form-group">
<label for="edit-rating">Rating (1-10)</label> <label for="edit-rating">Rating (1-10)</label>
<input <input
@@ -269,8 +309,7 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Tags</label> <div class="tags-input-container" aria-label="Tags">
<div class="tags-input-container">
@for (tag of editBook.tags; track tag; let i = $index) { @for (tag of editBook.tags; track tag; let i = $index) {
<span class="tag"> <span class="tag">
{{ tag }} {{ tag }}
@@ -287,8 +326,7 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group" aria-label="External Links">
<label>External Links</label>
<div class="links-list"> <div class="links-list">
@for (link of editBook.links; track link.url; let i = $index) { @for (link of editBook.links; track link.url; let i = $index) {
<div class="link-item"> <div class="link-item">
@@ -421,8 +459,7 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
@if (showFilters()) { @if (showFilters()) {
<div class="advanced-filters"> <div class="advanced-filters">
<div class="filter-group"> <div class="filter-group">
<label>Filter by Tags:</label> <div class="tags-filter" aria-label="Filter by Tags">
<div class="tags-filter">
@for (tag of allTags(); track tag) { @for (tag of allTags(); track tag) {
<label class="tag-checkbox"> <label class="tag-checkbox">
<input <input
@@ -475,6 +512,13 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
> >
To Read ({{ toReadCount() }}) To Read ({{ toReadCount() }})
</button> </button>
<button
(click)="setFilter(BookStatus.retired)"
[class.active]="statusFilter() === BookStatus.retired"
class="filter-btn"
>
Retired ({{ retiredCount() }})
</button>
</div> </div>
@if (loading()) { @if (loading()) {
@@ -548,12 +592,30 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
</div> </div>
} }
@if (book.dateStarted) {
<p class="date-started">
Started: {{ formatDate(book.dateStarted) }}
</p>
}
@if (book.dateFinished) { @if (book.dateFinished) {
<p class="date-finished"> <p class="date-finished">
Finished: {{ formatDate(book.dateFinished) }} Finished: {{ formatDate(book.dateFinished) }}
</p> </p>
} }
@if (book.createdAt) {
<p class="date-added">
Added: {{ formatDate(book.createdAt) }}
</p>
}
@if (book.updatedAt) {
<p class="date-updated">
Updated: {{ formatDate(book.updatedAt) }}
</p>
}
@if (authService.isAdmin()) { @if (authService.isAdmin()) {
<div class="actions"> <div class="actions">
<button (click)="startEdit(book)" class="btn btn-secondary btn-sm"> <button (click)="startEdit(book)" class="btn btn-secondary btn-sm">
@@ -989,7 +1051,10 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
margin: 0.5rem 0; margin: 0.5rem 0;
} }
.date-finished { .date-started,
.date-finished,
.date-added,
.date-updated {
font-size: 0.85rem; font-size: 0.85rem;
color: var(--witch-plum); color: var(--witch-plum);
margin-top: 0.5rem; margin-top: 0.5rem;
@@ -1417,6 +1482,7 @@ export class BooksListComponent implements OnInit {
readingCount = computed(() => this.books().filter(book => book.status === BookStatus.reading).length); readingCount = computed(() => this.books().filter(book => book.status === BookStatus.reading).length);
finishedCount = computed(() => this.books().filter(book => book.status === BookStatus.finished).length); finishedCount = computed(() => this.books().filter(book => book.status === BookStatus.finished).length);
toReadCount = computed(() => this.books().filter(book => book.status === BookStatus.toRead).length); toReadCount = computed(() => this.books().filter(book => book.status === BookStatus.toRead).length);
retiredCount = computed(() => this.books().filter(book => book.status === BookStatus.retired).length);
// Get all unique tags from all books // Get all unique tags from all books
allTags = computed(() => { allTags = computed(() => {
@@ -1467,11 +1533,13 @@ export class BooksListComponent implements OnInit {
totalFilteredBooks = computed(() => this.filteredBooks().length); totalFilteredBooks = computed(() => this.filteredBooks().length);
newBook: Partial<CreateBookDto> = { newBook: Partial<CreateBookDto> & { dateStarted?: Date; dateFinished?: Date } = {
title: '', title: '',
author: '', author: '',
isbn: '', isbn: '',
status: BookStatus.toRead, status: BookStatus.toRead,
dateStarted: undefined,
dateFinished: undefined,
rating: undefined, rating: undefined,
notes: '', notes: '',
tags: [], tags: [],
@@ -1552,6 +1620,7 @@ export class BooksListComponent implements OnInit {
case BookStatus.reading: return 'Currently Reading'; case BookStatus.reading: return 'Currently Reading';
case BookStatus.finished: return 'Finished'; case BookStatus.finished: return 'Finished';
case BookStatus.toRead: return 'To Read'; case BookStatus.toRead: return 'To Read';
case BookStatus.retired: return 'Retired';
} }
} }
@@ -1568,6 +1637,8 @@ export class BooksListComponent implements OnInit {
author: '', author: '',
isbn: '', isbn: '',
status: BookStatus.toRead, status: BookStatus.toRead,
dateStarted: undefined,
dateFinished: undefined,
rating: undefined, rating: undefined,
notes: '', notes: '',
coverImage: undefined, coverImage: undefined,
@@ -1634,6 +1705,8 @@ export class BooksListComponent implements OnInit {
author: this.newBook.author, author: this.newBook.author,
isbn: this.newBook.isbn, isbn: this.newBook.isbn,
status: this.newBook.status, status: this.newBook.status,
dateStarted: this.newBook.dateStarted ? new Date(this.newBook.dateStarted) : undefined,
dateFinished: this.newBook.dateFinished ? new Date(this.newBook.dateFinished) : undefined,
rating: this.newBook.rating, rating: this.newBook.rating,
notes: this.newBook.notes, notes: this.newBook.notes,
coverImage: this.newBook.coverImage, coverImage: this.newBook.coverImage,
@@ -1662,6 +1735,8 @@ export class BooksListComponent implements OnInit {
author: book.author, author: book.author,
isbn: book.isbn, isbn: book.isbn,
status: book.status, status: book.status,
dateStarted: book.dateStarted,
dateFinished: book.dateFinished,
rating: book.rating, rating: book.rating,
notes: book.notes, notes: book.notes,
coverImage: book.coverImage, coverImage: book.coverImage,
@@ -1690,7 +1765,13 @@ export class BooksListComponent implements OnInit {
const book = this.editingBook(); const book = this.editingBook();
if (!book || !this.editBook.title || !this.editBook.author || !this.editBook.status) return; if (!book || !this.editBook.title || !this.editBook.author || !this.editBook.status) return;
this.booksService.updateBook(book.id, this.editBook).subscribe(() => { const updateData = {
...this.editBook,
dateStarted: this.editBook.dateStarted ? new Date(this.editBook.dateStarted) : undefined,
dateFinished: this.editBook.dateFinished ? new Date(this.editBook.dateFinished) : undefined,
};
this.booksService.updateBook(book.id, updateData).subscribe(() => {
this.loadBooks(); this.loadBooks();
this.cancelEdit(); this.cancelEdit();
}); });
@@ -1888,7 +1969,7 @@ export class BooksListComponent implements OnInit {
try { try {
await this.suggestionService.createSuggestion({ await this.suggestionService.createSuggestion({
entityType: SuggestionEntity.BOOK, entityType: SuggestionEntity.book,
title: this.suggestedBook.title, title: this.suggestedBook.title,
author: this.suggestedBook.author, author: this.suggestedBook.author,
isbn: this.suggestedBook.isbn, isbn: this.suggestedBook.isbn,
apps/frontend/src/app/components/games/games-list.component.ts
+101 -11
View File
@@ -67,9 +67,30 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
<option [value]="GameStatus.playing">Currently Playing</option> <option [value]="GameStatus.playing">Currently Playing</option>
<option [value]="GameStatus.completed">Completed</option> <option [value]="GameStatus.completed">Completed</option>
<option [value]="GameStatus.backlog">In Backlog</option> <option [value]="GameStatus.backlog">In Backlog</option>
<option [value]="GameStatus.retired">Retired</option>
</select> </select>
</div> </div>
<div class="form-group">
<label for="dateStarted">Date Started</label>
<input
type="date"
id="dateStarted"
[(ngModel)]="newGame.dateStarted"
name="dateStarted"
>
</div>
<div class="form-group">
<label for="dateFinished">Date Finished</label>
<input
type="date"
id="dateFinished"
[(ngModel)]="newGame.dateFinished"
name="dateFinished"
>
</div>
<div class="form-group"> <div class="form-group">
<label for="rating">Rating (1-10)</label> <label for="rating">Rating (1-10)</label>
<input <input
@@ -114,8 +135,7 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Tags</label> <div class="tags-input-container" aria-label="Tags">
<div class="tags-input-container">
@for (tag of newGame.tags; track tag; let i = $index) { @for (tag of newGame.tags; track tag; let i = $index) {
<span class="tag"> <span class="tag">
{{ tag }} {{ tag }}
@@ -132,8 +152,7 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group" aria-label="External Links">
<label>External Links</label>
<div class="links-list"> <div class="links-list">
@for (link of newGame.links; track link.url; let i = $index) { @for (link of newGame.links; track link.url; let i = $index) {
<div class="link-item"> <div class="link-item">
@@ -198,9 +217,30 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
<option [value]="GameStatus.playing">Currently Playing</option> <option [value]="GameStatus.playing">Currently Playing</option>
<option [value]="GameStatus.completed">Completed</option> <option [value]="GameStatus.completed">Completed</option>
<option [value]="GameStatus.backlog">In Backlog</option> <option [value]="GameStatus.backlog">In Backlog</option>
<option [value]="GameStatus.retired">Retired</option>
</select> </select>
</div> </div>
<div class="form-group">
<label for="edit-dateStarted">Date Started</label>
<input
type="date"
id="edit-dateStarted"
[(ngModel)]="editGame.dateStarted"
name="dateStarted"
>
</div>
<div class="form-group">
<label for="edit-dateFinished">Date Finished</label>
<input
type="date"
id="edit-dateFinished"
[(ngModel)]="editGame.dateFinished"
name="dateFinished"
>
</div>
<div class="form-group"> <div class="form-group">
<label for="edit-rating">Rating (1-10)</label> <label for="edit-rating">Rating (1-10)</label>
<input <input
@@ -245,8 +285,7 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Tags</label> <div class="tags-input-container" aria-label="Tags">
<div class="tags-input-container">
@for (tag of editGame.tags; track tag; let i = $index) { @for (tag of editGame.tags; track tag; let i = $index) {
<span class="tag"> <span class="tag">
{{ tag }} {{ tag }}
@@ -263,8 +302,7 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group" aria-label="External Links">
<label>External Links</label>
<div class="links-list"> <div class="links-list">
@for (link of editGame.links; track link.url; let i = $index) { @for (link of editGame.links; track link.url; let i = $index) {
<div class="link-item"> <div class="link-item">
@@ -436,6 +474,13 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
> >
Backlog ({{ backlogCount() }}) Backlog ({{ backlogCount() }})
</button> </button>
<button
(click)="setFilter(GameStatus.retired)"
[class.active]="statusFilter() === GameStatus.retired"
class="filter-btn"
>
Retired ({{ retiredCount() }})
</button>
</div> </div>
@if (loading()) { @if (loading()) {
@@ -504,6 +549,26 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
</div> </div>
} }
@if (game.dateStarted) {
<p class="date-started">
Started: {{ formatDate(game.dateStarted) }}
</p>
}
@if (game.dateFinished) {
<p class="date-finished">
Finished: {{ formatDate(game.dateFinished) }}
</p>
}
<p class="date-added">
Added: {{ formatDate(game.createdAt) }}
</p>
<p class="date-updated">
Updated: {{ formatDate(game.updatedAt) }}
</p>
@if (authService.isAdmin()) { @if (authService.isAdmin()) {
<div class="actions"> <div class="actions">
<button (click)="startEdit(game)" class="btn btn-secondary btn-sm"> <button (click)="startEdit(game)" class="btn btn-secondary btn-sm">
@@ -858,6 +923,15 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
margin: 0.5rem 0; margin: 0.5rem 0;
} }
.date-started,
.date-finished,
.date-added,
.date-updated {
font-size: 0.85rem;
color: #4b5563;
margin-top: 0.5rem;
}
.actions { .actions {
margin-top: 1rem; margin-top: 1rem;
} }
@@ -1213,6 +1287,7 @@ export class GamesListComponent implements OnInit {
playingCount = computed(() => this.games().filter(game => game.status === GameStatus.playing).length); playingCount = computed(() => this.games().filter(game => game.status === GameStatus.playing).length);
completedCount = computed(() => this.games().filter(game => game.status === GameStatus.completed).length); completedCount = computed(() => this.games().filter(game => game.status === GameStatus.completed).length);
backlogCount = computed(() => this.games().filter(game => game.status === GameStatus.backlog).length); backlogCount = computed(() => this.games().filter(game => game.status === GameStatus.backlog).length);
retiredCount = computed(() => this.games().filter(game => game.status === GameStatus.retired).length);
allTags = computed(() => { allTags = computed(() => {
const tagsSet = new Set<string>(); const tagsSet = new Set<string>();
@@ -1261,10 +1336,12 @@ export class GamesListComponent implements OnInit {
totalFilteredGames = computed(() => this.filteredGames().length); totalFilteredGames = computed(() => this.filteredGames().length);
newGame: Partial<CreateGameDto> = { newGame: Partial<CreateGameDto> & { dateStarted?: Date; dateFinished?: Date } = {
title: '', title: '',
platform: '', platform: '',
status: GameStatus.backlog, status: GameStatus.backlog,
dateStarted: undefined,
dateFinished: undefined,
rating: undefined, rating: undefined,
notes: '', notes: '',
tags: [], tags: [],
@@ -1341,6 +1418,7 @@ export class GamesListComponent implements OnInit {
case GameStatus.playing: return 'Currently Playing'; case GameStatus.playing: return 'Currently Playing';
case GameStatus.completed: return 'Completed'; case GameStatus.completed: return 'Completed';
case GameStatus.backlog: return 'In Backlog'; case GameStatus.backlog: return 'In Backlog';
case GameStatus.retired: return 'Retired';
} }
} }
@@ -1356,6 +1434,8 @@ export class GamesListComponent implements OnInit {
title: '', title: '',
platform: '', platform: '',
status: GameStatus.backlog, status: GameStatus.backlog,
dateStarted: undefined,
dateFinished: undefined,
rating: undefined, rating: undefined,
notes: '', notes: '',
coverImage: undefined, coverImage: undefined,
@@ -1424,6 +1504,8 @@ export class GamesListComponent implements OnInit {
rating: this.newGame.rating, rating: this.newGame.rating,
notes: this.newGame.notes, notes: this.newGame.notes,
coverImage: this.newGame.coverImage, coverImage: this.newGame.coverImage,
dateStarted: this.newGame.dateStarted ? new Date(this.newGame.dateStarted) : undefined,
dateFinished: this.newGame.dateFinished ? new Date(this.newGame.dateFinished) : undefined,
tags: this.newGame.tags || [], tags: this.newGame.tags || [],
links: this.newGame.links || [] links: this.newGame.links || []
}; };
@@ -1448,6 +1530,8 @@ export class GamesListComponent implements OnInit {
title: game.title, title: game.title,
platform: game.platform, platform: game.platform,
status: game.status, status: game.status,
dateStarted: game.dateStarted,
dateFinished: game.dateFinished,
rating: game.rating, rating: game.rating,
notes: game.notes, notes: game.notes,
coverImage: game.coverImage, coverImage: game.coverImage,
@@ -1476,7 +1560,13 @@ export class GamesListComponent implements OnInit {
const game = this.editingGame(); const game = this.editingGame();
if (!game || !this.editGame.title || !this.editGame.status) return; if (!game || !this.editGame.title || !this.editGame.status) return;
this.gamesService.updateGame(game.id, this.editGame).subscribe(() => { const updateData: UpdateGameDto = {
...this.editGame,
dateStarted: this.editGame.dateStarted ? new Date(this.editGame.dateStarted) : undefined,
dateFinished: this.editGame.dateFinished ? new Date(this.editGame.dateFinished) : undefined
};
this.gamesService.updateGame(game.id, updateData).subscribe(() => {
this.loadGames(); this.loadGames();
this.cancelEdit(); this.cancelEdit();
}); });
@@ -1673,7 +1763,7 @@ export class GamesListComponent implements OnInit {
try { try {
await this.suggestionService.createSuggestion({ await this.suggestionService.createSuggestion({
entityType: SuggestionEntity.GAME, entityType: SuggestionEntity.game,
title: this.suggestedGame.title, title: this.suggestedGame.title,
platform: this.suggestedGame.platform, platform: this.suggestedGame.platform,
notes: this.suggestedGame.notes, notes: this.suggestedGame.notes,
apps/frontend/src/app/components/header/header.component.ts
+103 -7
View File
@@ -35,17 +35,34 @@ import { ApiService } from '../../services/api.service';
<div class="auth-section"> <div class="auth-section">
@if (authService.user(); as user) { @if (authService.user(); as user) {
<span class="welcome">Welcome, {{ user.username }}!</span> <div class="user-menu">
@if (user.avatar) {
<img
[src]="user.avatar"
[alt]="user.username"
class="user-avatar"
(click)="toggleDropdown()"
(keyup.enter)="toggleDropdown()"
(keyup.space)="toggleDropdown()"
tabindex="0"
role="button"
/>
}
@if (showDropdown()) {
<div class="dropdown-menu">
@if (!user.isAdmin) { @if (!user.isAdmin) {
<a routerLink="/my-suggestions" class="user-link">My Suggestions</a> <a routerLink="/my-suggestions" class="dropdown-item" (click)="closeDropdown()">My Suggestions</a>
} }
<a routerLink="/my-likes" class="user-link">My Likes</a> <a routerLink="/my-likes" class="dropdown-item" (click)="closeDropdown()">My Likes</a>
@if (user.isAdmin) { @if (user.isAdmin) {
<a routerLink="/admin/users" class="admin-badge">Users</a> <a routerLink="/admin/users" class="dropdown-item" (click)="closeDropdown()">Users</a>
<a routerLink="/admin/audit" class="admin-badge">Audit</a> <a routerLink="/admin/audit" class="dropdown-item" (click)="closeDropdown()">Audit</a>
<a routerLink="/admin/suggestions" class="admin-badge">Suggestions</a> <a routerLink="/admin/suggestions" class="dropdown-item" (click)="closeDropdown()">Suggestions</a>
} }
<button (click)="logout()" class="btn btn-secondary">Logout</button> <button (click)="logout()" class="dropdown-item logout-btn">Logout</button>
</div>
}
</div>
} @else { } @else {
<button (click)="login()" class="btn btn-primary">Login with Discord</button> <button (click)="login()" class="btn btn-primary">Login with Discord</button>
} }
@@ -122,6 +139,75 @@ import { ApiService } from '../../services/api.service';
color: var(--witch-lavender); color: var(--witch-lavender);
} }
.user-menu {
position: relative;
}
.user-avatar {
width: 40px;
height: 40px;
border-radius: 50%;
border: 2px solid var(--witch-lavender);
transition: all 0.3s;
cursor: pointer;
}
.user-avatar:hover {
border-color: var(--witch-moon);
transform: scale(1.1);
}
.dropdown-menu {
position: absolute;
top: 50px;
right: 0;
background-color: var(--witch-purple);
border: 2px solid var(--witch-lavender);
border-radius: 8px;
padding: 0.5rem 0;
min-width: 180px;
box-shadow: 0 4px 12px var(--witch-shadow);
z-index: 1000;
animation: fadeIn 0.2s ease-in;
}
@keyframes fadeIn {
from {
opacity: 0;
transform: translateY(-10px);
}
to {
opacity: 1;
transform: translateY(0);
}
}
.dropdown-item {
display: block;
width: 100%;
padding: 0.75rem 1rem;
color: var(--witch-lavender);
text-decoration: none;
background: none;
border: none;
text-align: left;
font-size: 0.9rem;
cursor: pointer;
transition: all 0.2s;
}
.dropdown-item:hover {
background-color: var(--witch-plum);
color: var(--witch-moon);
}
.logout-btn {
border-top: 1px solid var(--witch-lavender);
margin-top: 0.5rem;
padding-top: 0.75rem;
font-weight: 500;
}
.admin-badge { .admin-badge {
background-color: var(--witch-rose); background-color: var(--witch-rose);
color: var(--witch-moon); color: var(--witch-moon);
@@ -190,6 +276,7 @@ export class HeaderComponent implements OnInit {
authService = inject(AuthService); authService = inject(AuthService);
private apiService = inject(ApiService); private apiService = inject(ApiService);
version = signal<string | null>(null); version = signal<string | null>(null);
showDropdown = signal<boolean>(false);
ngOnInit() { ngOnInit() {
this.apiService.get<{ version: string }>('/version').subscribe({ this.apiService.get<{ version: string }>('/version').subscribe({
@@ -198,11 +285,20 @@ export class HeaderComponent implements OnInit {
}); });
} }
toggleDropdown() {
this.showDropdown.update(v => !v);
}
closeDropdown() {
this.showDropdown.set(false);
}
login() { login() {
this.authService.login(); this.authService.login();
} }
logout() { logout() {
this.closeDropdown();
this.authService.logout().subscribe(); this.authService.logout().subscribe();
} }
} }
apps/frontend/src/app/components/manga/manga-list.component.ts
+105 -11
View File
@@ -68,9 +68,30 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion
<option [value]="MangaStatus.reading">Currently Reading</option> <option [value]="MangaStatus.reading">Currently Reading</option>
<option [value]="MangaStatus.completed">Completed</option> <option [value]="MangaStatus.completed">Completed</option>
<option [value]="MangaStatus.wantToRead">Want to Read</option> <option [value]="MangaStatus.wantToRead">Want to Read</option>
<option [value]="MangaStatus.retired">Retired</option>
</select> </select>
</div> </div>
<div class="form-group">
<label for="dateStarted">Date Started</label>
<input
type="date"
id="dateStarted"
[(ngModel)]="newManga.dateStarted"
name="dateStarted"
>
</div>
<div class="form-group">
<label for="dateFinished">Date Finished</label>
<input
type="date"
id="dateFinished"
[(ngModel)]="newManga.dateFinished"
name="dateFinished"
>
</div>
<div class="form-group"> <div class="form-group">
<label for="rating">Rating (1-10)</label> <label for="rating">Rating (1-10)</label>
<input <input
@@ -115,8 +136,7 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Tags</label> <div class="tags-input-container" aria-label="Tags">
<div class="tags-input-container">
@for (tag of newManga.tags; track tag; let i = $index) { @for (tag of newManga.tags; track tag; let i = $index) {
<span class="tag"> <span class="tag">
{{ tag }} {{ tag }}
@@ -133,8 +153,7 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group" aria-label="External Links">
<label>External Links</label>
<div class="links-list"> <div class="links-list">
@for (link of newManga.links; track link.url; let i = $index) { @for (link of newManga.links; track link.url; let i = $index) {
<div class="link-item"> <div class="link-item">
@@ -200,9 +219,30 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion
<option [value]="MangaStatus.reading">Currently Reading</option> <option [value]="MangaStatus.reading">Currently Reading</option>
<option [value]="MangaStatus.completed">Completed</option> <option [value]="MangaStatus.completed">Completed</option>
<option [value]="MangaStatus.wantToRead">Want to Read</option> <option [value]="MangaStatus.wantToRead">Want to Read</option>
<option [value]="MangaStatus.retired">Retired</option>
</select> </select>
</div> </div>
<div class="form-group">
<label for="edit-dateStarted">Date Started</label>
<input
type="date"
id="edit-dateStarted"
[(ngModel)]="editManga.dateStarted"
name="dateStarted"
>
</div>
<div class="form-group">
<label for="edit-dateFinished">Date Finished</label>
<input
type="date"
id="edit-dateFinished"
[(ngModel)]="editManga.dateFinished"
name="dateFinished"
>
</div>
<div class="form-group"> <div class="form-group">
<label for="edit-rating">Rating (1-10)</label> <label for="edit-rating">Rating (1-10)</label>
<input <input
@@ -247,8 +287,7 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Tags</label> <div class="tags-input-container" aria-label="Tags">
<div class="tags-input-container">
@for (tag of editManga.tags; track tag; let i = $index) { @for (tag of editManga.tags; track tag; let i = $index) {
<span class="tag"> <span class="tag">
{{ tag }} {{ tag }}
@@ -265,8 +304,7 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group" aria-label="External Links">
<label>External Links</label>
<div class="links-list"> <div class="links-list">
@for (link of editManga.links; track link.url; let i = $index) { @for (link of editManga.links; track link.url; let i = $index) {
<div class="link-item"> <div class="link-item">
@@ -439,6 +477,13 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion
> >
Want to Read ({{ wantToReadCount() }}) Want to Read ({{ wantToReadCount() }})
</button> </button>
<button
(click)="setFilter(MangaStatus.retired)"
[class.active]="statusFilter() === MangaStatus.retired"
class="filter-btn"
>
Retired ({{ retiredCount() }})
</button>
</div> </div>
@if (loading()) { @if (loading()) {
@@ -505,6 +550,30 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion
</div> </div>
} }
@if (manga.dateStarted) {
<p class="date-started">
Started: {{ formatDate(manga.dateStarted) }}
</p>
}
@if (manga.dateFinished) {
<p class="date-finished">
Finished: {{ formatDate(manga.dateFinished) }}
</p>
}
@if (manga.createdAt) {
<p class="date-added">
Added: {{ formatDate(manga.createdAt) }}
</p>
}
@if (manga.updatedAt) {
<p class="date-updated">
Updated: {{ formatDate(manga.updatedAt) }}
</p>
}
@if (authService.isAdmin()) { @if (authService.isAdmin()) {
<div class="actions"> <div class="actions">
<button (click)="startEdit(manga)" class="btn btn-secondary btn-sm"> <button (click)="startEdit(manga)" class="btn btn-secondary btn-sm">
@@ -861,6 +930,15 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion
margin: 0.5rem 0; margin: 0.5rem 0;
} }
.date-started,
.date-finished,
.date-added,
.date-updated {
font-size: 0.85rem;
color: #4b5563;
margin-top: 0.5rem;
}
.actions { .actions {
margin-top: 1rem; margin-top: 1rem;
} }
@@ -1216,6 +1294,7 @@ export class MangaListComponent implements OnInit {
readingCount = computed(() => this.mangaList().filter(m => m.status === MangaStatus.reading).length); readingCount = computed(() => this.mangaList().filter(m => m.status === MangaStatus.reading).length);
completedCount = computed(() => this.mangaList().filter(m => m.status === MangaStatus.completed).length); completedCount = computed(() => this.mangaList().filter(m => m.status === MangaStatus.completed).length);
wantToReadCount = computed(() => this.mangaList().filter(m => m.status === MangaStatus.wantToRead).length); wantToReadCount = computed(() => this.mangaList().filter(m => m.status === MangaStatus.wantToRead).length);
retiredCount = computed(() => this.mangaList().filter(m => m.status === MangaStatus.retired).length);
allTags = computed(() => { allTags = computed(() => {
const tagsSet = new Set<string>(); const tagsSet = new Set<string>();
@@ -1264,10 +1343,12 @@ export class MangaListComponent implements OnInit {
totalFilteredManga = computed(() => this.filteredManga().length); totalFilteredManga = computed(() => this.filteredManga().length);
newManga: Partial<CreateMangaDto> = { newManga: Partial<CreateMangaDto> & { dateStarted?: Date; dateFinished?: Date } = {
title: '', title: '',
author: '', author: '',
status: MangaStatus.wantToRead, status: MangaStatus.wantToRead,
dateStarted: undefined,
dateFinished: undefined,
rating: undefined, rating: undefined,
notes: '', notes: '',
tags: [], tags: [],
@@ -1344,6 +1425,7 @@ export class MangaListComponent implements OnInit {
case MangaStatus.reading: return 'Currently Reading'; case MangaStatus.reading: return 'Currently Reading';
case MangaStatus.completed: return 'Completed'; case MangaStatus.completed: return 'Completed';
case MangaStatus.wantToRead: return 'Want to Read'; case MangaStatus.wantToRead: return 'Want to Read';
case MangaStatus.retired: return 'Retired';
} }
} }
@@ -1359,6 +1441,8 @@ export class MangaListComponent implements OnInit {
title: '', title: '',
author: '', author: '',
status: MangaStatus.wantToRead, status: MangaStatus.wantToRead,
dateStarted: undefined,
dateFinished: undefined,
rating: undefined, rating: undefined,
notes: '', notes: '',
coverImage: undefined, coverImage: undefined,
@@ -1424,6 +1508,8 @@ export class MangaListComponent implements OnInit {
title: this.newManga.title, title: this.newManga.title,
author: this.newManga.author, author: this.newManga.author,
status: this.newManga.status, status: this.newManga.status,
dateStarted: this.newManga.dateStarted ? new Date(this.newManga.dateStarted) : undefined,
dateFinished: this.newManga.dateFinished ? new Date(this.newManga.dateFinished) : undefined,
rating: this.newManga.rating, rating: this.newManga.rating,
notes: this.newManga.notes, notes: this.newManga.notes,
coverImage: this.newManga.coverImage, coverImage: this.newManga.coverImage,
@@ -1451,6 +1537,8 @@ export class MangaListComponent implements OnInit {
title: manga.title, title: manga.title,
author: manga.author, author: manga.author,
status: manga.status, status: manga.status,
dateStarted: manga.dateStarted,
dateFinished: manga.dateFinished,
rating: manga.rating, rating: manga.rating,
notes: manga.notes, notes: manga.notes,
coverImage: manga.coverImage, coverImage: manga.coverImage,
@@ -1479,7 +1567,13 @@ export class MangaListComponent implements OnInit {
const manga = this.editingManga(); const manga = this.editingManga();
if (!manga || !this.editManga.title || !this.editManga.author || !this.editManga.status) return; if (!manga || !this.editManga.title || !this.editManga.author || !this.editManga.status) return;
this.mangaService.updateManga(manga.id, this.editManga).subscribe(() => { const updateData = {
...this.editManga,
dateStarted: this.editManga.dateStarted ? new Date(this.editManga.dateStarted) : undefined,
dateFinished: this.editManga.dateFinished ? new Date(this.editManga.dateFinished) : undefined,
};
this.mangaService.updateManga(manga.id, updateData).subscribe(() => {
this.loadManga(); this.loadManga();
this.cancelEdit(); this.cancelEdit();
}); });
@@ -1674,7 +1768,7 @@ export class MangaListComponent implements OnInit {
try { try {
await this.suggestionService.createSuggestion({ await this.suggestionService.createSuggestion({
entityType: SuggestionEntity.MANGA, entityType: SuggestionEntity.manga,
title: this.suggestedManga.title, title: this.suggestedManga.title,
author: this.suggestedManga.author, author: this.suggestedManga.author,
notes: this.suggestedManga.notes, notes: this.suggestedManga.notes,
apps/frontend/src/app/components/music/music-list.component.ts
+97 -15
View File
@@ -77,9 +77,30 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment,
<option [value]="MusicStatus.listening">Currently Listening</option> <option [value]="MusicStatus.listening">Currently Listening</option>
<option [value]="MusicStatus.completed">Completed</option> <option [value]="MusicStatus.completed">Completed</option>
<option [value]="MusicStatus.wantToListen">Want to Listen</option> <option [value]="MusicStatus.wantToListen">Want to Listen</option>
<option [value]="MusicStatus.retired">Retired</option>
</select> </select>
</div> </div>
<div class="form-group">
<label for="dateStarted">Date Started</label>
<input
type="date"
id="dateStarted"
[(ngModel)]="newMusic.dateStarted"
name="dateStarted"
>
</div>
<div class="form-group">
<label for="dateFinished">Date Finished</label>
<input
type="date"
id="dateFinished"
[(ngModel)]="newMusic.dateFinished"
name="dateFinished"
>
</div>
<div class="form-group"> <div class="form-group">
<label for="rating">Rating (1-10)</label> <label for="rating">Rating (1-10)</label>
<input <input
@@ -124,8 +145,7 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment,
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Tags</label> <div class="tags-input-container" aria-label="Tags">
<div class="tags-input-container">
@for (tag of newMusic.tags; track tag; let i = $index) { @for (tag of newMusic.tags; track tag; let i = $index) {
<span class="tag"> <span class="tag">
{{ tag }} {{ tag }}
@@ -142,8 +162,7 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment,
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group" aria-label="External Links">
<label>External Links</label>
<div class="links-list"> <div class="links-list">
@for (link of newMusic.links; track link.url; let i = $index) { @for (link of newMusic.links; track link.url; let i = $index) {
<div class="link-item"> <div class="link-item">
@@ -218,9 +237,30 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment,
<option [value]="MusicStatus.listening">Currently Listening</option> <option [value]="MusicStatus.listening">Currently Listening</option>
<option [value]="MusicStatus.completed">Completed</option> <option [value]="MusicStatus.completed">Completed</option>
<option [value]="MusicStatus.wantToListen">Want to Listen</option> <option [value]="MusicStatus.wantToListen">Want to Listen</option>
<option [value]="MusicStatus.retired">Retired</option>
</select> </select>
</div> </div>
<div class="form-group">
<label for="edit-dateStarted">Date Started</label>
<input
type="date"
id="edit-dateStarted"
[(ngModel)]="editMusicData.dateStarted"
name="dateStarted"
>
</div>
<div class="form-group">
<label for="edit-dateFinished">Date Finished</label>
<input
type="date"
id="edit-dateFinished"
[(ngModel)]="editMusicData.dateFinished"
name="dateFinished"
>
</div>
<div class="form-group"> <div class="form-group">
<label for="edit-rating">Rating (1-10)</label> <label for="edit-rating">Rating (1-10)</label>
<input <input
@@ -265,8 +305,7 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment,
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Tags</label> <div class="tags-input-container" aria-label="Tags">
<div class="tags-input-container">
@for (tag of editMusicData.tags; track tag; let i = $index) { @for (tag of editMusicData.tags; track tag; let i = $index) {
<span class="tag"> <span class="tag">
{{ tag }} {{ tag }}
@@ -283,8 +322,7 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment,
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group" aria-label="External Links">
<label>External Links</label>
<div class="links-list"> <div class="links-list">
@for (link of editMusicData.links; track link.url; let i = $index) { @for (link of editMusicData.links; track link.url; let i = $index) {
<div class="link-item"> <div class="link-item">
@@ -500,6 +538,13 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment,
> >
Want to Listen ({{ wantToListenCount() }}) Want to Listen ({{ wantToListenCount() }})
</button> </button>
<button
(click)="setStatusFilter(MusicStatus.retired)"
[class.active]="statusFilter() === MusicStatus.retired"
class="filter-btn"
>
Retired ({{ retiredCount() }})
</button>
</div> </div>
</div> </div>
@@ -581,9 +626,27 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment,
</div> </div>
} }
@if (music.dateCompleted) { @if (music.dateStarted) {
<p class="date-completed"> <p class="date-started">
Completed: {{ formatDate(music.dateCompleted) }} Started: {{ formatDate(music.dateStarted) }}
</p>
}
@if (music.dateFinished) {
<p class="date-finished">
Finished: {{ formatDate(music.dateFinished) }}
</p>
}
@if (music.createdAt) {
<p class="date-added">
Added: {{ formatDate(music.createdAt) }}
</p>
}
@if (music.updatedAt) {
<p class="date-updated">
Updated: {{ formatDate(music.updatedAt) }}
</p> </p>
} }
@@ -1017,7 +1080,10 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment,
margin: 0.5rem 0; margin: 0.5rem 0;
} }
.date-completed { .date-started,
.date-finished,
.date-added,
.date-updated {
font-size: 0.85rem; font-size: 0.85rem;
color: var(--witch-plum); color: var(--witch-plum);
margin-top: 0.5rem; margin-top: 0.5rem;
@@ -1435,6 +1501,7 @@ export class MusicListComponent implements OnInit {
listeningCount = computed(() => this.music().filter(m => m.status === MusicStatus.listening).length); listeningCount = computed(() => this.music().filter(m => m.status === MusicStatus.listening).length);
completedCount = computed(() => this.music().filter(m => m.status === MusicStatus.completed).length); completedCount = computed(() => this.music().filter(m => m.status === MusicStatus.completed).length);
wantToListenCount = computed(() => this.music().filter(m => m.status === MusicStatus.wantToListen).length); wantToListenCount = computed(() => this.music().filter(m => m.status === MusicStatus.wantToListen).length);
retiredCount = computed(() => this.music().filter(m => m.status === MusicStatus.retired).length);
allTags = computed(() => { allTags = computed(() => {
const tagsSet = new Set<string>(); const tagsSet = new Set<string>();
@@ -1488,11 +1555,13 @@ export class MusicListComponent implements OnInit {
totalFilteredMusic = computed(() => this.filteredMusic().length); totalFilteredMusic = computed(() => this.filteredMusic().length);
newMusic: Partial<CreateMusicDto> = { newMusic: Partial<CreateMusicDto> & { dateStarted?: Date; dateFinished?: Date } = {
title: '', title: '',
artist: '', artist: '',
type: MusicType.album, type: MusicType.album,
status: MusicStatus.wantToListen, status: MusicStatus.wantToListen,
dateStarted: undefined,
dateFinished: undefined,
rating: undefined, rating: undefined,
notes: '', notes: '',
tags: [], tags: [],
@@ -1583,6 +1652,7 @@ export class MusicListComponent implements OnInit {
case MusicStatus.listening: return 'Currently Listening'; case MusicStatus.listening: return 'Currently Listening';
case MusicStatus.completed: return 'Completed'; case MusicStatus.completed: return 'Completed';
case MusicStatus.wantToListen: return 'Want to Listen'; case MusicStatus.wantToListen: return 'Want to Listen';
case MusicStatus.retired: return 'Retired';
} }
} }
@@ -1599,6 +1669,8 @@ export class MusicListComponent implements OnInit {
artist: '', artist: '',
type: MusicType.album, type: MusicType.album,
status: MusicStatus.wantToListen, status: MusicStatus.wantToListen,
dateStarted: undefined,
dateFinished: undefined,
rating: undefined, rating: undefined,
notes: '', notes: '',
coverArt: undefined, coverArt: undefined,
@@ -1665,6 +1737,8 @@ export class MusicListComponent implements OnInit {
artist: this.newMusic.artist, artist: this.newMusic.artist,
type: this.newMusic.type, type: this.newMusic.type,
status: this.newMusic.status, status: this.newMusic.status,
dateStarted: this.newMusic.dateStarted ? new Date(this.newMusic.dateStarted) : undefined,
dateFinished: this.newMusic.dateFinished ? new Date(this.newMusic.dateFinished) : undefined,
rating: this.newMusic.rating, rating: this.newMusic.rating,
notes: this.newMusic.notes, notes: this.newMusic.notes,
coverArt: this.newMusic.coverArt, coverArt: this.newMusic.coverArt,
@@ -1693,6 +1767,8 @@ export class MusicListComponent implements OnInit {
artist: music.artist, artist: music.artist,
type: music.type, type: music.type,
status: music.status, status: music.status,
dateStarted: music.dateStarted,
dateFinished: music.dateFinished,
rating: music.rating, rating: music.rating,
notes: music.notes, notes: music.notes,
coverArt: music.coverArt, coverArt: music.coverArt,
@@ -1721,7 +1797,13 @@ export class MusicListComponent implements OnInit {
const music = this.editingMusic(); const music = this.editingMusic();
if (!music || !this.editMusicData.title || !this.editMusicData.artist || !this.editMusicData.type || !this.editMusicData.status) return; if (!music || !this.editMusicData.title || !this.editMusicData.artist || !this.editMusicData.type || !this.editMusicData.status) return;
this.musicService.updateMusic(music.id, this.editMusicData).subscribe(() => { const updateData = {
...this.editMusicData,
dateStarted: this.editMusicData.dateStarted ? new Date(this.editMusicData.dateStarted) : undefined,
dateFinished: this.editMusicData.dateFinished ? new Date(this.editMusicData.dateFinished) : undefined,
};
this.musicService.updateMusic(music.id, updateData).subscribe(() => {
this.loadMusic(); this.loadMusic();
this.cancelEdit(); this.cancelEdit();
}); });
@@ -1919,7 +2001,7 @@ export class MusicListComponent implements OnInit {
try { try {
await this.suggestionService.createSuggestion({ await this.suggestionService.createSuggestion({
entityType: SuggestionEntity.MUSIC, entityType: SuggestionEntity.music,
title: this.suggestedMusic.title, title: this.suggestedMusic.title,
artist: this.suggestedMusic.artist, artist: this.suggestedMusic.artist,
type: this.suggestedMusic.type, type: this.suggestedMusic.type,
apps/frontend/src/app/components/my-likes/my-likes.component.ts
+3 -3
View File
@@ -373,12 +373,12 @@ export class MyLikesComponent implements OnInit {
} }
getItemTitle(likedItem: LikedItemDto): string { getItemTitle(likedItem: LikedItemDto): string {
const item = likedItem.item; const item = likedItem.item as any;
return item.title || item.name || 'Untitled'; return item.title || item.name || 'Untitled';
} }
getItemSubtitle(likedItem: LikedItemDto): string { getItemSubtitle(likedItem: LikedItemDto): string {
const item = likedItem.item; const item = likedItem.item as any;
const type = likedItem.like.entityType; const type = likedItem.like.entityType;
switch (type) { switch (type) {
@@ -400,7 +400,7 @@ export class MyLikesComponent implements OnInit {
} }
getItemImage(likedItem: LikedItemDto): string | null { getItemImage(likedItem: LikedItemDto): string | null {
const item = likedItem.item; const item = likedItem.item as any;
return item.coverImage || item.imageUrl || null; return item.coverImage || item.imageUrl || null;
} }
apps/frontend/src/app/components/my-suggestions/my-suggestions.component.ts
+19 -19
View File
@@ -43,22 +43,22 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared-
All ({{ suggestions().length }}) All ({{ suggestions().length }})
</button> </button>
<button <button
(click)="setFilter(SuggestionStatus.UNREVIEWED)" (click)="setFilter(SuggestionStatus.unreviewed)"
[class.active]="statusFilter() === SuggestionStatus.UNREVIEWED" [class.active]="statusFilter() === SuggestionStatus.unreviewed"
class="filter-btn pending" class="filter-btn pending"
> >
Pending ({{ unreviewedCount() }}) Pending ({{ unreviewedCount() }})
</button> </button>
<button <button
(click)="setFilter(SuggestionStatus.ACCEPTED)" (click)="setFilter(SuggestionStatus.accepted)"
[class.active]="statusFilter() === SuggestionStatus.ACCEPTED" [class.active]="statusFilter() === SuggestionStatus.accepted"
class="filter-btn accepted" class="filter-btn accepted"
> >
Accepted ({{ acceptedCount() }}) Accepted ({{ acceptedCount() }})
</button> </button>
<button <button
(click)="setFilter(SuggestionStatus.DECLINED)" (click)="setFilter(SuggestionStatus.declined)"
[class.active]="statusFilter() === SuggestionStatus.DECLINED" [class.active]="statusFilter() === SuggestionStatus.declined"
class="filter-btn declined" class="filter-btn declined"
> >
Declined ({{ declinedCount() }}) Declined ({{ declinedCount() }})
@@ -120,7 +120,7 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared-
} }
</div> </div>
@if (suggestion.status === SuggestionStatus.DECLINED && suggestion.declineReason) { @if (suggestion.status === SuggestionStatus.declined && suggestion.declineReason) {
<div class="decline-reason"> <div class="decline-reason">
<strong>Reason:</strong> {{ suggestion.declineReason }} <strong>Reason:</strong> {{ suggestion.declineReason }}
</div> </div>
@@ -337,9 +337,9 @@ export class MySuggestionsComponent implements OnInit {
SuggestionStatus = SuggestionStatus; SuggestionStatus = SuggestionStatus;
unreviewedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.UNREVIEWED).length; unreviewedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.unreviewed).length;
acceptedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.ACCEPTED).length; acceptedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.accepted).length;
declinedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.DECLINED).length; declinedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.declined).length;
filteredSuggestions = computed(() => { filteredSuggestions = computed(() => {
const filter = this.statusFilter(); const filter = this.statusFilter();
@@ -397,20 +397,20 @@ export class MySuggestionsComponent implements OnInit {
getStatusLabel(status: SuggestionStatus): string { getStatusLabel(status: SuggestionStatus): string {
switch (status) { switch (status) {
case SuggestionStatus.UNREVIEWED: return 'Pending Review'; case SuggestionStatus.unreviewed: return 'Pending Review';
case SuggestionStatus.ACCEPTED: return 'Accepted'; case SuggestionStatus.accepted: return 'Accepted';
case SuggestionStatus.DECLINED: return 'Declined'; case SuggestionStatus.declined: return 'Declined';
} }
} }
getEntityIcon(entityType: SuggestionEntity): string { getEntityIcon(entityType: SuggestionEntity): string {
switch (entityType) { switch (entityType) {
case SuggestionEntity.GAME: return '🎮'; case SuggestionEntity.game: return '🎮';
case SuggestionEntity.BOOK: return 'đź“š'; case SuggestionEntity.book: return 'đź“š';
case SuggestionEntity.MUSIC: return '🎵'; case SuggestionEntity.music: return '🎵';
case SuggestionEntity.MANGA: return 'đź“–'; case SuggestionEntity.manga: return 'đź“–';
case SuggestionEntity.SHOW: return 'đź“ş'; case SuggestionEntity.show: return 'đź“ş';
case SuggestionEntity.ART: return '🎨'; case SuggestionEntity.art: return '🎨';
} }
} }
apps/frontend/src/app/components/shows/shows-list.component.ts
+105 -11
View File
@@ -66,9 +66,30 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg
<option [value]="ShowStatus.watching">Currently Watching</option> <option [value]="ShowStatus.watching">Currently Watching</option>
<option [value]="ShowStatus.completed">Completed</option> <option [value]="ShowStatus.completed">Completed</option>
<option [value]="ShowStatus.wantToWatch">Want to Watch</option> <option [value]="ShowStatus.wantToWatch">Want to Watch</option>
<option [value]="ShowStatus.retired">Retired</option>
</select> </select>
</div> </div>
<div class="form-group">
<label for="dateStarted">Date Started</label>
<input
type="date"
id="dateStarted"
[(ngModel)]="newShow.dateStarted"
name="dateStarted"
>
</div>
<div class="form-group">
<label for="dateFinished">Date Finished</label>
<input
type="date"
id="dateFinished"
[(ngModel)]="newShow.dateFinished"
name="dateFinished"
>
</div>
<div class="form-group"> <div class="form-group">
<label for="rating">Rating (1-10)</label> <label for="rating">Rating (1-10)</label>
<input <input
@@ -113,8 +134,7 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Tags</label> <div class="tags-input-container" aria-label="Tags">
<div class="tags-input-container">
@for (tag of newShow.tags; track tag; let i = $index) { @for (tag of newShow.tags; track tag; let i = $index) {
<span class="tag"> <span class="tag">
{{ tag }} {{ tag }}
@@ -131,8 +151,7 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group" aria-label="External Links">
<label>External Links</label>
<div class="links-list"> <div class="links-list">
@for (link of newShow.links; track link.url; let i = $index) { @for (link of newShow.links; track link.url; let i = $index) {
<div class="link-item"> <div class="link-item">
@@ -196,9 +215,30 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg
<option [value]="ShowStatus.watching">Currently Watching</option> <option [value]="ShowStatus.watching">Currently Watching</option>
<option [value]="ShowStatus.completed">Completed</option> <option [value]="ShowStatus.completed">Completed</option>
<option [value]="ShowStatus.wantToWatch">Want to Watch</option> <option [value]="ShowStatus.wantToWatch">Want to Watch</option>
<option [value]="ShowStatus.retired">Retired</option>
</select> </select>
</div> </div>
<div class="form-group">
<label for="edit-dateStarted">Date Started</label>
<input
type="date"
id="edit-dateStarted"
[(ngModel)]="editShow.dateStarted"
name="dateStarted"
>
</div>
<div class="form-group">
<label for="edit-dateFinished">Date Finished</label>
<input
type="date"
id="edit-dateFinished"
[(ngModel)]="editShow.dateFinished"
name="dateFinished"
>
</div>
<div class="form-group"> <div class="form-group">
<label for="edit-rating">Rating (1-10)</label> <label for="edit-rating">Rating (1-10)</label>
<input <input
@@ -243,8 +283,7 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Tags</label> <div class="tags-input-container" aria-label="Tags">
<div class="tags-input-container">
@for (tag of editShow.tags; track tag; let i = $index) { @for (tag of editShow.tags; track tag; let i = $index) {
<span class="tag"> <span class="tag">
{{ tag }} {{ tag }}
@@ -261,8 +300,7 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group" aria-label="External Links">
<label>External Links</label>
<div class="links-list"> <div class="links-list">
@for (link of editShow.links; track link.url; let i = $index) { @for (link of editShow.links; track link.url; let i = $index) {
<div class="link-item"> <div class="link-item">
@@ -433,6 +471,13 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg
> >
Want to Watch ({{ wantToWatchCount() }}) Want to Watch ({{ wantToWatchCount() }})
</button> </button>
<button
(click)="setFilter(ShowStatus.retired)"
[class.active]="statusFilter() === ShowStatus.retired"
class="filter-btn"
>
Retired ({{ retiredCount() }})
</button>
</div> </div>
@if (loading()) { @if (loading()) {
@@ -499,6 +544,30 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg
</div> </div>
} }
@if (show.dateStarted) {
<p class="date-started">
Started: {{ formatDate(show.dateStarted) }}
</p>
}
@if (show.dateFinished) {
<p class="date-finished">
Finished: {{ formatDate(show.dateFinished) }}
</p>
}
@if (show.createdAt) {
<p class="date-added">
Added: {{ formatDate(show.createdAt) }}
</p>
}
@if (show.updatedAt) {
<p class="date-updated">
Updated: {{ formatDate(show.updatedAt) }}
</p>
}
@if (authService.isAdmin()) { @if (authService.isAdmin()) {
<div class="actions"> <div class="actions">
<button (click)="startEdit(show)" class="btn btn-secondary btn-sm"> <button (click)="startEdit(show)" class="btn btn-secondary btn-sm">
@@ -854,6 +923,15 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg
margin: 0.5rem 0; margin: 0.5rem 0;
} }
.date-started,
.date-finished,
.date-added,
.date-updated {
font-size: 0.85rem;
color: #4b5563;
margin-top: 0.5rem;
}
.actions { .actions {
margin-top: 1rem; margin-top: 1rem;
} }
@@ -1210,6 +1288,7 @@ export class ShowsListComponent implements OnInit {
watchingCount = computed(() => this.shows().filter(show => show.status === ShowStatus.watching).length); watchingCount = computed(() => this.shows().filter(show => show.status === ShowStatus.watching).length);
completedCount = computed(() => this.shows().filter(show => show.status === ShowStatus.completed).length); completedCount = computed(() => this.shows().filter(show => show.status === ShowStatus.completed).length);
wantToWatchCount = computed(() => this.shows().filter(show => show.status === ShowStatus.wantToWatch).length); wantToWatchCount = computed(() => this.shows().filter(show => show.status === ShowStatus.wantToWatch).length);
retiredCount = computed(() => this.shows().filter(show => show.status === ShowStatus.retired).length);
allTags = computed(() => { allTags = computed(() => {
const tagsSet = new Set<string>(); const tagsSet = new Set<string>();
@@ -1258,12 +1337,14 @@ export class ShowsListComponent implements OnInit {
totalFilteredShows = computed(() => this.filteredShows().length); totalFilteredShows = computed(() => this.filteredShows().length);
newShow: Partial<CreateShowDto> = { newShow: Partial<CreateShowDto> & { dateStarted?: Date; dateFinished?: Date } = {
title: '', title: '',
type: ShowType.tvSeries, type: ShowType.tvSeries,
status: ShowStatus.wantToWatch, status: ShowStatus.wantToWatch,
rating: undefined, rating: undefined,
notes: '', notes: '',
dateStarted: undefined,
dateFinished: undefined,
tags: [], tags: [],
links: [] links: []
}; };
@@ -1338,6 +1419,7 @@ export class ShowsListComponent implements OnInit {
case ShowStatus.watching: return 'Currently Watching'; case ShowStatus.watching: return 'Currently Watching';
case ShowStatus.completed: return 'Completed'; case ShowStatus.completed: return 'Completed';
case ShowStatus.wantToWatch: return 'Want to Watch'; case ShowStatus.wantToWatch: return 'Want to Watch';
case ShowStatus.retired: return 'Retired';
} }
} }
@@ -1365,6 +1447,8 @@ export class ShowsListComponent implements OnInit {
rating: undefined, rating: undefined,
notes: '', notes: '',
coverImage: undefined, coverImage: undefined,
dateStarted: undefined,
dateFinished: undefined,
tags: [], tags: [],
links: [] links: []
}; };
@@ -1427,6 +1511,8 @@ export class ShowsListComponent implements OnInit {
title: this.newShow.title, title: this.newShow.title,
type: this.newShow.type, type: this.newShow.type,
status: this.newShow.status, status: this.newShow.status,
dateStarted: this.newShow.dateStarted ? new Date(this.newShow.dateStarted) : undefined,
dateFinished: this.newShow.dateFinished ? new Date(this.newShow.dateFinished) : undefined,
rating: this.newShow.rating, rating: this.newShow.rating,
notes: this.newShow.notes, notes: this.newShow.notes,
coverImage: this.newShow.coverImage, coverImage: this.newShow.coverImage,
@@ -1454,6 +1540,8 @@ export class ShowsListComponent implements OnInit {
title: show.title, title: show.title,
type: show.type, type: show.type,
status: show.status, status: show.status,
dateStarted: show.dateStarted,
dateFinished: show.dateFinished,
rating: show.rating, rating: show.rating,
notes: show.notes, notes: show.notes,
coverImage: show.coverImage, coverImage: show.coverImage,
@@ -1482,7 +1570,13 @@ export class ShowsListComponent implements OnInit {
const show = this.editingShow(); const show = this.editingShow();
if (!show || !this.editShow.title || !this.editShow.type || !this.editShow.status) return; if (!show || !this.editShow.title || !this.editShow.type || !this.editShow.status) return;
this.showsService.updateShow(show.id, this.editShow).subscribe(() => { const updateData = {
...this.editShow,
dateStarted: this.editShow.dateStarted ? new Date(this.editShow.dateStarted) : undefined,
dateFinished: this.editShow.dateFinished ? new Date(this.editShow.dateFinished) : undefined,
};
this.showsService.updateShow(show.id, updateData).subscribe(() => {
this.loadShows(); this.loadShows();
this.cancelEdit(); this.cancelEdit();
}); });
@@ -1677,7 +1771,7 @@ export class ShowsListComponent implements OnInit {
try { try {
await this.suggestionService.createSuggestion({ await this.suggestionService.createSuggestion({
entityType: SuggestionEntity.SHOW, entityType: SuggestionEntity.show,
title: this.suggestedShow.title, title: this.suggestedShow.title,
type: this.suggestedShow.type, type: this.suggestedShow.type,
notes: this.suggestedShow.notes, notes: this.suggestedShow.notes,
apps/frontend/src/app/components/toast/toast.component.css
+91
View File
@@ -0,0 +1,91 @@
/**
* @copyright 2026 NHCarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
.toast-container {
position: fixed;
top: 80px;
right: 20px;
z-index: 9999;
display: flex;
flex-direction: column;
gap: 10px;
max-width: 400px;
}
.toast {
display: flex;
align-items: center;
gap: 12px;
padding: 16px;
border-radius: 8px;
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
cursor: pointer;
animation: slideIn 0.3s ease-out;
border: 2px solid;
background-color: var(--witch-purple);
color: var(--moon-white);
}
.toast-error {
border-color: #ff4444;
background-color: rgba(255, 68, 68, 0.4);
}
.toast-success {
border-color: #44ff88;
background-color: rgba(68, 255, 136, 0.4);
}
.toast-info {
border-color: var(--witch-lavender);
background-color: rgba(200, 162, 200, 0.4);
}
.toast-warning {
border-color: #ffaa44;
background-color: rgba(255, 170, 68, 0.4);
}
.toast-icon {
font-size: 20px;
flex-shrink: 0;
}
.toast-message {
flex: 1;
word-wrap: break-word;
}
.toast-close {
background: none;
border: none;
color: var(--moon-white);
font-size: 24px;
cursor: pointer;
padding: 0;
width: 24px;
height: 24px;
display: flex;
align-items: center;
justify-content: center;
flex-shrink: 0;
transition: transform 0.2s ease;
}
.toast-close:hover {
transform: scale(1.2);
}
@keyframes slideIn {
from {
transform: translateX(400px);
opacity: 0;
}
to {
transform: translateX(0);
opacity: 1;
}
}
apps/frontend/src/app/components/toast/toast.component.html
+29
View File
@@ -0,0 +1,29 @@
<!--
@copyright 2026 NHCarrigan
@license Naomi's Public License
@author Naomi Carrigan
-->
<div class="toast-container">
@for (toast of toastService.toastList(); track toast.id) {
<div
class="toast toast-{{ toast.type }}"
(click)="toastService.remove(toast.id)"
(keyup.enter)="toastService.remove(toast.id)"
(keyup.space)="toastService.remove(toast.id)"
tabindex="0"
role="button"
>
<div class="toast-icon">
@switch (toast.type) {
@case ('error') { ❌ }
@case ('success') { âś… }
@case ('info') { ℹ️ }
@case ('warning') { ⚠️ }
}
</div>
<div class="toast-message">{{ toast.message }}</div>
<button class="toast-close" (click)="toastService.remove(toast.id)">Ă—</button>
</div>
}
</div>
apps/frontend/src/app/components/toast/toast.component.ts
+18
View File
@@ -0,0 +1,18 @@
/**
* @copyright 2026 NHCarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import { Component, inject } from '@angular/core';
import { ToastService } from '../../services/toast.service';
@Component({
selector: 'app-toast',
standalone: true,
templateUrl: './toast.component.html',
styleUrls: ['./toast.component.css']
})
export class ToastComponent {
public toastService = inject(ToastService);
}
apps/frontend/src/app/initializers/console-logger.initializer.ts
+13
View File
@@ -0,0 +1,13 @@
/**
* @copyright 2026 NHCarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import { ConsoleLoggerService } from '../services/console-logger.service';
export function initializeConsoleLogger(consoleLogger: ConsoleLoggerService) {
return () => {
consoleLogger.initialise();
};
}
apps/frontend/src/app/interceptors/auth.interceptor.ts
+33 -5
View File
@@ -16,17 +16,17 @@ import {
import { Observable, catchError, throwError, switchMap, BehaviorSubject, filter, take } from 'rxjs'; import { Observable, catchError, throwError, switchMap, BehaviorSubject, filter, take } from 'rxjs';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { environment } from '../../environments/environment'; import { environment } from '../../environments/environment';
import { ToastService } from '../services/toast.service';
@Injectable() @Injectable()
export class AuthInterceptor implements HttpInterceptor { export class AuthInterceptor implements HttpInterceptor {
private router = inject(Router);
private http = inject(HttpClient);
private toast = inject(ToastService);
private isRefreshing = false; private isRefreshing = false;
private refreshTokenSubject = new BehaviorSubject<boolean | null>(null); private refreshTokenSubject = new BehaviorSubject<boolean | null>(null);
constructor(
private router: Router,
private http: HttpClient
) {}
intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> { intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
// Clone the request to add withCredentials // Clone the request to add withCredentials
const authReq = request.clone({ const authReq = request.clone({
@@ -38,6 +38,9 @@ export class AuthInterceptor implements HttpInterceptor {
if (error.status === 401 && !request.url.includes('/auth/refresh') && !request.url.includes('/auth/logout')) { if (error.status === 401 && !request.url.includes('/auth/refresh') && !request.url.includes('/auth/logout')) {
return this.handle401Error(authReq, next); return this.handle401Error(authReq, next);
} }
// Show toast for other HTTP errors
this.showErrorToast(error);
return throwError(() => error); return throwError(() => error);
}) })
); );
@@ -61,6 +64,7 @@ export class AuthInterceptor implements HttpInterceptor {
catchError((err) => { catchError((err) => {
this.isRefreshing = false; this.isRefreshing = false;
this.refreshTokenSubject.next(false); this.refreshTokenSubject.next(false);
this.toast.error('Your session has expired. Please log in again.');
this.router.navigate(['/']); this.router.navigate(['/']);
return throwError(() => err); return throwError(() => err);
}) })
@@ -78,4 +82,28 @@ export class AuthInterceptor implements HttpInterceptor {
}) })
); );
} }
private showErrorToast(error: HttpErrorResponse): void {
let message = 'Something went wrong. Please try again.';
switch (error.status) {
case 400:
message = error.error?.message || 'Invalid request. Please check your input.';
break;
case 403:
message = 'You do not have permission to perform this action.';
break;
case 404:
message = 'Resource not found.';
break;
case 500:
message = 'Server error. Please try again later.';
break;
case 0:
message = 'Network error. Please check your connection.';
break;
}
this.toast.error(message);
}
} }
apps/frontend/src/app/services/art.service.ts
+3 -2
View File
@@ -4,7 +4,7 @@
* @author Naomi Carrigan * @author Naomi Carrigan
*/ */
import { Injectable } from '@angular/core'; import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { ApiService } from './api.service'; import { ApiService } from './api.service';
import { Art, CreateArtDto, UpdateArtDto } from '@library/shared-types'; import { Art, CreateArtDto, UpdateArtDto } from '@library/shared-types';
@@ -13,7 +13,8 @@ import { Art, CreateArtDto, UpdateArtDto } from '@library/shared-types';
providedIn: 'root' providedIn: 'root'
}) })
export class ArtService { export class ArtService {
constructor(private api: ApiService) {} private api = inject(ApiService);
getAllArt(): Observable<Art[]> { getAllArt(): Observable<Art[]> {
return this.api.get<Art[]>('/art'); return this.api.get<Art[]>('/art');
apps/frontend/src/app/services/auth.service.ts
+35 -7
View File
@@ -4,7 +4,7 @@
* @author Naomi Carrigan * @author Naomi Carrigan
*/ */
import { Injectable, signal } from '@angular/core'; import { Injectable, signal, inject } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { Observable, tap, catchError, switchMap, throwError, of } from 'rxjs'; import { Observable, tap, catchError, switchMap, throwError, of } from 'rxjs';
import { ApiService } from './api.service'; import { ApiService } from './api.service';
@@ -16,15 +16,14 @@ import { HttpClient } from '@angular/common/http';
providedIn: 'root' providedIn: 'root'
}) })
export class AuthService { export class AuthService {
private api = inject(ApiService);
private router = inject(Router);
private http = inject(HttpClient);
private currentUser = signal<User | null>(null); private currentUser = signal<User | null>(null);
public readonly user = this.currentUser.asReadonly(); public readonly user = this.currentUser.asReadonly();
private refreshing = false; private refreshing = false;
private refreshInterval?: ReturnType<typeof setInterval>;
constructor(
private api: ApiService,
private router: Router,
private http: HttpClient
) {}
login(): void { login(): void {
// Redirect to API login endpoint // Redirect to API login endpoint
@@ -35,6 +34,7 @@ export class AuthService {
return this.api.get<AuthResponse>('/auth/me').pipe( return this.api.get<AuthResponse>('/auth/me').pipe(
tap(response => { tap(response => {
this.currentUser.set(response.user); this.currentUser.set(response.user);
this.startRefreshTimer();
}), }),
catchError(error => { catchError(error => {
if (error.status === 401) { if (error.status === 401) {
@@ -42,9 +42,11 @@ export class AuthService {
switchMap(() => this.api.get<AuthResponse>('/auth/me')), switchMap(() => this.api.get<AuthResponse>('/auth/me')),
tap(response => { tap(response => {
this.currentUser.set(response.user); this.currentUser.set(response.user);
this.startRefreshTimer();
}), }),
catchError(() => { catchError(() => {
this.currentUser.set(null); this.currentUser.set(null);
this.stopRefreshTimer();
return throwError(() => error); return throwError(() => error);
}) })
); );
@@ -68,20 +70,45 @@ export class AuthService {
tap(response => { tap(response => {
this.currentUser.set(response.user); this.currentUser.set(response.user);
this.refreshing = false; this.refreshing = false;
this.startRefreshTimer();
}), }),
catchError(error => { catchError(error => {
this.refreshing = false; this.refreshing = false;
this.currentUser.set(null); this.currentUser.set(null);
this.stopRefreshTimer();
return throwError(() => error); 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 }> { logout(): Observable<{ message: string }> {
return this.api.post<{ message: string }>('/auth/logout', {}).pipe( return this.api.post<{ message: string }>('/auth/logout', {}).pipe(
tap(() => { tap(() => {
this.currentUser.set(null); this.currentUser.set(null);
this.api.clearCsrfToken(); this.api.clearCsrfToken();
this.stopRefreshTimer();
this.router.navigate(['/']); this.router.navigate(['/']);
}) })
); );
@@ -89,6 +116,7 @@ export class AuthService {
clearUser(): void { clearUser(): void {
this.currentUser.set(null); this.currentUser.set(null);
this.stopRefreshTimer();
} }
isAuthenticated(): boolean { isAuthenticated(): boolean {
apps/frontend/src/app/services/books.service.ts
+3 -2
View File
@@ -4,7 +4,7 @@
* @author Naomi Carrigan * @author Naomi Carrigan
*/ */
import { Injectable } from '@angular/core'; import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { ApiService } from './api.service'; import { ApiService } from './api.service';
import { Book, CreateBookDto, UpdateBookDto } from '@library/shared-types'; import { Book, CreateBookDto, UpdateBookDto } from '@library/shared-types';
@@ -13,7 +13,8 @@ import { Book, CreateBookDto, UpdateBookDto } from '@library/shared-types';
providedIn: 'root' providedIn: 'root'
}) })
export class BooksService { export class BooksService {
constructor(private api: ApiService) {} private api = inject(ApiService);
getAllBooks(): Observable<Book[]> { getAllBooks(): Observable<Book[]> {
return this.api.get<Book[]>('/books'); return this.api.get<Book[]>('/books');
apps/frontend/src/app/services/comments.service.ts
+3 -2
View File
@@ -4,7 +4,7 @@
* @author Naomi Carrigan * @author Naomi Carrigan
*/ */
import { Injectable } from '@angular/core'; import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { ApiService } from './api.service'; import { ApiService } from './api.service';
import { Comment, CreateCommentDto } from '@library/shared-types'; import { Comment, CreateCommentDto } from '@library/shared-types';
@@ -13,7 +13,8 @@ import { Comment, CreateCommentDto } from '@library/shared-types';
providedIn: 'root' providedIn: 'root'
}) })
export class CommentsService { export class CommentsService {
constructor(private api: ApiService) {} private api = inject(ApiService);
getCommentsForGame(gameId: string): Observable<Comment[]> { getCommentsForGame(gameId: string): Observable<Comment[]> {
return this.api.get<Comment[]>(`/games/${gameId}/comments`); return this.api.get<Comment[]>(`/games/${gameId}/comments`);
apps/frontend/src/app/services/console-logger.service.ts
+127
View File
@@ -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);
}
});
}
}
apps/frontend/src/app/services/games.service.ts
+3 -2
View File
@@ -4,7 +4,7 @@
* @author Naomi Carrigan * @author Naomi Carrigan
*/ */
import { Injectable } from '@angular/core'; import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { ApiService } from './api.service'; import { ApiService } from './api.service';
import { Game, CreateGameDto, UpdateGameDto } from '@library/shared-types'; import { Game, CreateGameDto, UpdateGameDto } from '@library/shared-types';
@@ -13,7 +13,8 @@ import { Game, CreateGameDto, UpdateGameDto } from '@library/shared-types';
providedIn: 'root' providedIn: 'root'
}) })
export class GamesService { export class GamesService {
constructor(private api: ApiService) {} private api = inject(ApiService);
getAllGames(): Observable<Game[]> { getAllGames(): Observable<Game[]> {
return this.api.get<Game[]>('/games'); return this.api.get<Game[]>('/games');
apps/frontend/src/app/services/global-error-handler.service.ts
+43
View File
@@ -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.';
}
}
apps/frontend/src/app/services/manga.service.ts
+3 -2
View File
@@ -4,7 +4,7 @@
* @author Naomi Carrigan * @author Naomi Carrigan
*/ */
import { Injectable } from '@angular/core'; import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { ApiService } from './api.service'; import { ApiService } from './api.service';
import { Manga, CreateMangaDto, UpdateMangaDto } from '@library/shared-types'; import { Manga, CreateMangaDto, UpdateMangaDto } from '@library/shared-types';
@@ -13,7 +13,8 @@ import { Manga, CreateMangaDto, UpdateMangaDto } from '@library/shared-types';
providedIn: 'root' providedIn: 'root'
}) })
export class MangaService { export class MangaService {
constructor(private api: ApiService) {} private api = inject(ApiService);
getAllManga(): Observable<Manga[]> { getAllManga(): Observable<Manga[]> {
return this.api.get<Manga[]>('/manga'); return this.api.get<Manga[]>('/manga');
apps/frontend/src/app/services/music.service.ts
+3 -2
View File
@@ -4,7 +4,7 @@
* @author Naomi Carrigan * @author Naomi Carrigan
*/ */
import { Injectable } from '@angular/core'; import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { ApiService } from './api.service'; import { ApiService } from './api.service';
import { Music, CreateMusicDto, UpdateMusicDto } from '@library/shared-types'; import { Music, CreateMusicDto, UpdateMusicDto } from '@library/shared-types';
@@ -13,7 +13,8 @@ import { Music, CreateMusicDto, UpdateMusicDto } from '@library/shared-types';
providedIn: 'root' providedIn: 'root'
}) })
export class MusicService { export class MusicService {
constructor(private api: ApiService) {} private api = inject(ApiService);
getAllMusic(): Observable<Music[]> { getAllMusic(): Observable<Music[]> {
return this.api.get<Music[]>('/music'); return this.api.get<Music[]>('/music');
apps/frontend/src/app/services/shows.service.ts
+3 -2
View File
@@ -4,7 +4,7 @@
* @author Naomi Carrigan * @author Naomi Carrigan
*/ */
import { Injectable } from '@angular/core'; import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { ApiService } from './api.service'; import { ApiService } from './api.service';
import { Show, CreateShowDto, UpdateShowDto } from '@library/shared-types'; import { Show, CreateShowDto, UpdateShowDto } from '@library/shared-types';
@@ -13,7 +13,8 @@ import { Show, CreateShowDto, UpdateShowDto } from '@library/shared-types';
providedIn: 'root' providedIn: 'root'
}) })
export class ShowsService { export class ShowsService {
constructor(private api: ApiService) {} private api = inject(ApiService);
getAllShows(): Observable<Show[]> { getAllShows(): Observable<Show[]> {
return this.api.get<Show[]>('/shows'); return this.api.get<Show[]>('/shows');
apps/frontend/src/app/services/toast.service.ts
+70
View File
@@ -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);
}
}
dev.env
+24
View File
@@ -0,0 +1,24 @@
# Database
DATABASE_URL="op://Environment Variables - Naomi/Library/mongo url"
# JWT Secret
JWT_SECRET="op://Environment Variables - Naomi/Library/jwt secret"
# Discord OAuth
DISCORD_CLIENT_ID="op://Environment Variables - Naomi/Library/discord client id"
DISCORD_CLIENT_SECRET="op://Environment Variables - Naomi/Library/discord client secret"
# Admin Configuration
ADMIN_DISCORD_ID="op://Environment Variables - Naomi/Library/admin discord id"
# Discord Server
DISCORD_GUILD_ID="op://Environment Variables - Naomi/Library/discord server id"
SPONSOR_ROLE_ID="op://Environment Variables - Naomi/Library/sponsor role id"
MOD_ROLE_ID="op://Environment Variables - Naomi/Library/mod role id"
STAFF_ROLE_ID="op://Environment Variables - Naomi/Library/staff role id"
# Application URL
BASE_URL="op://Environment Variables - Naomi/Library/localhost url"
# Logger
LOG_TOKEN="op://Environment Variables - Naomi/Alert Server/api_auth"
eslint.config.mjs
+1 -6
View File
@@ -1,8 +1,3 @@
import nhcarrigan from '@nhcarrigan/eslint-config'; import nhcarrigan from '@nhcarrigan/eslint-config';
export default [ export default nhcarrigan;
...nhcarrigan,
{
ignores: ['**/dist', '**/out-tsc', 'node_modules'],
},
];
package.json
+17 -15
View File
@@ -3,8 +3,9 @@
"version": "0.0.0", "version": "0.0.0",
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"dev": "nx run-many --target=build --all && NODE_ENV=production op run --env-file=dev.env -- node dist/api/main.js",
"lint": "nx run-many --target=lint --all", "lint": "nx run-many --target=lint --all",
"build": "nx run-many --target=build --all", "build": "pnpm db:gen && nx run-many --target=build --all",
"test": "nx run-many --target=test --all --passWithNoTests", "test": "nx run-many --target=test --all --passWithNoTests",
"build:frontend": "nx build frontend --configuration=production", "build:frontend": "nx build frontend --configuration=production",
"build:api": "nx build api", "build:api": "nx build api",
@@ -25,21 +26,22 @@
"@angular/platform-browser": "21.1.2", "@angular/platform-browser": "21.1.2",
"@angular/router": "21.1.2", "@angular/router": "21.1.2",
"@fastify/autoload": "6.0.3", "@fastify/autoload": "6.0.3",
"@fastify/cookie": "^11.0.2", "@fastify/cookie": "11.0.2",
"@fastify/cors": "^11.0.0", "@fastify/cors": "11.0.0",
"@fastify/csrf-protection": "^7.1.0", "@fastify/csrf-protection": "7.1.0",
"@fastify/helmet": "^13.0.2", "@fastify/helmet": "13.0.2",
"@fastify/jwt": "^10.0.0", "@fastify/jwt": "10.0.0",
"@fastify/oauth2": "^8.1.2", "@fastify/oauth2": "8.1.2",
"@fastify/rate-limit": "^10.3.0", "@fastify/rate-limit": "10.3.0",
"@fastify/sensible": "6.0.4", "@fastify/sensible": "6.0.4",
"@fastify/static": "^9.0.0", "@fastify/static": "9.0.0",
"@nhcarrigan/logger": "1.1.1",
"@prisma/client": "6.19.2", "@prisma/client": "6.19.2",
"dompurify": "^3.3.1", "dompurify": "3.3.1",
"fastify": "5.7.3", "fastify": "5.7.3",
"fastify-plugin": "5.0.1", "fastify-plugin": "5.0.1",
"jsdom": "^28.0.0", "jsdom": "28.0.0",
"marked": "^17.0.1", "marked": "17.0.1",
"rxjs": "7.8.2" "rxjs": "7.8.2"
}, },
"devDependencies": { "devDependencies": {
@@ -65,10 +67,10 @@
"@swc-node/register": "1.9.2", "@swc-node/register": "1.9.2",
"@swc/core": "1.5.29", "@swc/core": "1.5.29",
"@swc/helpers": "0.5.18", "@swc/helpers": "0.5.18",
"@types/dompurify": "^3.2.0", "@types/dompurify": "3.2.0",
"@types/jest": "30.0.0", "@types/jest": "30.0.0",
"@types/jsdom": "^27.0.0", "@types/jsdom": "27.0.0",
"@types/jsonwebtoken": "^9.0.10", "@types/jsonwebtoken": "9.0.10",
"@types/node": "20.19.9", "@types/node": "20.19.9",
"@typescript-eslint/utils": "8.54.0", "@typescript-eslint/utils": "8.54.0",
"angular-eslint": "21.1.0", "angular-eslint": "21.1.0",
pnpm-lock.yaml
Generated
+34 -19
View File
@@ -30,37 +30,40 @@ importers:
specifier: 6.0.3 specifier: 6.0.3
version: 6.0.3 version: 6.0.3
'@fastify/cookie': '@fastify/cookie':
specifier: ^11.0.2 specifier: 11.0.2
version: 11.0.2 version: 11.0.2
'@fastify/cors': '@fastify/cors':
specifier: ^11.0.0 specifier: 11.0.0
version: 11.2.0 version: 11.0.0
'@fastify/csrf-protection': '@fastify/csrf-protection':
specifier: ^7.1.0 specifier: 7.1.0
version: 7.1.0 version: 7.1.0
'@fastify/helmet': '@fastify/helmet':
specifier: ^13.0.2 specifier: 13.0.2
version: 13.0.2 version: 13.0.2
'@fastify/jwt': '@fastify/jwt':
specifier: ^10.0.0 specifier: 10.0.0
version: 10.0.0 version: 10.0.0
'@fastify/oauth2': '@fastify/oauth2':
specifier: ^8.1.2 specifier: 8.1.2
version: 8.1.2 version: 8.1.2
'@fastify/rate-limit': '@fastify/rate-limit':
specifier: ^10.3.0 specifier: 10.3.0
version: 10.3.0 version: 10.3.0
'@fastify/sensible': '@fastify/sensible':
specifier: 6.0.4 specifier: 6.0.4
version: 6.0.4 version: 6.0.4
'@fastify/static': '@fastify/static':
specifier: ^9.0.0 specifier: 9.0.0
version: 9.0.0 version: 9.0.0
'@nhcarrigan/logger':
specifier: 1.1.1
version: 1.1.1
'@prisma/client': '@prisma/client':
specifier: 6.19.2 specifier: 6.19.2
version: 6.19.2(prisma@6.19.2(typescript@5.9.3))(typescript@5.9.3) version: 6.19.2(prisma@6.19.2(typescript@5.9.3))(typescript@5.9.3)
dompurify: dompurify:
specifier: ^3.3.1 specifier: 3.3.1
version: 3.3.1 version: 3.3.1
fastify: fastify:
specifier: 5.7.3 specifier: 5.7.3
@@ -69,10 +72,10 @@ importers:
specifier: 5.0.1 specifier: 5.0.1
version: 5.0.1 version: 5.0.1
jsdom: jsdom:
specifier: ^28.0.0 specifier: 28.0.0
version: 28.0.0 version: 28.0.0
marked: marked:
specifier: ^17.0.1 specifier: 17.0.1
version: 17.0.1 version: 17.0.1
rxjs: rxjs:
specifier: 7.8.2 specifier: 7.8.2
@@ -145,16 +148,16 @@ importers:
specifier: 0.5.18 specifier: 0.5.18
version: 0.5.18 version: 0.5.18
'@types/dompurify': '@types/dompurify':
specifier: ^3.2.0 specifier: 3.2.0
version: 3.2.0 version: 3.2.0
'@types/jest': '@types/jest':
specifier: 30.0.0 specifier: 30.0.0
version: 30.0.0 version: 30.0.0
'@types/jsdom': '@types/jsdom':
specifier: ^27.0.0 specifier: 27.0.0
version: 27.0.0 version: 27.0.0
'@types/jsonwebtoken': '@types/jsonwebtoken':
specifier: ^9.0.10 specifier: 9.0.10
version: 9.0.10 version: 9.0.10
'@types/node': '@types/node':
specifier: 20.19.9 specifier: 20.19.9
@@ -1611,8 +1614,8 @@ packages:
'@fastify/cookie@11.0.2': '@fastify/cookie@11.0.2':
resolution: {integrity: sha512-GWdwdGlgJxyvNv+QcKiGNevSspMQXncjMZ1J8IvuDQk0jvkzgWWZFNC2En3s+nHndZBGV8IbLwOI/sxCZw/mzA==} resolution: {integrity: sha512-GWdwdGlgJxyvNv+QcKiGNevSspMQXncjMZ1J8IvuDQk0jvkzgWWZFNC2En3s+nHndZBGV8IbLwOI/sxCZw/mzA==}
'@fastify/cors@11.2.0': '@fastify/cors@11.0.0':
resolution: {integrity: sha512-LbLHBuSAdGdSFZYTLVA3+Ch2t+sA6nq3Ejc6XLAKiQ6ViS2qFnvicpj0htsx03FyYeLs04HfRNBsz/a8SvbcUw==} resolution: {integrity: sha512-41Bx0LVGr2a6DnnhDN/SgfDlTRNZtEs8niPxyoymV6Hw09AIdz/9Rn/0Fpu+pBOs6kviwS44JY2mB8NcU2qSAA==}
'@fastify/csrf-protection@7.1.0': '@fastify/csrf-protection@7.1.0':
resolution: {integrity: sha512-I2TDd4SRRYQivKCMHdB/8py+CPO9DT0e63lh4DO8MDCJh8NROq8HD/iO0IjYtwhsD3bZhr0cBXsFdfPvyTmzNw==} resolution: {integrity: sha512-I2TDd4SRRYQivKCMHdB/8py+CPO9DT0e63lh4DO8MDCJh8NROq8HD/iO0IjYtwhsD3bZhr0cBXsFdfPvyTmzNw==}
@@ -2488,6 +2491,9 @@ packages:
typescript: '>=5' typescript: '>=5'
vitest: '>=2' vitest: '>=2'
'@nhcarrigan/logger@1.1.1':
resolution: {integrity: sha512-P6OEQFHDtf6psybYGljuCxkSW6DLQCsx1aZZ3w4YKBXHBFjDbhuvpM9K1kPhVN48hakitx2WPLEoIFr6YZELYw==}
'@noble/hashes@1.4.0': '@noble/hashes@1.4.0':
resolution: {integrity: sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==} resolution: {integrity: sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==}
engines: {node: '>= 16'} engines: {node: '>= 16'}
@@ -6890,6 +6896,9 @@ packages:
resolution: {integrity: sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==} resolution: {integrity: sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==}
engines: {node: '>= 18'} engines: {node: '>= 18'}
mnemonist@0.40.0:
resolution: {integrity: sha512-kdd8AFNig2AD5Rkih7EPCXhu/iMvwevQFX/uEiGhZyPZi7fHqOoF4V4kHLpCfysxXMgQ4B52kdPMCwARshKvEg==}
mnemonist@0.40.3: mnemonist@0.40.3:
resolution: {integrity: sha512-Vjyr90sJ23CKKH/qPAgUKicw/v6pRoamxIEDFOF8uSgFME7DqPRpHgRTejWVjkdGg5dXj0/NyxZHZ9bcjH+2uQ==} resolution: {integrity: sha512-Vjyr90sJ23CKKH/qPAgUKicw/v6pRoamxIEDFOF8uSgFME7DqPRpHgRTejWVjkdGg5dXj0/NyxZHZ9bcjH+2uQ==}
@@ -11558,10 +11567,10 @@ snapshots:
cookie: 1.1.1 cookie: 1.1.1
fastify-plugin: 5.0.1 fastify-plugin: 5.0.1
'@fastify/cors@11.2.0': '@fastify/cors@11.0.0':
dependencies: dependencies:
fastify-plugin: 5.0.1 fastify-plugin: 5.0.1
toad-cache: 3.7.0 mnemonist: 0.40.0
'@fastify/csrf-protection@7.1.0': '@fastify/csrf-protection@7.1.0':
dependencies: dependencies:
@@ -12722,6 +12731,8 @@ snapshots:
- eslint-import-resolver-webpack - eslint-import-resolver-webpack
- supports-color - supports-color
'@nhcarrigan/logger@1.1.1': {}
'@noble/hashes@1.4.0': {} '@noble/hashes@1.4.0': {}
'@nodelib/fs.scandir@2.1.5': '@nodelib/fs.scandir@2.1.5':
@@ -18229,6 +18240,10 @@ snapshots:
dependencies: dependencies:
minipass: 7.1.2 minipass: 7.1.2
mnemonist@0.40.0:
dependencies:
obliterator: 2.0.5
mnemonist@0.40.3: mnemonist@0.40.3:
dependencies: dependencies:
obliterator: 2.0.5 obliterator: 2.0.5
prod.env
+3
View File
@@ -19,3 +19,6 @@ STAFF_ROLE_ID="op://Environment Variables - Naomi/Library/staff role id"
# Application URL # Application URL
BASE_URL="op://Environment Variables - Naomi/Library/base url" BASE_URL="op://Environment Variables - Naomi/Library/base url"
# Logger
LOG_TOKEN="op://Environment Variables - Naomi/Alert Server/api_auth"
shared-types/eslint.config.mjs
+102 -8
View File
@@ -3,19 +3,113 @@ import { fileURLToPath } from 'url';
import { dirname } from 'path'; import { dirname } from 'path';
const __dirname = dirname(fileURLToPath(import.meta.url)); const __dirname = dirname(fileURLToPath(import.meta.url));
const nhcarriganArray = Array.isArray(nhcarrigan) ? nhcarrigan : [nhcarrigan];
// Jest globals that should be available in test files
const jestGlobals = {
afterAll: 'readonly',
afterEach: 'readonly',
beforeAll: 'readonly',
beforeEach: 'readonly',
describe: 'readonly',
expect: 'readonly',
it: 'readonly',
jest: 'readonly',
test: 'readonly',
};
// Map the nhcarrigan configs to handle shared-types directory structure
const mappedConfigs = nhcarriganArray.flatMap(config => {
if (!config.files) {
return [config];
}
const newFiles = config.files
.map(pattern => {
if (pattern.startsWith('src/')) {
return pattern.replace('src/', 'shared-types/src/');
} else if (pattern.startsWith('test/')) {
return pattern.replace('test/', 'shared-types/test/');
}
return pattern;
});
// Determine if this is a test file config
const isTestFile = newFiles[0]?.includes('test/');
// Update configs to handle shared-types directory structure
let updatedConfig = { ...config, files: newFiles };
if (config.languageOptions) {
const updatedLanguageOptions = { ...config.languageOptions };
// Add Jest globals for test files
if (isTestFile) {
updatedLanguageOptions.globals = { ...updatedLanguageOptions.globals, ...jestGlobals };
}
// Update parserOptions to use our tsconfig with proper tsconfigRootDir
if (config.languageOptions.parserOptions) {
updatedLanguageOptions.parserOptions = {
...config.languageOptions.parserOptions,
tsconfigRootDir: __dirname,
};
}
updatedConfig = { ...updatedConfig, languageOptions: updatedLanguageOptions };
}
return [updatedConfig];
});
export default [ export default [
...nhcarrigan,
{ {
ignores: ['**/dist', '**/out-tsc', 'node_modules'], ignores: ['dist', 'out-tsc', 'node_modules'],
}, },
...mappedConfigs,
// Disable vitest rules for this Jest project
{ {
files: ['**/*.ts'], files: ['shared-types/test/**/*.spec.ts'],
languageOptions: { rules: {
parserOptions: { 'vitest/consistent-test-filename': 'off',
project: './tsconfig.lib.json', 'vitest/consistent-test-it': 'off',
tsconfigRootDir: __dirname, 'vitest/expect-expect': 'off',
}, 'vitest/no-alias-methods': 'off',
'vitest/no-commented-out-tests': 'off',
'vitest/no-conditional-expect': 'off',
'vitest/no-conditional-in-test': 'off',
'vitest/no-conditional-tests': 'off',
'vitest/no-disabled-tests': 'off',
'vitest/no-duplicate-hooks': 'off',
'vitest/no-focused-tests': 'off',
'vitest/no-identical-title': 'off',
'vitest/no-standalone-expect': 'off',
'vitest/no-test-prefixes': 'off',
'vitest/no-test-return-statement': 'off',
'vitest/prefer-comparison-matcher': 'off',
'vitest/prefer-each': 'off',
'vitest/prefer-equality-matcher': 'off',
'vitest/prefer-expect-assertions': 'off',
'vitest/prefer-expect-resolves': 'off',
'vitest/prefer-hooks-in-order': 'off',
'vitest/prefer-hooks-on-top': 'off',
'vitest/prefer-lowercase-title': 'off',
'vitest/prefer-mock-promise-shorthand': 'off',
'vitest/prefer-spy-on': 'off',
'vitest/prefer-strict-equal': 'off',
'vitest/prefer-to-be': 'off',
'vitest/prefer-to-be-falsy': 'off',
'vitest/prefer-to-be-object': 'off',
'vitest/prefer-to-be-truthy': 'off',
'vitest/prefer-to-contain': 'off',
'vitest/prefer-to-have-length': 'off',
'vitest/prefer-todo': 'off',
'vitest/require-hook': 'off',
'vitest/require-to-throw-message': 'off',
'vitest/require-top-level-describe': 'off',
'vitest/valid-describe-callback': 'off',
'vitest/valid-expect': 'off',
'vitest/valid-title': 'off',
}, },
}, },
]; ];
shared-types/jest.config.ts
+22
View File
@@ -0,0 +1,22 @@
export default {
displayName: "shared-types",
preset: "../jest.preset.js",
testEnvironment: "node",
transform: {
"^.+\\.[tj]s$": ["ts-jest", { tsconfig: "<rootDir>/tsconfig.spec.json" }],
},
moduleFileExtensions: ["ts", "js", "html"],
coverageDirectory: "../coverage/shared-types",
coverageThreshold: {
global: {
branches: 100,
functions: 100,
lines: 100,
statements: 100,
},
},
collectCoverageFrom: [
"src/**/*.ts",
"!src/index.ts", // Just re-exports
],
};
shared-types/project.json
+16 -1
View File
@@ -5,5 +5,20 @@
"projectType": "library", "projectType": "library",
"tags": [], "tags": [],
"// targets": "to see all targets run: nx show project shared-types --web", "// targets": "to see all targets run: nx show project shared-types --web",
"targets": {} "targets": {
"lint": {
"executor": "@nx/eslint:lint",
"options": {
"lintFilePatterns": ["shared-types/**/*.ts"]
}
},
"test": {
"executor": "@nx/jest:jest",
"options": {
"jestConfig": "shared-types/jest.config.ts",
"passWithNoTests": true
},
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"]
}
}
} }
shared-types/src/index.ts
+11 -11
View File
@@ -1,17 +1,17 @@
/** /**
* @copyright 2026 NHCarrigan * @copyright NHCarrigan
* @license Naomi's Public License * @license Naomi's Public License
* @author Naomi Carrigan * @author Naomi Carrigan
*/ */
export * from "./lib/game.types"; export type * from "./lib/art.types";
export * from "./lib/book.types";
export * from "./lib/music.types";
export * from "./lib/art.types";
export * from "./lib/show.types";
export * from "./lib/manga.types";
export type * from "./lib/auth.types";
export * from "./lib/comment.types";
export * from "./lib/audit.types"; export * from "./lib/audit.types";
export type * from "./lib/auth.types";
export * from "./lib/book.types";
export type * from "./lib/comment.types";
export type * from "./lib/common.types";
export * from "./lib/game.types";
export type * from "./lib/like.types";
export * from "./lib/manga.types";
export * from "./lib/music.types";
export * from "./lib/show.types";
export * from "./lib/suggestion.types"; export * from "./lib/suggestion.types";
export * from "./lib/common.types";
export * from "./lib/like.types";
shared-types/src/lib/art.types.ts
+12 -9
View File
@@ -1,30 +1,33 @@
/** /**
* @copyright 2026 NHCarrigan * @copyright NHCarrigan
* @license Naomi's Public License * @license Naomi's Public License
* @author Naomi Carrigan
*/ */
import { Link } from "./common.types"; import type { Link } from "./common.types";
export interface Art { interface Art {
id: string; id: string;
title: string; title: string;
artist: string; artist: string;
description?: string; description?: string;
imageUrl: string; imageUrl: string;
tags: string[]; tags: Array<string>;
links: Link[]; links: Array<Link>;
dateAdded: Date; dateAdded: Date;
createdAt: Date; createdAt: Date;
updatedAt: Date; updatedAt: Date;
} }
export interface CreateArtDto { interface CreateArtDto {
title: string; title: string;
artist: string; artist: string;
description?: string; description?: string;
imageUrl: string; imageUrl: string;
tags?: string[]; tags?: Array<string>;
links?: Link[]; links?: Array<Link>;
} }
export interface UpdateArtDto extends Partial<CreateArtDto> {} type UpdateArtDto = Partial<CreateArtDto>;
export type { Art, CreateArtDto, UpdateArtDto };
shared-types/src/lib/audit.types.ts
+39 -25
View File
@@ -1,36 +1,42 @@
export enum AuditAction { /**
LOGIN = "LOGIN", * @copyright NHCarrigan
LOGOUT = "LOGOUT", * @license Naomi's Public License
LOGIN_FAILED = "LOGIN_FAILED", * @author Naomi Carrigan
COMMENT_CREATE = "COMMENT_CREATE", */
COMMENT_UPDATE = "COMMENT_UPDATE",
COMMENT_DELETE = "COMMENT_DELETE", enum AuditAction {
ENTRY_CREATE = "ENTRY_CREATE", login = "LOGIN",
ENTRY_UPDATE = "ENTRY_UPDATE", logout = "LOGOUT",
ENTRY_DELETE = "ENTRY_DELETE", loginFailed = "LOGIN_FAILED",
LIKE = "LIKE", commentCreate = "COMMENT_CREATE",
UNLIKE = "UNLIKE", commentUpdate = "COMMENT_UPDATE",
USER_BAN = "USER_BAN", commentDelete = "COMMENT_DELETE",
USER_UNBAN = "USER_UNBAN", entryCreate = "ENTRY_CREATE",
RATE_LIMIT_EXCEEDED = "RATE_LIMIT_EXCEEDED", entryUpdate = "ENTRY_UPDATE",
CSRF_VALIDATION_FAILED = "CSRF_VALIDATION_FAILED", entryDelete = "ENTRY_DELETE",
UNAUTHORIZED_ACCESS = "UNAUTHORIZED_ACCESS", like = "LIKE",
unlike = "UNLIKE",
userBan = "USER_BAN",
userUnban = "USER_UNBAN",
rateLimitExceeded = "RATE_LIMIT_EXCEEDED",
csrfValidationFailed = "CSRF_VALIDATION_FAILED",
unauthorizedAccess = "UNAUTHORIZED_ACCESS",
} }
export enum AuditCategory { enum AuditCategory {
AUTH = "AUTH", auth = "AUTH",
CONTENT = "CONTENT", content = "CONTENT",
ADMIN = "ADMIN", admin = "ADMIN",
SECURITY = "SECURITY", security = "SECURITY",
} }
export interface AuditLogUser { interface AuditLogUser {
id: string; id: string;
username: string; username: string;
avatar?: string; avatar?: string;
} }
export interface AuditLog { interface AuditLog {
id: string; id: string;
action: AuditAction; action: AuditAction;
category: AuditCategory; category: AuditCategory;
@@ -46,7 +52,7 @@ export interface AuditLog {
createdAt: Date; createdAt: Date;
} }
export interface AuditLogFilters { interface AuditLogFilters {
action?: AuditAction; action?: AuditAction;
category?: AuditCategory; category?: AuditCategory;
userId?: string; userId?: string;
@@ -56,3 +62,11 @@ export interface AuditLogFilters {
page?: number; page?: number;
limit?: number; limit?: number;
} }
export {
AuditAction,
AuditCategory,
type AuditLog,
type AuditLogFilters,
type AuditLogUser,
};
shared-types/src/lib/auth.types.ts
+6 -3
View File
@@ -4,7 +4,7 @@
* @author Naomi Carrigan * @author Naomi Carrigan
*/ */
export interface User { interface User {
id: string; id: string;
email: string; email: string;
username: string; username: string;
@@ -18,7 +18,8 @@ export interface User {
isStaff: boolean; isStaff: boolean;
} }
export interface JwtPayload { interface JwtPayload {
/** /**
* User id. * User id.
*/ */
@@ -30,7 +31,9 @@ export interface JwtPayload {
exp?: number; exp?: number;
} }
export interface AuthResponse { interface AuthResponse {
accessToken: string; accessToken: string;
user: User; user: User;
} }
export type { AuthResponse, JwtPayload, User };
shared-types/src/lib/book.types.ts
+19 -12
View File
@@ -1,46 +1,53 @@
/** /**
* @copyright 2026 NHCarrigan * @copyright NHCarrigan
* @copyright 2026 NHCarrigan
* @license Naomi's Public License * @license Naomi's Public License
* @author Naomi Carrigan
*/ */
export enum BookStatus { import type { Link } from "./common.types";
enum BookStatus {
reading = "READING", reading = "READING",
finished = "FINISHED", finished = "FINISHED",
toRead = "TO_READ", toRead = "TO_READ",
retired = "RETIRED",
} }
import { Link } from "./common.types"; interface Book {
export interface Book {
id: string; id: string;
title: string; title: string;
author: string; author: string;
isbn?: string; isbn?: string;
status: BookStatus; status: BookStatus;
dateAdded: Date; dateAdded: Date;
dateStarted?: Date;
dateFinished?: Date; dateFinished?: Date;
rating?: number; rating?: number;
notes?: string; notes?: string;
coverImage?: string; coverImage?: string;
tags: string[]; tags: Array<string>;
links: Link[]; links: Array<Link>;
createdAt: Date; createdAt: Date;
updatedAt: Date; updatedAt: Date;
} }
export interface CreateBookDto { interface CreateBookDto {
title: string; title: string;
author: string; author: string;
isbn?: string; isbn?: string;
status: BookStatus; status: BookStatus;
dateStarted?: Date;
dateFinished?: Date;
rating?: number; rating?: number;
notes?: string; notes?: string;
coverImage?: string; coverImage?: string;
tags?: string[]; tags?: Array<string>;
links?: Link[]; links?: Array<Link>;
} }
export interface UpdateBookDto extends Partial<CreateBookDto> { interface UpdateBookDto extends Partial<CreateBookDto> {
dateStarted?: Date;
dateFinished?: Date; dateFinished?: Date;
} }
export { type Book, BookStatus, type CreateBookDto, type UpdateBookDto };
shared-types/src/lib/comment.types.ts
+5 -3
View File
@@ -4,7 +4,7 @@
* @author Naomi Carrigan * @author Naomi Carrigan
*/ */
export interface CommentUser { interface CommentUser {
id: string; id: string;
username: string; username: string;
avatar?: string; avatar?: string;
@@ -14,7 +14,7 @@ export interface CommentUser {
isStaff?: boolean; isStaff?: boolean;
} }
export interface Comment { interface Comment {
id: string; id: string;
content: string; content: string;
rawContent?: string; rawContent?: string;
@@ -30,6 +30,8 @@ export interface Comment {
updatedAt: Date; updatedAt: Date;
} }
export interface CreateCommentDto { interface CreateCommentDto {
content: string; content: string;
} }
export type { Comment, CommentUser, CreateCommentDto };
shared-types/src/lib/common.types.ts
+6
View File
@@ -1,3 +1,9 @@
/**
* @copyright NHCarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
export interface Link { export interface Link {
title: string; title: string;
url: string; url: string;
shared-types/src/lib/game.types.ts
+21 -12
View File
@@ -1,44 +1,53 @@
/** /**
* @copyright 2026 NHCarrigan * @copyright NHCarrigan
* @copyright 2026 NHCarrigan
* @license Naomi's Public License * @license Naomi's Public License
* @author Naomi Carrigan
*/ */
export enum GameStatus { import type { Link } from "./common.types";
enum GameStatus {
playing = "PLAYING", playing = "PLAYING",
completed = "COMPLETED", completed = "COMPLETED",
backlog = "BACKLOG", backlog = "BACKLOG",
retired = "RETIRED",
} }
import { Link } from "./common.types"; interface Game {
export interface Game {
id: string; id: string;
title: string; title: string;
platform?: string; platform?: string;
status: GameStatus; status: GameStatus;
dateAdded: Date; dateAdded: Date;
dateStarted?: Date;
dateCompleted?: Date; dateCompleted?: Date;
dateFinished?: Date;
rating?: number; rating?: number;
notes?: string; notes?: string;
coverImage?: string; coverImage?: string;
tags: string[]; tags: Array<string>;
links: Link[]; links: Array<Link>;
createdAt: Date; createdAt: Date;
updatedAt: Date; updatedAt: Date;
} }
export interface CreateGameDto { interface CreateGameDto {
title: string; title: string;
platform?: string; platform?: string;
status: GameStatus; status: GameStatus;
dateStarted?: Date;
dateFinished?: Date;
rating?: number; rating?: number;
notes?: string; notes?: string;
coverImage?: string; coverImage?: string;
tags?: string[]; tags?: Array<string>;
links?: Link[]; links?: Array<Link>;
} }
export interface UpdateGameDto extends Partial<CreateGameDto> { interface UpdateGameDto extends Partial<CreateGameDto> {
dateStarted?: Date;
dateCompleted?: Date; dateCompleted?: Date;
dateFinished?: Date;
} }
export { type CreateGameDto, type Game, GameStatus, type UpdateGameDto };
shared-types/src/lib/like.types.ts
+14 -8
View File
@@ -1,32 +1,38 @@
/** /**
* @copyright 2026 NHCarrigan * @copyright NHCarrigan
* @license Naomi's Public License * @license Naomi's Public License
* @author Naomi Carrigan * @author Naomi Carrigan
*/ */
export interface Like { interface Like {
id: string; id: string;
userId: string; userId: string;
entityType: 'book' | 'game' | 'show' | 'manga' | 'music' | 'art'; entityType: "book" | "game" | "show" | "manga" | "music" | "art";
entityId: string; entityId: string;
createdAt: Date; createdAt: Date;
} }
export type CreateLikeDto = Pick<Like, 'entityType' | 'entityId'>; type CreateLikeDto = Pick<Like, "entityType" | "entityId">;
export interface LikeCountDto { interface LikeCountDto {
entityId: string; entityId: string;
entityType: string; entityType: string;
count: number; count: number;
} }
export interface LikedItemDto { interface LikedItemDto {
like: Like; like: Like;
item: any; // This will be the actual entity (Book, Game, etc.)
/**
* This will be the actual entity (Book, Game, etc.).
*/
item: unknown;
} }
// Response types // Response types
export interface LikeResponse { interface LikeResponse {
liked: boolean; liked: boolean;
count: number; count: number;
} }
export type { CreateLikeDto, Like, LikeCountDto, LikedItemDto, LikeResponse };
shared-types/src/lib/manga.types.ts
+21 -11
View File
@@ -1,44 +1,54 @@
/** /**
* @copyright 2026 NHCarrigan * @copyright NHCarrigan
* @license Naomi's Public License * @license Naomi's Public License
* @author Naomi Carrigan * @author Naomi Carrigan
*/ */
export enum MangaStatus { import type { Link } from "./common.types";
enum MangaStatus {
reading = "READING", reading = "READING",
completed = "COMPLETED", completed = "COMPLETED",
wantToRead = "WANT_TO_READ", wantToRead = "WANT_TO_READ",
retired = "RETIRED",
} }
import { Link } from "./common.types"; interface Manga {
export interface Manga {
id: string; id: string;
title: string; title: string;
author: string; author: string;
status: MangaStatus; status: MangaStatus;
dateAdded: Date; dateAdded: Date;
dateStarted?: Date;
dateCompleted?: Date; dateCompleted?: Date;
dateFinished?: Date;
rating?: number; rating?: number;
notes?: string; notes?: string;
coverImage?: string; coverImage?: string;
tags: string[]; tags: Array<string>;
links: Link[]; links: Array<Link>;
createdAt: Date; createdAt: Date;
updatedAt: Date; updatedAt: Date;
} }
export interface CreateMangaDto { interface CreateMangaDto {
title: string; title: string;
author: string; author: string;
status: MangaStatus; status: MangaStatus;
dateStarted?: Date;
dateFinished?: Date;
rating?: number; rating?: number;
notes?: string; notes?: string;
coverImage?: string; coverImage?: string;
tags?: string[]; tags?: Array<string>;
links?: Link[]; links?: Array<Link>;
} }
export interface UpdateMangaDto extends Partial<CreateMangaDto> { interface UpdateMangaDto extends Partial<CreateMangaDto> {
dateStarted?: Date;
dateCompleted?: Date; dateCompleted?: Date;
dateFinished?: Date;
} }
export { MangaStatus };
export type { CreateMangaDto, Manga, UpdateMangaDto };
shared-types/src/lib/music.types.ts
+23 -13
View File
@@ -1,52 +1,62 @@
/** /**
* @copyright 2026 NHCarrigan * @copyright NHCarrigan
* @copyright 2026 NHCarrigan
* @license Naomi's Public License * @license Naomi's Public License
* @author Naomi Carrigan
*/ */
export enum MusicType { import type { Link } from "./common.types";
enum MusicType {
album = "ALBUM", album = "ALBUM",
single = "SINGLE", single = "SINGLE",
ep = "EP", ep = "EP",
} }
export enum MusicStatus { enum MusicStatus {
listening = "LISTENING", listening = "LISTENING",
completed = "COMPLETED", completed = "COMPLETED",
wantToListen = "WANT_TO_LISTEN", wantToListen = "WANT_TO_LISTEN",
retired = "RETIRED",
} }
import { Link } from "./common.types"; interface Music {
export interface Music {
id: string; id: string;
title: string; title: string;
artist: string; artist: string;
type: MusicType; type: MusicType;
status: MusicStatus; status: MusicStatus;
dateAdded: Date; dateAdded: Date;
dateStarted?: Date;
dateCompleted?: Date; dateCompleted?: Date;
dateFinished?: Date;
rating?: number; rating?: number;
notes?: string; notes?: string;
coverArt?: string; coverArt?: string;
tags: string[]; tags: Array<string>;
links: Link[]; links: Array<Link>;
createdAt: Date; createdAt: Date;
updatedAt: Date; updatedAt: Date;
} }
export interface CreateMusicDto { interface CreateMusicDto {
title: string; title: string;
artist: string; artist: string;
type: MusicType; type: MusicType;
status: MusicStatus; status: MusicStatus;
dateStarted?: Date;
dateFinished?: Date;
rating?: number; rating?: number;
notes?: string; notes?: string;
coverArt?: string; coverArt?: string;
tags?: string[]; tags?: Array<string>;
links?: Link[]; links?: Array<Link>;
} }
export interface UpdateMusicDto extends Partial<CreateMusicDto> { interface UpdateMusicDto extends Partial<CreateMusicDto> {
dateStarted?: Date;
dateCompleted?: Date; dateCompleted?: Date;
dateFinished?: Date;
} }
export { MusicStatus, MusicType };
export type { CreateMusicDto, Music, UpdateMusicDto };
shared-types/src/lib/show.types.ts
+22 -12
View File
@@ -1,51 +1,61 @@
/** /**
* @copyright 2026 NHCarrigan * @copyright NHCarrigan
* @license Naomi's Public License * @license Naomi's Public License
* @author Naomi Carrigan * @author Naomi Carrigan
*/ */
export enum ShowType { import type { Link } from "./common.types";
enum ShowType {
tvSeries = "TV_SERIES", tvSeries = "TV_SERIES",
anime = "ANIME", anime = "ANIME",
film = "FILM", film = "FILM",
documentary = "DOCUMENTARY", documentary = "DOCUMENTARY",
} }
export enum ShowStatus { enum ShowStatus {
watching = "WATCHING", watching = "WATCHING",
completed = "COMPLETED", completed = "COMPLETED",
wantToWatch = "WANT_TO_WATCH", wantToWatch = "WANT_TO_WATCH",
retired = "RETIRED",
} }
import { Link } from "./common.types"; interface Show {
export interface Show {
id: string; id: string;
title: string; title: string;
type: ShowType; type: ShowType;
status: ShowStatus; status: ShowStatus;
dateAdded: Date; dateAdded: Date;
dateStarted?: Date;
dateCompleted?: Date; dateCompleted?: Date;
dateFinished?: Date;
rating?: number; rating?: number;
notes?: string; notes?: string;
coverImage?: string; coverImage?: string;
tags: string[]; tags: Array<string>;
links: Link[]; links: Array<Link>;
createdAt: Date; createdAt: Date;
updatedAt: Date; updatedAt: Date;
} }
export interface CreateShowDto { interface CreateShowDto {
title: string; title: string;
type: ShowType; type: ShowType;
status: ShowStatus; status: ShowStatus;
dateStarted?: Date;
dateFinished?: Date;
rating?: number; rating?: number;
notes?: string; notes?: string;
coverImage?: string; coverImage?: string;
tags?: string[]; tags?: Array<string>;
links?: Link[]; links?: Array<Link>;
} }
export interface UpdateShowDto extends Partial<CreateShowDto> { interface UpdateShowDto extends Partial<CreateShowDto> {
dateStarted?: Date;
dateCompleted?: Date; dateCompleted?: Date;
dateFinished?: Date;
} }
export { ShowStatus, ShowType };
export type { CreateShowDto, Show, UpdateShowDto };
shared-types/src/lib/suggestion.types.ts
+54 -33
View File
@@ -1,26 +1,32 @@
import type { CreateGameDto } from "./game.types"; /**
import type { CreateBookDto } from "./book.types"; * @copyright NHCarrigan
import type { CreateMusicDto } from "./music.types"; * @license Naomi's Public License
* @author Naomi Carrigan
*/
import type { CreateArtDto } from "./art.types"; import type { CreateArtDto } from "./art.types";
import type { CreateShowDto } from "./show.types"; import type { CreateBookDto } from "./book.types";
import type { CreateGameDto } from "./game.types";
import type { CreateMangaDto } from "./manga.types"; import type { CreateMangaDto } from "./manga.types";
import type { CreateMusicDto } from "./music.types";
import type { CreateShowDto } from "./show.types";
export enum SuggestionEntity { enum SuggestionEntity {
GAME = "GAME", game = "GAME",
BOOK = "BOOK", book = "BOOK",
MUSIC = "MUSIC", music = "MUSIC",
ART = "ART", art = "ART",
SHOW = "SHOW", show = "SHOW",
MANGA = "MANGA", manga = "MANGA",
} }
export enum SuggestionStatus { enum SuggestionStatus {
UNREVIEWED = "UNREVIEWED", unreviewed = "UNREVIEWED",
ACCEPTED = "ACCEPTED", accepted = "ACCEPTED",
DECLINED = "DECLINED", declined = "DECLINED",
} }
export interface SuggestionUser { interface SuggestionUser {
id: string; id: string;
username: string; username: string;
avatar?: string; avatar?: string;
@@ -30,7 +36,7 @@ export interface SuggestionUser {
isStaff: boolean; isStaff: boolean;
} }
export interface Suggestion { interface Suggestion {
id: string; id: string;
userId: string; userId: string;
user: SuggestionUser; user: SuggestionUser;
@@ -48,16 +54,16 @@ export interface Suggestion {
updatedAt: Date; updatedAt: Date;
} }
export interface CreateGameSuggestionDto { interface CreateGameSuggestionDto {
entityType: SuggestionEntity.GAME; entityType: SuggestionEntity.game;
title: string; title: string;
platform?: string; platform?: string;
notes?: string; notes?: string;
coverImage?: string; coverImage?: string;
} }
export interface CreateBookSuggestionDto { interface CreateBookSuggestionDto {
entityType: SuggestionEntity.BOOK; entityType: SuggestionEntity.book;
title: string; title: string;
author: string; author: string;
isbn?: string; isbn?: string;
@@ -65,8 +71,8 @@ export interface CreateBookSuggestionDto {
coverImage?: string; coverImage?: string;
} }
export interface CreateMusicSuggestionDto { interface CreateMusicSuggestionDto {
entityType: SuggestionEntity.MUSIC; entityType: SuggestionEntity.music;
title: string; title: string;
artist: string; artist: string;
type: string; type: string;
@@ -74,31 +80,31 @@ export interface CreateMusicSuggestionDto {
coverArt?: string; coverArt?: string;
} }
export interface CreateArtSuggestionDto { interface CreateArtSuggestionDto {
entityType: SuggestionEntity.ART; entityType: SuggestionEntity.art;
title: string; title: string;
artist: string; artist: string;
description?: string; description?: string;
imageUrl: string; imageUrl: string;
} }
export interface CreateShowSuggestionDto { interface CreateShowSuggestionDto {
entityType: SuggestionEntity.SHOW; entityType: SuggestionEntity.show;
title: string; title: string;
type: string; type: string;
notes?: string; notes?: string;
coverImage?: string; coverImage?: string;
} }
export interface CreateMangaSuggestionDto { interface CreateMangaSuggestionDto {
entityType: SuggestionEntity.MANGA; entityType: SuggestionEntity.manga;
title: string; title: string;
author: string; author: string;
notes?: string; notes?: string;
coverImage?: string; coverImage?: string;
} }
export type CreateSuggestionDto = type CreateSuggestionDto =
| CreateGameSuggestionDto | CreateGameSuggestionDto
| CreateBookSuggestionDto | CreateBookSuggestionDto
| CreateMusicSuggestionDto | CreateMusicSuggestionDto
@@ -106,11 +112,11 @@ export type CreateSuggestionDto =
| CreateShowSuggestionDto | CreateShowSuggestionDto
| CreateMangaSuggestionDto; | CreateMangaSuggestionDto;
export interface DeclineSuggestionDto { interface DeclineSuggestionDto {
reason?: string; reason?: string;
} }
export interface AcceptWithEditsDto { interface AcceptWithEditsDto {
title?: string; title?: string;
platform?: string; platform?: string;
author?: string; author?: string;
@@ -122,6 +128,21 @@ export interface AcceptWithEditsDto {
coverImage?: string; coverImage?: string;
coverArt?: string; coverArt?: string;
imageUrl?: string; imageUrl?: string;
tags?: string[]; tags?: Array<string>;
links?: Array<{ label: string; url: string }>; links?: Array<{ label: string; url: string }>;
} }
export { SuggestionEntity, SuggestionStatus };
export type {
AcceptWithEditsDto,
CreateArtSuggestionDto,
CreateBookSuggestionDto,
CreateGameSuggestionDto,
CreateMangaSuggestionDto,
CreateMusicSuggestionDto,
CreateShowSuggestionDto,
CreateSuggestionDto,
DeclineSuggestionDto,
Suggestion,
SuggestionUser,
};
shared-types/test/art.types.spec.ts
+110
View File
@@ -0,0 +1,110 @@
/**
* @copyright NHCarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import type { Art, CreateArtDto, UpdateArtDto } from "../src/lib/art.types";
describe("art Types", () => {
describe("art interface", () => {
it("should accept valid art object with minimal fields", () => {
const art: Art = {
artist: "Jane Doe",
createdAt: new Date(),
dateAdded: new Date(),
id: "art123",
imageUrl: "https://example.com/sunset.jpg",
links: [],
tags: [],
title: "Beautiful Sunset",
updatedAt: new Date(),
};
expect(art.description).toBeUndefined();
expect(art.tags).toEqual([]);
});
it("should accept valid art object with all fields", () => {
const fullArt: Art = {
artist: "John Smith",
createdAt: new Date("2024-01-01"),
dateAdded: new Date("2024-01-01"),
description: "A breathtaking view of the mountains",
id: "art456",
imageUrl: "https://example.com/mountains.jpg",
links: [
{ title: "Artist Portfolio", url: "https://artist.com" },
{ title: "Instagram", url: "https://instagram.com/artist" },
],
tags: [ "landscape", "nature", "mountains" ],
title: "Mountain Landscape",
updatedAt: new Date("2024-01-02"),
};
expect(fullArt.description).toBe("A breathtaking view of the mountains");
expect(fullArt.tags).toHaveLength(3);
expect(fullArt.links).toHaveLength(2);
});
});
describe("createArtDto interface", () => {
it("should accept DTO with required fields only", () => {
const createDto: CreateArtDto = {
artist: "New Artist",
imageUrl: "https://example.com/art.jpg",
title: "New Artwork",
};
expect(createDto.description).toBeUndefined();
expect(createDto.tags).toBeUndefined();
expect(createDto.links).toBeUndefined();
});
it("should accept DTO with all fields", () => {
const fullCreateDto: CreateArtDto = {
artist: "Famous Artist",
description: "Detailed description",
imageUrl: "https://example.com/complete.jpg",
links: [ { title: "Website", url: "https://website.com" } ],
tags: [ "tag1", "tag2" ],
title: "Complete Artwork",
};
expect(fullCreateDto.tags).toEqual([ "tag1", "tag2" ]);
expect(fullCreateDto.links).toHaveLength(1);
});
});
describe("updateArtDto type", () => {
it("should accept empty update DTO", () => {
const emptyUpdate: UpdateArtDto = {};
expect(emptyUpdate).toEqual({});
});
it("should accept partial updates", () => {
const partialUpdate: UpdateArtDto = {
tags: [ "new-tag" ],
title: "Updated Title",
};
expect(partialUpdate.title).toBe("Updated Title");
expect(partialUpdate.artist).toBeUndefined();
expect(partialUpdate.tags).toEqual([ "new-tag" ]);
});
it("should accept full update", () => {
const fullUpdate: UpdateArtDto = {
artist: "Different Artist",
description: "New description",
imageUrl: "https://example.com/new-image.jpg",
links: [ { title: "New Link", url: "https://newlink.com" } ],
tags: [ "updated", "tags" ],
title: "Completely New Title",
};
expect(fullUpdate.title).toBe("Completely New Title");
expect(fullUpdate.links).toHaveLength(1);
});
});
});
shared-types/test/audit.types.spec.ts
+129
View File
@@ -0,0 +1,129 @@
/**
* @copyright NHCarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import {
AuditAction,
AuditCategory,
type AuditLog,
type AuditLogFilters,
type AuditLogUser,
} from "../src/lib/audit.types";
describe("audit Types", () => {
describe("auditAction enum", () => {
it("should have all expected action values", () => {
expect(AuditAction.login).toBe("LOGIN");
expect(AuditAction.logout).toBe("LOGOUT");
expect(AuditAction.loginFailed).toBe("LOGIN_FAILED");
expect(AuditAction.commentCreate).toBe("COMMENT_CREATE");
expect(AuditAction.commentUpdate).toBe("COMMENT_UPDATE");
expect(AuditAction.commentDelete).toBe("COMMENT_DELETE");
expect(AuditAction.entryCreate).toBe("ENTRY_CREATE");
expect(AuditAction.entryUpdate).toBe("ENTRY_UPDATE");
expect(AuditAction.entryDelete).toBe("ENTRY_DELETE");
expect(AuditAction.like).toBe("LIKE");
expect(AuditAction.unlike).toBe("UNLIKE");
expect(AuditAction.userBan).toBe("USER_BAN");
expect(AuditAction.userUnban).toBe("USER_UNBAN");
expect(AuditAction.rateLimitExceeded).toBe("RATE_LIMIT_EXCEEDED");
expect(AuditAction.csrfValidationFailed).toBe("CSRF_VALIDATION_FAILED");
expect(AuditAction.unauthorizedAccess).toBe("UNAUTHORIZED_ACCESS");
});
});
describe("auditCategory enum", () => {
it("should have all expected category values", () => {
expect(AuditCategory.auth).toBe("AUTH");
expect(AuditCategory.content).toBe("CONTENT");
expect(AuditCategory.admin).toBe("ADMIN");
expect(AuditCategory.security).toBe("SECURITY");
});
});
describe("auditLogUser interface", () => {
it("should accept valid user objects", () => {
const userWithAvatar: AuditLogUser = {
avatar: "https://example.com/avatar.png",
id: "user123",
username: "testuser",
};
const userWithoutAvatar: AuditLogUser = {
id: "user456",
username: "anotheruser",
};
expect(userWithAvatar.avatar).toBe("https://example.com/avatar.png");
expect(userWithoutAvatar.avatar).toBeUndefined();
});
});
describe("auditLog interface", () => {
it("should accept valid audit log with minimal fields", () => {
const minimalLog: AuditLog = {
action: AuditAction.login,
category: AuditCategory.auth,
createdAt: new Date(),
id: "log123",
success: true,
};
expect(minimalLog.userId).toBeUndefined();
expect(minimalLog.details).toBeUndefined();
});
it("should accept valid audit log with all fields", () => {
const fullLog: AuditLog = {
action: AuditAction.commentDelete,
category: AuditCategory.admin,
createdAt: new Date(),
details: "Admin deleted inappropriate comment",
id: "log456",
resourceId: "comment123",
resourceType: "comment",
success: true,
targetUser: {
id: "user789",
username: "targetuser",
},
targetUserId: "user789",
user: {
avatar: "https://example.com/avatar.png",
id: "user123",
username: "admin",
},
userAgent: "Mozilla/5.0 (Windows NT 10.0; Win64; x64)",
userId: "user123",
};
expect(fullLog.user?.username).toBe("admin");
expect(fullLog.targetUser?.username).toBe("targetuser");
});
});
describe("auditLogFilters interface", () => {
it("should accept empty filters", () => {
const emptyFilters: AuditLogFilters = {};
expect(emptyFilters).toEqual({});
});
it("should accept filters with all fields", () => {
const fullFilters: AuditLogFilters = {
action: AuditAction.login,
category: AuditCategory.auth,
endDate: new Date("2024-12-31"),
limit: 50,
page: 1,
startDate: new Date("2024-01-01"),
success: true,
userId: "user123",
};
expect(fullFilters.page).toBe(1);
expect(fullFilters.limit).toBe(50);
});
});
});
shared-types/test/auth.types.spec.ts
+118
View File
@@ -0,0 +1,118 @@
/**
* @copyright NHCarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import type { AuthResponse, JwtPayload, User } from "../src/lib/auth.types";
describe("auth Types", () => {
describe("user interface", () => {
it("should accept valid user objects", () => {
const userWithAvatar: User = {
avatar: "https://example.com/avatar.png",
discordId: "discord123",
email: "test@example.com",
id: "user123",
inDiscord: true,
isAdmin: true,
isBanned: false,
isMod: true,
isStaff: true,
isVip: false,
username: "testuser",
};
const userWithoutAvatar: User = {
discordId: "discord456",
email: "another@example.com",
id: "user456",
inDiscord: false,
isAdmin: false,
isBanned: false,
isMod: false,
isStaff: false,
isVip: true,
username: "anotheruser",
};
expect(userWithAvatar.avatar).toBe("https://example.com/avatar.png");
expect(userWithoutAvatar.avatar).toBeUndefined();
expect(userWithAvatar.isAdmin).toBeTruthy();
expect(userWithoutAvatar.isVip).toBeTruthy();
});
it("should handle all boolean flags correctly", () => {
const bannedUser: User = {
discordId: "discord789",
email: "banned@example.com",
id: "banned123",
inDiscord: false,
isAdmin: false,
isBanned: true,
isMod: false,
isStaff: false,
isVip: false,
username: "banneduser",
};
expect(bannedUser.isBanned).toBeTruthy();
expect(bannedUser.isAdmin).toBeFalsy();
expect(bannedUser.inDiscord).toBeFalsy();
});
});
describe("jwtPayload interface", () => {
it("should accept JWT payload with required fields", () => {
const payload: JwtPayload = {
email: "test@example.com",
isAdmin: false,
sub: "user123",
username: "testuser",
};
expect(payload.sub).toBe("user123");
expect(payload.iat).toBeUndefined();
expect(payload.exp).toBeUndefined();
});
it("should accept JWT payload with timestamps", () => {
const now = Math.floor(Date.now() / 1000);
const payloadWithTimestamps: JwtPayload = {
email: "another@example.com",
exp: now + 3600,
iat: now,
isAdmin: true,
sub: "user456",
username: "anotheruser", // 1 hour
};
expect(payloadWithTimestamps.iat).toBe(now);
expect(payloadWithTimestamps.exp).toBe(now + 3600);
});
});
describe("authResponse interface", () => {
it("should accept valid auth response", () => {
const authResponse: AuthResponse = {
accessToken: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9...",
user: {
avatar: "https://example.com/avatar.png",
discordId: "discord123",
email: "test@example.com",
id: "user123",
inDiscord: true,
isAdmin: false,
isBanned: false,
isMod: false,
isStaff: false,
isVip: false,
username: "testuser",
},
};
expect(authResponse.accessToken).toContain("eyJ");
expect(authResponse.user.username).toBe("testuser");
});
});
});
shared-types/test/book.types.spec.ts
+151
View File
@@ -0,0 +1,151 @@
/**
* @copyright NHCarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import { BookStatus } from "../src/lib/book.types";
import type { Book, CreateBookDto, UpdateBookDto } from "../src/lib/book.types";
describe("book Types", () => {
describe("bookStatus enum", () => {
it("should have the correct values", () => {
expect(BookStatus.reading).toBe("READING");
expect(BookStatus.finished).toBe("FINISHED");
expect(BookStatus.toRead).toBe("TO_READ");
});
it("should have all expected enum values", () => {
const values = Object.values(BookStatus);
expect(values).toHaveLength(4);
expect(values).toContain("READING");
expect(values).toContain("FINISHED");
expect(values).toContain("TO_READ");
expect(values).toContain("RETIRED");
});
});
describe("book interface", () => {
it("should accept valid book object with minimal fields", () => {
const book: Book = {
author: "F. Scott Fitzgerald",
createdAt: new Date("2024-01-15"),
dateAdded: new Date("2024-01-15"),
id: "book123",
links: [],
status: BookStatus.reading,
tags: [],
title: "The Great Gatsby",
updatedAt: new Date("2024-01-16"),
};
expect(book.isbn).toBeUndefined();
expect(book.dateFinished).toBeUndefined();
expect(book.rating).toBeUndefined();
expect(book.notes).toBeUndefined();
expect(book.coverImage).toBeUndefined();
});
it("should accept valid book object with all fields", () => {
const fullBook: Book = {
author: "George Orwell",
coverImage: "https://example.com/1984-cover.jpg",
createdAt: new Date("2024-01-01"),
dateAdded: new Date("2024-01-01"),
dateFinished: new Date("2024-01-20"),
id: "book456",
isbn: "978-0-452-28423-4",
links: [
{ title: "Goodreads", url: "https://goodreads.com/book/1984" },
{ title: "Wikipedia", url: "https://wikipedia.org/wiki/1984" },
],
notes: "A dystopian masterpiece that remains relevant",
rating: 5,
status: BookStatus.finished,
tags: [ "dystopian", "classic", "political" ],
title: "1984",
updatedAt: new Date("2024-01-20"),
};
expect(fullBook.isbn).toBe("978-0-452-28423-4");
expect(fullBook.rating).toBe(5);
expect(fullBook.tags).toHaveLength(3);
expect(fullBook.links).toHaveLength(2);
});
});
describe("createBookDto interface", () => {
it("should accept DTO with required fields only", () => {
const createDto: CreateBookDto = {
author: "Harper Lee",
status: BookStatus.toRead,
title: "To Kill a Mockingbird",
};
expect(createDto.isbn).toBeUndefined();
expect(createDto.rating).toBeUndefined();
expect(createDto.notes).toBeUndefined();
expect(createDto.coverImage).toBeUndefined();
expect(createDto.tags).toBeUndefined();
expect(createDto.links).toBeUndefined();
});
it("should accept DTO with all fields", () => {
const fullCreateDto: CreateBookDto = {
author: "J.R.R. Tolkien",
coverImage: "https://example.com/hobbit-cover.jpg",
isbn: "978-0-547-92822-7",
links: [ { title: "Author Website", url: "https://tolkien.com" } ],
notes: "Starting the journey to Middle-earth",
rating: 4,
status: BookStatus.reading,
tags: [ "fantasy", "adventure", "classic" ],
title: "The Hobbit",
};
expect(fullCreateDto.isbn).toBe("978-0-547-92822-7");
expect(fullCreateDto.rating).toBe(4);
expect(fullCreateDto.tags).toEqual([ "fantasy", "adventure", "classic" ]);
expect(fullCreateDto.links).toHaveLength(1);
});
});
describe("updateBookDto type", () => {
it("should accept empty update DTO", () => {
const emptyUpdate: UpdateBookDto = {};
expect(emptyUpdate).toEqual({});
});
it("should accept partial updates including dateFinished", () => {
const partialUpdate: UpdateBookDto = {
dateFinished: new Date("2024-02-01"),
rating: 5,
status: BookStatus.finished,
};
expect(partialUpdate.status).toBe(BookStatus.finished);
expect(partialUpdate.dateFinished).toEqual(new Date("2024-02-01"));
expect(partialUpdate.rating).toBe(5);
expect(partialUpdate.title).toBeUndefined();
});
it("should accept full update", () => {
const fullUpdate: UpdateBookDto = {
author: "Different Author",
coverImage: "https://example.com/new-cover.jpg",
dateFinished: new Date("2024-02-15"),
isbn: "978-1-234-56789-0",
links: [ { title: "New Link", url: "https://newlink.com" } ],
notes: "Updated notes after finishing",
rating: 3,
status: BookStatus.finished,
tags: [ "updated", "tags" ],
title: "Updated Title",
};
expect(fullUpdate.title).toBe("Updated Title");
expect(fullUpdate.dateFinished).toEqual(new Date("2024-02-15"));
expect(fullUpdate.links).toHaveLength(1);
});
});
});
shared-types/test/comment.types.spec.ts
+195
View File
@@ -0,0 +1,195 @@
/**
* @copyright 2026 NHCarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import type { CommentUser, Comment, CreateCommentDto } from "../src/lib/comment.types";
describe("comment Types", () => {
describe("commentUser interface", () => {
it("should accept valid user object with minimal fields", () => {
const user: CommentUser = {
id: "user123",
username: "testuser",
};
expect(user.avatar).toBeUndefined();
expect(user.inDiscord).toBeUndefined();
expect(user.isVip).toBeUndefined();
expect(user.isMod).toBeUndefined();
expect(user.isStaff).toBeUndefined();
});
it("should accept valid user object with all fields", () => {
const fullUser: CommentUser = {
avatar: "https://example.com/avatar.png",
id: "user456",
inDiscord: true,
isMod: true,
isStaff: false,
isVip: true,
username: "vipmoduser",
};
expect(fullUser.avatar).toBe("https://example.com/avatar.png");
expect(fullUser.inDiscord).toBeTruthy();
expect(fullUser.isVip).toBeTruthy();
expect(fullUser.isMod).toBeTruthy();
expect(fullUser.isStaff).toBeFalsy();
});
});
describe("comment interface", () => {
it("should accept valid comment object with minimal fields", () => {
const comment: Comment = {
content: "This is a great book!",
createdAt: new Date("2024-01-15"),
id: "comment123",
updatedAt: new Date("2024-01-15"),
user: {
id: "user123",
username: "bookworm",
},
userId: "user123",
};
expect(comment.rawContent).toBeUndefined();
expect(comment.gameId).toBeUndefined();
expect(comment.bookId).toBeUndefined();
expect(comment.musicId).toBeUndefined();
expect(comment.artId).toBeUndefined();
expect(comment.showId).toBeUndefined();
expect(comment.mangaId).toBeUndefined();
});
it("should accept comment for a book", () => {
const bookComment: Comment = {
bookId: "book123",
content: "<p>Amazing read!</p>",
createdAt: new Date("2024-01-20"),
id: "comment456",
rawContent: "Amazing read!",
updatedAt: new Date("2024-01-21"),
user: {
avatar: "https://example.com/reader.png",
id: "user789",
inDiscord: true,
isMod: false,
isStaff: false,
isVip: false,
username: "reader",
},
userId: "user789",
};
expect(bookComment.bookId).toBe("book123");
expect(bookComment.rawContent).toBe("Amazing read!");
expect(bookComment.gameId).toBeUndefined();
});
it("should accept comment for a game", () => {
const gameComment: Comment = {
content: "Best game ever!",
createdAt: new Date("2024-02-01"),
gameId: "game789",
id: "comment789",
updatedAt: new Date("2024-02-01"),
user: {
id: "user456",
username: "gamer",
},
userId: "user456",
};
expect(gameComment.gameId).toBe("game789");
expect(gameComment.bookId).toBeUndefined();
});
it("should accept comment for music", () => {
const musicComment: Comment = {
content: "Beautiful album",
createdAt: new Date("2024-02-10"),
id: "comment999",
musicId: "music123",
updatedAt: new Date("2024-02-10"),
user: {
id: "user111",
username: "musiclover",
},
userId: "user111",
};
expect(musicComment.musicId).toBe("music123");
});
it("should accept comment for art", () => {
const artComment: Comment = {
artId: "art456",
content: "Stunning artwork!",
createdAt: new Date("2024-02-15"),
id: "comment111",
updatedAt: new Date("2024-02-15"),
user: {
id: "user222",
username: "artcritic",
},
userId: "user222",
};
expect(artComment.artId).toBe("art456");
});
it("should accept comment for a show", () => {
const showComment: Comment = {
content: "Great series!",
createdAt: new Date("2024-02-20"),
id: "comment222",
showId: "show789",
updatedAt: new Date("2024-02-20"),
user: {
id: "user333",
username: "tvfan",
},
userId: "user333",
};
expect(showComment.showId).toBe("show789");
});
it("should accept comment for manga", () => {
const mangaComment: Comment = {
content: "Awesome manga!",
createdAt: new Date("2024-02-25"),
id: "comment333",
mangaId: "manga123",
updatedAt: new Date("2024-02-25"),
user: {
id: "user444",
username: "mangareader",
},
userId: "user444",
};
expect(mangaComment.mangaId).toBe("manga123");
});
});
describe("createCommentDto interface", () => {
it("should accept DTO with content", () => {
const createDto: CreateCommentDto = {
content: "This is my comment",
};
expect(createDto.content).toBe("This is my comment");
});
it("should accept DTO with formatted content", () => {
const createDto: CreateCommentDto = {
content: "<p>This is <strong>formatted</strong> content!</p>",
};
expect(createDto.content).toBe("<p>This is <strong>formatted</strong> content!</p>");
});
});
});
shared-types/test/common.types.spec.ts
+37
View File
@@ -0,0 +1,37 @@
/**
* @copyright NHCarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import type { Link } from "../src/lib/common.types";
describe("common Types", () => {
describe("link interface", () => {
it("should accept valid Link objects", () => {
const validLink: Link = {
title: "Example Website",
url: "https://example.com",
};
expect(validLink.title).toBe("Example Website");
expect(validLink.url).toBe("https://example.com");
});
it("should work with different URL formats", () => {
const links: Array<Link> = [
{ title: "HTTP URL", url: "http://example.com" },
{ title: "HTTPS URL", url: "https://example.com" },
{ title: "Relative URL", url: "/path/to/page" },
{ title: "URL with query", url: "https://example.com?query=value" },
{ title: "URL with anchor", url: "https://example.com#section" },
];
expect(links).toHaveLength(5);
for (const link of links) {
expect(link).toHaveProperty("title");
expect(link).toHaveProperty("url");
}
});
});
});
shared-types/test/game.types.spec.ts
+176
View File
@@ -0,0 +1,176 @@
/**
* @copyright NHCarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import { GameStatus } from "../src/lib/game.types";
import type { Game, CreateGameDto, UpdateGameDto } from "../src/lib/game.types";
describe("game Types", () => {
describe("gameStatus enum", () => {
it("should have the correct values", () => {
expect(GameStatus.playing).toBe("PLAYING");
expect(GameStatus.completed).toBe("COMPLETED");
expect(GameStatus.backlog).toBe("BACKLOG");
});
it("should have all expected enum values", () => {
const values = Object.values(GameStatus);
expect(values).toHaveLength(4);
expect(values).toContain("PLAYING");
expect(values).toContain("COMPLETED");
expect(values).toContain("BACKLOG");
expect(values).toContain("RETIRED");
});
});
describe("game interface", () => {
it("should accept valid game object with minimal fields", () => {
const game: Game = {
createdAt: new Date("2024-01-15"),
dateAdded: new Date("2024-01-15"),
id: "game123",
links: [],
status: GameStatus.playing,
tags: [],
title: "The Legend of Zelda: Breath of the Wild",
updatedAt: new Date("2024-01-16"),
};
expect(game.platform).toBeUndefined();
expect(game.dateCompleted).toBeUndefined();
expect(game.rating).toBeUndefined();
expect(game.notes).toBeUndefined();
expect(game.coverImage).toBeUndefined();
});
it("should accept valid game object with all fields", () => {
const fullGame: Game = {
coverImage: "https://example.com/hades-cover.jpg",
createdAt: new Date("2024-01-01"),
dateAdded: new Date("2024-01-01"),
dateCompleted: new Date("2024-01-20"),
id: "game456",
links: [
{ title: "Steam", url: "https://store.steampowered.com/app/hades" },
{ title: "Official Site", url: "https://supergiantgames.com/hades" },
],
notes: "One of the best roguelikes ever made",
platform: "Nintendo Switch",
rating: 5,
status: GameStatus.completed,
tags: [ "roguelike", "indie", "action", "mythology" ],
title: "Hades",
updatedAt: new Date("2024-01-20"),
};
expect(fullGame.platform).toBe("Nintendo Switch");
expect(fullGame.rating).toBe(5);
expect(fullGame.tags).toHaveLength(4);
expect(fullGame.links).toHaveLength(2);
});
it("should accept games on different platforms", () => {
const pcGame: Game = {
createdAt: new Date("2024-02-01"),
dateAdded: new Date("2024-02-01"),
id: "game789",
links: [],
platform: "PC",
status: GameStatus.completed,
tags: [ "puzzle", "first-person" ],
title: "Portal 2",
updatedAt: new Date("2024-02-01"),
};
const ps5Game: Game = {
createdAt: new Date("2024-02-05"),
dateAdded: new Date("2024-02-05"),
id: "game999",
links: [],
platform: "PlayStation 5",
status: GameStatus.backlog,
tags: [ "action", "superhero" ],
title: "Spider-Man: Miles Morales",
updatedAt: new Date("2024-02-05"),
};
expect(pcGame.platform).toBe("PC");
expect(ps5Game.platform).toBe("PlayStation 5");
});
});
describe("createGameDto interface", () => {
it("should accept DTO with required fields only", () => {
const createDto: CreateGameDto = {
status: GameStatus.backlog,
title: "Elden Ring",
};
expect(createDto.platform).toBeUndefined();
expect(createDto.rating).toBeUndefined();
expect(createDto.notes).toBeUndefined();
expect(createDto.coverImage).toBeUndefined();
expect(createDto.tags).toBeUndefined();
expect(createDto.links).toBeUndefined();
});
it("should accept DTO with all fields", () => {
const fullCreateDto: CreateGameDto = {
coverImage: "https://example.com/hollow-knight.jpg",
links: [ { title: "Wiki", url: "https://hollowknight.wiki" } ],
notes: "Beautiful metroidvania with challenging gameplay",
platform: "Nintendo Switch",
rating: 4,
status: GameStatus.playing,
tags: [ "metroidvania", "indie", "platformer" ],
title: "Hollow Knight",
};
expect(fullCreateDto.platform).toBe("Nintendo Switch");
expect(fullCreateDto.rating).toBe(4);
expect(fullCreateDto.tags).toEqual([ "metroidvania", "indie", "platformer" ]);
expect(fullCreateDto.links).toHaveLength(1);
});
});
describe("updateGameDto type", () => {
it("should accept empty update DTO", () => {
const emptyUpdate: UpdateGameDto = {};
expect(emptyUpdate).toEqual({});
});
it("should accept partial updates including dateCompleted", () => {
const partialUpdate: UpdateGameDto = {
dateCompleted: new Date("2024-02-10"),
rating: 5,
status: GameStatus.completed,
};
expect(partialUpdate.status).toBe(GameStatus.completed);
expect(partialUpdate.dateCompleted).toEqual(new Date("2024-02-10"));
expect(partialUpdate.rating).toBe(5);
expect(partialUpdate.title).toBeUndefined();
});
it("should accept full update", () => {
const fullUpdate: UpdateGameDto = {
coverImage: "https://example.com/new-cover.jpg",
dateCompleted: new Date("2024-02-15"),
links: [ { title: "New Link", url: "https://newlink.com" } ],
notes: "Updated after completion",
platform: "Xbox Series X",
rating: 3,
status: GameStatus.completed,
tags: [ "updated", "tags" ],
title: "Updated Game Title",
};
expect(fullUpdate.title).toBe("Updated Game Title");
expect(fullUpdate.platform).toBe("Xbox Series X");
expect(fullUpdate.dateCompleted).toEqual(new Date("2024-02-15"));
expect(fullUpdate.links).toHaveLength(1);
});
});
});
shared-types/test/like.types.spec.ts
+228
View File
@@ -0,0 +1,228 @@
/**
* @copyright NHCarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import type { Like, CreateLikeDto, LikeResponse, LikedItemDto, LikeCountDto } from "../src/lib/like.types";
describe("like Types", () => {
describe("like interface", () => {
it("should accept valid like object for a book", () => {
const bookLike: Like = {
createdAt: new Date("2024-01-15"),
entityId: "book456",
entityType: "book",
id: "like123",
userId: "user123",
};
expect(bookLike.entityType).toBe("book");
expect(bookLike.entityId).toBe("book456");
});
it("should accept valid like object for a game", () => {
const gameLike: Like = {
createdAt: new Date("2024-01-20"),
entityId: "game123",
entityType: "game",
id: "like456",
userId: "user789",
};
expect(gameLike.entityType).toBe("game");
expect(gameLike.entityId).toBe("game123");
});
it("should accept likes for all entity types", () => {
const showLike: Like = {
createdAt: new Date("2024-02-01"),
entityId: "show222",
entityType: "show",
id: "like789",
userId: "user111",
};
const mangaLike: Like = {
createdAt: new Date("2024-02-05"),
entityId: "manga444",
entityType: "manga",
id: "like999",
userId: "user333",
};
const musicLike: Like = {
createdAt: new Date("2024-02-10"),
entityId: "music666",
entityType: "music",
id: "like111",
userId: "user555",
};
const artLike: Like = {
createdAt: new Date("2024-02-15"),
entityId: "art888",
entityType: "art",
id: "like222",
userId: "user777",
};
expect(showLike.entityType).toBe("show");
expect(mangaLike.entityType).toBe("manga");
expect(musicLike.entityType).toBe("music");
expect(artLike.entityType).toBe("art");
});
});
describe("createLikeDto type", () => {
it("should pick only entityType and entityId from Like", () => {
const createDto: CreateLikeDto = {
entityId: "book123",
entityType: "book",
};
expect(createDto.entityType).toBe("book");
expect(createDto.entityId).toBe("book123");
// Verify it only has these two properties
expect(Object.keys(createDto)).toHaveLength(2);
});
it("should accept different entity types", () => {
const gameDto: CreateLikeDto = {
entityId: "game456",
entityType: "game",
};
const artDto: CreateLikeDto = {
entityId: "art789",
entityType: "art",
};
expect(gameDto.entityType).toBe("game");
expect(artDto.entityType).toBe("art");
});
});
describe("likeCountDto interface", () => {
it("should accept valid like count object", () => {
const likeCount: LikeCountDto = {
count: 42,
entityId: "book123",
entityType: "book",
};
expect(likeCount.count).toBe(42);
expect(likeCount.entityType).toBe("book");
});
it("should accept like counts for different entities", () => {
const gameLikeCount: LikeCountDto = {
count: 15,
entityId: "game456",
entityType: "game",
};
const showLikeCount: LikeCountDto = {
count: 0,
entityId: "show789",
entityType: "show",
};
expect(gameLikeCount.count).toBe(15);
expect(showLikeCount.count).toBe(0);
});
});
describe("likedItemDto interface", () => {
it("should accept liked item with unknown item type", () => {
const likedBook: LikedItemDto = {
item: {
author: "F. Scott Fitzgerald",
id: "book456",
title: "The Great Gatsby",
// ... other book properties
},
like: {
createdAt: new Date("2024-01-15"),
entityId: "book456",
entityType: "book",
id: "like123",
userId: "user123",
},
};
expect(likedBook.like.entityType).toBe("book");
expect(likedBook.item).toBeDefined();
});
it("should accept liked items for different entity types", () => {
const likedGame: LikedItemDto = {
item: {
id: "game123",
platform: "Nintendo Switch",
title: "Hades",
// ... other game properties
},
like: {
createdAt: new Date("2024-02-01"),
entityId: "game123",
entityType: "game",
id: "like456",
userId: "user789",
},
};
const likedArt: LikedItemDto = {
item: {
artist: "Jane Doe",
id: "art456",
imageUrl: "https://example.com/sunset.jpg",
title: "Beautiful Sunset",
// ... other art properties
},
like: {
createdAt: new Date("2024-02-10"),
entityId: "art456",
entityType: "art",
id: "like789",
userId: "user999",
},
};
expect(likedGame.like.entityType).toBe("game");
expect(likedArt.like.entityType).toBe("art");
});
});
describe("likeResponse interface", () => {
it("should accept response with liked true", () => {
const likedResponse: LikeResponse = {
count: 10,
liked: true,
};
expect(likedResponse.liked).toBeTruthy();
expect(likedResponse.count).toBe(10);
});
it("should accept response with liked false", () => {
const notLikedResponse: LikeResponse = {
count: 5,
liked: false,
};
expect(notLikedResponse.liked).toBeFalsy();
expect(notLikedResponse.count).toBe(5);
});
it("should accept response with zero count", () => {
const zeroResponse: LikeResponse = {
count: 0,
liked: false,
};
expect(zeroResponse.liked).toBeFalsy();
expect(zeroResponse.count).toBe(0);
});
});
});
shared-types/test/manga.types.spec.ts
+173
View File
@@ -0,0 +1,173 @@
/**
* @copyright NHCarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import { MangaStatus } from "../src/lib/manga.types";
import type { Manga, CreateMangaDto, UpdateMangaDto } from "../src/lib/manga.types";
describe("manga Types", () => {
describe("mangaStatus enum", () => {
it("should have the correct values", () => {
expect(MangaStatus.reading).toBe("READING");
expect(MangaStatus.completed).toBe("COMPLETED");
expect(MangaStatus.wantToRead).toBe("WANT_TO_READ");
});
it("should have all expected enum values", () => {
const values = Object.values(MangaStatus);
expect(values).toHaveLength(4);
expect(values).toContain("READING");
expect(values).toContain("COMPLETED");
expect(values).toContain("WANT_TO_READ");
expect(values).toContain("RETIRED");
});
});
describe("manga interface", () => {
it("should accept valid manga object with minimal fields", () => {
const manga: Manga = {
author: "Tsugumi Ohba",
createdAt: new Date("2024-01-15"),
dateAdded: new Date("2024-01-15"),
id: "manga123",
links: [],
status: MangaStatus.reading,
tags: [],
title: "Death Note",
updatedAt: new Date("2024-01-16"),
};
expect(manga.dateCompleted).toBeUndefined();
expect(manga.rating).toBeUndefined();
expect(manga.notes).toBeUndefined();
expect(manga.coverImage).toBeUndefined();
});
it("should accept valid manga object with all fields", () => {
const fullManga: Manga = {
author: "Eiichiro Oda",
coverImage: "https://example.com/onepiece-cover.jpg",
createdAt: new Date("2024-01-01"),
dateAdded: new Date("2024-01-01"),
dateCompleted: undefined,
id: "manga456",
links: [
{ title: "MyAnimeList", url: "https://myanimelist.net/manga/13" },
{ title: "Official Site", url: "https://one-piece.com" },
],
notes: "Epic adventure that keeps getting better",
// Still ongoing
rating: 5,
status: MangaStatus.reading,
tags: [ "adventure", "shounen", "pirates", "long-running" ],
title: "One Piece",
updatedAt: new Date("2024-02-01"),
};
expect(fullManga.author).toBe("Eiichiro Oda");
expect(fullManga.rating).toBe(5);
expect(fullManga.tags).toHaveLength(4);
expect(fullManga.links).toHaveLength(2);
});
it("should accept completed manga", () => {
const completedManga: Manga = {
author: "Hiromu Arakawa",
coverImage: "https://example.com/fma-cover.jpg",
createdAt: new Date("2023-12-01"),
dateAdded: new Date("2023-12-01"),
dateCompleted: new Date("2024-01-30"),
id: "manga789",
links: [],
notes: "Perfect from start to finish",
rating: 5,
status: MangaStatus.completed,
tags: [ "shounen", "adventure", "alchemy" ],
title: "Fullmetal Alchemist",
updatedAt: new Date("2024-01-30"),
};
expect(completedManga.status).toBe(MangaStatus.completed);
expect(completedManga.dateCompleted).toEqual(new Date("2024-01-30"));
});
});
describe("createMangaDto interface", () => {
it("should accept DTO with required fields only", () => {
const createDto: CreateMangaDto = {
author: "Hajime Isayama",
status: MangaStatus.wantToRead,
title: "Attack on Titan",
};
expect(createDto.rating).toBeUndefined();
expect(createDto.notes).toBeUndefined();
expect(createDto.coverImage).toBeUndefined();
expect(createDto.tags).toBeUndefined();
expect(createDto.links).toBeUndefined();
});
it("should accept DTO with all fields", () => {
const fullCreateDto: CreateMangaDto = {
author: "Kohei Horikoshi",
coverImage: "https://example.com/mha-cover.jpg",
links: [ { title: "Wiki", url: "https://mha.wiki" } ],
notes: "Great superhero manga with unique powers",
rating: 4,
status: MangaStatus.reading,
tags: [ "shounen", "superhero", "school" ],
title: "My Hero Academia",
};
expect(fullCreateDto.author).toBe("Kohei Horikoshi");
expect(fullCreateDto.rating).toBe(4);
expect(fullCreateDto.tags).toEqual([ "shounen", "superhero", "school" ]);
expect(fullCreateDto.links).toHaveLength(1);
});
});
describe("updateMangaDto type", () => {
it("should accept empty update DTO", () => {
const emptyUpdate: UpdateMangaDto = {};
expect(emptyUpdate).toEqual({});
});
it("should accept partial updates including dateCompleted", () => {
const partialUpdate: UpdateMangaDto = {
dateCompleted: new Date("2024-02-10"),
rating: 4,
status: MangaStatus.completed,
};
expect(partialUpdate.status).toBe(MangaStatus.completed);
expect(partialUpdate.dateCompleted).toEqual(new Date("2024-02-10"));
expect(partialUpdate.rating).toBe(4);
expect(partialUpdate.title).toBeUndefined();
});
it("should accept full update", () => {
const fullUpdate: UpdateMangaDto = {
author: "Different Author",
coverImage: "https://example.com/new-manga-cover.jpg",
dateCompleted: new Date("2024-02-15"),
links: [ { title: "New Link", url: "https://newlink.com" } ],
notes: "Updated after finishing the series",
rating: 3,
status: MangaStatus.completed,
tags: [ "updated", "tags" ],
title: "Updated Manga Title",
};
expect(fullUpdate.title).toBe("Updated Manga Title");
expect(fullUpdate.author).toBe("Different Author");
expect(fullUpdate.dateCompleted).toEqual(new Date("2024-02-15"));
expect(fullUpdate.links).toHaveLength(1);
});
});
});
shared-types/test/music.types.spec.ts
+201
View File
@@ -0,0 +1,201 @@
/**
* @copyright NHCarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import { MusicStatus, MusicType } from "../src/lib/music.types";
import type { Music, CreateMusicDto, UpdateMusicDto } from "../src/lib/music.types";
describe("music Types", () => {
describe("musicType enum", () => {
it("should have the correct values", () => {
expect(MusicType.album).toBe("ALBUM");
expect(MusicType.single).toBe("SINGLE");
expect(MusicType.ep).toBe("EP");
});
it("should have all expected enum values", () => {
const values = Object.values(MusicType);
expect(values).toHaveLength(3);
expect(values).toContain("ALBUM");
expect(values).toContain("SINGLE");
expect(values).toContain("EP");
});
});
describe("musicStatus enum", () => {
it("should have the correct values", () => {
expect(MusicStatus.listening).toBe("LISTENING");
expect(MusicStatus.completed).toBe("COMPLETED");
expect(MusicStatus.wantToListen).toBe("WANT_TO_LISTEN");
});
it("should have all expected enum values", () => {
const values = Object.values(MusicStatus);
expect(values).toHaveLength(4);
expect(values).toContain("LISTENING");
expect(values).toContain("COMPLETED");
expect(values).toContain("WANT_TO_LISTEN");
expect(values).toContain("RETIRED");
});
});
describe("music interface", () => {
it("should accept valid music object with minimal fields", () => {
const music: Music = {
artist: "Pink Floyd",
createdAt: new Date("2024-01-15"),
dateAdded: new Date("2024-01-15"),
id: "music123",
links: [],
status: MusicStatus.listening,
tags: [],
title: "Dark Side of the Moon",
type: MusicType.album,
updatedAt: new Date("2024-01-16"),
};
expect(music.dateCompleted).toBeUndefined();
expect(music.rating).toBeUndefined();
expect(music.notes).toBeUndefined();
expect(music.coverArt).toBeUndefined();
});
it("should accept valid music object with all fields", () => {
const fullMusic: Music = {
artist: "Pink Floyd",
coverArt: "https://example.com/the-wall-cover.jpg",
createdAt: new Date("2024-01-01"),
dateAdded: new Date("2024-01-01"),
dateCompleted: new Date("2024-01-20"),
id: "music456",
links: [
{ title: "Spotify", url: "https://spotify.com/album/the-wall" },
{ title: "Apple Music", url: "https://music.apple.com/album/the-wall" },
],
notes: "A rock opera masterpiece",
rating: 5,
status: MusicStatus.completed,
tags: [ "progressive rock", "concept album", "classic" ],
title: "The Wall",
type: MusicType.album,
updatedAt: new Date("2024-01-20"),
};
expect(fullMusic.artist).toBe("Pink Floyd");
expect(fullMusic.rating).toBe(5);
expect(fullMusic.tags).toHaveLength(3);
expect(fullMusic.links).toHaveLength(2);
});
it("should accept different music types", () => {
const single: Music = {
artist: "The Weeknd",
createdAt: new Date("2024-02-01"),
dateAdded: new Date("2024-02-01"),
id: "music789",
links: [],
status: MusicStatus.completed,
tags: [ "pop", "synthwave" ],
title: "Blinding Lights",
type: MusicType.single,
updatedAt: new Date("2024-02-01"),
};
const ep: Music = {
artist: "The Weeknd",
createdAt: new Date("2024-02-05"),
dateAdded: new Date("2024-02-05"),
id: "music999",
links: [],
status: MusicStatus.wantToListen,
tags: [ "r&b", "dark" ],
title: "My Dear Melancholy,",
type: MusicType.ep,
updatedAt: new Date("2024-02-05"),
};
expect(single.type).toBe(MusicType.single);
expect(ep.type).toBe(MusicType.ep);
});
});
describe("createMusicDto interface", () => {
it("should accept DTO with required fields only", () => {
const createDto: CreateMusicDto = {
artist: "Fleetwood Mac",
status: MusicStatus.wantToListen,
title: "Rumours",
type: MusicType.album,
};
expect(createDto.rating).toBeUndefined();
expect(createDto.notes).toBeUndefined();
expect(createDto.coverArt).toBeUndefined();
expect(createDto.tags).toBeUndefined();
expect(createDto.links).toBeUndefined();
});
it("should accept DTO with all fields", () => {
const fullCreateDto: CreateMusicDto = {
artist: "The Weeknd",
coverArt: "https://example.com/after-hours.jpg",
links: [ { title: "YouTube", url: "https://youtube.com/album/after-hours" } ],
notes: "Dark synthwave vibes",
rating: 4,
status: MusicStatus.listening,
tags: [ "synthwave", "pop", "r&b" ],
title: "After Hours",
type: MusicType.album,
};
expect(fullCreateDto.artist).toBe("The Weeknd");
expect(fullCreateDto.type).toBe(MusicType.album);
expect(fullCreateDto.rating).toBe(4);
expect(fullCreateDto.tags).toEqual([ "synthwave", "pop", "r&b" ]);
expect(fullCreateDto.links).toHaveLength(1);
});
});
describe("updateMusicDto type", () => {
it("should accept empty update DTO", () => {
const emptyUpdate: UpdateMusicDto = {};
expect(emptyUpdate).toEqual({});
});
it("should accept partial updates including dateCompleted", () => {
const partialUpdate: UpdateMusicDto = {
dateCompleted: new Date("2024-02-10"),
rating: 5,
status: MusicStatus.completed,
};
expect(partialUpdate.status).toBe(MusicStatus.completed);
expect(partialUpdate.dateCompleted).toEqual(new Date("2024-02-10"));
expect(partialUpdate.rating).toBe(5);
expect(partialUpdate.title).toBeUndefined();
});
it("should accept full update", () => {
const fullUpdate: UpdateMusicDto = {
artist: "Different Artist",
coverArt: "https://example.com/new-cover.jpg",
dateCompleted: new Date("2024-02-15"),
links: [ { title: "New Link", url: "https://newlink.com" } ],
notes: "Updated after listening",
rating: 3,
status: MusicStatus.completed,
tags: [ "updated", "tags" ],
title: "Updated Album Title",
type: MusicType.ep,
};
expect(fullUpdate.title).toBe("Updated Album Title");
expect(fullUpdate.artist).toBe("Different Artist");
expect(fullUpdate.type).toBe(MusicType.ep);
expect(fullUpdate.dateCompleted).toEqual(new Date("2024-02-15"));
expect(fullUpdate.links).toHaveLength(1);
});
});
});
shared-types/test/show.types.spec.ts
+195
View File
@@ -0,0 +1,195 @@
/**
* @copyright NHCarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import { ShowStatus, ShowType } from "../src/lib/show.types";
import type { Show, CreateShowDto, UpdateShowDto } from "../src/lib/show.types";
describe("show Types", () => {
describe("showType enum", () => {
it("should have the correct values", () => {
expect(ShowType.tvSeries).toBe("TV_SERIES");
expect(ShowType.anime).toBe("ANIME");
expect(ShowType.film).toBe("FILM");
expect(ShowType.documentary).toBe("DOCUMENTARY");
});
it("should have all expected enum values", () => {
const values = Object.values(ShowType);
expect(values).toHaveLength(4);
expect(values).toContain("TV_SERIES");
expect(values).toContain("ANIME");
expect(values).toContain("FILM");
expect(values).toContain("DOCUMENTARY");
});
});
describe("showStatus enum", () => {
it("should have the correct values", () => {
expect(ShowStatus.watching).toBe("WATCHING");
expect(ShowStatus.completed).toBe("COMPLETED");
expect(ShowStatus.wantToWatch).toBe("WANT_TO_WATCH");
});
it("should have all expected enum values", () => {
const values = Object.values(ShowStatus);
expect(values).toHaveLength(4);
expect(values).toContain("WATCHING");
expect(values).toContain("COMPLETED");
expect(values).toContain("WANT_TO_WATCH");
expect(values).toContain("RETIRED");
});
});
describe("show interface", () => {
it("should accept valid show object with minimal fields", () => {
const show: Show = {
createdAt: new Date("2024-01-15"),
dateAdded: new Date("2024-01-15"),
id: "show123",
links: [],
status: ShowStatus.watching,
tags: [],
title: "Breaking Bad",
type: ShowType.tvSeries,
updatedAt: new Date("2024-01-16"),
};
expect(show.dateCompleted).toBeUndefined();
expect(show.rating).toBeUndefined();
expect(show.notes).toBeUndefined();
expect(show.coverImage).toBeUndefined();
});
it("should accept valid show object with all fields", () => {
const fullShow: Show = {
coverImage: "https://example.com/aot-cover.jpg",
createdAt: new Date("2024-01-01"),
dateAdded: new Date("2024-01-01"),
dateCompleted: new Date("2024-01-20"),
id: "show456",
links: [
{ title: "MyAnimeList", url: "https://myanimelist.net/anime/16498" },
{ title: "Crunchyroll", url: "https://crunchyroll.com/attack-on-titan" },
],
notes: "Incredible story with amazing animation",
rating: 5,
status: ShowStatus.completed,
tags: [ "action", "dark fantasy", "shounen" ],
title: "Attack on Titan",
type: ShowType.anime,
updatedAt: new Date("2024-01-20"),
};
expect(fullShow.type).toBe(ShowType.anime);
expect(fullShow.rating).toBe(5);
expect(fullShow.tags).toHaveLength(3);
expect(fullShow.links).toHaveLength(2);
});
it("should accept different show types", () => {
const film: Show = {
createdAt: new Date("2024-02-01"),
dateAdded: new Date("2024-02-01"),
id: "show789",
links: [],
rating: 5,
status: ShowStatus.completed,
tags: [ "sci-fi", "thriller" ],
title: "Inception",
type: ShowType.film,
updatedAt: new Date("2024-02-01"),
};
const documentary: Show = {
createdAt: new Date("2024-02-05"),
dateAdded: new Date("2024-02-05"),
id: "show999",
links: [],
status: ShowStatus.wantToWatch,
tags: [ "nature", "wildlife" ],
title: "Planet Earth II",
type: ShowType.documentary,
updatedAt: new Date("2024-02-05"),
};
expect(film.type).toBe(ShowType.film);
expect(documentary.type).toBe(ShowType.documentary);
});
});
describe("createShowDto interface", () => {
it("should accept DTO with required fields only", () => {
const createDto: CreateShowDto = {
status: ShowStatus.wantToWatch,
title: "Stranger Things",
type: ShowType.tvSeries,
};
expect(createDto.rating).toBeUndefined();
expect(createDto.notes).toBeUndefined();
expect(createDto.coverImage).toBeUndefined();
expect(createDto.tags).toBeUndefined();
expect(createDto.links).toBeUndefined();
});
it("should accept DTO with all fields", () => {
const fullCreateDto: CreateShowDto = {
coverImage: "https://example.com/death-note.jpg",
links: [ { title: "Netflix", url: "https://netflix.com/death-note" } ],
notes: "Psychological thriller with great plot",
rating: 4,
status: ShowStatus.watching,
tags: [ "psychological", "thriller", "supernatural" ],
title: "Death Note",
type: ShowType.anime,
};
expect(fullCreateDto.type).toBe(ShowType.anime);
expect(fullCreateDto.rating).toBe(4);
expect(fullCreateDto.tags).toEqual([ "psychological", "thriller", "supernatural" ]);
expect(fullCreateDto.links).toHaveLength(1);
});
});
describe("updateShowDto type", () => {
it("should accept empty update DTO", () => {
const emptyUpdate: UpdateShowDto = {};
expect(emptyUpdate).toEqual({});
});
it("should accept partial updates including dateCompleted", () => {
const partialUpdate: UpdateShowDto = {
dateCompleted: new Date("2024-02-10"),
rating: 5,
status: ShowStatus.completed,
};
expect(partialUpdate.status).toBe(ShowStatus.completed);
expect(partialUpdate.dateCompleted).toEqual(new Date("2024-02-10"));
expect(partialUpdate.rating).toBe(5);
expect(partialUpdate.title).toBeUndefined();
});
it("should accept full update", () => {
const fullUpdate: UpdateShowDto = {
coverImage: "https://example.com/new-show-cover.jpg",
dateCompleted: new Date("2024-02-15"),
links: [ { title: "New Link", url: "https://newlink.com" } ],
notes: "Updated after watching",
rating: 3,
status: ShowStatus.completed,
tags: [ "updated", "tags" ],
title: "Updated Show Title",
type: ShowType.documentary,
};
expect(fullUpdate.title).toBe("Updated Show Title");
expect(fullUpdate.type).toBe(ShowType.documentary);
expect(fullUpdate.dateCompleted).toEqual(new Date("2024-02-15"));
expect(fullUpdate.links).toHaveLength(1);
});
});
});
shared-types/test/suggestion.types.spec.ts
+440
View File
@@ -0,0 +1,440 @@
/**
* @copyright NHCarrigan
* @license Naomi's Public License
* @author Naomi Carrigan
*/
import { GameStatus, BookStatus, MangaStatus, MusicStatus, MusicType, ShowStatus, ShowType } from "../src";
import { SuggestionEntity, SuggestionStatus } from "../src/lib/suggestion.types";
import type {
Suggestion,
SuggestionUser,
CreateSuggestionDto,
DeclineSuggestionDto,
CreateGameSuggestionDto,
CreateBookSuggestionDto,
CreateMusicSuggestionDto,
CreateArtSuggestionDto,
CreateShowSuggestionDto,
CreateMangaSuggestionDto,
AcceptWithEditsDto,
} from "../src/lib/suggestion.types";
describe("suggestion Types", () => {
describe("suggestionEntity enum", () => {
it("should have the correct values", () => {
expect(SuggestionEntity.game).toBe("GAME");
expect(SuggestionEntity.book).toBe("BOOK");
expect(SuggestionEntity.music).toBe("MUSIC");
expect(SuggestionEntity.art).toBe("ART");
expect(SuggestionEntity.show).toBe("SHOW");
expect(SuggestionEntity.manga).toBe("MANGA");
});
it("should have all expected enum values", () => {
const values = Object.values(SuggestionEntity);
expect(values).toHaveLength(6);
expect(values).toContain("GAME");
expect(values).toContain("BOOK");
expect(values).toContain("MUSIC");
expect(values).toContain("ART");
expect(values).toContain("SHOW");
expect(values).toContain("MANGA");
});
});
describe("suggestionStatus enum", () => {
it("should have the correct values", () => {
expect(SuggestionStatus.unreviewed).toBe("UNREVIEWED");
expect(SuggestionStatus.accepted).toBe("ACCEPTED");
expect(SuggestionStatus.declined).toBe("DECLINED");
});
it("should have all expected enum values", () => {
const values = Object.values(SuggestionStatus);
expect(values).toHaveLength(3);
expect(values).toContain("UNREVIEWED");
expect(values).toContain("ACCEPTED");
expect(values).toContain("DECLINED");
});
});
describe("suggestionUser interface", () => {
it("should accept valid user object", () => {
const user: SuggestionUser = {
avatar: "https://example.com/avatar.png",
id: "user123",
inDiscord: true,
isMod: false,
isStaff: false,
isVip: false,
username: "suggester",
};
expect(user.inDiscord).toBeTruthy();
expect(user.isVip).toBeFalsy();
});
it("should accept user without avatar", () => {
const user: SuggestionUser = {
id: "user456",
inDiscord: true,
isMod: false,
isStaff: true,
isVip: true,
username: "vipuser",
};
expect(user.avatar).toBeUndefined();
expect(user.isVip).toBeTruthy();
expect(user.isStaff).toBeTruthy();
});
});
describe("suggestion interface", () => {
it("should accept game suggestion", () => {
const gameSuggestion: Suggestion = {
createdAt: new Date("2024-01-15"),
entityType: SuggestionEntity.game,
gameData: {
coverImage: "https://example.com/hades.jpg",
notes: "Amazing roguelike",
platform: "Nintendo Switch",
status: GameStatus.backlog,
title: "Hades",
},
id: "sug123",
status: SuggestionStatus.unreviewed,
title: "Hades",
updatedAt: new Date("2024-01-15"),
user: {
id: "user123",
inDiscord: true,
isMod: false,
isStaff: false,
isVip: false,
username: "gamer",
},
userId: "user123",
};
expect(gameSuggestion.entityType).toBe(SuggestionEntity.game);
expect(gameSuggestion.gameData).toBeDefined();
expect(gameSuggestion.bookData).toBeUndefined();
});
it("should accept book suggestion", () => {
const bookSuggestion: Suggestion = {
bookData: {
author: "George Orwell",
isbn: "978-0-452-28423-4",
notes: "Dystopian classic",
status: BookStatus.toRead,
title: "1984",
},
createdAt: new Date("2024-01-20"),
entityType: SuggestionEntity.book,
id: "sug456",
status: SuggestionStatus.accepted,
title: "1984",
updatedAt: new Date("2024-01-21"),
user: {
id: "user456",
inDiscord: false,
isMod: false,
isStaff: false,
isVip: true,
username: "reader",
},
userId: "user456",
};
expect(bookSuggestion.entityType).toBe(SuggestionEntity.book);
expect(bookSuggestion.bookData).toBeDefined();
expect(bookSuggestion.gameData).toBeUndefined();
});
it("should accept declined suggestion with reason", () => {
const declinedSuggestion: Suggestion = {
createdAt: new Date("2024-02-01"),
declineReason: "Already in the library",
entityType: SuggestionEntity.music,
id: "sug789",
musicData: {
artist: "Pink Floyd",
status: MusicStatus.wantToListen,
title: "Dark Side of the Moon",
type: MusicType.album,
},
status: SuggestionStatus.declined,
title: "Dark Side of the Moon",
updatedAt: new Date("2024-02-02"),
user: {
id: "user789",
inDiscord: true,
isMod: false,
isStaff: false,
isVip: false,
username: "suggester",
},
userId: "user789",
};
expect(declinedSuggestion.status).toBe(SuggestionStatus.declined);
expect(declinedSuggestion.declineReason).toBe("Already in the library");
});
it("should accept art suggestion", () => {
const artSuggestion: Suggestion = {
artData: {
artist: "Jane Doe",
description: "A stunning sunset painting",
imageUrl: "https://example.com/sunset.jpg",
title: "Beautiful Sunset",
},
createdAt: new Date("2024-02-10"),
entityType: SuggestionEntity.art,
id: "sug999",
status: SuggestionStatus.unreviewed,
title: "Beautiful Sunset",
updatedAt: new Date("2024-02-10"),
user: {
id: "user999",
inDiscord: true,
isMod: true,
isStaff: false,
isVip: false,
username: "artlover",
},
userId: "user999",
};
expect(artSuggestion.entityType).toBe(SuggestionEntity.art);
expect(artSuggestion.artData).toBeDefined();
});
it("should accept show and manga suggestions", () => {
const showSuggestion: Suggestion = {
createdAt: new Date("2024-02-15"),
entityType: SuggestionEntity.show,
id: "sug111",
showData: {
status: ShowStatus.wantToWatch,
title: "Breaking Bad",
type: ShowType.tvSeries,
},
status: SuggestionStatus.unreviewed,
title: "Breaking Bad",
updatedAt: new Date("2024-02-15"),
user: {
id: "user111",
inDiscord: false,
isMod: false,
isStaff: true,
isVip: false,
username: "tvfan",
},
userId: "user111",
};
const mangaSuggestion: Suggestion = {
createdAt: new Date("2024-02-20"),
entityType: SuggestionEntity.manga,
id: "sug222",
mangaData: {
author: "Eiichiro Oda",
status: MangaStatus.reading,
title: "One Piece",
},
status: SuggestionStatus.accepted,
title: "One Piece",
updatedAt: new Date("2024-02-21"),
user: {
id: "user222",
inDiscord: true,
isMod: true,
isStaff: true,
isVip: true,
username: "mangareader",
},
userId: "user222",
};
expect(showSuggestion.entityType).toBe(SuggestionEntity.show);
expect(mangaSuggestion.entityType).toBe(SuggestionEntity.manga);
});
});
describe("createSuggestionDto types", () => {
it("should accept game suggestion DTO", () => {
const gameDto: CreateGameSuggestionDto = {
coverImage: "https://example.com/hollow.jpg",
entityType: SuggestionEntity.game,
notes: "Great metroidvania",
platform: "PC",
title: "Hollow Knight",
};
expect(gameDto.entityType).toBe(SuggestionEntity.game);
expect(gameDto.platform).toBe("PC");
});
it("should accept book suggestion DTO", () => {
const bookDto: CreateBookSuggestionDto = {
author: "J.R.R. Tolkien",
coverImage: "https://example.com/hobbit.jpg",
entityType: SuggestionEntity.book,
isbn: "978-0-547-92822-7",
notes: "Fantasy classic",
title: "The Hobbit",
};
expect(bookDto.entityType).toBe(SuggestionEntity.book);
expect(bookDto.author).toBe("J.R.R. Tolkien");
});
it("should accept music suggestion DTO", () => {
const musicDto: CreateMusicSuggestionDto = {
artist: "Pink Floyd",
coverArt: "https://example.com/wall.jpg",
entityType: SuggestionEntity.music,
notes: "Rock opera",
title: "The Wall",
type: "ALBUM",
};
expect(musicDto.entityType).toBe(SuggestionEntity.music);
expect(musicDto.type).toBe("ALBUM");
});
it("should accept art suggestion DTO", () => {
const artDto: CreateArtSuggestionDto = {
artist: "Vincent van Gogh",
description: "Famous painting",
entityType: SuggestionEntity.art,
imageUrl: "https://example.com/starry.jpg",
title: "Starry Night",
};
expect(artDto.entityType).toBe(SuggestionEntity.art);
expect(artDto.imageUrl).toBe("https://example.com/starry.jpg");
});
it("should accept show suggestion DTO", () => {
const showDto: CreateShowSuggestionDto = {
coverImage: "https://example.com/office.jpg",
entityType: SuggestionEntity.show,
notes: "Comedy series",
title: "The Office",
type: "TV_SERIES",
};
expect(showDto.entityType).toBe(SuggestionEntity.show);
expect(showDto.type).toBe("TV_SERIES");
});
it("should accept manga suggestion DTO", () => {
const mangaDto: CreateMangaSuggestionDto = {
author: "Tsugumi Ohba",
coverImage: "https://example.com/deathnote.jpg",
entityType: SuggestionEntity.manga,
notes: "Psychological thriller",
title: "Death Note",
};
expect(mangaDto.entityType).toBe(SuggestionEntity.manga);
expect(mangaDto.author).toBe("Tsugumi Ohba");
});
it("should work with union type", () => {
const suggestions: Array<CreateSuggestionDto> = [
{
entityType: SuggestionEntity.game,
title: "Game Title",
},
{
author: "Author Name",
entityType: SuggestionEntity.book,
title: "Book Title",
},
];
expect(suggestions).toHaveLength(2);
expect(suggestions[0].entityType).toBe(SuggestionEntity.game);
expect(suggestions[1].entityType).toBe(SuggestionEntity.book);
});
});
describe("declineSuggestionDto interface", () => {
it("should accept empty decline DTO", () => {
const declineDto: DeclineSuggestionDto = {};
expect(declineDto.reason).toBeUndefined();
});
it("should accept decline DTO with reason", () => {
const declineDto: DeclineSuggestionDto = {
reason: "Already exists in the library",
};
expect(declineDto.reason).toBe("Already exists in the library");
});
});
describe("acceptWithEditsDto interface", () => {
it("should accept empty edits DTO", () => {
const editsDto: AcceptWithEditsDto = {};
expect(editsDto).toEqual({});
});
it("should accept edits for book fields", () => {
const editsDto: AcceptWithEditsDto = {
author: "Corrected Author",
coverImage: "https://example.com/new-cover.jpg",
isbn: "978-0-123-45678-9",
links: [ { label: "Goodreads", url: "https://goodreads.com" } ],
notes: "Updated notes",
tags: [ "fiction", "classic" ],
title: "Corrected Title",
};
expect(editsDto.title).toBe("Corrected Title");
expect(editsDto.author).toBe("Corrected Author");
expect(editsDto.tags).toHaveLength(2);
});
it("should accept edits for music fields", () => {
const editsDto: AcceptWithEditsDto = {
artist: "Artist Name",
coverArt: "https://example.com/album.jpg",
title: "Album Title",
type: "ALBUM",
};
expect(editsDto.artist).toBe("Artist Name");
expect(editsDto.type).toBe("ALBUM");
expect(editsDto.coverArt).toBe("https://example.com/album.jpg");
});
it("should accept edits for game fields", () => {
const editsDto: AcceptWithEditsDto = {
coverImage: "https://example.com/game.jpg",
notes: "Action RPG",
platform: "PlayStation 5",
title: "Game Title",
};
expect(editsDto.platform).toBe("PlayStation 5");
});
it("should accept edits for art fields", () => {
const editsDto: AcceptWithEditsDto = {
artist: "Artist Name",
description: "Beautiful artwork",
imageUrl: "https://example.com/art.jpg",
title: "Art Title",
};
expect(editsDto.description).toBe("Beautiful artwork");
expect(editsDto.imageUrl).toBe("https://example.com/art.jpg");
});
});
});
shared-types/tsconfig.json
+3 -7
View File
@@ -1,6 +1,7 @@
{ {
"extends": "../tsconfig.base.json", "extends": "../tsconfig.base.json",
"compilerOptions": { "compilerOptions": {
"outDir": "../dist/out-tsc",
"module": "commonjs", "module": "commonjs",
"forceConsistentCasingInFileNames": true, "forceConsistentCasingInFileNames": true,
"strict": true, "strict": true,
@@ -10,11 +11,6 @@
"noFallthroughCasesInSwitch": true, "noFallthroughCasesInSwitch": true,
"noPropertyAccessFromIndexSignature": true "noPropertyAccessFromIndexSignature": true
}, },
"files": [], "include": ["src/**/*.ts", "test/**/*.ts"],
"include": [], "exclude": ["test/**/*.spec.ts"]
"references": [
{
"path": "./tsconfig.lib.json"
}
]
} }
shared-types/tsconfig.spec.json
+7
View File
@@ -0,0 +1,7 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"types": ["jest", "node"]
},
"include": ["test/**/*.spec.ts"]
}
tsconfig.base.json
+1 -1
View File
@@ -18,5 +18,5 @@
"@library/shared-types": ["shared-types/src/index.ts"] "@library/shared-types": ["shared-types/src/index.ts"]
} }
}, },
"exclude": ["node_modules", "tmp"] "exclude": ["node_modules", "tmp", "**/test/**/*.spec.ts"]
} }