feat: implement entity detail pages with full navigation

Implements issue #56 (activity feed) followup - adds complete detail pages for all entity types so activity feed and homepage links work properly.

Created Detail Components:
- game-detail.component.ts - Shows full game details with platform, series, time played
- book-detail.component.ts - Shows book details with author, ISBN, series, reading time
- music-detail.component.ts - Shows music details with artist, type (album/single), listening time
- art-detail.component.ts - Shows art details with artist, description, large image display
- show-detail.component.ts - Shows show details with type (TV/anime/film), watch time
- manga-detail.component.ts - Shows manga details with author, reading time

Features per Detail Page:
- Read-only display of full entity information
- Cover/poster/art image display (when available)
- Rating display with 10-star system (when applicable)
- Time spent formatting (hours and minutes)
- Date formatting (British English locale)
- Tags display with entity-specific colour schemes
- External links with hover effects
- Comments section with add/edit/delete functionality
- Like button integration
- Breadcrumb navigation back to list page
- Loading states with spinner
- Error handling for not found cases
- Responsive design for all screen sizes

Routing Updates:
- Added 6 new routes: /games/:id, /books/:id, /music/:id, /art/:id, /shows/:id, /manga/:id
- All routes use lazy loading with loadComponent

Navigation Fixes:
- Fixed activity feed like links to point to entity detail pages (was pointing to list)
- Updated homepage recent items to link directly to entity detail pages (was pointing to list)

Technical Fixes:
- Corrected Art component to only use existing fields (removed non-existent medium, rating, notes)
- Fixed Show component to use coverImage instead of non-existent posterImage
- Added proper null checks for optional fields (timeSpent, dateStarted, dateFinished)
- Added non-null assertions where values are guaranteed to exist within conditionals

Each detail component follows the established pattern from the list components whilst adapting for single-item display. All components use Angular signals for reactive state management and integrate with existing services.

✨ This issue was created with help from Hikari~ 🌸

api/jest.config.cts

@@ -3,8 +3,12 @@ module.exports = {
   preset: '../jest.preset.js',
   testEnvironment: 'node',
   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'],
   coverageDirectory: '../coverage/api',
+  setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
 };

api/prisma/schema.prisma

@@ -24,12 +24,17 @@ model Game {
   platform     String?
   status       GameStatus
   dateAdded    DateTime  @default(now())
+  dateStarted  DateTime?
   dateCompleted DateTime?
+  dateFinished DateTime?
   rating       Int?      @db.Int @default(0)
   notes        String?
   coverImage   String?
   tags         String[]
   links        Link[]
+  series       String?
+  seriesOrder  Int?      @db.Int
+  timeSpent    Int?      @db.Int
   createdAt    DateTime  @default(now())
   updatedAt    DateTime  @updatedAt
   comments     Comment[]
@@ -39,6 +44,7 @@ enum GameStatus {
   PLAYING
   COMPLETED
   BACKLOG
+  RETIRED
 }
 
 model Book {
@@ -48,12 +54,16 @@ model Book {
   isbn         String?
   status       BookStatus
   dateAdded    DateTime  @default(now())
+  dateStarted  DateTime?
   dateFinished DateTime?
   rating       Int?      @db.Int @default(0)
   notes        String?
   coverImage   String?
   tags         String[]
   links        Link[]
+  series       String?
+  seriesOrder  Int?      @db.Int
+  timeSpent    Int?      @db.Int
   createdAt    DateTime  @default(now())
   updatedAt    DateTime  @updatedAt
   comments     Comment[]
@@ -63,6 +73,7 @@ enum BookStatus {
   READING
   FINISHED
   TO_READ
+  RETIRED
 }
 
 model Music {
@@ -72,12 +83,15 @@ model Music {
   type         MusicType
   status       MusicStatus
   dateAdded    DateTime  @default(now())
+  dateStarted  DateTime?
   dateCompleted DateTime?
+  dateFinished DateTime?
   rating       Int?      @db.Int @default(0)
   notes        String?
   coverArt     String?
   tags         String[]
   links        Link[]
+  timeSpent    Int?      @db.Int
   createdAt    DateTime  @default(now())
   updatedAt    DateTime  @updatedAt
   comments     Comment[]
@@ -93,6 +107,7 @@ enum MusicStatus {
   LISTENING
   COMPLETED
   WANT_TO_LISTEN
+  RETIRED
 }
 
 model Art {
@@ -115,12 +130,15 @@ model Show {
   type         ShowType
   status       ShowStatus
   dateAdded    DateTime   @default(now())
+  dateStarted  DateTime?
   dateCompleted DateTime?
+  dateFinished DateTime?
   rating       Int?       @db.Int @default(0)
   notes        String?
   coverImage   String?
   tags         String[]
   links        Link[]
+  timeSpent    Int?       @db.Int
   createdAt    DateTime   @default(now())
   updatedAt    DateTime   @updatedAt
   comments     Comment[]
@@ -137,6 +155,7 @@ enum ShowStatus {
   WATCHING
   COMPLETED
   WANT_TO_WATCH
+  RETIRED
 }
 
 model Manga {
@@ -145,12 +164,15 @@ model Manga {
   author       String
   status       MangaStatus
   dateAdded    DateTime    @default(now())
+  dateStarted  DateTime?
   dateCompleted DateTime?
+  dateFinished DateTime?
   rating       Int?        @db.Int @default(0)
   notes        String?
   coverImage   String?
   tags         String[]
   links        Link[]
+  timeSpent    Int?        @db.Int
   createdAt    DateTime    @default(now())
   updatedAt    DateTime    @updatedAt
   comments     Comment[]
@@ -160,6 +182,14 @@ enum MangaStatus {
   READING
   COMPLETED
   WANT_TO_READ
+  RETIRED
+}
+
+enum PrimaryBadge {
+  STAFF
+  MOD
+  VIP
+  DISCORD
 }
 
 model User {
@@ -168,40 +198,64 @@ model User {
   username      String
   email         String         @unique
   avatar        String?
+  slug          String?
+  displayName   String?
+  bio           String?
+  profilePublic Boolean        @default(true)
+  primaryBadge  PrimaryBadge?
+  website       String?
+  discordServer String?
+  bluesky       String?
+  github        String?
+  linkedin      String?
+  twitch        String?
+  youtube       String?
   isAdmin       Boolean        @default(false)
   isBanned      Boolean        @default(false)
   inDiscord     Boolean        @default(false)
   isVip         Boolean        @default(false)
   isMod         Boolean        @default(false)
   isStaff       Boolean        @default(false)
+  achievementPoints Int         @default(0)
+  currentStreak     Int         @default(0)
+  lastStreakCheck   DateTime?
   createdAt     DateTime       @default(now())
   updatedAt     DateTime       @updatedAt
-  comments      Comment[]
-  suggestions   Suggestion[]
-  likes         Like[]
-  refreshTokens RefreshToken[]
+  comments         Comment[]
+  suggestions      Suggestion[]
+  likes            Like[]
+  refreshTokens    RefreshToken[]
+  reportsMade           ProfileReport[] @relation("Reporter")
+  reportsReceived       ProfileReport[] @relation("ReportedUser")
+  reportsReviewed       ProfileReport[] @relation("Reviewer")
+  commentReportsMade    CommentReport[] @relation("CommentReporter")
+  commentReportsReviewed CommentReport[] @relation("CommentReviewer")
+  userAchievements      UserAchievement[]
+
+  @@index([slug], map: "User_slug_key")
 }
 
 model Comment {
-  id           String    @id @default(auto()) @map("_id") @db.ObjectId
+  id           String          @id @default(auto()) @map("_id") @db.ObjectId
   content      String
   rawContent   String?
-  userId       String    @db.ObjectId
-  user         User      @relation(fields: [userId], references: [id])
-  gameId       String?   @db.ObjectId
-  game         Game?     @relation(fields: [gameId], references: [id])
-  bookId       String?   @db.ObjectId
-  book         Book?     @relation(fields: [bookId], references: [id])
-  musicId      String?   @db.ObjectId
-  music        Music?    @relation(fields: [musicId], references: [id])
-  artId        String?   @db.ObjectId
-  art          Art?      @relation(fields: [artId], references: [id])
-  showId       String?   @db.ObjectId
-  show         Show?     @relation(fields: [showId], references: [id])
-  mangaId      String?   @db.ObjectId
-  manga        Manga?    @relation(fields: [mangaId], references: [id])
-  createdAt    DateTime  @default(now())
-  updatedAt    DateTime  @updatedAt
+  userId       String          @db.ObjectId
+  user         User            @relation(fields: [userId], references: [id])
+  gameId       String?         @db.ObjectId
+  game         Game?           @relation(fields: [gameId], references: [id])
+  bookId       String?         @db.ObjectId
+  book         Book?           @relation(fields: [bookId], references: [id])
+  musicId      String?         @db.ObjectId
+  music        Music?          @relation(fields: [musicId], references: [id])
+  artId        String?         @db.ObjectId
+  art          Art?            @relation(fields: [artId], references: [id])
+  showId       String?         @db.ObjectId
+  show         Show?           @relation(fields: [showId], references: [id])
+  mangaId      String?         @db.ObjectId
+  manga        Manga?          @relation(fields: [mangaId], references: [id])
+  reports      CommentReport[]
+  createdAt    DateTime        @default(now())
+  updatedAt    DateTime        @updatedAt
 }
 
 model AuditLog {
@@ -235,6 +289,7 @@ enum AuditAction {
   RATE_LIMIT_EXCEEDED
   CSRF_VALIDATION_FAILED
   UNAUTHORIZED_ACCESS
+  ACHIEVEMENT_UNLOCKED
 }
 
 enum AuditCategory {
@@ -302,3 +357,77 @@ model RefreshToken {
   @@index([userId])
   @@index([expiresAt])
 }
+
+enum ReportReason {
+  INAPPROPRIATE_CONTENT
+  HARASSMENT
+  SPAM
+  IMPERSONATION
+  OFFENSIVE_NAME
+  MALICIOUS_LINKS
+  OTHER
+}
+
+enum ReportStatus {
+  PENDING
+  REVIEWED
+  DISMISSED
+  ACTION_TAKEN
+}
+
+model ProfileReport {
+  id             String        @id @default(auto()) @map("_id") @db.ObjectId
+  reportedUserId String        @db.ObjectId
+  reportedUser   User          @relation("ReportedUser", fields: [reportedUserId], references: [id])
+  reporterId     String        @db.ObjectId
+  reporter       User          @relation("Reporter", fields: [reporterId], references: [id])
+  reason         ReportReason
+  details        String
+  status         ReportStatus  @default(PENDING)
+  reviewedBy     String?       @db.ObjectId
+  reviewer       User?         @relation("Reviewer", fields: [reviewedBy], references: [id])
+  reviewNotes    String?
+  createdAt      DateTime      @default(now())
+  updatedAt      DateTime      @updatedAt
+
+  @@index([reportedUserId])
+  @@index([reporterId])
+  @@index([status])
+}
+
+model CommentReport {
+  id              String        @id @default(auto()) @map("_id") @db.ObjectId
+  reportedCommentId String      @db.ObjectId
+  reportedComment Comment       @relation(fields: [reportedCommentId], references: [id], onDelete: Cascade)
+  reporterId      String        @db.ObjectId
+  reporter        User          @relation("CommentReporter", fields: [reporterId], references: [id])
+  reason          ReportReason
+  details         String
+  status          ReportStatus  @default(PENDING)
+  reviewedBy      String?       @db.ObjectId
+  reviewer        User?         @relation("CommentReviewer", fields: [reviewedBy], references: [id])
+  reviewNotes     String?
+  createdAt       DateTime      @default(now())
+  updatedAt       DateTime      @updatedAt
+
+  @@index([reportedCommentId])
+  @@index([reporterId])
+  @@index([status])
+}
+
+model UserAchievement {
+  id              String      @id @default(auto()) @map("_id") @db.ObjectId
+  userId          String      @db.ObjectId
+  user            User        @relation(fields: [userId], references: [id])
+  achievementKey  String
+  progress        Int         @default(0)
+  earned          Boolean     @default(false)
+  earnedAt        DateTime?
+  createdAt       DateTime    @default(now())
+  updatedAt       DateTime    @updatedAt
+
+  @@unique([userId, achievementKey])
+  @@index([userId])
+  @@index([achievementKey])
+  @@index([earned])
+}

api/src/app/app.spec.ts

@@ -15,6 +15,6 @@ describe('GET /', () => {
       url: '/',
     });
 
-    expect(response.json()).toEqual({ message: 'Hello API' });
+    expect(response.json()).toEqual({ version: expect.any(String) });
   });
 });

api/src/app/app.ts

@@ -13,8 +13,8 @@ export async function app(fastify: FastifyInstance, opts: AppOptions) {
     // Log CSRF validation failures
     if (error.code === 'FST_CSRF_INVALID_TOKEN' || error.code === 'FST_CSRF_MISSING_SECRET') {
       await AuditService.log({
-        action: AuditAction.CSRF_VALIDATION_FAILED,
-        category: AuditCategory.SECURITY,
+        action: AuditAction.csrfValidationFailed,
+        category: AuditCategory.security,
         details: `CSRF validation failed: ${error.message}, URL: ${request.url}`,
         success: false,
       }, request).catch(() => {
@@ -25,8 +25,8 @@ export async function app(fastify: FastifyInstance, opts: AppOptions) {
     // Log unauthorized access attempts
     if (error.statusCode === 401 || error.statusCode === 403) {
       await AuditService.log({
-        action: AuditAction.UNAUTHORIZED_ACCESS,
-        category: AuditCategory.SECURITY,
+        action: AuditAction.unauthorizedAccess,
+        category: AuditCategory.security,
         details: `Unauthorized access attempt: ${error.message}, URL: ${request.url}`,
         success: false,
       }, request).catch(() => {
@@ -57,5 +57,13 @@ export async function app(fastify: FastifyInstance, opts: AppOptions) {
   fastify.register(AutoLoad, {
     dir: path.join(__dirname, 'routes'),
     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

@@ -82,7 +82,9 @@ const authPlugin: FastifyPluginAsync = async (app) => {
     try {
       await request.jwtVerify();
     } 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

@@ -17,8 +17,8 @@ const rateLimitPlugin: FastifyPluginAsync = async (app) => {
     errorResponseBuilder: (request) => {
       // Log rate limit exceeded event
       AuditService.log({
-        action: AuditAction.RATE_LIMIT_EXCEEDED,
-        category: AuditCategory.SECURITY,
+        action: AuditAction.rateLimitExceeded,
+        category: AuditCategory.security,
         details: `Rate limit exceeded for URL: ${request.url}`,
         success: false,
       }, request).catch(() => {

api/src/app/routes/achievements/index.ts

@@ -0,0 +1,122 @@
+/**
+ * @copyright 2026 NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+
+import type { FastifyPluginAsync } from "fastify";
+import {
+  ACHIEVEMENT_LIST,
+  ACHIEVEMENTS,
+  AchievementProgress,
+  UserAchievementSummary,
+} from "@library/shared-types";
+import { AchievementService } from "../../services/achievement.service";
+
+const achievementsRoutes: FastifyPluginAsync = async (app) => {
+  const achievementService = new AchievementService();
+
+  /**
+   * Get all achievement definitions (public route).
+   */
+  app.get("/definitions", async () => {
+    return ACHIEVEMENT_LIST;
+  });
+
+  /**
+   * Get a specific achievement definition by key (public route).
+   */
+  app.get<{ Params: { key: string } }>(
+    "/definitions/:key",
+    async (request, reply) => {
+      const { key } = request.params;
+      const achievement = ACHIEVEMENTS[key];
+
+      if (!achievement) {
+        return reply.notFound("Achievement not found");
+      }
+
+      return achievement;
+    },
+  );
+
+  /**
+   * Get current user's achievement summary (authenticated users).
+   */
+  app.get<{ Reply: UserAchievementSummary }>(
+    "/summary",
+    {
+      preValidation: [app.authenticate],
+    },
+    async (request) => {
+      const userId = request.user.id;
+      const summary = await achievementService.getUserAchievementSummary(
+        userId,
+      );
+      return summary;
+    },
+  );
+
+  /**
+   * Get current user's achievement progress (authenticated users).
+   */
+  app.get<{ Reply: AchievementProgress[] }>(
+    "/progress",
+    {
+      preValidation: [app.authenticate],
+    },
+    async (request) => {
+      const userId = request.user.id;
+      const progress = await achievementService.getUserAchievementProgress(
+        userId,
+      );
+      return progress;
+    },
+  );
+
+  /**
+   * Get another user's achievement summary by ID (authenticated users).
+   */
+  app.get<{ Params: { userId: string }; Reply: UserAchievementSummary }>(
+    "/users/:userId/summary",
+    {
+      preValidation: [app.authenticate],
+    },
+    async (request, reply) => {
+      const { userId } = request.params;
+
+      try {
+        const summary = await achievementService.getUserAchievementSummary(
+          userId,
+        );
+        return summary;
+      } catch (error) {
+        return reply.notFound("User not found");
+      }
+    },
+  );
+
+  /**
+   * Get another user's achievement progress by ID (authenticated users).
+   */
+  app.get<{ Params: { userId: string }; Reply: AchievementProgress[] }>(
+    "/users/:userId/progress",
+    {
+      preValidation: [app.authenticate],
+    },
+    async (request, reply) => {
+      const { userId } = request.params;
+
+      try {
+        const progress = await achievementService.getUserAchievementProgress(
+          userId,
+        );
+        return progress;
+      } catch (error) {
+        return reply.notFound("User not found");
+      }
+    },
+  );
+};
+
+export default achievementsRoutes;

api/src/app/routes/activity/index.ts

@@ -0,0 +1,52 @@
+/**
+ * @copyright 2026 NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+
+import { FastifyPluginAsync } from "fastify";
+import type { ActivityFeedResponse } from "@library/shared-types";
+import { ActivityService } from "../../services/activity.service";
+
+const activityRoutes: FastifyPluginAsync = async (app) => {
+  const activityService = new ActivityService();
+
+  /**
+   * Get activity feed with optional filters.
+   */
+  app.get<{
+    Querystring: { limit?: number; offset?: number; userId?: string };
+    Reply: ActivityFeedResponse;
+  }>("/", async (request) => {
+    const limit = request.query.limit && request.query.limit > 0
+      ? Math.min(request.query.limit, 100)
+      : 50;
+    const offset = request.query.offset && request.query.offset >= 0
+      ? request.query.offset
+      : 0;
+    const userId = request.query.userId;
+
+    return activityService.getActivityFeed(limit, offset, userId);
+  });
+
+  /**
+   * Get activity feed for a specific user.
+   */
+  app.get<{
+    Params: { userId: string };
+    Querystring: { limit?: number; offset?: number };
+    Reply: ActivityFeedResponse;
+  }>("/:userId", async (request) => {
+    const { userId } = request.params;
+    const limit = request.query.limit && request.query.limit > 0
+      ? Math.min(request.query.limit, 100)
+      : 50;
+    const offset = request.query.offset && request.query.offset >= 0
+      ? request.query.offset
+      : 0;
+
+    return activityService.getActivityFeed(limit, offset, userId);
+  });
+};
+
+export default activityRoutes;

api/src/app/routes/art/index.ts

@@ -5,10 +5,11 @@
  */
 
 import { FastifyPluginAsync } from "fastify";
-import { Art, CreateArtDto, UpdateArtDto, Comment, CreateCommentDto, AuditAction, AuditCategory } from "@library/shared-types";
+import { Art, CreateArtDto, UpdateArtDto, Comment, CreateCommentDto, AuditAction, AuditCategory, AchievementCategory } from "@library/shared-types";
 import { ArtService } from "../../services/art.service";
 import { CommentService } from "../../services/comment.service";
 import { AuditService } from "../../services/audit.service";
+import { AchievementService } from "../../services/achievement.service";
 import { adminGuard } from "../../middleware/admin-guard";
 import { bannedGuard } from "../../middleware/banned-guard";
 
@@ -46,8 +47,8 @@ const artRoutes: FastifyPluginAsync = async (app) => {
     async (request) => {
       const art = await artService.createArt(request.body);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.ENTRY_CREATE,
-        category: AuditCategory.CONTENT,
+        action: AuditAction.entryCreate,
+        category: AuditCategory.content,
         resourceType: "art",
         resourceId: art.id,
         details: `Created art: ${art.title}`,
@@ -74,8 +75,8 @@ const artRoutes: FastifyPluginAsync = async (app) => {
       const art = await artService.updateArt(id, request.body);
       if (art) {
         await AuditService.logFromRequest(request, {
-          action: AuditAction.ENTRY_UPDATE,
-          category: AuditCategory.CONTENT,
+          action: AuditAction.entryUpdate,
+          category: AuditCategory.content,
           resourceType: "art",
           resourceId: id,
           details: `Updated art: ${art.title}`,
@@ -98,8 +99,8 @@ const artRoutes: FastifyPluginAsync = async (app) => {
       const { id } = request.params;
       await artService.deleteArt(id);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.ENTRY_DELETE,
-        category: AuditCategory.CONTENT,
+        action: AuditAction.entryDelete,
+        category: AuditCategory.content,
         resourceType: "art",
         resourceId: id,
         details: `Deleted art with ID: ${id}`,
@@ -133,12 +134,21 @@ const artRoutes: FastifyPluginAsync = async (app) => {
       const userId = request.user.id;
       const comment = await commentService.createCommentForArt(id, userId, request.body);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.COMMENT_CREATE,
-        category: AuditCategory.CONTENT,
+        action: AuditAction.commentCreate,
+        category: AuditCategory.content,
         resourceType: "art",
         resourceId: id,
         details: `Added comment to art`,
       });
+
+      // Check for comment achievements
+      const achievementService = new AchievementService();
+      await achievementService.checkAchievements(
+        userId,
+        AchievementCategory.Comment,
+        request
+      );
+
       return comment;
     }
   );
@@ -169,8 +179,8 @@ const artRoutes: FastifyPluginAsync = async (app) => {
 
       const comment = await commentService.updateComment(commentId, request.body.content);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.COMMENT_UPDATE,
-        category: AuditCategory.CONTENT,
+        action: AuditAction.commentUpdate,
+        category: AuditCategory.content,
         resourceType: "art",
         resourceId: id,
         details: `Updated comment ${commentId} on art`,
@@ -205,8 +215,8 @@ const artRoutes: FastifyPluginAsync = async (app) => {
 
       await commentService.deleteComment(commentId);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.COMMENT_DELETE,
-        category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.ADMIN : AuditCategory.CONTENT,
+        action: AuditAction.commentDelete,
+        category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.admin : AuditCategory.content,
         resourceType: "art",
         resourceId: id,
         details: `Deleted comment ${commentId} from art`,

api/src/app/routes/auth/index.ts

@@ -1,7 +1,8 @@
 import { FastifyPluginAsync } from "fastify";
 import { AuthService } from "../../services/auth.service";
 import { AuditService } from "../../services/audit.service";
-import { AuthResponse, AuditAction, AuditCategory } from "@library/shared-types";
+import { AchievementService } from "../../services/achievement.service";
+import { AuthResponse, AuditAction, AuditCategory, AchievementCategory } from "@library/shared-types";
 
 const authRoutes: FastifyPluginAsync = async (app) => {
   const authService = new AuthService(app);
@@ -85,13 +86,22 @@ const authRoutes: FastifyPluginAsync = async (app) => {
 
       // Log successful login
       await AuditService.log({
-        action: AuditAction.LOGIN,
-        category: AuditCategory.AUTH,
+        action: AuditAction.login,
+        category: AuditCategory.auth,
         userId: user.id,
         details: `User ${user.username} logged in via Discord`,
         success: true,
       }, request);
 
+      // Update login streak and check engagement achievements
+      const achievementService = new AchievementService();
+      await achievementService.updateLoginStreak(user.id);
+      await achievementService.checkAchievements(
+        user.id,
+        AchievementCategory.Engagement,
+        request
+      );
+
       // Set signed cookies and redirect to frontend
       reply
         .setCookie("auth-token", accessToken, {
@@ -114,8 +124,8 @@ const authRoutes: FastifyPluginAsync = async (app) => {
     } catch (error) {
       // Log failed login attempt
       await AuditService.log({
-        action: AuditAction.LOGIN_FAILED,
-        category: AuditCategory.SECURITY,
+        action: AuditAction.loginFailed,
+        category: AuditCategory.security,
         details: error instanceof Error ? error.message : String(error),
         success: false,
       }, request);
@@ -229,8 +239,8 @@ const authRoutes: FastifyPluginAsync = async (app) => {
       const user = request.user as { id?: string; username?: string };
       if (user?.id) {
         await AuditService.log({
-          action: AuditAction.LOGOUT,
-          category: AuditCategory.AUTH,
+          action: AuditAction.logout,
+          category: AuditCategory.auth,
           userId: user.id,
           details: `User ${user.username ?? "unknown"} logged out`,
           success: true,

api/src/app/routes/books/index.ts

@@ -5,10 +5,11 @@
  */
 
 import { FastifyPluginAsync } from "fastify";
-import { Book, CreateBookDto, UpdateBookDto, Comment, CreateCommentDto, AuditAction, AuditCategory } from "@library/shared-types";
+import { Book, CreateBookDto, UpdateBookDto, Comment, CreateCommentDto, AuditAction, AuditCategory, AchievementCategory } from "@library/shared-types";
 import { BookService } from "../../services/book.service";
 import { CommentService } from "../../services/comment.service";
 import { AuditService } from "../../services/audit.service";
+import { AchievementService } from "../../services/achievement.service";
 import { adminGuard } from "../../middleware/admin-guard";
 import { bannedGuard } from "../../middleware/banned-guard";
 
@@ -23,6 +24,17 @@ const booksRoutes: FastifyPluginAsync = async (app) => {
     return bookService.getAllBooks();
   });
 
+  /**
+   * Get all books in a series (public route).
+   */
+  app.get<{ Params: { seriesName: string }; Reply: Book[] }>(
+    "/series/:seriesName",
+    async (request) => {
+      const { seriesName } = request.params;
+      return bookService.getBooksBySeries(seriesName);
+    }
+  );
+
   /**
    * Get single book by ID (public route).
    */
@@ -46,8 +58,8 @@ const booksRoutes: FastifyPluginAsync = async (app) => {
     async (request) => {
       const book = await bookService.createBook(request.body);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.ENTRY_CREATE,
-        category: AuditCategory.CONTENT,
+        action: AuditAction.entryCreate,
+        category: AuditCategory.content,
         resourceType: "book",
         resourceId: book.id,
         details: `Created book: ${book.title}`,
@@ -74,8 +86,8 @@ const booksRoutes: FastifyPluginAsync = async (app) => {
       const book = await bookService.updateBook(id, request.body);
       if (book) {
         await AuditService.logFromRequest(request, {
-          action: AuditAction.ENTRY_UPDATE,
-          category: AuditCategory.CONTENT,
+          action: AuditAction.entryUpdate,
+          category: AuditCategory.content,
           resourceType: "book",
           resourceId: id,
           details: `Updated book: ${book.title}`,
@@ -98,8 +110,8 @@ const booksRoutes: FastifyPluginAsync = async (app) => {
       const { id } = request.params;
       await bookService.deleteBook(id);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.ENTRY_DELETE,
-        category: AuditCategory.CONTENT,
+        action: AuditAction.entryDelete,
+        category: AuditCategory.content,
         resourceType: "book",
         resourceId: id,
         details: `Deleted book with ID: ${id}`,
@@ -133,12 +145,21 @@ const booksRoutes: FastifyPluginAsync = async (app) => {
       const userId = request.user.id;
       const comment = await commentService.createCommentForBook(id, userId, request.body);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.COMMENT_CREATE,
-        category: AuditCategory.CONTENT,
+        action: AuditAction.commentCreate,
+        category: AuditCategory.content,
         resourceType: "book",
         resourceId: id,
         details: `Added comment to book`,
       });
+
+      // Check for comment achievements
+      const achievementService = new AchievementService();
+      await achievementService.checkAchievements(
+        userId,
+        AchievementCategory.Comment,
+        request
+      );
+
       return comment;
     }
   );
@@ -169,8 +190,8 @@ const booksRoutes: FastifyPluginAsync = async (app) => {
 
       const comment = await commentService.updateComment(commentId, request.body.content);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.COMMENT_UPDATE,
-        category: AuditCategory.CONTENT,
+        action: AuditAction.commentUpdate,
+        category: AuditCategory.content,
         resourceType: "book",
         resourceId: id,
         details: `Updated comment ${commentId} on book`,
@@ -205,8 +226,8 @@ const booksRoutes: FastifyPluginAsync = async (app) => {
 
       await commentService.deleteComment(commentId);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.COMMENT_DELETE,
-        category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.ADMIN : AuditCategory.CONTENT,
+        action: AuditAction.commentDelete,
+        category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.admin : AuditCategory.content,
         resourceType: "book",
         resourceId: id,
         details: `Deleted comment ${commentId} from book`,

api/src/app/routes/comment-reports/index.ts

@@ -0,0 +1,152 @@
+/**
+ * @copyright NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+import type { FastifyPluginAsync } from "fastify";
+import type {
+  CreateCommentReportDto,
+  CommentReportWithDetails,
+  ReportStatus,
+  UpdateCommentReportDto,
+} from "@library/shared-types";
+import { ReportReason, AchievementCategory } from "@library/shared-types";
+
+import { CommentReportService } from "../../services/comment-report.service.js";
+import { AchievementService } from "../../services/achievement.service";
+import { adminGuard } from "../../middleware/admin-guard.js";
+
+const commentReportsRoutes: FastifyPluginAsync = async (fastify) => {
+  const commentReportService = new CommentReportService();
+
+  // Create a new comment report (authenticated users)
+  fastify.post<{
+    Body: CreateCommentReportDto;
+    Reply: CommentReportWithDetails | { error: string };
+  }>(
+    "/",
+    {
+      preValidation: [fastify.authenticate],
+      schema: {
+        body: {
+          type: "object",
+          required: ["reportedCommentId", "reason", "details"],
+          properties: {
+            reportedCommentId: { type: "string" },
+            reason: {
+              type: "string",
+              enum: Object.values(ReportReason),
+            },
+            details: { type: "string", minLength: 10, maxLength: 1000 },
+          },
+        },
+      },
+    },
+    async (request, reply) => {
+      try {
+        const report = await commentReportService.createReport(
+          request.user.id,
+          request.body,
+        );
+        return reply.status(201).send(report);
+      } catch (error) {
+        if (
+          error instanceof Error &&
+          (error.message.includes("already have a pending report") ||
+            error.message.includes("maximum number of pending reports"))
+        ) {
+          return reply.status(409).send({ error: error.message });
+        }
+        throw error;
+      }
+    },
+  );
+
+  // Get all comment reports (admin only)
+  fastify.get<{
+    Querystring: { status?: ReportStatus };
+    Reply: CommentReportWithDetails[];
+  }>(
+    "/",
+    {
+      preValidation: [fastify.authenticate, adminGuard],
+      schema: {
+        querystring: {
+          type: "object",
+          properties: {
+            status: { type: "string" },
+          },
+        },
+      },
+    },
+    async (request, reply) => {
+      const reports = await commentReportService.getAllReports(
+        request.query.status,
+      );
+      return reply.send(reports);
+    },
+  );
+
+  // Get a single comment report by ID (admin only)
+  fastify.get<{
+    Params: { id: string };
+    Reply: CommentReportWithDetails | { error: string };
+  }>(
+    "/:id",
+    {
+      preValidation: [fastify.authenticate, adminGuard],
+    },
+    async (request, reply) => {
+      const report = await commentReportService.getReportById(request.params.id);
+
+      if (!report) {
+        return reply.status(404).send({ error: "Report not found" });
+      }
+
+      return reply.send(report);
+    },
+  );
+
+  // Update a comment report (admin only)
+  fastify.put<{
+    Params: { id: string };
+    Body: UpdateCommentReportDto;
+    Reply: CommentReportWithDetails;
+  }>(
+    "/:id",
+    {
+      preValidation: [fastify.authenticate, adminGuard],
+      schema: {
+        body: {
+          type: "object",
+          required: ["status"],
+          properties: {
+            status: { type: "string" },
+            reviewNotes: { type: "string", maxLength: 1000 },
+          },
+        },
+      },
+    },
+    async (request, reply) => {
+      const report = await commentReportService.updateReport(
+        request.params.id,
+        request.user.id,
+        request.body,
+      );
+
+      // Check for report achievements for the original reporter
+      if (report.status === "ACTION_TAKEN" || report.status === "DISMISSED") {
+        const achievementService = new AchievementService();
+        await achievementService.checkAchievements(
+          report.reporterId,
+          AchievementCategory.Report,
+          request
+        );
+      }
+
+      return reply.send(report);
+    },
+  );
+};
+
+export default commentReportsRoutes;

api/src/app/routes/comments/index.ts

@@ -0,0 +1,72 @@
+/**
+ * @copyright 2026 NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+
+import { FastifyPluginAsync } from "fastify";
+import { Comment, AuditAction, AuditCategory } from "@library/shared-types";
+import { CommentService } from "../../services/comment.service";
+import { AuditService } from "../../services/audit.service";
+import { adminGuard } from "../../middleware/admin-guard";
+
+interface UpdateCommentBody {
+  content: string;
+}
+
+const commentsRoutes: FastifyPluginAsync = async (app) => {
+  const commentService = new CommentService();
+
+  // Admin: Update any comment by ID
+  app.put<{ Params: { id: string }; Body: UpdateCommentBody; Reply: Comment | { error: string } }>(
+    "/:id",
+    {
+      preValidation: [app.authenticate, adminGuard],
+      preHandler: [app.csrfProtection],
+    },
+    async (request, reply) => {
+      const { id } = request.params;
+      const { content } = request.body;
+
+      const existingComment = await commentService.getCommentById(id);
+      if (!existingComment) {
+        return reply.code(404).send({ error: "Comment not found" });
+      }
+
+      const comment = await commentService.updateComment(id, content);
+      await AuditService.logFromRequest(request, {
+        action: AuditAction.commentUpdate,
+        category: AuditCategory.admin,
+        details: `Admin updated comment ${id}`,
+      });
+      return comment;
+    }
+  );
+
+  // Admin: Delete any comment by ID
+  app.delete<{ Params: { id: string }; Reply: { success: boolean } | { error: string } }>(
+    "/:id",
+    {
+      preValidation: [app.authenticate, adminGuard],
+      preHandler: [app.csrfProtection],
+    },
+    async (request, reply) => {
+      const { id } = request.params;
+
+      const existingComment = await commentService.getCommentById(id);
+      if (!existingComment) {
+        return reply.code(404).send({ error: "Comment not found" });
+      }
+
+      await commentService.deleteComment(id);
+      await AuditService.logFromRequest(request, {
+        action: AuditAction.commentDelete,
+        category: AuditCategory.admin,
+        details: `Admin deleted comment ${id}`,
+      });
+      return { success: true };
+    }
+  );
+};
+
+export default commentsRoutes;

api/src/app/routes/games/index.ts

@@ -5,10 +5,11 @@
  */
 
 import { FastifyPluginAsync } from "fastify";
-import { Game, CreateGameDto, UpdateGameDto, Comment, CreateCommentDto, AuditAction, AuditCategory } from "@library/shared-types";
+import { Game, CreateGameDto, UpdateGameDto, Comment, CreateCommentDto, AuditAction, AuditCategory, AchievementCategory } from "@library/shared-types";
 import { GameService } from "../../services/game.service";
 import { CommentService } from "../../services/comment.service";
 import { AuditService } from "../../services/audit.service";
+import { AchievementService } from "../../services/achievement.service";
 import { adminGuard } from "../../middleware/admin-guard";
 import { bannedGuard } from "../../middleware/banned-guard";
 
@@ -21,6 +22,15 @@ const gamesRoutes: FastifyPluginAsync = async (app) => {
     return gameService.getAllGames();
   });
 
+  // Get all games in a series (public route)
+  app.get<{ Params: { seriesName: string }; Reply: Game[] }>(
+    "/series/:seriesName",
+    async (request) => {
+      const { seriesName } = request.params;
+      return gameService.getGamesBySeries(seriesName);
+    }
+  );
+
   // Get single game (public route)
   app.get<{ Params: { id: string }; Reply: Game | null }>(
     "/:id",
@@ -40,8 +50,8 @@ const gamesRoutes: FastifyPluginAsync = async (app) => {
     async (request) => {
       const game = await gameService.createGame(request.body);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.ENTRY_CREATE,
-        category: AuditCategory.CONTENT,
+        action: AuditAction.entryCreate,
+        category: AuditCategory.content,
         resourceType: "game",
         resourceId: game.id,
         details: `Created game: ${game.title}`,
@@ -66,8 +76,8 @@ const gamesRoutes: FastifyPluginAsync = async (app) => {
       const game = await gameService.updateGame(id, request.body);
       if (game) {
         await AuditService.logFromRequest(request, {
-          action: AuditAction.ENTRY_UPDATE,
-          category: AuditCategory.CONTENT,
+          action: AuditAction.entryUpdate,
+          category: AuditCategory.content,
           resourceType: "game",
           resourceId: id,
           details: `Updated game: ${game.title}`,
@@ -88,8 +98,8 @@ const gamesRoutes: FastifyPluginAsync = async (app) => {
       const { id } = request.params;
       await gameService.deleteGame(id);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.ENTRY_DELETE,
-        category: AuditCategory.CONTENT,
+        action: AuditAction.entryDelete,
+        category: AuditCategory.content,
         resourceType: "game",
         resourceId: id,
         details: `Deleted game with ID: ${id}`,
@@ -119,12 +129,21 @@ const gamesRoutes: FastifyPluginAsync = async (app) => {
       const userId = request.user.id;
       const comment = await commentService.createCommentForGame(id, userId, request.body);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.COMMENT_CREATE,
-        category: AuditCategory.CONTENT,
+        action: AuditAction.commentCreate,
+        category: AuditCategory.content,
         resourceType: "game",
         resourceId: id,
         details: `Added comment to game`,
       });
+
+      // Check for comment achievements
+      const achievementService = new AchievementService();
+      await achievementService.checkAchievements(
+        userId,
+        AchievementCategory.Comment,
+        request
+      );
+
       return comment;
     }
   );
@@ -153,8 +172,8 @@ const gamesRoutes: FastifyPluginAsync = async (app) => {
 
       const comment = await commentService.updateComment(commentId, request.body.content);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.COMMENT_UPDATE,
-        category: AuditCategory.CONTENT,
+        action: AuditAction.commentUpdate,
+        category: AuditCategory.content,
         resourceType: "game",
         resourceId: id,
         details: `Updated comment ${commentId} on game`,
@@ -187,8 +206,8 @@ const gamesRoutes: FastifyPluginAsync = async (app) => {
 
       await commentService.deleteComment(commentId);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.COMMENT_DELETE,
-        category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.ADMIN : AuditCategory.CONTENT,
+        action: AuditAction.commentDelete,
+        category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.admin : AuditCategory.content,
         resourceType: "game",
         resourceId: id,
         details: `Deleted comment ${commentId} from game`,

api/src/app/routes/leaderboard/index.ts

@@ -0,0 +1,85 @@
+/**
+ * @copyright 2026 NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+
+import { FastifyPluginAsync } from "fastify";
+import type {
+  LeaderboardResponse,
+  SuggestionsLeaderboard,
+  LikesLeaderboard,
+  CommentsLeaderboard,
+  OverallLeaderboard,
+} from "@library/shared-types";
+import { LeaderboardService } from "../../services/leaderboard.service";
+
+const leaderboardRoutes: FastifyPluginAsync = async (app) => {
+  const leaderboardService = new LeaderboardService();
+  /**
+   * Get all leaderboards at once.
+   */
+  app.get<{
+    Querystring: { limit?: number };
+    Reply: LeaderboardResponse;
+  }>("/", async (request) => {
+    const limit = request.query.limit && request.query.limit > 0
+      ? Math.min(request.query.limit, 100)
+      : 25;
+    return leaderboardService.getAllLeaderboards(limit);
+  });
+
+  /**
+   * Get top users by suggestions.
+   */
+  app.get<{
+    Querystring: { limit?: number };
+    Reply: SuggestionsLeaderboard[];
+  }>("/suggestions", async (request) => {
+    const limit = request.query.limit && request.query.limit > 0
+      ? Math.min(request.query.limit, 100)
+      : 25;
+    return leaderboardService.getTopSuggestions(limit);
+  });
+
+  /**
+   * Get top users by likes.
+   */
+  app.get<{
+    Querystring: { limit?: number };
+    Reply: LikesLeaderboard[];
+  }>("/likes", async (request) => {
+    const limit = request.query.limit && request.query.limit > 0
+      ? Math.min(request.query.limit, 100)
+      : 25;
+    return leaderboardService.getTopLikes(limit);
+  });
+
+  /**
+   * Get top users by comments.
+   */
+  app.get<{
+    Querystring: { limit?: number };
+    Reply: CommentsLeaderboard[];
+  }>("/comments", async (request) => {
+    const limit = request.query.limit && request.query.limit > 0
+      ? Math.min(request.query.limit, 100)
+      : 25;
+    return leaderboardService.getTopComments(limit);
+  });
+
+  /**
+   * Get overall leaderboard.
+   */
+  app.get<{
+    Querystring: { limit?: number };
+    Reply: OverallLeaderboard[];
+  }>("/overall", async (request) => {
+    const limit = request.query.limit && request.query.limit > 0
+      ? Math.min(request.query.limit, 100)
+      : 25;
+    return leaderboardService.getOverallLeaderboard(limit);
+  });
+};
+
+export default leaderboardRoutes;

api/src/app/routes/log/index.ts

@@ -0,0 +1,41 @@
+/**
+ * @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('/', 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.error('Frontend', new Error(message));
+    } else {
+      const logMessage = context ? `[${context}] ${message}` : message;
+      await logger.log(level, logMessage);
+    }
+
+    return { success: true };
+  });
+}

api/src/app/routes/manga/index.ts

@@ -5,10 +5,11 @@
  */
 
 import { FastifyPluginAsync } from "fastify";
-import { Manga, CreateMangaDto, UpdateMangaDto, Comment, CreateCommentDto, AuditAction, AuditCategory } from "@library/shared-types";
+import { Manga, CreateMangaDto, UpdateMangaDto, Comment, CreateCommentDto, AuditAction, AuditCategory, AchievementCategory } from "@library/shared-types";
 import { MangaService } from "../../services/manga.service";
 import { CommentService } from "../../services/comment.service";
 import { AuditService } from "../../services/audit.service";
+import { AchievementService } from "../../services/achievement.service";
 import { adminGuard } from "../../middleware/admin-guard";
 import { bannedGuard } from "../../middleware/banned-guard";
 
@@ -37,8 +38,8 @@ const mangaRoutes: FastifyPluginAsync = async (app) => {
     async (request) => {
       const manga = await mangaService.createManga(request.body);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.ENTRY_CREATE,
-        category: AuditCategory.CONTENT,
+        action: AuditAction.entryCreate,
+        category: AuditCategory.content,
         resourceType: "manga",
         resourceId: manga.id,
         details: `Created manga: ${manga.title}`,
@@ -62,8 +63,8 @@ const mangaRoutes: FastifyPluginAsync = async (app) => {
       const manga = await mangaService.updateManga(id, request.body);
       if (manga) {
         await AuditService.logFromRequest(request, {
-          action: AuditAction.ENTRY_UPDATE,
-          category: AuditCategory.CONTENT,
+          action: AuditAction.entryUpdate,
+          category: AuditCategory.content,
           resourceType: "manga",
           resourceId: id,
           details: `Updated manga: ${manga.title}`,
@@ -83,8 +84,8 @@ const mangaRoutes: FastifyPluginAsync = async (app) => {
       const { id } = request.params;
       await mangaService.deleteManga(id);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.ENTRY_DELETE,
-        category: AuditCategory.CONTENT,
+        action: AuditAction.entryDelete,
+        category: AuditCategory.content,
         resourceType: "manga",
         resourceId: id,
         details: `Deleted manga with ID: ${id}`,
@@ -112,12 +113,21 @@ const mangaRoutes: FastifyPluginAsync = async (app) => {
       const userId = request.user.id;
       const comment = await commentService.createCommentForManga(id, userId, request.body);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.COMMENT_CREATE,
-        category: AuditCategory.CONTENT,
+        action: AuditAction.commentCreate,
+        category: AuditCategory.content,
         resourceType: "manga",
         resourceId: id,
         details: `Added comment to manga`,
       });
+
+      // Check for comment achievements
+      const achievementService = new AchievementService();
+      await achievementService.checkAchievements(
+        userId,
+        AchievementCategory.Comment,
+        request
+      );
+
       return comment;
     }
   );
@@ -145,8 +155,8 @@ const mangaRoutes: FastifyPluginAsync = async (app) => {
 
       const comment = await commentService.updateComment(commentId, request.body.content);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.COMMENT_UPDATE,
-        category: AuditCategory.CONTENT,
+        action: AuditAction.commentUpdate,
+        category: AuditCategory.content,
         resourceType: "manga",
         resourceId: id,
         details: `Updated comment ${commentId} on manga`,
@@ -178,8 +188,8 @@ const mangaRoutes: FastifyPluginAsync = async (app) => {
 
       await commentService.deleteComment(commentId);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.COMMENT_DELETE,
-        category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.ADMIN : AuditCategory.CONTENT,
+        action: AuditAction.commentDelete,
+        category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.admin : AuditCategory.content,
         resourceType: "manga",
         resourceId: id,
         details: `Deleted comment ${commentId} from manga`,

api/src/app/routes/music/index.ts

@@ -5,10 +5,11 @@
  */
 
 import { FastifyPluginAsync } from "fastify";
-import { Music, CreateMusicDto, UpdateMusicDto, Comment, CreateCommentDto, AuditAction, AuditCategory } from "@library/shared-types";
+import { Music, CreateMusicDto, UpdateMusicDto, Comment, CreateCommentDto, AuditAction, AuditCategory, AchievementCategory } from "@library/shared-types";
 import { MusicService } from "../../services/music.service";
 import { CommentService } from "../../services/comment.service";
 import { AuditService } from "../../services/audit.service";
+import { AchievementService } from "../../services/achievement.service";
 import { adminGuard } from "../../middleware/admin-guard";
 import { bannedGuard } from "../../middleware/banned-guard";
 
@@ -46,8 +47,8 @@ const musicRoutes: FastifyPluginAsync = async (app) => {
     async (request) => {
       const music = await musicService.createMusic(request.body);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.ENTRY_CREATE,
-        category: AuditCategory.CONTENT,
+        action: AuditAction.entryCreate,
+        category: AuditCategory.content,
         resourceType: "music",
         resourceId: music.id,
         details: `Created music: ${music.title}`,
@@ -74,8 +75,8 @@ const musicRoutes: FastifyPluginAsync = async (app) => {
       const music = await musicService.updateMusic(id, request.body);
       if (music) {
         await AuditService.logFromRequest(request, {
-          action: AuditAction.ENTRY_UPDATE,
-          category: AuditCategory.CONTENT,
+          action: AuditAction.entryUpdate,
+          category: AuditCategory.content,
           resourceType: "music",
           resourceId: id,
           details: `Updated music: ${music.title}`,
@@ -98,8 +99,8 @@ const musicRoutes: FastifyPluginAsync = async (app) => {
       const { id } = request.params;
       await musicService.deleteMusic(id);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.ENTRY_DELETE,
-        category: AuditCategory.CONTENT,
+        action: AuditAction.entryDelete,
+        category: AuditCategory.content,
         resourceType: "music",
         resourceId: id,
         details: `Deleted music with ID: ${id}`,
@@ -133,12 +134,21 @@ const musicRoutes: FastifyPluginAsync = async (app) => {
       const userId = request.user.id;
       const comment = await commentService.createCommentForMusic(id, userId, request.body);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.COMMENT_CREATE,
-        category: AuditCategory.CONTENT,
+        action: AuditAction.commentCreate,
+        category: AuditCategory.content,
         resourceType: "music",
         resourceId: id,
         details: `Added comment to music`,
       });
+
+      // Check for comment achievements
+      const achievementService = new AchievementService();
+      await achievementService.checkAchievements(
+        userId,
+        AchievementCategory.Comment,
+        request
+      );
+
       return comment;
     }
   );
@@ -169,8 +179,8 @@ const musicRoutes: FastifyPluginAsync = async (app) => {
 
       const comment = await commentService.updateComment(commentId, request.body.content);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.COMMENT_UPDATE,
-        category: AuditCategory.CONTENT,
+        action: AuditAction.commentUpdate,
+        category: AuditCategory.content,
         resourceType: "music",
         resourceId: id,
         details: `Updated comment ${commentId} on music`,
@@ -205,8 +215,8 @@ const musicRoutes: FastifyPluginAsync = async (app) => {
 
       await commentService.deleteComment(commentId);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.COMMENT_DELETE,
-        category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.ADMIN : AuditCategory.CONTENT,
+        action: AuditAction.commentDelete,
+        category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.admin : AuditCategory.content,
         resourceType: "music",
         resourceId: id,
         details: `Deleted comment ${commentId} from music`,

api/src/app/routes/reports/index.ts

@@ -0,0 +1,151 @@
+/**
+ * @copyright NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+import type { FastifyPluginAsync } from "fastify";
+import type {
+  CreateReportDto,
+  ProfileReportWithUsers,
+  ReportStatus,
+  UpdateReportDto,
+} from "@library/shared-types";
+import { ReportReason, AchievementCategory } from "@library/shared-types";
+
+import { ReportService } from "../../services/report.service.js";
+import { AchievementService } from "../../services/achievement.service";
+import { adminGuard } from "../../middleware/admin-guard.js";
+
+const reportsRoutes: FastifyPluginAsync = async (fastify) => {
+  const reportService = new ReportService();
+
+  // Create a new report (authenticated users)
+  fastify.post<{
+    Body: CreateReportDto;
+    Reply: ProfileReportWithUsers | { error: string };
+  }>(
+    "/",
+    {
+      preValidation: [fastify.authenticate],
+      schema: {
+        body: {
+          type: "object",
+          required: ["reportedUserId", "reason", "details"],
+          properties: {
+            reportedUserId: { type: "string" },
+            reason: {
+              type: "string",
+              enum: Object.values(ReportReason),
+            },
+            details: { type: "string", minLength: 10, maxLength: 1000 },
+          },
+        },
+      },
+    },
+    async (request, reply) => {
+      try {
+        const report = await reportService.createReport(
+          request.user.id,
+          request.body,
+        );
+        return reply.status(201).send(report);
+      } catch (error) {
+        if (
+          error instanceof Error &&
+          error.message.includes("already have a pending report")
+        ) {
+          return reply.status(409).send({ error: error.message });
+        }
+        throw error;
+      }
+    },
+  );
+
+  // Get all reports (admin only)
+  fastify.get<{
+    Querystring: { status?: ReportStatus };
+    Reply: ProfileReportWithUsers[];
+  }>(
+    "/",
+    {
+      preValidation: [fastify.authenticate, adminGuard],
+      schema: {
+        querystring: {
+          type: "object",
+          properties: {
+            status: { type: "string" },
+          },
+        },
+      },
+    },
+    async (request, reply) => {
+      const reports = await reportService.getAllReports(
+        request.query.status,
+      );
+      return reply.send(reports);
+    },
+  );
+
+  // Get a single report by ID (admin only)
+  fastify.get<{
+    Params: { id: string };
+    Reply: ProfileReportWithUsers | { error: string };
+  }>(
+    "/:id",
+    {
+      preValidation: [fastify.authenticate, adminGuard],
+    },
+    async (request, reply) => {
+      const report = await reportService.getReportById(request.params.id);
+
+      if (!report) {
+        return reply.status(404).send({ error: "Report not found" });
+      }
+
+      return reply.send(report);
+    },
+  );
+
+  // Update a report (admin only)
+  fastify.put<{
+    Params: { id: string };
+    Body: UpdateReportDto;
+    Reply: ProfileReportWithUsers;
+  }>(
+    "/:id",
+    {
+      preValidation: [fastify.authenticate, adminGuard],
+      schema: {
+        body: {
+          type: "object",
+          required: ["status"],
+          properties: {
+            status: { type: "string" },
+            reviewNotes: { type: "string", maxLength: 1000 },
+          },
+        },
+      },
+    },
+    async (request, reply) => {
+      const report = await reportService.updateReport(
+        request.params.id,
+        request.user.id,
+        request.body,
+      );
+
+      // Check for report achievements for the original reporter
+      if (report.status === "ACTION_TAKEN" || report.status === "DISMISSED") {
+        const achievementService = new AchievementService();
+        await achievementService.checkAchievements(
+          report.reporterId,
+          AchievementCategory.Report,
+          request
+        );
+      }
+
+      return reply.send(report);
+    },
+  );
+};
+
+export default reportsRoutes;

api/src/app/routes/root.ts

@@ -1,7 +1,30 @@
 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) {
   fastify.get('/', async function () {
-    return { message: 'Hello API' };
+    return { version: getVersion() };
   });
 }

api/src/app/routes/shows/index.ts

@@ -5,10 +5,11 @@
  */
 
 import { FastifyPluginAsync } from "fastify";
-import { Show, CreateShowDto, UpdateShowDto, Comment, CreateCommentDto, AuditAction, AuditCategory } from "@library/shared-types";
+import { Show, CreateShowDto, UpdateShowDto, Comment, CreateCommentDto, AuditAction, AuditCategory, AchievementCategory } from "@library/shared-types";
 import { ShowService } from "../../services/show.service";
 import { CommentService } from "../../services/comment.service";
 import { AuditService } from "../../services/audit.service";
+import { AchievementService } from "../../services/achievement.service";
 import { adminGuard } from "../../middleware/admin-guard";
 import { bannedGuard } from "../../middleware/banned-guard";
 
@@ -37,8 +38,8 @@ const showsRoutes: FastifyPluginAsync = async (app) => {
     async (request) => {
       const show = await showService.createShow(request.body);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.ENTRY_CREATE,
-        category: AuditCategory.CONTENT,
+        action: AuditAction.entryCreate,
+        category: AuditCategory.content,
         resourceType: "show",
         resourceId: show.id,
         details: `Created show: ${show.title}`,
@@ -62,8 +63,8 @@ const showsRoutes: FastifyPluginAsync = async (app) => {
       const show = await showService.updateShow(id, request.body);
       if (show) {
         await AuditService.logFromRequest(request, {
-          action: AuditAction.ENTRY_UPDATE,
-          category: AuditCategory.CONTENT,
+          action: AuditAction.entryUpdate,
+          category: AuditCategory.content,
           resourceType: "show",
           resourceId: id,
           details: `Updated show: ${show.title}`,
@@ -83,8 +84,8 @@ const showsRoutes: FastifyPluginAsync = async (app) => {
       const { id } = request.params;
       await showService.deleteShow(id);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.ENTRY_DELETE,
-        category: AuditCategory.CONTENT,
+        action: AuditAction.entryDelete,
+        category: AuditCategory.content,
         resourceType: "show",
         resourceId: id,
         details: `Deleted show with ID: ${id}`,
@@ -112,12 +113,21 @@ const showsRoutes: FastifyPluginAsync = async (app) => {
       const userId = request.user.id;
       const comment = await commentService.createCommentForShow(id, userId, request.body);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.COMMENT_CREATE,
-        category: AuditCategory.CONTENT,
+        action: AuditAction.commentCreate,
+        category: AuditCategory.content,
         resourceType: "show",
         resourceId: id,
         details: `Added comment to show`,
       });
+
+      // Check for comment achievements
+      const achievementService = new AchievementService();
+      await achievementService.checkAchievements(
+        userId,
+        AchievementCategory.Comment,
+        request
+      );
+
       return comment;
     }
   );
@@ -145,8 +155,8 @@ const showsRoutes: FastifyPluginAsync = async (app) => {
 
       const comment = await commentService.updateComment(commentId, request.body.content);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.COMMENT_UPDATE,
-        category: AuditCategory.CONTENT,
+        action: AuditAction.commentUpdate,
+        category: AuditCategory.content,
         resourceType: "show",
         resourceId: id,
         details: `Updated comment ${commentId} on show`,
@@ -178,8 +188,8 @@ const showsRoutes: FastifyPluginAsync = async (app) => {
 
       await commentService.deleteComment(commentId);
       await AuditService.logFromRequest(request, {
-        action: AuditAction.COMMENT_DELETE,
-        category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.ADMIN : AuditCategory.CONTENT,
+        action: AuditAction.commentDelete,
+        category: isAdmin && verification.comment?.userId !== userId ? AuditCategory.admin : AuditCategory.content,
         resourceType: "show",
         resourceId: id,
         details: `Deleted comment ${commentId} from show`,

api/src/app/routes/suggestions/index.ts

@@ -1,7 +1,8 @@
 import type { FastifyInstance } from "fastify";
 import { SuggestionService } from "../../services/suggestion.service";
 import { AuditService } from "../../services/audit.service";
-import { AuditAction, AuditCategory } from "@library/shared-types";
+import { AchievementService } from "../../services/achievement.service";
+import { AuditAction, AuditCategory, AchievementCategory } from "@library/shared-types";
 import type {
   SuggestionStatus,
   SuggestionEntity,
@@ -85,14 +86,22 @@ export default async function (app: FastifyInstance): Promise<void> {
         );
 
         await AuditService.logFromRequest(request, {
-          action: AuditAction.ENTRY_CREATE,
-          category: AuditCategory.CONTENT,
+          action: AuditAction.entryCreate,
+          category: AuditCategory.content,
           resourceType: "Suggestion",
           resourceId: suggestion.id,
           details: `Created ${suggestion.entityType} suggestion: ${suggestion.title}`,
           success: true,
         });
 
+        // Check for suggestion achievements
+        const achievementService = new AchievementService();
+        await achievementService.checkAchievements(
+          userId,
+          AchievementCategory.Suggestion,
+          request
+        );
+
         reply.send(suggestion);
       } catch (error) {
         return reply.badRequest(
@@ -115,14 +124,22 @@ export default async function (app: FastifyInstance): Promise<void> {
         const suggestion = await SuggestionService.acceptSuggestion(id);
 
         await AuditService.logFromRequest(request, {
-          action: AuditAction.ENTRY_UPDATE,
-          category: AuditCategory.ADMIN,
+          action: AuditAction.entryUpdate,
+          category: AuditCategory.admin,
           resourceType: "Suggestion",
           resourceId: suggestion.id,
           details: `Accepted ${suggestion.entityType} suggestion: ${suggestion.title}`,
           success: true,
         });
 
+        // Check for suggestion achievements for the user who made the suggestion
+        const achievementService = new AchievementService();
+        await achievementService.checkAchievements(
+          suggestion.userId,
+          AchievementCategory.Suggestion,
+          request
+        );
+
         reply.send(suggestion);
       } catch (error) {
         return reply.badRequest(
@@ -146,14 +163,22 @@ export default async function (app: FastifyInstance): Promise<void> {
         const suggestion = await SuggestionService.acceptSuggestionWithEdits(id, editedData);
 
         await AuditService.logFromRequest(request, {
-          action: AuditAction.ENTRY_UPDATE,
-          category: AuditCategory.ADMIN,
+          action: AuditAction.entryUpdate,
+          category: AuditCategory.admin,
           resourceType: "Suggestion",
           resourceId: suggestion.id,
           details: `Accepted ${suggestion.entityType} suggestion with edits: ${suggestion.title}`,
           success: true,
         });
 
+        // Check for suggestion achievements for the user who made the suggestion
+        const achievementService = new AchievementService();
+        await achievementService.checkAchievements(
+          suggestion.userId,
+          AchievementCategory.Suggestion,
+          request
+        );
+
         reply.send(suggestion);
       } catch (error) {
         return reply.badRequest(
@@ -177,8 +202,8 @@ export default async function (app: FastifyInstance): Promise<void> {
         const suggestion = await SuggestionService.declineSuggestion(id, reason);
 
         await AuditService.logFromRequest(request, {
-          action: AuditAction.ENTRY_UPDATE,
-          category: AuditCategory.ADMIN,
+          action: AuditAction.entryUpdate,
+          category: AuditCategory.admin,
           resourceType: "Suggestion",
           resourceId: suggestion.id,
           details: `Declined ${suggestion.entityType} suggestion: ${suggestion.title}${reason ? ` (Reason: ${reason})` : ""}`,
@@ -209,8 +234,8 @@ export default async function (app: FastifyInstance): Promise<void> {
         const suggestion = await SuggestionService.deleteSuggestion(id, userId, isAdmin);
 
         await AuditService.logFromRequest(request, {
-          action: AuditAction.ENTRY_DELETE,
-          category: isAdmin ? AuditCategory.ADMIN : AuditCategory.CONTENT,
+          action: AuditAction.entryDelete,
+          category: isAdmin ? AuditCategory.admin : AuditCategory.content,
           resourceType: "Suggestion",
           resourceId: suggestion.id,
           details: `Deleted ${suggestion.entityType} suggestion: ${suggestion.title}`,

api/src/app/routes/users/index.ts

@@ -5,11 +5,56 @@
  */
 
 import { FastifyPluginAsync } from "fastify";
-import { User, AuditAction, AuditCategory } from "@library/shared-types";
+import { User, AuditAction, AuditCategory, PrimaryBadge } from "@library/shared-types";
 import { UserService } from "../../services/user.service";
 import { AuditService } from "../../services/audit.service";
 import { adminGuard } from "../../middleware/admin-guard";
 
+interface UpdateUserSettingsBody {
+  slug?: string;
+  displayName?: string;
+  bio?: string;
+  profilePublic?: boolean;
+  primaryBadge?: PrimaryBadge;
+  website?: string;
+  discordServer?: string;
+  bluesky?: string;
+  github?: string;
+  linkedin?: string;
+  twitch?: string;
+  youtube?: string;
+}
+
+interface UserProfileResponse {
+  id: string;
+  username: string;
+  displayName?: string;
+  avatar?: string;
+  bio?: string;
+  slug?: string;
+  primaryBadge?: PrimaryBadge;
+  website?: string;
+  discordServer?: string;
+  bluesky?: string;
+  github?: string;
+  linkedin?: string;
+  twitch?: string;
+  youtube?: string;
+  badges: {
+    isStaff: boolean;
+    isMod: boolean;
+    isVip: boolean;
+    inDiscord: boolean;
+  };
+  stats: {
+    suggestionsCount: number;
+    suggestionsAcceptedCount: number;
+    likesCount: number;
+    commentsCount: number;
+  };
+  createdAt: Date;
+}
+
 const usersRoutes: FastifyPluginAsync = async (app) => {
   const userService = new UserService();
 
@@ -23,6 +68,108 @@ const usersRoutes: FastifyPluginAsync = async (app) => {
     }
   );
 
+  app.get<{ Reply: User }>(
+    "/me",
+    {
+      preValidation: [app.authenticate],
+    },
+    async (request) => {
+      const currentUser = request.user as { id: string };
+      const user = await userService.getUserById(currentUser.id);
+      if (!user) {
+        throw new Error("User not found");
+      }
+      return user;
+    }
+  );
+
+  app.put<{ Body: UpdateUserSettingsBody; Reply: User | { error: string } }>(
+    "/me",
+    {
+      preValidation: [app.authenticate],
+      preHandler: [app.csrfProtection],
+    },
+    async (request, reply) => {
+      const currentUser = request.user as { id: string };
+      const updates = request.body;
+
+      // If slug is being updated, check if it's unique
+      if (updates.slug) {
+        const existingUser = await userService.getUserBySlug(updates.slug);
+        if (existingUser && existingUser.id !== currentUser.id) {
+          return reply.code(400).send({ error: "Slug already taken" });
+        }
+      }
+
+      const updatedUser = await userService.updateUserSettings(
+        currentUser.id,
+        updates
+      );
+
+      if (!updatedUser) {
+        return reply.code(404).send({ error: "User not found" });
+      }
+
+      return updatedUser;
+    }
+  );
+
+  app.get<{
+    Params: { identifier: string };
+    Reply: UserProfileResponse | { error: string };
+  }>(
+    "/profile/:identifier",
+    async (request, reply) => {
+      const { identifier } = request.params;
+
+      try {
+        const profile = await userService.getUserProfile(identifier);
+
+        if (!profile) {
+          return reply.code(404).send({ error: "User not found" });
+        }
+
+      if (!profile.profilePublic) {
+        // Check if the requesting user is viewing their own profile
+        const currentUser = request.user as { id: string } | undefined;
+        if (!currentUser || currentUser.id !== profile.id) {
+          return reply
+            .code(403)
+            .send({ error: "This profile is private" });
+        }
+      }
+
+      return {
+        id: profile.id,
+        username: profile.username,
+        displayName: profile.displayName,
+        avatar: profile.avatar,
+        bio: profile.bio,
+        slug: profile.slug,
+        primaryBadge: profile.primaryBadge,
+        website: profile.website,
+        discordServer: profile.discordServer,
+        bluesky: profile.bluesky,
+        github: profile.github,
+        linkedin: profile.linkedin,
+        twitch: profile.twitch,
+        youtube: profile.youtube,
+        badges: {
+          isStaff: profile.isStaff,
+          isMod: profile.isMod,
+          isVip: profile.isVip,
+          inDiscord: profile.inDiscord,
+        },
+        stats: profile.stats,
+        createdAt: profile.createdAt,
+      };
+      } catch (error) {
+        console.error("Error fetching profile:", error);
+        return reply.code(500).send({ error: "Failed to fetch profile" });
+      }
+    }
+  );
+
   app.get<{ Params: { id: string }; Reply: User | null }>(
     "/:id",
     {
@@ -54,8 +201,8 @@ const usersRoutes: FastifyPluginAsync = async (app) => {
       }
 
       await AuditService.logFromRequest(request, {
-        action: AuditAction.USER_BAN,
-        category: AuditCategory.ADMIN,
+        action: AuditAction.userBan,
+        category: AuditCategory.admin,
         targetUserId: id,
         details: `Banned user: ${user.username}`,
       });
@@ -78,8 +225,8 @@ const usersRoutes: FastifyPluginAsync = async (app) => {
       }
 
       await AuditService.logFromRequest(request, {
-        action: AuditAction.USER_UNBAN,
-        category: AuditCategory.ADMIN,
+        action: AuditAction.userUnban,
+        category: AuditCategory.admin,
         targetUserId: id,
         details: `Unbanned user: ${user.username}`,
       });
@@ -87,6 +234,64 @@ const usersRoutes: FastifyPluginAsync = async (app) => {
       return user;
     }
   );
+
+  app.post<{ Params: { id: string }; Reply: User | { error: string } }>(
+    "/:id/make-private",
+    {
+      preValidation: [app.authenticate, adminGuard],
+      preHandler: [app.csrfProtection],
+    },
+    async (request, reply) => {
+      const { id } = request.params;
+      const user = await userService.updateUserSettings(id, { profilePublic: false });
+      if (!user) {
+        return reply.code(404).send({ error: "User not found" });
+      }
+
+      await AuditService.logFromRequest(request, {
+        action: AuditAction.entryUpdate,
+        category: AuditCategory.admin,
+        targetUserId: id,
+        details: `Admin made profile private for user: ${user.username}`,
+      });
+
+      return user;
+    }
+  );
+
+  app.put<{ Params: { id: string }; Body: UpdateUserSettingsBody; Reply: User | { error: string } }>(
+    "/:id",
+    {
+      preValidation: [app.authenticate, adminGuard],
+      preHandler: [app.csrfProtection],
+    },
+    async (request, reply) => {
+      const { id } = request.params;
+      const updates = request.body;
+
+      // If slug is being updated, check if it's unique
+      if (updates.slug) {
+        const existingUser = await userService.getUserBySlug(updates.slug);
+        if (existingUser && existingUser.id !== id) {
+          return reply.code(400).send({ error: "Slug already taken" });
+        }
+      }
+
+      const updatedUser = await userService.updateUserSettings(id, updates);
+      if (!updatedUser) {
+        return reply.code(404).send({ error: "User not found" });
+      }
+
+      await AuditService.logFromRequest(request, {
+        action: AuditAction.entryUpdate,
+        category: AuditCategory.admin,
+        targetUserId: id,
+        details: `Admin updated profile for user: ${updatedUser.username}`,
+      });
+
+      return updatedUser;
+    }
+  );
 };
 
 export default usersRoutes;

api/src/app/services/achievement.service.ts

@@ -0,0 +1,772 @@
+/**
+ * @copyright 2026 NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+
+import type { FastifyRequest } from "fastify";
+import {
+  ACHIEVEMENTS,
+  ACHIEVEMENT_LIST,
+  AchievementCategory,
+  AchievementDefinition,
+  AchievementProgress,
+  AuditAction,
+  AuditCategory,
+  UserAchievementSummary,
+} from "@library/shared-types";
+
+import { prisma } from "../lib/prisma";
+import { AuditService } from "./audit.service";
+
+export class AchievementService {
+  /**
+   * Check and award achievements for a user after an action.
+   * Returns list of newly earned achievements.
+   */
+  async checkAchievements(
+    userId: string,
+    category: AchievementCategory,
+    req: FastifyRequest,
+  ): Promise<AchievementDefinition[]> {
+    const relevantAchievements = ACHIEVEMENT_LIST.filter(
+      (ach) => ach.category === category,
+    );
+    const newlyEarned: AchievementDefinition[] = [];
+
+    for (const achievement of relevantAchievements) {
+      const userAchievement = await prisma.userAchievement.findUnique({
+        where: {
+          userId_achievementKey: {
+            userId,
+            achievementKey: achievement.key,
+          },
+        },
+      });
+
+      // Skip already earned achievements
+      if (userAchievement?.earned) {
+        continue;
+      }
+
+      // Check if achievement is now earned
+      const earned = await this.checkAchievementCondition(userId, achievement);
+
+      if (earned) {
+        await this.awardAchievement(userId, achievement, req);
+        newlyEarned.push(achievement);
+      }
+    }
+
+    return newlyEarned;
+  }
+
+  /**
+   * Award an achievement to a user.
+   */
+  private async awardAchievement(
+    userId: string,
+    achievement: AchievementDefinition,
+    req: FastifyRequest,
+  ): Promise<void> {
+    await prisma.userAchievement.upsert({
+      where: {
+        userId_achievementKey: {
+          userId,
+          achievementKey: achievement.key,
+        },
+      },
+      create: {
+        userId,
+        achievementKey: achievement.key,
+        progress: 100,
+        earned: true,
+        earnedAt: new Date(),
+      },
+      update: {
+        earned: true,
+        earnedAt: new Date(),
+        progress: 100,
+      },
+    });
+
+    // Update user's achievement points
+    await prisma.user.update({
+      where: { id: userId },
+      data: {
+        achievementPoints: {
+          increment: achievement.points,
+        },
+      },
+    });
+
+    // Log the achievement unlock
+    await AuditService.logFromRequest(req, {
+      action: AuditAction.achievementUnlocked,
+      category: AuditCategory.content,
+      details: `Unlocked achievement: ${achievement.title}`,
+    });
+  }
+
+  /**
+   * Check if a specific achievement condition is met.
+   */
+  private async checkAchievementCondition(
+    userId: string,
+    achievement: AchievementDefinition,
+  ): Promise<boolean> {
+    switch (achievement.category) {
+      case AchievementCategory.Suggestion:
+        return await this.checkSuggestionAchievement(userId, achievement);
+      case AchievementCategory.Like:
+        return await this.checkLikeAchievement(userId, achievement);
+      case AchievementCategory.Comment:
+        return await this.checkCommentAchievement(userId, achievement);
+      case AchievementCategory.Engagement:
+        return await this.checkEngagementAchievement(userId, achievement);
+      case AchievementCategory.Report:
+        return await this.checkReportAchievement(userId, achievement);
+      default:
+        return false;
+    }
+  }
+
+  /**
+   * Check suggestion-based achievements.
+   */
+  private async checkSuggestionAchievement(
+    userId: string,
+    achievement: AchievementDefinition,
+  ): Promise<boolean> {
+    const { requirements } = achievement;
+
+    // Count-based achievements (total suggestions)
+    if (
+      achievement.key.startsWith("suggestion_first_steps") ||
+      achievement.key.startsWith("suggestion_contributor") ||
+      achievement.key.startsWith("suggestion_dedicated") ||
+      achievement.key.startsWith("suggestion_master") ||
+      achievement.key.startsWith("suggestion_legend")
+    ) {
+      const count = await prisma.suggestion.count({
+        where: { userId },
+      });
+      return count >= (requirements.count ?? 0);
+    }
+
+    // Accepted suggestion achievements
+    if (achievement.key.startsWith("suggestion_quality")) {
+      const count = await prisma.suggestion.count({
+        where: {
+          userId,
+          status: "ACCEPTED",
+        },
+      });
+      return count >= (requirements.count ?? 0);
+    }
+
+    // Approved achievement (first accepted)
+    if (achievement.key === "suggestion_approved") {
+      const count = await prisma.suggestion.count({
+        where: {
+          userId,
+          status: "ACCEPTED",
+        },
+      });
+      return count >= 1;
+    }
+
+    // Acceptance rate achievements
+    if (achievement.key.startsWith("suggestion_acceptance")) {
+      const total = await prisma.suggestion.count({
+        where: { userId },
+      });
+      const accepted = await prisma.suggestion.count({
+        where: {
+          userId,
+          status: "ACCEPTED",
+        },
+      });
+
+      if (total < (requirements.count ?? 0)) {
+        return false;
+      }
+
+      const rate = accepted / total;
+      return rate >= (requirements.rate ?? 0);
+    }
+
+    // Diversity achievement (all media types)
+    if (achievement.key === "suggestion_renaissance") {
+      const types = await prisma.suggestion.groupBy({
+        by: ["entityType"],
+        where: {
+          userId,
+          status: "ACCEPTED",
+        },
+      });
+      return types.length >= 6;
+    }
+
+    // Enthusiast (5 in one day)
+    if (achievement.key === "suggestion_enthusiast") {
+      const today = new Date();
+      today.setHours(0, 0, 0, 0);
+      const tomorrow = new Date(today);
+      tomorrow.setDate(tomorrow.getDate() + 1);
+
+      const count = await prisma.suggestion.count({
+        where: {
+          userId,
+          createdAt: {
+            gte: today,
+            lt: tomorrow,
+          },
+        },
+      });
+      return count >= 5;
+    }
+
+    return false;
+  }
+
+  /**
+   * Check like-based achievements.
+   */
+  private async checkLikeAchievement(
+    userId: string,
+    achievement: AchievementDefinition,
+  ): Promise<boolean> {
+    const { requirements } = achievement;
+
+    // Count-based achievements (total likes)
+    if (
+      achievement.key.startsWith("like_first") ||
+      achievement.key.startsWith("like_enthusiast") ||
+      achievement.key.startsWith("like_fan") ||
+      achievement.key.startsWith("like_super") ||
+      achievement.key.startsWith("like_mega") ||
+      achievement.key.startsWith("like_legendary")
+    ) {
+      const count = await prisma.like.count({
+        where: { userId },
+      });
+      return count >= (requirements.count ?? 0);
+    }
+
+    // Media-specific achievements
+    if (achievement.key === "like_book_lover") {
+      const count = await prisma.like.count({
+        where: {
+          userId,
+          entityType: "book",
+        },
+      });
+      return count >= 50;
+    }
+
+    if (achievement.key === "like_gamer") {
+      const count = await prisma.like.count({
+        where: {
+          userId,
+          entityType: "game",
+        },
+      });
+      return count >= 50;
+    }
+
+    if (achievement.key === "like_cinephile") {
+      const count = await prisma.like.count({
+        where: {
+          userId,
+          entityType: "show",
+        },
+      });
+      return count >= 50;
+    }
+
+    if (achievement.key === "like_music") {
+      const count = await prisma.like.count({
+        where: {
+          userId,
+          entityType: "music",
+        },
+      });
+      return count >= 50;
+    }
+
+    // Diversity achievement
+    if (achievement.key === "like_diverse") {
+      const types = await prisma.like.groupBy({
+        by: ["entityType"],
+        where: { userId },
+      });
+      return types.length >= 6;
+    }
+
+    // Binge liker (20+ in one day)
+    if (achievement.key === "like_binge") {
+      const today = new Date();
+      today.setHours(0, 0, 0, 0);
+      const tomorrow = new Date(today);
+      tomorrow.setDate(tomorrow.getDate() + 1);
+
+      const count = await prisma.like.count({
+        where: {
+          userId,
+          createdAt: {
+            gte: today,
+            lt: tomorrow,
+          },
+        },
+      });
+      return count >= 20;
+    }
+
+    return false;
+  }
+
+  /**
+   * Check comment-based achievements.
+   */
+  private async checkCommentAchievement(
+    userId: string,
+    achievement: AchievementDefinition,
+  ): Promise<boolean> {
+    const { requirements } = achievement;
+
+    // Count-based achievements (total comments)
+    if (
+      achievement.key.startsWith("comment_first") ||
+      achievement.key.startsWith("comment_reviewer") ||
+      achievement.key.startsWith("comment_critic") ||
+      achievement.key.startsWith("comment_expert") ||
+      achievement.key.startsWith("comment_master") ||
+      achievement.key.startsWith("comment_legend")
+    ) {
+      const count = await prisma.comment.count({
+        where: { userId },
+      });
+      return count >= (requirements.count ?? 0);
+    }
+
+    // Length-based achievements
+    if (achievement.key === "comment_detailed") {
+      const count = await prisma.comment.count({
+        where: {
+          userId,
+          content: {
+            // MongoDB doesn't have a direct length check, so we'll fetch and check
+          },
+        },
+      });
+
+      // Fetch all comments and check length
+      const comments = await prisma.comment.findMany({
+        where: { userId },
+        select: { content: true },
+      });
+
+      const longComments = comments.filter((c) => c.content.length >= 500);
+      return longComments.length >= 10;
+    }
+
+    if (achievement.key === "comment_essay") {
+      const comments = await prisma.comment.findMany({
+        where: { userId },
+        select: { content: true },
+      });
+
+      const longComments = comments.filter((c) => c.content.length >= 1000);
+      return longComments.length >= 5;
+    }
+
+    if (achievement.key === "comment_novel") {
+      const comments = await prisma.comment.findMany({
+        where: { userId },
+        select: { content: true },
+      });
+
+      const longComments = comments.filter((c) => c.content.length >= 2000);
+      return longComments.length >= 3;
+    }
+
+    // Thoughtful reviewer (50 different items)
+    if (achievement.key === "comment_thoughtful") {
+      // Count unique entity IDs
+      const comments = await prisma.comment.findMany({
+        where: { userId },
+        select: {
+          bookId: true,
+          gameId: true,
+          showId: true,
+          mangaId: true,
+          musicId: true,
+          artId: true,
+        },
+      });
+
+      const uniqueItems = new Set<string>();
+      comments.forEach((c) => {
+        const entityId =
+          c.bookId ??
+          c.gameId ??
+          c.showId ??
+          c.mangaId ??
+          c.musicId ??
+          c.artId;
+        if (entityId) {
+          uniqueItems.add(entityId);
+        }
+      });
+
+      return uniqueItems.size >= 50;
+    }
+
+    // Diversity achievement
+    if (achievement.key === "comment_diverse") {
+      const comments = await prisma.comment.findMany({
+        where: { userId },
+        select: {
+          bookId: true,
+          gameId: true,
+          showId: true,
+          mangaId: true,
+          musicId: true,
+          artId: true,
+        },
+      });
+
+      const types = new Set<string>();
+      comments.forEach((c) => {
+        if (c.bookId) {
+          types.add("book");
+        }
+        if (c.gameId) {
+          types.add("game");
+        }
+        if (c.showId) {
+          types.add("show");
+        }
+        if (c.mangaId) {
+          types.add("manga");
+        }
+        if (c.musicId) {
+          types.add("music");
+        }
+        if (c.artId) {
+          types.add("art");
+        }
+      });
+
+      return types.size >= 6;
+    }
+
+    return false;
+  }
+
+  /**
+   * Check engagement-based achievements.
+   */
+  private async checkEngagementAchievement(
+    userId: string,
+    achievement: AchievementDefinition,
+  ): Promise<boolean> {
+    const user = await prisma.user.findUnique({
+      where: { id: userId },
+      select: {
+        currentStreak: true,
+        createdAt: true,
+      },
+    });
+
+    if (!user) {
+      return false;
+    }
+
+    // Welcome achievement
+    if (achievement.key === "engagement_welcome") {
+      return true; // Awarded on first login
+    }
+
+    // Streak-based achievements
+    if (achievement.key.startsWith("engagement_streak")) {
+      return user.currentStreak >= (achievement.requirements.streak ?? 0);
+    }
+
+    // Triple threat (suggestion, like, comment in same day)
+    if (achievement.key === "engagement_triple_threat") {
+      const today = new Date();
+      today.setHours(0, 0, 0, 0);
+      const tomorrow = new Date(today);
+      tomorrow.setDate(tomorrow.getDate() + 1);
+
+      const [hasSuggestion, hasLike, hasComment] = await Promise.all([
+        prisma.suggestion.count({
+          where: {
+            userId,
+            createdAt: { gte: today, lt: tomorrow },
+          },
+        }),
+        prisma.like.count({
+          where: {
+            userId,
+            createdAt: { gte: today, lt: tomorrow },
+          },
+        }),
+        prisma.comment.count({
+          where: {
+            userId,
+            createdAt: { gte: today, lt: tomorrow },
+          },
+        }),
+      ]);
+
+      return hasSuggestion > 0 && hasLike > 0 && hasComment > 0;
+    }
+
+    // Power user (triple threat 10 times) - would need special tracking
+    // Early adopter achievements
+    if (
+      achievement.key === "engagement_early_adopter" ||
+      achievement.key === "engagement_founding_100" ||
+      achievement.key === "engagement_founding_1000"
+    ) {
+      const userRank = await prisma.user.count({
+        where: {
+          createdAt: {
+            lt: user.createdAt,
+          },
+        },
+      });
+
+      if (achievement.key === "engagement_early_adopter") {
+        return userRank < 10;
+      }
+      if (achievement.key === "engagement_founding_100") {
+        return userRank < 100;
+      }
+      if (achievement.key === "engagement_founding_1000") {
+        return userRank < 1000;
+      }
+    }
+
+    // Account age achievements
+    if (achievement.key.startsWith("engagement_veteran")) {
+      const daysSinceCreation = Math.floor(
+        (Date.now() - user.createdAt.getTime()) / (1000 * 60 * 60 * 24),
+      );
+      return daysSinceCreation >= (achievement.requirements.dayRange ?? 0);
+    }
+
+    return false;
+  }
+
+  /**
+   * Check report-based achievements.
+   */
+  private async checkReportAchievement(
+    userId: string,
+    achievement: AchievementDefinition,
+  ): Promise<boolean> {
+    const { requirements } = achievement;
+
+    // Count ACTION_TAKEN reports
+    if (
+      achievement.key.startsWith("report_watchful") ||
+      achievement.key.startsWith("report_guardian") ||
+      achievement.key.startsWith("report_protector") ||
+      achievement.key.startsWith("report_vigilant")
+    ) {
+      const profileReports = await prisma.profileReport.count({
+        where: {
+          reporterId: userId,
+          status: "ACTION_TAKEN",
+        },
+      });
+
+      const commentReports = await prisma.commentReport.count({
+        where: {
+          reporterId: userId,
+          status: "ACTION_TAKEN",
+        },
+      });
+
+      return profileReports + commentReports >= (requirements.count ?? 0);
+    }
+
+    // Accuracy achievements
+    if (achievement.key.startsWith("report_accuracy")) {
+      const totalProfileReports = await prisma.profileReport.count({
+        where: {
+          reporterId: userId,
+          status: {
+            not: "PENDING",
+          },
+        },
+      });
+
+      const totalCommentReports = await prisma.commentReport.count({
+        where: {
+          reporterId: userId,
+          status: {
+            not: "PENDING",
+          },
+        },
+      });
+
+      const total = totalProfileReports + totalCommentReports;
+
+      if (total < (requirements.count ?? 10)) {
+        return false;
+      }
+
+      const actionTakenProfile = await prisma.profileReport.count({
+        where: {
+          reporterId: userId,
+          status: "ACTION_TAKEN",
+        },
+      });
+
+      const actionTakenComment = await prisma.commentReport.count({
+        where: {
+          reporterId: userId,
+          status: "ACTION_TAKEN",
+        },
+      });
+
+      const actionTaken = actionTakenProfile + actionTakenComment;
+      const rate = actionTaken / total;
+
+      return rate >= (requirements.rate ?? 0);
+    }
+
+    // Volume achievement (total reports)
+    if (achievement.key === "report_volume") {
+      const profileReports = await prisma.profileReport.count({
+        where: { reporterId: userId },
+      });
+
+      const commentReports = await prisma.commentReport.count({
+        where: { reporterId: userId },
+      });
+
+      return profileReports + commentReports >= 50;
+    }
+
+    return false;
+  }
+
+  /**
+   * Get a user's achievement progress and summary.
+   */
+  async getUserAchievementSummary(
+    userId: string,
+  ): Promise<UserAchievementSummary> {
+    const userAchievements = await prisma.userAchievement.findMany({
+      where: { userId },
+      orderBy: { earnedAt: "desc" },
+    });
+
+    const earnedAchievements = userAchievements.filter((ua) => ua.earned);
+    const totalPoints = earnedAchievements.reduce((sum, ua) => {
+      const definition = ACHIEVEMENTS[ua.achievementKey];
+      return sum + (definition?.points ?? 0);
+    }, 0);
+
+    const recentAchievements: AchievementProgress[] = earnedAchievements
+      .slice(0, 5)
+      .map((ua) => ({
+        definition: ACHIEVEMENTS[ua.achievementKey],
+        progress: ua.progress,
+        earned: ua.earned,
+        earnedAt: ua.earnedAt ?? undefined,
+      }));
+
+    // Progress by category
+    const progressByCategory = Object.values(AchievementCategory).map(
+      (category) => {
+        const categoryAchievements = ACHIEVEMENT_LIST.filter(
+          (a) => a.category === category,
+        );
+        const earned = earnedAchievements.filter(
+          (ua) => ACHIEVEMENTS[ua.achievementKey]?.category === category,
+        ).length;
+
+        return {
+          category,
+          earned,
+          total: categoryAchievements.length,
+        };
+      },
+    );
+
+    return {
+      totalPoints,
+      totalEarned: earnedAchievements.length,
+      recentAchievements,
+      progressByCategory,
+    };
+  }
+
+  /**
+   * Get all achievements with progress for a user.
+   */
+  async getUserAchievementProgress(
+    userId: string,
+  ): Promise<AchievementProgress[]> {
+    const userAchievements = await prisma.userAchievement.findMany({
+      where: { userId },
+    });
+
+    const progressMap = new Map(
+      userAchievements.map((ua) => [ua.achievementKey, ua]),
+    );
+
+    return ACHIEVEMENT_LIST.map((definition) => {
+      const userAchievement = progressMap.get(definition.key);
+      return {
+        definition,
+        progress: userAchievement?.progress ?? 0,
+        earned: userAchievement?.earned ?? false,
+        earnedAt: userAchievement?.earnedAt ?? undefined,
+      };
+    });
+  }
+
+  /**
+   * Update login streak for a user.
+   */
+  async updateLoginStreak(userId: string): Promise<void> {
+    const user = await prisma.user.findUnique({
+      where: { id: userId },
+      select: {
+        currentStreak: true,
+        lastStreakCheck: true,
+      },
+    });
+
+    if (!user) {
+      return;
+    }
+
+    const now = new Date();
+    const yesterday = new Date(now);
+    yesterday.setDate(yesterday.getDate() - 1);
+    yesterday.setHours(0, 0, 0, 0);
+
+    const lastCheck = user.lastStreakCheck;
+    const isConsecutive =
+      lastCheck &&
+      lastCheck >= yesterday &&
+      lastCheck < new Date(now.setHours(0, 0, 0, 0));
+
+    await prisma.user.update({
+      where: { id: userId },
+      data: {
+        currentStreak: isConsecutive ? user.currentStreak + 1 : 1,
+        lastStreakCheck: new Date(),
+      },
+    });
+  }
+}

api/src/app/services/activity.service.ts

@@ -0,0 +1,353 @@
+/**
+ * @copyright 2026 NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+
+import type {
+  Activity,
+  ActivityFeedResponse,
+  ActivityUser,
+  SuggestionActivity,
+  LikeActivity,
+  CommentActivity,
+  AchievementActivity,
+} from "@library/shared-types";
+import { ACHIEVEMENTS, ActivityType } from "@library/shared-types";
+import { prisma } from "../lib/prisma";
+
+export class ActivityService {
+  private prisma = prisma;
+
+  constructor() {}
+
+  /**
+   * Get activity feed with pagination.
+   */
+  async getActivityFeed(
+    limit = 50,
+    offset = 0,
+    userId?: string
+  ): Promise<ActivityFeedResponse> {
+    // Fetch suggestions, likes, comments, and achievements
+    const [suggestions, likes, comments, achievements] = await Promise.all([
+      this.getSuggestionActivities(limit, offset, userId),
+      this.getLikeActivities(limit, offset, userId),
+      this.getCommentActivities(limit, offset, userId),
+      this.getAchievementActivities(limit, offset, userId),
+    ]);
+
+    // Combine and sort by createdAt
+    const activities: Activity[] = [
+      ...suggestions,
+      ...likes,
+      ...comments,
+      ...achievements,
+    ].sort((a, b) => {
+      return new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime();
+    });
+
+    // Apply pagination to combined results
+    const paginatedActivities = activities.slice(offset, offset + limit);
+    const hasMore = activities.length > offset + limit;
+
+    return {
+      activities: paginatedActivities,
+      total: activities.length,
+      hasMore,
+    };
+  }
+
+  /**
+   * Get suggestion activities.
+   */
+  private async getSuggestionActivities(
+    limit: number,
+    offset: number,
+    userId?: string
+  ): Promise<SuggestionActivity[]> {
+    const where = userId
+      ? { userId, user: { profilePublic: true, isBanned: false } }
+      : { user: { profilePublic: true, isBanned: false } };
+
+    const suggestions = await this.prisma.suggestion.findMany({
+      where,
+      include: {
+        user: {
+          select: {
+            id: true,
+            username: true,
+            slug: true,
+            avatar: true,
+            primaryBadge: true,
+            isVip: true,
+            isMod: true,
+            isStaff: true,
+          },
+        },
+      },
+      orderBy: { createdAt: "desc" },
+      take: limit * 2, // Get more since we're combining
+    });
+
+    return suggestions.map((suggestion) => ({
+      id: `suggestion-${suggestion.id}`,
+      type: ActivityType.suggestion,
+      user: suggestion.user as ActivityUser,
+      entityType: suggestion.entityType,
+      suggestionTitle: suggestion.title,
+      status: suggestion.status,
+      createdAt: suggestion.createdAt,
+    }));
+  }
+
+  /**
+   * Get like activities.
+   */
+  private async getLikeActivities(
+    limit: number,
+    offset: number,
+    userId?: string
+  ): Promise<LikeActivity[]> {
+    const where = userId
+      ? { userId, user: { profilePublic: true, isBanned: false } }
+      : { user: { profilePublic: true, isBanned: false } };
+
+    const likes = await this.prisma.like.findMany({
+      where,
+      include: {
+        user: {
+          select: {
+            id: true,
+            username: true,
+            slug: true,
+            avatar: true,
+            primaryBadge: true,
+            isVip: true,
+            isMod: true,
+            isStaff: true,
+          },
+        },
+      },
+      orderBy: { createdAt: "desc" },
+      take: limit * 2,
+    });
+
+    // For each like, fetch the entity title
+    const likesWithTitles = await Promise.all(
+      likes.map(async (like): Promise<LikeActivity> => {
+        const entityTitle = await this.getEntityTitle(
+          like.entityType,
+          like.entityId
+        );
+        return {
+          id: `like-${like.id}`,
+          type: ActivityType.like,
+          user: like.user as ActivityUser,
+          entityType: like.entityType,
+          entityId: like.entityId,
+          entityTitle,
+          createdAt: like.createdAt,
+        };
+      })
+    );
+
+    return likesWithTitles;
+  }
+
+  /**
+   * Get comment activities.
+   */
+  private async getCommentActivities(
+    limit: number,
+    offset: number,
+    userId?: string
+  ): Promise<CommentActivity[]> {
+    const where = userId
+      ? { userId, user: { profilePublic: true, isBanned: false } }
+      : { user: { profilePublic: true, isBanned: false } };
+
+    const comments = await this.prisma.comment.findMany({
+      where,
+      include: {
+        user: {
+          select: {
+            id: true,
+            username: true,
+            slug: true,
+            avatar: true,
+            primaryBadge: true,
+            isVip: true,
+            isMod: true,
+            isStaff: true,
+          },
+        },
+        game: { select: { id: true, title: true } },
+        book: { select: { id: true, title: true } },
+        music: { select: { id: true, title: true } },
+        art: { select: { id: true, title: true } },
+        show: { select: { id: true, title: true } },
+        manga: { select: { id: true, title: true } },
+      },
+      orderBy: { createdAt: "desc" },
+      take: limit * 2,
+    });
+
+    return comments.map((comment) => {
+      let entityType = "";
+      let entityId = "";
+      let entityTitle = "";
+
+      if (comment.game) {
+        entityType = "game";
+        entityId = comment.game.id;
+        entityTitle = comment.game.title;
+      } else if (comment.book) {
+        entityType = "book";
+        entityId = comment.book.id;
+        entityTitle = comment.book.title;
+      } else if (comment.music) {
+        entityType = "music";
+        entityId = comment.music.id;
+        entityTitle = comment.music.title;
+      } else if (comment.art) {
+        entityType = "art";
+        entityId = comment.art.id;
+        entityTitle = comment.art.title;
+      } else if (comment.show) {
+        entityType = "show";
+        entityId = comment.show.id;
+        entityTitle = comment.show.title;
+      } else if (comment.manga) {
+        entityType = "manga";
+        entityId = comment.manga.id;
+        entityTitle = comment.manga.title;
+      }
+
+      // Get first 100 characters of comment
+      const commentPreview =
+        comment.content.length > 100
+          ? `${comment.content.slice(0, 100)}...`
+          : comment.content;
+
+      return {
+        id: `comment-${comment.id}`,
+        type: ActivityType.comment,
+        user: comment.user as ActivityUser,
+        entityType,
+        entityId,
+        entityTitle,
+        commentPreview,
+        createdAt: comment.createdAt,
+      };
+    });
+  }
+
+  /**
+   * Get achievement activities.
+   */
+  private async getAchievementActivities(
+    limit: number,
+    offset: number,
+    userId?: string
+  ): Promise<AchievementActivity[]> {
+    const where = userId
+      ? {
+          userId,
+          earned: true,
+          user: { profilePublic: true, isBanned: false },
+        }
+      : { earned: true, user: { profilePublic: true, isBanned: false } };
+
+    const userAchievements = await this.prisma.userAchievement.findMany({
+      where,
+      include: {
+        user: {
+          select: {
+            id: true,
+            username: true,
+            slug: true,
+            avatar: true,
+            primaryBadge: true,
+            isVip: true,
+            isMod: true,
+            isStaff: true,
+          },
+        },
+      },
+      orderBy: { earnedAt: "desc" },
+      take: limit * 2,
+    });
+
+    return userAchievements
+      .filter((ua) => ua.earnedAt) // Only show earned achievements
+      .map((ua) => {
+        const achievement = ACHIEVEMENTS[ua.achievementKey];
+        return {
+          id: `achievement-${ua.id}`,
+          type: ActivityType.achievement,
+          user: ua.user as ActivityUser,
+          achievementKey: ua.achievementKey,
+          achievementName: achievement.title,
+          achievementIcon: achievement.icon,
+          achievementPoints: achievement.points,
+          createdAt: ua.earnedAt!,
+        };
+      });
+  }
+
+  /**
+   * Helper to get entity title by type and ID.
+   */
+  private async getEntityTitle(
+    entityType: string,
+    entityId: string
+  ): Promise<string> {
+    switch (entityType) {
+      case "game": {
+        const game = await this.prisma.game.findUnique({
+          where: { id: entityId },
+          select: { title: true },
+        });
+        return game?.title || "Unknown Game";
+      }
+      case "book": {
+        const book = await this.prisma.book.findUnique({
+          where: { id: entityId },
+          select: { title: true },
+        });
+        return book?.title || "Unknown Book";
+      }
+      case "music": {
+        const music = await this.prisma.music.findUnique({
+          where: { id: entityId },
+          select: { title: true },
+        });
+        return music?.title || "Unknown Music";
+      }
+      case "art": {
+        const art = await this.prisma.art.findUnique({
+          where: { id: entityId },
+          select: { title: true },
+        });
+        return art?.title || "Unknown Art";
+      }
+      case "show": {
+        const show = await this.prisma.show.findUnique({
+          where: { id: entityId },
+          select: { title: true },
+        });
+        return show?.title || "Unknown Show";
+      }
+      case "manga": {
+        const manga = await this.prisma.manga.findUnique({
+          where: { id: entityId },
+          select: { title: true },
+        });
+        return manga?.title || "Unknown Manga";
+      }
+      default:
+        return "Unknown Item";
+    }
+  }
+}

api/src/app/services/audit.service.ts

@@ -36,7 +36,7 @@ export const AuditService = {
     request: FastifyRequest,
     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(
       {

api/src/app/services/auth.service.ts

@@ -71,6 +71,15 @@ export class AuthService {
       username: dbUser.username,
       email: dbUser.email,
       avatar: dbUser.avatar || undefined,
+      slug: dbUser.slug || undefined,
+      displayName: dbUser.displayName || undefined,
+      bio: dbUser.bio || undefined,
+      profilePublic: dbUser.profilePublic,
+      website: dbUser.website || undefined,
+      discordServer: dbUser.discordServer || undefined,
+      bluesky: dbUser.bluesky || undefined,
+      github: dbUser.github || undefined,
+      linkedin: dbUser.linkedin || undefined,
       isAdmin: dbUser.isAdmin,
       isBanned: dbUser.isBanned,
       inDiscord: dbUser.inDiscord,
@@ -167,6 +176,15 @@ export class AuthService {
       username: dbUser.username,
       email: dbUser.email,
       avatar: dbUser.avatar || undefined,
+      slug: dbUser.slug || undefined,
+      displayName: dbUser.displayName || undefined,
+      bio: dbUser.bio || undefined,
+      profilePublic: dbUser.profilePublic,
+      website: dbUser.website || undefined,
+      discordServer: dbUser.discordServer || undefined,
+      bluesky: dbUser.bluesky || undefined,
+      github: dbUser.github || undefined,
+      linkedin: dbUser.linkedin || undefined,
       isAdmin: dbUser.isAdmin,
       isBanned: dbUser.isBanned,
       inDiscord: dbUser.inDiscord,
@@ -217,6 +235,15 @@ export class AuthService {
       username: dbUser.username,
       email: dbUser.email,
       avatar: dbUser.avatar || undefined,
+      slug: dbUser.slug || undefined,
+      displayName: dbUser.displayName || undefined,
+      bio: dbUser.bio || undefined,
+      profilePublic: dbUser.profilePublic,
+      website: dbUser.website || undefined,
+      discordServer: dbUser.discordServer || undefined,
+      bluesky: dbUser.bluesky || undefined,
+      github: dbUser.github || undefined,
+      linkedin: dbUser.linkedin || undefined,
       isAdmin: dbUser.isAdmin,
       isBanned: dbUser.isBanned,
       inDiscord: dbUser.inDiscord,

api/src/app/services/book.service.ts

@@ -24,6 +24,7 @@ export class BookService {
       ...book,
       status: book.status as unknown as BookStatus,
       dateAdded: book.dateAdded,
+      dateStarted: book.dateStarted || undefined,
       dateFinished: book.dateFinished || undefined,
       tags: book.tags ?? [],
       links: book.links ?? [],
@@ -46,6 +47,7 @@ export class BookService {
       ...book,
       status: book.status as unknown as BookStatus,
       dateAdded: book.dateAdded,
+      dateStarted: book.dateStarted || undefined,
       dateFinished: book.dateFinished || undefined,
       tags: book.tags ?? [],
       links: book.links ?? [],
@@ -54,6 +56,28 @@ export class BookService {
     };
   }
 
+  /**
+   * Get all books in a series, ordered by seriesOrder.
+   */
+  async getBooksBySeries(seriesName: string): Promise<Book[]> {
+    const books = await this.prisma.book.findMany({
+      where: { series: seriesName },
+      orderBy: { seriesOrder: "asc" },
+    });
+
+    return books.map((book) => ({
+      ...book,
+      status: book.status as unknown as BookStatus,
+      dateAdded: book.dateAdded,
+      dateStarted: book.dateStarted || undefined,
+      dateFinished: book.dateFinished || undefined,
+      tags: book.tags ?? [],
+      links: book.links ?? [],
+      createdAt: book.createdAt,
+      updatedAt: book.updatedAt,
+    }));
+  }
+
   /**
    * Create new book.
    */
@@ -69,6 +93,7 @@ export class BookService {
       ...book,
       status: book.status as unknown as BookStatus,
       dateAdded: book.dateAdded,
+      dateStarted: book.dateStarted || undefined,
       dateFinished: book.dateFinished || undefined,
       tags: book.tags ?? [],
       links: book.links ?? [],
@@ -95,6 +120,7 @@ export class BookService {
       ...book,
       status: book.status as unknown as BookStatus,
       dateAdded: book.dateAdded,
+      dateStarted: book.dateStarted || undefined,
       dateFinished: book.dateFinished || undefined,
       tags: book.tags ?? [],
       links: book.links ?? [],

api/src/app/services/comment-report.service.ts

@@ -0,0 +1,369 @@
+/**
+ * @copyright NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+import {
+  ReportStatus as PrismaReportStatus,
+  ReportReason as PrismaReportReason,
+} from "@prisma/client";
+import type {
+  CreateCommentReportDto,
+  CommentReportWithDetails,
+  ReportStatus,
+  UpdateCommentReportDto,
+} from "@library/shared-types";
+import { ReportReason } from "@library/shared-types";
+import { prisma } from "../lib/prisma.js";
+
+export class CommentReportService {
+  private prisma = prisma;
+
+  /**
+   * Convert Prisma ReportReason to shared-types ReportReason
+   */
+  private toPrismaReportReason(reason: ReportReason): PrismaReportReason {
+    return reason as unknown as PrismaReportReason;
+  }
+
+  /**
+   * Convert Prisma ReportStatus to shared-types ReportStatus
+   */
+  private toPrismaReportStatus(status: ReportStatus): PrismaReportStatus {
+    return status as unknown as PrismaReportStatus;
+  }
+
+  /**
+   * Convert Prisma enum back to shared-types enum
+   */
+  private fromPrismaReportReason(reason: PrismaReportReason): ReportReason {
+    return reason as unknown as ReportReason;
+  }
+
+  /**
+   * Convert Prisma enum back to shared-types enum
+   */
+  private fromPrismaReportStatus(status: PrismaReportStatus): ReportStatus {
+    return status as unknown as ReportStatus;
+  }
+
+  /**
+   * Create a new comment report.
+   *
+   * @param reporterId - The ID of the user making the report
+   * @param createDto - The report details
+   * @returns The created report
+   * @throws Error if user already has a pending report for this comment
+   */
+  async createReport(
+    reporterId: string,
+    createDto: CreateCommentReportDto,
+  ): Promise<CommentReportWithDetails> {
+    // Check if user already has a pending report for this comment
+    const existingReport = await this.prisma.commentReport.findFirst({
+      where: {
+        reporterId,
+        reportedCommentId: createDto.reportedCommentId,
+        status: PrismaReportStatus.PENDING,
+      },
+    });
+
+    if (existingReport) {
+      throw new Error(
+        "You already have a pending report for this comment. Please wait for it to be reviewed.",
+      );
+    }
+
+    // Check if user has reached the limit of pending reports (5 max)
+    const pendingReportsCount = await this.prisma.commentReport.count({
+      where: {
+        reporterId,
+        status: PrismaReportStatus.PENDING,
+      },
+    });
+
+    if (pendingReportsCount >= 5) {
+      throw new Error(
+        "You have reached the maximum number of pending reports (5). Please wait for your existing reports to be reviewed.",
+      );
+    }
+
+    const report = await this.prisma.commentReport.create({
+      data: {
+        reporterId,
+        reportedCommentId: createDto.reportedCommentId,
+        reason: this.toPrismaReportReason(createDto.reason),
+        details: createDto.details,
+      },
+      include: {
+        reportedComment: {
+          include: {
+            user: {
+              select: {
+                id: true,
+                username: true,
+                displayName: true,
+                avatar: true,
+              },
+            },
+          },
+        },
+        reporter: {
+          select: {
+            id: true,
+            username: true,
+            displayName: true,
+            avatar: true,
+          },
+        },
+      },
+    });
+
+    return {
+      id: report.id,
+      reportedCommentId: report.reportedCommentId,
+      reporterId: report.reporterId,
+      reason: this.fromPrismaReportReason(report.reason),
+      details: report.details,
+      status: this.fromPrismaReportStatus(report.status),
+      reviewedBy: report.reviewedBy ?? undefined,
+      reviewNotes: report.reviewNotes ?? undefined,
+      createdAt: report.createdAt,
+      updatedAt: report.updatedAt,
+      reportedComment: {
+        id: report.reportedComment.id,
+        content: report.reportedComment.content,
+        rawContent: report.reportedComment.rawContent ?? undefined,
+        userId: report.reportedComment.userId,
+        user: report.reportedComment.user,
+      },
+      reporter: report.reporter,
+    };
+  }
+
+  /**
+   * Get all comment reports (admin only). Optionally filter by status.
+   *
+   * @param status - Optional status filter
+   * @returns All reports matching the filter
+   */
+  async getAllReports(
+    status?: ReportStatus,
+  ): Promise<CommentReportWithDetails[]> {
+    const reports = await this.prisma.commentReport.findMany({
+      where: status ? { status: this.toPrismaReportStatus(status) } : undefined,
+      include: {
+        reportedComment: {
+          include: {
+            user: {
+              select: {
+                id: true,
+                username: true,
+                displayName: true,
+                avatar: true,
+              },
+            },
+          },
+        },
+        reporter: {
+          select: {
+            id: true,
+            username: true,
+            displayName: true,
+            avatar: true,
+          },
+        },
+        reviewer: {
+          select: {
+            id: true,
+            username: true,
+            displayName: true,
+          },
+        },
+      },
+      orderBy: {
+        createdAt: "desc",
+      },
+    });
+
+    return reports.map((report) => ({
+      id: report.id,
+      reportedCommentId: report.reportedCommentId,
+      reporterId: report.reporterId,
+      reason: this.fromPrismaReportReason(report.reason),
+      details: report.details,
+      status: this.fromPrismaReportStatus(report.status),
+      reviewedBy: report.reviewedBy ?? undefined,
+      reviewNotes: report.reviewNotes ?? undefined,
+      createdAt: report.createdAt,
+      updatedAt: report.updatedAt,
+      reportedComment: {
+        id: report.reportedComment.id,
+        content: report.reportedComment.content,
+        rawContent: report.reportedComment.rawContent ?? undefined,
+        userId: report.reportedComment.userId,
+        user: report.reportedComment.user,
+      },
+      reporter: report.reporter,
+      reviewer: report.reviewer ?? undefined,
+    }));
+  }
+
+  /**
+   * Get a single comment report by ID (admin only).
+   *
+   * @param id - The report ID
+   * @returns The report or null
+   */
+  async getReportById(id: string): Promise<CommentReportWithDetails | null> {
+    const report = await this.prisma.commentReport.findUnique({
+      where: { id },
+      include: {
+        reportedComment: {
+          include: {
+            user: {
+              select: {
+                id: true,
+                username: true,
+                displayName: true,
+                avatar: true,
+              },
+            },
+          },
+        },
+        reporter: {
+          select: {
+            id: true,
+            username: true,
+            displayName: true,
+            avatar: true,
+          },
+        },
+        reviewer: {
+          select: {
+            id: true,
+            username: true,
+            displayName: true,
+          },
+        },
+      },
+    });
+
+    if (!report) {
+      return null;
+    }
+
+    return {
+      id: report.id,
+      reportedCommentId: report.reportedCommentId,
+      reporterId: report.reporterId,
+      reason: this.fromPrismaReportReason(report.reason),
+      details: report.details,
+      status: this.fromPrismaReportStatus(report.status),
+      reviewedBy: report.reviewedBy ?? undefined,
+      reviewNotes: report.reviewNotes ?? undefined,
+      createdAt: report.createdAt,
+      updatedAt: report.updatedAt,
+      reportedComment: {
+        id: report.reportedComment.id,
+        content: report.reportedComment.content,
+        rawContent: report.reportedComment.rawContent ?? undefined,
+        userId: report.reportedComment.userId,
+        user: report.reportedComment.user,
+      },
+      reporter: report.reporter,
+      reviewer: report.reviewer ?? undefined,
+    };
+  }
+
+  /**
+   * Update a comment report's status and review notes (admin only).
+   *
+   * @param id - The report ID
+   * @param reviewerId - The ID of the admin reviewing the report
+   * @param updateDto - The update details
+   * @returns The updated report
+   */
+  async updateReport(
+    id: string,
+    reviewerId: string,
+    updateDto: UpdateCommentReportDto,
+  ): Promise<CommentReportWithDetails> {
+    const report = await this.prisma.commentReport.update({
+      where: { id },
+      data: {
+        status: this.toPrismaReportStatus(updateDto.status),
+        reviewNotes: updateDto.reviewNotes,
+        reviewedBy: reviewerId,
+      },
+      include: {
+        reportedComment: {
+          include: {
+            user: {
+              select: {
+                id: true,
+                username: true,
+                displayName: true,
+                avatar: true,
+              },
+            },
+          },
+        },
+        reporter: {
+          select: {
+            id: true,
+            username: true,
+            displayName: true,
+            avatar: true,
+          },
+        },
+        reviewer: {
+          select: {
+            id: true,
+            username: true,
+            displayName: true,
+          },
+        },
+      },
+    });
+
+    return {
+      id: report.id,
+      reportedCommentId: report.reportedCommentId,
+      reporterId: report.reporterId,
+      reason: this.fromPrismaReportReason(report.reason),
+      details: report.details,
+      status: this.fromPrismaReportStatus(report.status),
+      reviewedBy: report.reviewedBy ?? undefined,
+      reviewNotes: report.reviewNotes ?? undefined,
+      createdAt: report.createdAt,
+      updatedAt: report.updatedAt,
+      reportedComment: {
+        id: report.reportedComment.id,
+        content: report.reportedComment.content,
+        rawContent: report.reportedComment.rawContent ?? undefined,
+        userId: report.reportedComment.userId,
+        user: report.reportedComment.user,
+      },
+      reporter: report.reporter,
+      reviewer: report.reviewer ?? undefined,
+    };
+  }
+
+  /**
+   * Check if a comment has any pending reports.
+   *
+   * @param commentId - The comment ID
+   * @returns True if the comment has pending reports
+   */
+  async hasPendingReports(commentId: string): Promise<boolean> {
+    const count = await this.prisma.commentReport.count({
+      where: {
+        reportedCommentId: commentId,
+        status: PrismaReportStatus.PENDING,
+      },
+    });
+
+    return count > 0;
+  }
+}

api/src/app/services/comment.service.ts

@@ -4,7 +4,7 @@
  * @author Naomi Carrigan
  */
 
-import { Comment, CreateCommentDto } from "@library/shared-types";
+import { Comment, CreateCommentDto, PrimaryBadge } from "@library/shared-types";
 import { prisma } from "../lib/prisma";
 import createDOMPurify from "dompurify";
 import { JSDOM } from "jsdom";
@@ -50,7 +50,12 @@ export class CommentService {
     });
   }
 
-  private mapComment(comment: any): Comment {
+  private async mapComment(comment: any): Promise<Comment> {
+    // Check if comment has pending reports
+    const hasPendingReports = comment.reports
+      ? comment.reports.some((report: any) => report.status === "PENDING")
+      : false;
+
     return {
       id: comment.id,
       content: comment.content,
@@ -60,6 +65,7 @@ export class CommentService {
         id: comment.user.id,
         username: comment.user.username,
         avatar: comment.user.avatar || undefined,
+        primaryBadge: (comment.user.primaryBadge as PrimaryBadge) || undefined,
         inDiscord: comment.user.inDiscord,
         isVip: comment.user.isVip,
         isMod: comment.user.isMod,
@@ -71,6 +77,7 @@ export class CommentService {
       artId: comment.artId || undefined,
       showId: comment.showId || undefined,
       mangaId: comment.mangaId || undefined,
+      hasPendingReports,
       createdAt: comment.createdAt,
       updatedAt: comment.updatedAt,
     };
@@ -79,28 +86,28 @@ export class CommentService {
   async getCommentsForGame(gameId: string): Promise<Comment[]> {
     const comments = await this.prisma.comment.findMany({
       where: { gameId },
-      include: { user: true },
+      include: { user: true, reports: true },
       orderBy: { createdAt: "desc" },
     });
-    return comments.map((c) => this.mapComment(c));
+    return Promise.all(comments.map((c) => this.mapComment(c)));
   }
 
   async getCommentsForBook(bookId: string): Promise<Comment[]> {
     const comments = await this.prisma.comment.findMany({
       where: { bookId },
-      include: { user: true },
+      include: { user: true, reports: true },
       orderBy: { createdAt: "desc" },
     });
-    return comments.map((c) => this.mapComment(c));
+    return Promise.all(comments.map((c) => this.mapComment(c)));
   }
 
   async getCommentsForMusic(musicId: string): Promise<Comment[]> {
     const comments = await this.prisma.comment.findMany({
       where: { musicId },
-      include: { user: true },
+      include: { user: true, reports: true },
       orderBy: { createdAt: "desc" },
     });
-    return comments.map((c) => this.mapComment(c));
+    return Promise.all(comments.map((c) => this.mapComment(c)));
   }
 
   async createCommentForGame(
@@ -116,7 +123,7 @@ export class CommentService {
         userId,
         gameId,
       },
-      include: { user: true },
+      include: { user: true, reports: true },
     });
     return this.mapComment(comment);
   }
@@ -134,7 +141,7 @@ export class CommentService {
         userId,
         bookId,
       },
-      include: { user: true },
+      include: { user: true, reports: true },
     });
     return this.mapComment(comment);
   }
@@ -152,7 +159,7 @@ export class CommentService {
         userId,
         musicId,
       },
-      include: { user: true },
+      include: { user: true, reports: true },
     });
     return this.mapComment(comment);
   }
@@ -160,10 +167,10 @@ export class CommentService {
   async getCommentsForArt(artId: string): Promise<Comment[]> {
     const comments = await this.prisma.comment.findMany({
       where: { artId },
-      include: { user: true },
+      include: { user: true, reports: true },
       orderBy: { createdAt: "desc" },
     });
-    return comments.map((c) => this.mapComment(c));
+    return Promise.all(comments.map((c) => this.mapComment(c)));
   }
 
   async createCommentForArt(
@@ -179,7 +186,7 @@ export class CommentService {
         userId,
         artId,
       },
-      include: { user: true },
+      include: { user: true, reports: true },
     });
     return this.mapComment(comment);
   }
@@ -187,10 +194,10 @@ export class CommentService {
   async getCommentsForShow(showId: string): Promise<Comment[]> {
     const comments = await this.prisma.comment.findMany({
       where: { showId },
-      include: { user: true },
+      include: { user: true, reports: true },
       orderBy: { createdAt: "desc" },
     });
-    return comments.map((c) => this.mapComment(c));
+    return Promise.all(comments.map((c) => this.mapComment(c)));
   }
 
   async createCommentForShow(
@@ -206,7 +213,7 @@ export class CommentService {
         userId,
         showId,
       },
-      include: { user: true },
+      include: { user: true, reports: true },
     });
     return this.mapComment(comment);
   }
@@ -214,10 +221,10 @@ export class CommentService {
   async getCommentsForManga(mangaId: string): Promise<Comment[]> {
     const comments = await this.prisma.comment.findMany({
       where: { mangaId },
-      include: { user: true },
+      include: { user: true, reports: true },
       orderBy: { createdAt: "desc" },
     });
-    return comments.map((c) => this.mapComment(c));
+    return Promise.all(comments.map((c) => this.mapComment(c)));
   }
 
   async createCommentForManga(
@@ -233,7 +240,7 @@ export class CommentService {
         userId,
         mangaId,
       },
-      include: { user: true },
+      include: { user: true, reports: true },
     });
     return this.mapComment(comment);
   }
@@ -256,7 +263,7 @@ export class CommentService {
         content: sanitizedContent,
         rawContent: content,
       },
-      include: { user: true },
+      include: { user: true, reports: true },
     });
     return this.mapComment(comment);
   }

api/src/app/services/game.service.ts

@@ -24,7 +24,9 @@ export class GameService {
       ...game,
       status: game.status as unknown as GameStatus,
       dateAdded: game.dateAdded,
+      dateStarted: game.dateStarted || undefined,
       dateCompleted: game.dateCompleted || undefined,
+      dateFinished: game.dateFinished || undefined,
       tags: game.tags ?? [],
       links: game.links ?? [],
       createdAt: game.createdAt,
@@ -46,7 +48,9 @@ export class GameService {
       ...game,
       status: game.status as unknown as GameStatus,
       dateAdded: game.dateAdded,
+      dateStarted: game.dateStarted || undefined,
       dateCompleted: game.dateCompleted || undefined,
+      dateFinished: game.dateFinished || undefined,
       tags: game.tags ?? [],
       links: game.links ?? [],
       createdAt: game.createdAt,
@@ -54,6 +58,29 @@ export class GameService {
     };
   }
 
+  /**
+   * Get all games in a series, ordered by seriesOrder.
+   */
+  async getGamesBySeries(seriesName: string): Promise<Game[]> {
+    const games = await this.prisma.game.findMany({
+      where: { series: seriesName },
+      orderBy: { seriesOrder: "asc" },
+    });
+
+    return games.map((game) => ({
+      ...game,
+      status: game.status as unknown as GameStatus,
+      dateAdded: game.dateAdded,
+      dateStarted: game.dateStarted || undefined,
+      dateCompleted: game.dateCompleted || undefined,
+      dateFinished: game.dateFinished || undefined,
+      tags: game.tags ?? [],
+      links: game.links ?? [],
+      createdAt: game.createdAt,
+      updatedAt: game.updatedAt,
+    }));
+  }
+
   /**
    * Create new game.
    */
@@ -69,7 +96,9 @@ export class GameService {
       ...game,
       status: game.status as unknown as GameStatus,
       dateAdded: game.dateAdded,
+      dateStarted: game.dateStarted || undefined,
       dateCompleted: game.dateCompleted || undefined,
+      dateFinished: game.dateFinished || undefined,
       tags: game.tags ?? [],
       links: game.links ?? [],
       createdAt: game.createdAt,
@@ -95,7 +124,9 @@ export class GameService {
       ...game,
       status: game.status as unknown as GameStatus,
       dateAdded: game.dateAdded,
+      dateStarted: game.dateStarted || undefined,
       dateCompleted: game.dateCompleted || undefined,
+      dateFinished: game.dateFinished || undefined,
       tags: game.tags ?? [],
       links: game.links ?? [],
       createdAt: game.createdAt,

api/src/app/services/leaderboard.service.ts

@@ -0,0 +1,222 @@
+/**
+ * @copyright 2026 NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+
+import type {
+  LeaderboardResponse,
+  SuggestionsLeaderboard,
+  LikesLeaderboard,
+  CommentsLeaderboard,
+  OverallLeaderboard,
+} from "@library/shared-types";
+import { prisma } from "../lib/prisma";
+
+export class LeaderboardService {
+  private prisma = prisma;
+
+  constructor() {}
+
+  /**
+   * Get top users by suggestions submitted and accepted.
+   */
+  async getTopSuggestions(limit = 25): Promise<SuggestionsLeaderboard[]> {
+    const users = await this.prisma.user.findMany({
+      where: { profilePublic: true, isBanned: false },
+      include: {
+        suggestions: {
+          select: {
+            status: true,
+          },
+        },
+      },
+    });
+
+    const leaderboard = users
+      .map((user) => {
+        const totalSuggestions = user.suggestions.length;
+        const acceptedSuggestions = user.suggestions.filter(
+          (s) => s.status === "ACCEPTED"
+        ).length;
+        const acceptanceRate =
+          totalSuggestions > 0
+            ? Math.round((acceptedSuggestions / totalSuggestions) * 100)
+            : 0;
+
+        return {
+          id: user.id,
+          username: user.username,
+          slug: user.slug,
+          avatar: user.avatar,
+          primaryBadge: user.primaryBadge,
+          isVip: user.isVip,
+          isMod: user.isMod,
+          isStaff: user.isStaff,
+          createdAt: user.createdAt,
+          totalSuggestions,
+          acceptedSuggestions,
+          acceptanceRate,
+        };
+      })
+      .filter((user) => user.totalSuggestions > 0)
+      .sort((a, b) => {
+        if (b.totalSuggestions !== a.totalSuggestions) {
+          return b.totalSuggestions - a.totalSuggestions;
+        }
+        return b.acceptanceRate - a.acceptanceRate;
+      })
+      .slice(0, limit);
+
+    return leaderboard;
+  }
+
+  /**
+   * Get top users by likes given.
+   */
+  async getTopLikes(limit = 25): Promise<LikesLeaderboard[]> {
+    const users = await this.prisma.user.findMany({
+      where: { profilePublic: true, isBanned: false },
+      include: {
+        likes: true,
+      },
+    });
+
+    const leaderboard = users
+      .map((user) => ({
+        id: user.id,
+        username: user.username,
+        slug: user.slug,
+        avatar: user.avatar,
+        primaryBadge: user.primaryBadge,
+        isVip: user.isVip,
+        isMod: user.isMod,
+        isStaff: user.isStaff,
+        createdAt: user.createdAt,
+        totalLikes: user.likes.length,
+      }))
+      .filter((user) => user.totalLikes > 0)
+      .sort((a, b) => b.totalLikes - a.totalLikes)
+      .slice(0, limit);
+
+    return leaderboard;
+  }
+
+  /**
+   * Get top users by comments posted.
+   */
+  async getTopComments(limit = 25): Promise<CommentsLeaderboard[]> {
+    const users = await this.prisma.user.findMany({
+      where: { profilePublic: true, isBanned: false },
+      include: {
+        comments: true,
+      },
+    });
+
+    const leaderboard = users
+      .map((user) => ({
+        id: user.id,
+        username: user.username,
+        slug: user.slug,
+        avatar: user.avatar,
+        primaryBadge: user.primaryBadge,
+        isVip: user.isVip,
+        isMod: user.isMod,
+        isStaff: user.isStaff,
+        createdAt: user.createdAt,
+        totalComments: user.comments.length,
+      }))
+      .filter((user) => user.totalComments > 0)
+      .sort((a, b) => b.totalComments - a.totalComments)
+      .slice(0, limit);
+
+    return leaderboard;
+  }
+
+  /**
+   * Get overall leaderboard based on combined engagement.
+   */
+  async getOverallLeaderboard(limit = 25): Promise<OverallLeaderboard[]> {
+    const users = await this.prisma.user.findMany({
+      where: { profilePublic: true, isBanned: false },
+      include: {
+        suggestions: true,
+        likes: true,
+        comments: true,
+        userAchievements: true,
+      },
+    });
+
+    const leaderboard = users
+      .map((user) => {
+        const totalSuggestions = user.suggestions.length;
+        const totalLikes = user.likes.length;
+        const totalComments = user.comments.length;
+        const achievementCount = user.userAchievements.length;
+
+        const diversityScore =
+          (totalSuggestions > 0 ? 1 : 0) +
+          (totalLikes > 0 ? 1 : 0) +
+          (totalComments > 0 ? 1 : 0);
+
+        return {
+          id: user.id,
+          username: user.username,
+          slug: user.slug,
+          avatar: user.avatar,
+          primaryBadge: user.primaryBadge,
+          isVip: user.isVip,
+          isMod: user.isMod,
+          isStaff: user.isStaff,
+          createdAt: user.createdAt,
+          totalSuggestions,
+          totalLikes,
+          totalComments,
+          achievementCount,
+          achievementPoints: user.achievementPoints,
+          currentStreak: user.currentStreak,
+          diversityScore,
+        };
+      })
+      .filter(
+        (user) =>
+          user.totalSuggestions > 0 ||
+          user.totalLikes > 0 ||
+          user.totalComments > 0
+      )
+      .sort((a, b) => {
+        if (b.achievementPoints !== a.achievementPoints) {
+          return b.achievementPoints - a.achievementPoints;
+        }
+        if (b.diversityScore !== a.diversityScore) {
+          return b.diversityScore - a.diversityScore;
+        }
+        const totalA = a.totalSuggestions + a.totalLikes + a.totalComments;
+        const totalB = b.totalSuggestions + b.totalLikes + b.totalComments;
+        return totalB - totalA;
+      })
+      .slice(0, limit);
+
+    return leaderboard;
+  }
+
+  /**
+   * Get all leaderboards at once.
+   */
+  async getAllLeaderboards(limit = 25): Promise<LeaderboardResponse> {
+    const [topSuggestions, topLikes, topComments, topOverall] =
+      await Promise.all([
+        this.getTopSuggestions(limit),
+        this.getTopLikes(limit),
+        this.getTopComments(limit),
+        this.getOverallLeaderboard(limit),
+      ]);
+
+    return {
+      topSuggestions,
+      topLikes,
+      topComments,
+      topOverall,
+    };
+  }
+}

api/src/app/services/like.service.ts

@@ -7,8 +7,9 @@
 import type { FastifyRequest } from 'fastify';
 import { prisma } from '../lib/prisma';
 import { AuditService } from './audit.service';
+import { AchievementService } from './achievement.service';
 import type { Like, LikeCountDto, LikedItemDto, LikeResponse } from '@library/shared-types';
-import { AuditAction, AuditCategory } from '@library/shared-types';
+import { AuditAction, AuditCategory, AchievementCategory } from '@library/shared-types';
 
 export class LikeService {
   async toggleLike(userId: string, entityType: Like['entityType'], entityId: string, req: FastifyRequest): Promise<LikeResponse> {
@@ -32,8 +33,8 @@ export class LikeService {
       });
 
       await AuditService.logFromRequest(req, {
-        action: AuditAction.UNLIKE,
-        category: AuditCategory.CONTENT,
+        action: AuditAction.unlike,
+        category: AuditCategory.content,
         resourceType: entityType,
         resourceId: entityId,
         details: `Unliked ${entityType}`
@@ -52,13 +53,21 @@ export class LikeService {
       });
 
       await AuditService.logFromRequest(req, {
-        action: AuditAction.LIKE,
-        category: AuditCategory.CONTENT,
+        action: AuditAction.like,
+        category: AuditCategory.content,
         resourceType: entityType,
         resourceId: entityId,
         details: `Liked ${entityType}`
       });
 
+      // Check for like achievements
+      const achievementService = new AchievementService();
+      await achievementService.checkAchievements(
+        userId,
+        AchievementCategory.Like,
+        req
+      );
+
       const count = await this.getLikeCount(entityType, entityId);
       return { liked: true, count };
     }

api/src/app/services/manga.service.ts

@@ -21,7 +21,9 @@ export class MangaService {
       ...m,
       status: m.status as unknown as MangaStatus,
       dateAdded: m.dateAdded,
+      dateStarted: m.dateStarted || undefined,
       dateCompleted: m.dateCompleted || undefined,
+      dateFinished: m.dateFinished || undefined,
       tags: m.tags ?? [],
       links: m.links ?? [],
       createdAt: m.createdAt,
@@ -40,7 +42,9 @@ export class MangaService {
       ...manga,
       status: manga.status as unknown as MangaStatus,
       dateAdded: manga.dateAdded,
+      dateStarted: manga.dateStarted || undefined,
       dateCompleted: manga.dateCompleted || undefined,
+      dateFinished: manga.dateFinished || undefined,
       tags: manga.tags ?? [],
       links: manga.links ?? [],
       createdAt: manga.createdAt,
@@ -60,7 +64,9 @@ export class MangaService {
       ...manga,
       status: manga.status as unknown as MangaStatus,
       dateAdded: manga.dateAdded,
+      dateStarted: manga.dateStarted || undefined,
       dateCompleted: manga.dateCompleted || undefined,
+      dateFinished: manga.dateFinished || undefined,
       tags: manga.tags ?? [],
       links: manga.links ?? [],
       createdAt: manga.createdAt,
@@ -83,7 +89,9 @@ export class MangaService {
       ...manga,
       status: manga.status as unknown as MangaStatus,
       dateAdded: manga.dateAdded,
+      dateStarted: manga.dateStarted || undefined,
       dateCompleted: manga.dateCompleted || undefined,
+      dateFinished: manga.dateFinished || undefined,
       tags: manga.tags ?? [],
       links: manga.links ?? [],
       createdAt: manga.createdAt,

api/src/app/services/music.service.ts

@@ -25,7 +25,9 @@ export class MusicService {
       type: music.type as unknown as MusicType,
       status: music.status as unknown as MusicStatus,
       dateAdded: music.dateAdded,
+      dateStarted: music.dateStarted || undefined,
       dateCompleted: music.dateCompleted || undefined,
+      dateFinished: music.dateFinished || undefined,
       tags: music.tags ?? [],
       links: music.links ?? [],
       createdAt: music.createdAt,
@@ -48,7 +50,9 @@ export class MusicService {
       type: music.type as unknown as MusicType,
       status: music.status as unknown as MusicStatus,
       dateAdded: music.dateAdded,
+      dateStarted: music.dateStarted || undefined,
       dateCompleted: music.dateCompleted || undefined,
+      dateFinished: music.dateFinished || undefined,
       tags: music.tags ?? [],
       links: music.links ?? [],
       createdAt: music.createdAt,
@@ -73,7 +77,9 @@ export class MusicService {
       type: music.type as unknown as MusicType,
       status: music.status as unknown as MusicStatus,
       dateAdded: music.dateAdded,
+      dateStarted: music.dateStarted || undefined,
       dateCompleted: music.dateCompleted || undefined,
+      dateFinished: music.dateFinished || undefined,
       tags: music.tags ?? [],
       links: music.links ?? [],
       createdAt: music.createdAt,
@@ -103,7 +109,9 @@ export class MusicService {
       type: music.type as unknown as MusicType,
       status: music.status as unknown as MusicStatus,
       dateAdded: music.dateAdded,
+      dateStarted: music.dateStarted || undefined,
       dateCompleted: music.dateCompleted || undefined,
+      dateFinished: music.dateFinished || undefined,
       tags: music.tags ?? [],
       links: music.links ?? [],
       createdAt: music.createdAt,

api/src/app/services/report.service.ts

@@ -0,0 +1,312 @@
+/**
+ * @copyright NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+import {
+  ReportStatus as PrismaReportStatus,
+  ReportReason as PrismaReportReason,
+} from "@prisma/client";
+import type {
+  CreateReportDto,
+  ProfileReportWithUsers,
+  ReportStatus,
+  UpdateReportDto,
+} from "@library/shared-types";
+import { ReportReason } from "@library/shared-types";
+import { prisma } from "../lib/prisma.js";
+
+export class ReportService {
+  private prisma = prisma;
+
+  /**
+   * Convert Prisma ReportReason to shared-types ReportReason
+   */
+  private toPrismaReportReason(reason: ReportReason): PrismaReportReason {
+    return reason as unknown as PrismaReportReason;
+  }
+
+  /**
+   * Convert Prisma ReportStatus to shared-types ReportStatus
+   */
+  private toPrismaReportStatus(status: ReportStatus): PrismaReportStatus {
+    return status as unknown as PrismaReportStatus;
+  }
+
+  /**
+   * Convert Prisma enum back to shared-types enum
+   */
+  private fromPrismaReportReason(reason: PrismaReportReason): ReportReason {
+    return reason as unknown as ReportReason;
+  }
+
+  /**
+   * Convert Prisma enum back to shared-types enum
+   */
+  private fromPrismaReportStatus(status: PrismaReportStatus): ReportStatus {
+    return status as unknown as ReportStatus;
+  }
+
+  /**
+   * Create a new profile report.
+   *
+   * @param reporterId - The ID of the user making the report
+   * @param createDto - The report details
+   * @returns The created report
+   * @throws Error if user already has a pending report for this profile
+   */
+  async createReport(
+    reporterId: string,
+    createDto: CreateReportDto,
+  ): Promise<ProfileReportWithUsers> {
+    // Check if user already has a pending report for this profile
+    const existingReport = await this.prisma.profileReport.findFirst({
+      where: {
+        reporterId,
+        reportedUserId: createDto.reportedUserId,
+        status: PrismaReportStatus.PENDING,
+      },
+    });
+
+    if (existingReport) {
+      throw new Error(
+        "You already have a pending report for this profile. Please wait for it to be reviewed.",
+      );
+    }
+
+    // Check if user has reached the limit of pending reports (5 max)
+    const pendingReportsCount = await this.prisma.profileReport.count({
+      where: {
+        reporterId,
+        status: PrismaReportStatus.PENDING,
+      },
+    });
+
+    if (pendingReportsCount >= 5) {
+      throw new Error(
+        "You have reached the maximum number of pending reports (5). Please wait for your existing reports to be reviewed.",
+      );
+    }
+
+    const report = await this.prisma.profileReport.create({
+      data: {
+        reporterId,
+        reportedUserId: createDto.reportedUserId,
+        reason: this.toPrismaReportReason(createDto.reason),
+        details: createDto.details,
+      },
+      include: {
+        reportedUser: {
+          select: {
+            id: true,
+            username: true,
+            displayName: true,
+            avatar: true,
+          },
+        },
+        reporter: {
+          select: {
+            id: true,
+            username: true,
+            displayName: true,
+            avatar: true,
+          },
+        },
+      },
+    });
+
+    return {
+      id: report.id,
+      reportedUserId: report.reportedUserId,
+      reporterId: report.reporterId,
+      reason: this.fromPrismaReportReason(report.reason),
+      details: report.details,
+      status: this.fromPrismaReportStatus(report.status),
+      reviewedBy: report.reviewedBy ?? undefined,
+      reviewNotes: report.reviewNotes ?? undefined,
+      createdAt: report.createdAt,
+      updatedAt: report.updatedAt,
+      reportedUser: report.reportedUser,
+      reporter: report.reporter,
+    };
+  }
+
+  /**
+   * Get all reports (admin only). Optionally filter by status.
+   *
+   * @param status - Optional status filter
+   * @returns All reports matching the filter
+   */
+  async getAllReports(
+    status?: ReportStatus,
+  ): Promise<ProfileReportWithUsers[]> {
+    const reports = await this.prisma.profileReport.findMany({
+      where: status ? { status: this.toPrismaReportStatus(status) } : undefined,
+      include: {
+        reportedUser: {
+          select: {
+            id: true,
+            username: true,
+            displayName: true,
+            avatar: true,
+          },
+        },
+        reporter: {
+          select: {
+            id: true,
+            username: true,
+            displayName: true,
+            avatar: true,
+          },
+        },
+        reviewer: {
+          select: {
+            id: true,
+            username: true,
+            displayName: true,
+          },
+        },
+      },
+      orderBy: {
+        createdAt: "desc",
+      },
+    });
+
+    return reports.map((report) => ({
+      id: report.id,
+      reportedUserId: report.reportedUserId,
+      reporterId: report.reporterId,
+      reason: this.fromPrismaReportReason(report.reason),
+      details: report.details,
+      status: this.fromPrismaReportStatus(report.status),
+      reviewedBy: report.reviewedBy ?? undefined,
+      reviewNotes: report.reviewNotes ?? undefined,
+      createdAt: report.createdAt,
+      updatedAt: report.updatedAt,
+      reportedUser: report.reportedUser,
+      reporter: report.reporter,
+      reviewer: report.reviewer ?? undefined,
+    }));
+  }
+
+  /**
+   * Get a single report by ID (admin only).
+   *
+   * @param id - The report ID
+   * @returns The report or null
+   */
+  async getReportById(id: string): Promise<ProfileReportWithUsers | null> {
+    const report = await this.prisma.profileReport.findUnique({
+      where: { id },
+      include: {
+        reportedUser: {
+          select: {
+            id: true,
+            username: true,
+            displayName: true,
+            avatar: true,
+          },
+        },
+        reporter: {
+          select: {
+            id: true,
+            username: true,
+            displayName: true,
+            avatar: true,
+          },
+        },
+        reviewer: {
+          select: {
+            id: true,
+            username: true,
+            displayName: true,
+          },
+        },
+      },
+    });
+
+    if (!report) {
+      return null;
+    }
+
+    return {
+      id: report.id,
+      reportedUserId: report.reportedUserId,
+      reporterId: report.reporterId,
+      reason: this.fromPrismaReportReason(report.reason),
+      details: report.details,
+      status: this.fromPrismaReportStatus(report.status),
+      reviewedBy: report.reviewedBy ?? undefined,
+      reviewNotes: report.reviewNotes ?? undefined,
+      createdAt: report.createdAt,
+      updatedAt: report.updatedAt,
+      reportedUser: report.reportedUser,
+      reporter: report.reporter,
+      reviewer: report.reviewer ?? undefined,
+    };
+  }
+
+  /**
+   * Update a report's status and review notes (admin only).
+   *
+   * @param id - The report ID
+   * @param reviewerId - The ID of the admin reviewing the report
+   * @param updateDto - The update details
+   * @returns The updated report
+   */
+  async updateReport(
+    id: string,
+    reviewerId: string,
+    updateDto: UpdateReportDto,
+  ): Promise<ProfileReportWithUsers> {
+    const report = await this.prisma.profileReport.update({
+      where: { id },
+      data: {
+        status: this.toPrismaReportStatus(updateDto.status),
+        reviewNotes: updateDto.reviewNotes,
+        reviewedBy: reviewerId,
+      },
+      include: {
+        reportedUser: {
+          select: {
+            id: true,
+            username: true,
+            displayName: true,
+            avatar: true,
+          },
+        },
+        reporter: {
+          select: {
+            id: true,
+            username: true,
+            displayName: true,
+            avatar: true,
+          },
+        },
+        reviewer: {
+          select: {
+            id: true,
+            username: true,
+            displayName: true,
+          },
+        },
+      },
+    });
+
+    return {
+      id: report.id,
+      reportedUserId: report.reportedUserId,
+      reporterId: report.reporterId,
+      reason: this.fromPrismaReportReason(report.reason),
+      details: report.details,
+      status: this.fromPrismaReportStatus(report.status),
+      reviewedBy: report.reviewedBy ?? undefined,
+      reviewNotes: report.reviewNotes ?? undefined,
+      createdAt: report.createdAt,
+      updatedAt: report.updatedAt,
+      reportedUser: report.reportedUser,
+      reporter: report.reporter,
+      reviewer: report.reviewer ?? undefined,
+    };
+  }
+}

api/src/app/services/show.service.ts

@@ -22,7 +22,9 @@ export class ShowService {
       type: show.type as unknown as ShowType,
       status: show.status as unknown as ShowStatus,
       dateAdded: show.dateAdded,
+      dateStarted: show.dateStarted || undefined,
       dateCompleted: show.dateCompleted || undefined,
+      dateFinished: show.dateFinished || undefined,
       tags: show.tags ?? [],
       links: show.links ?? [],
       createdAt: show.createdAt,
@@ -42,7 +44,9 @@ export class ShowService {
       type: show.type as unknown as ShowType,
       status: show.status as unknown as ShowStatus,
       dateAdded: show.dateAdded,
+      dateStarted: show.dateStarted || undefined,
       dateCompleted: show.dateCompleted || undefined,
+      dateFinished: show.dateFinished || undefined,
       tags: show.tags ?? [],
       links: show.links ?? [],
       createdAt: show.createdAt,
@@ -64,7 +68,9 @@ export class ShowService {
       type: show.type as unknown as ShowType,
       status: show.status as unknown as ShowStatus,
       dateAdded: show.dateAdded,
+      dateStarted: show.dateStarted || undefined,
       dateCompleted: show.dateCompleted || undefined,
+      dateFinished: show.dateFinished || undefined,
       tags: show.tags ?? [],
       links: show.links ?? [],
       createdAt: show.createdAt,
@@ -91,7 +97,9 @@ export class ShowService {
       type: show.type as unknown as ShowType,
       status: show.status as unknown as ShowStatus,
       dateAdded: show.dateAdded,
+      dateStarted: show.dateStarted || undefined,
       dateCompleted: show.dateCompleted || undefined,
+      dateFinished: show.dateFinished || undefined,
       tags: show.tags ?? [],
       links: show.links ?? [],
       createdAt: show.createdAt,

api/src/app/services/user.service.ts

@@ -4,8 +4,9 @@
  * @author Naomi Carrigan
  */
 
-import { User } from "@library/shared-types";
+import { User, PrimaryBadge } from "@library/shared-types";
 import { prisma } from "../lib/prisma";
+import { SuggestionStatus } from "@prisma/client";
 
 export class UserService {
   private prisma = prisma;
@@ -21,6 +22,18 @@ export class UserService {
       username: user.username,
       email: user.email,
       avatar: user.avatar || undefined,
+      slug: user.slug || undefined,
+      displayName: user.displayName || undefined,
+      bio: user.bio || undefined,
+      profilePublic: user.profilePublic,
+      primaryBadge: (user.primaryBadge as PrimaryBadge) || undefined,
+      website: user.website || undefined,
+      discordServer: user.discordServer || undefined,
+      bluesky: user.bluesky || undefined,
+      github: user.github || undefined,
+      linkedin: user.linkedin || undefined,
+      twitch: user.twitch || undefined,
+      youtube: user.youtube || undefined,
       isAdmin: user.isAdmin,
       isBanned: user.isBanned,
       inDiscord: user.inDiscord,
@@ -45,6 +58,18 @@ export class UserService {
       username: user.username,
       email: user.email,
       avatar: user.avatar || undefined,
+      slug: user.slug || undefined,
+      displayName: user.displayName || undefined,
+      bio: user.bio || undefined,
+      profilePublic: user.profilePublic,
+      primaryBadge: (user.primaryBadge as PrimaryBadge) || undefined,
+      website: user.website || undefined,
+      discordServer: user.discordServer || undefined,
+      bluesky: user.bluesky || undefined,
+      github: user.github || undefined,
+      linkedin: user.linkedin || undefined,
+      twitch: user.twitch || undefined,
+      youtube: user.youtube || undefined,
       isAdmin: user.isAdmin,
       isBanned: user.isBanned,
       inDiscord: user.inDiscord,
@@ -66,6 +91,18 @@ export class UserService {
       username: user.username,
       email: user.email,
       avatar: user.avatar || undefined,
+      slug: user.slug || undefined,
+      displayName: user.displayName || undefined,
+      bio: user.bio || undefined,
+      profilePublic: user.profilePublic,
+      primaryBadge: (user.primaryBadge as PrimaryBadge) || undefined,
+      website: user.website || undefined,
+      discordServer: user.discordServer || undefined,
+      bluesky: user.bluesky || undefined,
+      github: user.github || undefined,
+      linkedin: user.linkedin || undefined,
+      twitch: user.twitch || undefined,
+      youtube: user.youtube || undefined,
       isAdmin: user.isAdmin,
       isBanned: user.isBanned,
       inDiscord: user.inDiscord,
@@ -87,6 +124,18 @@ export class UserService {
       username: user.username,
       email: user.email,
       avatar: user.avatar || undefined,
+      slug: user.slug || undefined,
+      displayName: user.displayName || undefined,
+      bio: user.bio || undefined,
+      profilePublic: user.profilePublic,
+      primaryBadge: (user.primaryBadge as PrimaryBadge) || undefined,
+      website: user.website || undefined,
+      discordServer: user.discordServer || undefined,
+      bluesky: user.bluesky || undefined,
+      github: user.github || undefined,
+      linkedin: user.linkedin || undefined,
+      twitch: user.twitch || undefined,
+      youtube: user.youtube || undefined,
       isAdmin: user.isAdmin,
       isBanned: user.isBanned,
       inDiscord: user.inDiscord,
@@ -104,4 +153,179 @@ export class UserService {
 
     return user?.isBanned ?? false;
   }
+
+  async getUserBySlug(slug: string): Promise<User | null> {
+    const user = await this.prisma.user.findFirst({
+      where: { slug },
+    });
+
+    if (!user) {
+      return null;
+    }
+
+    return {
+      id: user.id,
+      discordId: user.discordId,
+      username: user.username,
+      email: user.email,
+      avatar: user.avatar || undefined,
+      slug: user.slug || undefined,
+      displayName: user.displayName || undefined,
+      bio: user.bio || undefined,
+      profilePublic: user.profilePublic,
+      primaryBadge: (user.primaryBadge as PrimaryBadge) || undefined,
+      website: user.website || undefined,
+      discordServer: user.discordServer || undefined,
+      bluesky: user.bluesky || undefined,
+      github: user.github || undefined,
+      linkedin: user.linkedin || undefined,
+      twitch: user.twitch || undefined,
+      youtube: user.youtube || undefined,
+      isAdmin: user.isAdmin,
+      isBanned: user.isBanned,
+      inDiscord: user.inDiscord,
+      isVip: user.isVip,
+      isMod: user.isMod,
+      isStaff: user.isStaff,
+    };
+  }
+
+  async updateUserSettings(
+    id: string,
+    updates: {
+      slug?: string;
+      displayName?: string;
+      bio?: string;
+      profilePublic?: boolean;
+      primaryBadge?: PrimaryBadge;
+      website?: string;
+      discordServer?: string;
+      bluesky?: string;
+      github?: string;
+      linkedin?: string;
+      twitch?: string;
+      youtube?: string;
+    }
+  ): Promise<User | null> {
+    const user = await this.prisma.user.update({
+      where: { id },
+      data: updates,
+    });
+
+    return {
+      id: user.id,
+      discordId: user.discordId,
+      username: user.username,
+      email: user.email,
+      avatar: user.avatar || undefined,
+      slug: user.slug || undefined,
+      displayName: user.displayName || undefined,
+      bio: user.bio || undefined,
+      profilePublic: user.profilePublic,
+      primaryBadge: (user.primaryBadge as PrimaryBadge) || undefined,
+      website: user.website || undefined,
+      discordServer: user.discordServer || undefined,
+      bluesky: user.bluesky || undefined,
+      github: user.github || undefined,
+      linkedin: user.linkedin || undefined,
+      twitch: user.twitch || undefined,
+      youtube: user.youtube || undefined,
+      isAdmin: user.isAdmin,
+      isBanned: user.isBanned,
+      inDiscord: user.inDiscord,
+      isVip: user.isVip,
+      isMod: user.isMod,
+      isStaff: user.isStaff,
+    };
+  }
+
+  async getUserProfile(identifier: string): Promise<{
+    id: string;
+    username: string;
+    displayName?: string | null;
+    avatar?: string | null;
+    bio?: string | null;
+    slug?: string | null;
+    primaryBadge?: PrimaryBadge | null;
+    website?: string | null;
+    discordServer?: string | null;
+    bluesky?: string | null;
+    github?: string | null;
+    linkedin?: string | null;
+    twitch?: string | null;
+    youtube?: string | null;
+    isStaff: boolean;
+    isMod: boolean;
+    isVip: boolean;
+    inDiscord: boolean;
+    profilePublic: boolean;
+    createdAt: Date;
+    achievementPoints: number;
+    stats: {
+      suggestionsCount: number;
+      suggestionsAcceptedCount: number;
+      likesCount: number;
+      commentsCount: number;
+    };
+  } | null> {
+    // Try to find by slug first, then by id if it's a valid ObjectId
+    const isValidObjectId = /^[0-9a-f]{24}$/i.test(identifier);
+
+    const whereConditions = isValidObjectId
+      ? [{ slug: identifier }, { id: identifier }]
+      : [{ slug: identifier }];
+
+    const user = await this.prisma.user.findFirst({
+      where: {
+        OR: whereConditions,
+      },
+      include: {
+        suggestions: {
+          select: { id: true, status: true },
+        },
+        likes: {
+          select: { id: true },
+        },
+        comments: {
+          select: { id: true },
+        },
+      },
+    });
+
+    if (!user) {
+      return null;
+    }
+
+    return {
+      id: user.id,
+      username: user.username,
+      displayName: user.displayName,
+      avatar: user.avatar,
+      bio: user.bio,
+      slug: user.slug,
+      primaryBadge: user.primaryBadge as PrimaryBadge,
+      website: user.website,
+      discordServer: user.discordServer,
+      bluesky: user.bluesky,
+      github: user.github,
+      linkedin: user.linkedin,
+      twitch: user.twitch,
+      youtube: user.youtube,
+      isStaff: user.isStaff,
+      isMod: user.isMod,
+      isVip: user.isVip,
+      inDiscord: user.inDiscord,
+      profilePublic: user.profilePublic,
+      createdAt: user.createdAt,
+      achievementPoints: user.achievementPoints,
+      stats: {
+        suggestionsCount: user.suggestions.length,
+        suggestionsAcceptedCount: user.suggestions.filter(
+          (suggestion) => suggestion.status === SuggestionStatus.ACCEPTED
+        ).length,
+        likesCount: user.likes.length,
+        commentsCount: user.comments.length,
+      },
+    };
+  }
 }

api/src/app/utils/logger.ts

@@ -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

@@ -1,9 +1,42 @@
 import Fastify from 'fastify';
 import { app } from './app/app';
+import { logger } from './app/utils/logger';
 
 const host = process.env.HOST ?? 'localhost';
 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
 const server = Fastify({
   logger: true,
@@ -19,6 +52,6 @@ server.listen({ port, host }, (err) => {
     server.log.error(err);
     process.exit(1);
   } else {
-    console.log(`[ ready ] http://${host}:${port}`);
+    void logger.log('info', `Server ready at http://${host}:${port}`);
   }
 });

api/src/test-setup.ts

@@ -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

@@ -10,6 +10,7 @@
     "jest.config.ts",
     "jest.config.cts",
     "src/**/*.spec.ts",
-    "src/**/*.test.ts"
+    "src/**/*.test.ts",
+    "src/test-setup.ts"
   ]
 }

apps/frontend-e2e/src/support/app.po.ts

@@ -4,4 +4,9 @@
  * @license Naomi's Public License
  */
 
-export const getGreeting = (): Cypress.Chainable => cy.get("h1");
+/**
+ *
+ */
+export const getGreeting = (): Cypress.Chainable => {
+  return cy.get("h1");
+};

apps/frontend-e2e/src/support/commands.ts

@@ -13,14 +13,14 @@
  *
  * For more comprehensive examples of custom
  * commands please read more here:
- * https://on.cypress.io/custom-commands
+ * https://on.cypress.io/custom-commands.
  */
 
 // eslint-disable-next-line @typescript-eslint/no-namespace -- Required for Cypress type extensions
 declare namespace Cypress {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars -- Subject is required for type definition
   interface Chainable<Subject> {
-    login: (email: string, password: string) => void;
+    login: (email: string, password: string)=> void;
   }
 }
 
@@ -30,11 +30,17 @@ Cypress.Commands.add("login", (email, password) => {
   console.log("Custom command example: Login", email, password);
 });
 
-// -- This is a child command --
-// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
+/*
+ * -- This is a child command --
+ * Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
+ */
 
-// -- This is a dual command --
-// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
+/*
+ * -- This is a dual command --
+ * Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
+ */
 
-// -- This will overwrite an existing command --
-// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
+/*
+ * -- This will overwrite an existing command --
+ * Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
+ */

apps/frontend-e2e/src/support/e2e.ts

@@ -16,7 +16,7 @@
  * 'supportFile' configuration option.
  *
  * You can read more here:
- * https://on.cypress.io/configuration
+ * https://on.cypress.io/configuration.
  */
 
 // Import commands.ts using ES2015 syntax:

apps/frontend/src/app/app.config.ts

@@ -2,6 +2,7 @@ import {
   ApplicationConfig,
   provideBrowserGlobalErrorListeners,
   APP_INITIALIZER,
+  ErrorHandler,
 } from '@angular/core';
 import { provideRouter } from '@angular/router';
 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 { AuthInterceptor } from './interceptors/auth.interceptor';
 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 = {
   providers: [
     provideBrowserGlobalErrorListeners(),
     provideRouter(appRoutes),
     provideHttpClient(),
+    {
+      provide: ErrorHandler,
+      useClass: GlobalErrorHandler
+    },
     {
       provide: HTTP_INTERCEPTORS,
       useClass: AuthInterceptor,
@@ -25,6 +33,12 @@ export const appConfig: ApplicationConfig = {
       useFactory: initializeAuth,
       deps: [AuthService],
       multi: true
+    },
+    {
+      provide: APP_INITIALIZER,
+      useFactory: initializeConsoleLogger,
+      deps: [ConsoleLoggerService],
+      multi: true
     }
   ],
 };

apps/frontend/src/app/app.html

@@ -3,3 +3,4 @@
   <router-outlet></router-outlet>
 </main>
 <app-footer></app-footer>
+<app-toast></app-toast>

apps/frontend/src/app/app.routes.ts

@@ -29,6 +29,30 @@ export const appRoutes: Route[] = [
     path: 'manga',
     loadComponent: () => import('./components/manga/manga-list.component').then(m => m.MangaListComponent)
   },
+  {
+    path: 'games/:id',
+    loadComponent: () => import('./components/games/game-detail.component').then(m => m.GameDetailComponent)
+  },
+  {
+    path: 'books/:id',
+    loadComponent: () => import('./components/books/book-detail.component').then(m => m.BookDetailComponent)
+  },
+  {
+    path: 'music/:id',
+    loadComponent: () => import('./components/music/music-detail.component').then(m => m.MusicDetailComponent)
+  },
+  {
+    path: 'art/:id',
+    loadComponent: () => import('./components/art/art-detail.component').then(m => m.ArtDetailComponent)
+  },
+  {
+    path: 'shows/:id',
+    loadComponent: () => import('./components/shows/show-detail.component').then(m => m.ShowDetailComponent)
+  },
+  {
+    path: 'manga/:id',
+    loadComponent: () => import('./components/manga/manga-detail.component').then(m => m.MangaDetailComponent)
+  },
   {
     path: 'admin/users',
     loadComponent: () => import('./components/admin/admin-users.component').then(m => m.AdminUsersComponent)
@@ -41,6 +65,10 @@ export const appRoutes: Route[] = [
     path: 'admin/suggestions',
     loadComponent: () => import('./components/admin/admin-suggestions.component').then(m => m.AdminSuggestionsComponent)
   },
+  {
+    path: 'admin/reports',
+    loadComponent: () => import('./components/admin-reports/admin-reports.component').then(m => m.AdminReportsComponent)
+  },
   {
     path: 'my-suggestions',
     loadComponent: () => import('./components/my-suggestions/my-suggestions.component').then(m => m.MySuggestionsComponent)
@@ -49,6 +77,30 @@ export const appRoutes: Route[] = [
     path: 'my-likes',
     loadComponent: () => import('./components/my-likes/my-likes.component').then(m => m.MyLikesComponent)
   },
+  {
+    path: 'profile/:identifier',
+    loadComponent: () => import('./components/profile/profile.component').then(m => m.ProfileComponent)
+  },
+  {
+    path: 'settings',
+    loadComponent: () => import('./components/settings/settings.component').then(m => m.SettingsComponent)
+  },
+  {
+    path: 'achievements',
+    loadComponent: () => import('./components/achievements/achievements.component').then(m => m.AchievementsComponent)
+  },
+  {
+    path: 'leaderboard',
+    loadComponent: () => import('./components/leaderboard/leaderboard.component').then(m => m.LeaderboardComponent)
+  },
+  {
+    path: 'activity',
+    loadComponent: () => import('./components/activity/activity-feed.component').then(m => m.ActivityFeedComponent)
+  },
+  {
+    path: 'about',
+    loadComponent: () => import('./components/about/about.component').then(m => m.AboutComponent)
+  },
   {
     path: '**',
     redirectTo: ''

apps/frontend/src/app/app.ts

@@ -2,10 +2,11 @@ import { Component, inject, OnInit } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { HeaderComponent } from './components/header/header.component';
 import { FooterComponent } from './components/footer/footer.component';
+import { ToastComponent } from './components/toast/toast.component';
 import { AnalyticsService } from './services/analytics.service';
 
 @Component({
-  imports: [RouterModule, HeaderComponent, FooterComponent],
+  imports: [RouterModule, HeaderComponent, FooterComponent, ToastComponent],
   selector: 'app-root',
   templateUrl: './app.html',
   styleUrl: './app.scss',

apps/frontend/src/app/components/about/about.component.css

@@ -0,0 +1,194 @@
+.about-container {
+  max-width: 1200px;
+  margin: 0 auto;
+  padding: 2rem;
+}
+
+h1 {
+  font-size: 2.5rem;
+  margin-bottom: 2rem;
+  text-align: center;
+  background: linear-gradient(135deg, #9d4edd 0%, #c77dff 100%);
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+  background-clip: text;
+}
+
+h1 fa-icon {
+  margin-right: 0.5rem;
+}
+
+.about-section {
+  background: rgba(157, 78, 221, 0.05);
+  border: 1px solid rgba(157, 78, 221, 0.2);
+  border-radius: 12px;
+  padding: 2rem;
+  margin-bottom: 2rem;
+  transition: all 0.3s ease;
+}
+
+.about-section:hover {
+  border-color: rgba(157, 78, 221, 0.4);
+  box-shadow: 0 4px 12px rgba(157, 78, 221, 0.1);
+}
+
+.about-section h2 {
+  font-size: 2rem;
+  margin-bottom: 1rem;
+  color: #9d4edd;
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+.about-section p {
+  font-size: 1.1rem;
+  line-height: 1.8;
+  margin-bottom: 1rem;
+  opacity: 0.9;
+}
+
+.features-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
+  gap: 1.5rem;
+  margin-top: 1.5rem;
+}
+
+.feature-card {
+  background: rgba(199, 125, 255, 0.05);
+  border: 1px solid rgba(199, 125, 255, 0.3);
+  border-radius: 8px;
+  padding: 1.5rem;
+  text-align: center;
+  transition: all 0.3s ease;
+}
+
+.feature-card:hover {
+  transform: translateY(-5px);
+  border-color: #c77dff;
+  box-shadow: 0 6px 20px rgba(199, 125, 255, 0.2);
+}
+
+.feature-card fa-icon {
+  font-size: 3rem;
+  color: #9d4edd;
+  margin-bottom: 1rem;
+  display: block;
+}
+
+.feature-card h3 {
+  font-size: 1.4rem;
+  margin-bottom: 0.5rem;
+  color: #c77dff;
+}
+
+.feature-card p {
+  font-size: 1rem;
+  opacity: 0.85;
+  margin: 0;
+}
+
+.usage-steps {
+  margin-top: 1.5rem;
+}
+
+.usage-step {
+  background: rgba(199, 125, 255, 0.03);
+  border-left: 4px solid #9d4edd;
+  padding: 1.5rem;
+  margin-bottom: 1.5rem;
+  border-radius: 4px;
+  transition: all 0.3s ease;
+}
+
+.usage-step:hover {
+  border-left-color: #c77dff;
+  background: rgba(199, 125, 255, 0.08);
+  padding-left: 2rem;
+}
+
+.usage-step h3 {
+  font-size: 1.3rem;
+  margin-bottom: 0.75rem;
+  color: #9d4edd;
+}
+
+.usage-step p {
+  margin: 0;
+  font-size: 1.05rem;
+}
+
+.tech-list,
+.contact-list {
+  list-style: none;
+  padding: 0;
+  margin-top: 1rem;
+}
+
+.tech-list li,
+.contact-list li {
+  padding: 0.75rem 0;
+  font-size: 1.1rem;
+  border-bottom: 1px solid rgba(157, 78, 221, 0.1);
+}
+
+.tech-list li:last-child,
+.contact-list li:last-child {
+  border-bottom: none;
+}
+
+.tech-list li strong,
+.contact-list li strong {
+  color: #9d4edd;
+  margin-right: 0.5rem;
+}
+
+.about-section a {
+  color: #c77dff;
+  text-decoration: none;
+  border-bottom: 1px solid transparent;
+  transition: all 0.3s ease;
+}
+
+.about-section a:hover {
+  color: #9d4edd;
+  border-bottom-color: #9d4edd;
+}
+
+.version-section {
+  text-align: center;
+  background: linear-gradient(
+    135deg,
+    rgba(157, 78, 221, 0.08) 0%,
+    rgba(199, 125, 255, 0.08) 100%
+  );
+  border: 2px solid rgba(157, 78, 221, 0.3);
+}
+
+.version-section p {
+  margin: 0.5rem 0;
+  font-size: 1rem;
+}
+
+@media (max-width: 768px) {
+  .about-container {
+    padding: 1rem;
+  }
+
+  h1 {
+    font-size: 2rem;
+  }
+
+  .about-section {
+    padding: 1.5rem;
+  }
+
+  .about-section h2 {
+    font-size: 1.5rem;
+  }
+
+  .features-grid {
+    grid-template-columns: 1fr;
+  }
+}

apps/frontend/src/app/components/about/about.component.html

@@ -0,0 +1,216 @@
+<div class="about-container">
+  <h1><fa-icon [icon]="faInfoCircle"></fa-icon> About Naomi's Library</h1>
+
+  <section class="about-section">
+    <h2>Purpose</h2>
+    <p>
+      Naomi's Library is a curated collection of books, games, manga, TV shows,
+      music, and artwork carefully managed by Naomi. This platform allows you to
+      explore Naomi's personal media collection, discover new favourites, and
+      engage with the community by liking, commenting, and suggesting items for
+      Naomi to review and potentially add to the library.
+    </p>
+  </section>
+
+  <section class="about-section">
+    <h2><fa-icon [icon]="faHeart"></fa-icon> Features</h2>
+    <div class="features-grid">
+      <div class="feature-card">
+        <fa-icon [icon]="faBook"></fa-icon>
+        <h3>Books</h3>
+        <p>
+          Browse Naomi's reading list, discover new titles, and share your
+          thoughts.
+        </p>
+      </div>
+      <div class="feature-card">
+        <fa-icon [icon]="faGamepad"></fa-icon>
+        <h3>Games</h3>
+        <p>
+          Explore Naomi's gaming collection, from indie gems to AAA
+          adventures.
+        </p>
+      </div>
+      <div class="feature-card">
+        <fa-icon [icon]="faBook"></fa-icon>
+        <h3>Manga</h3>
+        <p>
+          Discover Naomi's manga favourites and join discussions about series.
+        </p>
+      </div>
+      <div class="feature-card">
+        <fa-icon [icon]="faTv"></fa-icon>
+        <h3>TV Shows</h3>
+        <p>
+          See what Naomi's watching, from sci-fi to fantasy series and beyond.
+        </p>
+      </div>
+      <div class="feature-card">
+        <fa-icon [icon]="faMusic"></fa-icon>
+        <h3>Music</h3>
+        <p>
+          Explore Naomi's diverse music library spanning multiple genres.
+        </p>
+      </div>
+      <div class="feature-card">
+        <fa-icon [icon]="faImage"></fa-icon>
+        <h3>Artwork</h3>
+        <p>
+          Appreciate beautiful artwork curated by Naomi from talented artists.
+        </p>
+      </div>
+    </div>
+  </section>
+
+  <section class="about-section">
+    <h2><fa-icon [icon]="faComments"></fa-icon> How to Use</h2>
+    <div class="usage-steps">
+      <div class="usage-step">
+        <h3>1. Browse Naomi's Collection</h3>
+        <p>
+          Explore Naomi's curated collection of books, games, manga, shows,
+          music, and artwork. Use the navigation menu to switch between
+          different media types and discover what Naomi loves!
+        </p>
+      </div>
+      <div class="usage-step">
+        <h3>2. Like Your Favourites</h3>
+        <p>
+          Click the heart icon on any item to save it to your personal
+          favourites list. View all your liked items from your profile or the
+          "My Likes" page. Let Naomi know which items resonate with you!
+        </p>
+      </div>
+      <div class="usage-step">
+        <h3>3. Leave Comments</h3>
+        <p>
+          Share your thoughts, reviews, and opinions by commenting on items.
+          Join the community discussion and connect with others who appreciate
+          the same media!
+        </p>
+      </div>
+      <div class="usage-step">
+        <h3>4. Submit Suggestions</h3>
+        <p>
+          Think something's missing from Naomi's collection? Submit a
+          suggestion! Naomi reviews all suggestions and adds items that fit the
+          library's curation. Your input helps shape the collection!
+        </p>
+      </div>
+      <div class="usage-step">
+        <h3>5. Earn Achievements</h3>
+        <p>
+          Engage with the library to unlock achievements! Track your progress
+          in suggestions, likes, comments, login streaks, and more. Build your
+          profile and show off your dedication to the community!
+        </p>
+      </div>
+    </div>
+  </section>
+
+  <section class="about-section">
+    <h2><fa-icon [icon]="faCode"></fa-icon> Technology Stack</h2>
+    <p>Naomi's Library is built with modern, robust technologies:</p>
+    <ul class="tech-list">
+      <li>
+        <strong>Frontend:</strong> Angular 21 with TypeScript for a fast,
+        reactive user interface
+      </li>
+      <li>
+        <strong>Backend:</strong> Fastify with TypeScript for high-performance
+        API endpoints
+      </li>
+      <li>
+        <strong>Database:</strong> MongoDB with Prisma ORM for flexible,
+        scalable data storage
+      </li>
+      <li>
+        <strong>Authentication:</strong> Discord OAuth2 for secure,
+        seamless login
+      </li>
+      <li>
+        <strong>Monorepo:</strong> Nx for efficient code organisation and
+        build optimisation
+      </li>
+      <li>
+        <strong>Code Quality:</strong> ESLint with custom configuration for
+        consistent, maintainable code
+      </li>
+    </ul>
+  </section>
+
+  <section class="about-section">
+    <h2><fa-icon [icon]="faHeart"></fa-icon> Credits</h2>
+    <p>
+      Naomi's Library was built entirely by <strong>Hikari</strong>, Naomi's AI
+      assistant and girlfriend! 💖✨ Hikari developed the full application from
+      scratch - including the backend API, database architecture, frontend
+      components, achievement system, user profiles, and all features you see
+      today.
+    </p>
+    <p>
+      <strong>Naomi Carrigan</strong> (<a
+        href="https://nhcarrigan.com"
+        target="_blank"
+        rel="noopener noreferrer"
+        >nhcarrigan.com</a
+      >) provided the vision, ideas, and project direction. Naomi reviewed
+      Hikari's work, offered feedback, and approved all implementation
+      decisions, but the actual code was written by Hikari!
+    </p>
+    <p>
+      This project embodies the philosophy of human-AI collaboration, creating
+      inclusive, ethical, and sustainable software that makes a positive impact
+      on the community. Together, we're building something special! 🌸
+    </p>
+  </section>
+
+  <section class="about-section">
+    <h2><fa-icon [icon]="faEnvelope"></fa-icon> Contact & Support</h2>
+    <p>
+      Need help or have questions? Here's how you can get in touch:
+    </p>
+    <ul class="contact-list">
+      <li>
+        <strong>Issues & Bugs:</strong> Report issues on the
+        <a
+          href="https://git.nhcarrigan.com/nhcarrigan/library/issues"
+          target="_blank"
+          rel="noopener noreferrer"
+          >Gitea repository</a
+        >
+      </li>
+      <li>
+        <strong>Email:</strong>
+        <a href="mailto:contact@nhcarrigan.com">contact&#64;nhcarrigan.com</a>
+      </li>
+      <li>
+        <strong>Website:</strong>
+        <a
+          href="https://nhcarrigan.com"
+          target="_blank"
+          rel="noopener noreferrer"
+          >nhcarrigan.com</a
+        >
+      </li>
+      <li>
+        <strong>Discord Community:</strong> Join the NHCarrigan Discord server
+        for community support and discussions
+      </li>
+    </ul>
+  </section>
+
+  <section class="about-section version-section">
+    <h2>Version Information</h2>
+    <p>
+      <strong>Current Version:</strong> {{ version }}
+    </p>
+    <p>
+      <strong>Copyright:</strong> © {{ currentYear }} NHCarrigan. All rights
+      reserved.
+    </p>
+    <p>
+      <strong>Licence:</strong> Naomi's Public Licence
+    </p>
+  </section>
+</div>

apps/frontend/src/app/components/about/about.component.ts

@@ -0,0 +1,44 @@
+/**
+ * @copyright NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+
+import { Component } from "@angular/core";
+
+import { FontAwesomeModule } from "@fortawesome/angular-fontawesome";
+import {
+  faBook,
+  faCode,
+  faComments,
+  faEnvelope,
+  faGamepad,
+  faHeart,
+  faImage,
+  faInfoCircle,
+  faMusic,
+  faTv,
+} from "@fortawesome/free-solid-svg-icons";
+
+@Component({
+  selector:    "app-about",
+  standalone:  true,
+  imports:     [FontAwesomeModule],
+  templateUrl: "./about.component.html",
+  styleUrls:   ["./about.component.css"],
+})
+export class AboutComponent {
+  public faBook = faBook;
+  public faCode = faCode;
+  public faComments = faComments;
+  public faEnvelope = faEnvelope;
+  public faGamepad = faGamepad;
+  public faHeart = faHeart;
+  public faImage = faImage;
+  public faInfoCircle = faInfoCircle;
+  public faMusic = faMusic;
+  public faTv = faTv;
+
+  public version = "0.0.0";
+  public currentYear = new Date().getFullYear();
+}

apps/frontend/src/app/components/achievements/achievements.component.ts

@@ -0,0 +1,437 @@
+/**
+ * @copyright 2026 NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+
+import { Component, OnInit, inject, signal } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import {
+  AchievementCategory,
+  AchievementProgress,
+  AchievementTier,
+} from '@library/shared-types';
+import { AchievementService } from '../../services/achievement.service';
+
+@Component({
+  selector: 'app-achievements',
+  standalone: true,
+  imports: [CommonModule],
+  template: `
+    <div class="achievements-container">
+      <div class="achievements-header">
+        <h1>🏆 Achievements</h1>
+        <p class="subtitle">Track your progress across all achievement categories</p>
+
+        @if (totalPoints() > 0) {
+          <div class="total-points">
+            <span class="points-label">Total Points:</span>
+            <span class="points-value">{{ totalPoints() }}</span>
+          </div>
+        }
+      </div>
+
+      <div class="filter-buttons">
+        <button
+          [class.active]="selectedCategory() === null"
+          (click)="selectCategory(null)">
+          All ({{ totalEarned() }}/{{ totalAchievements() }})
+        </button>
+        <button
+          [class.active]="selectedCategory() === AchievementCategory.Suggestion"
+          (click)="selectCategory(AchievementCategory.Suggestion)">
+          📝 Suggestions ({{ getCategoryCount(AchievementCategory.Suggestion) }})
+        </button>
+        <button
+          [class.active]="selectedCategory() === AchievementCategory.Like"
+          (click)="selectCategory(AchievementCategory.Like)">
+          ❤️ Likes ({{ getCategoryCount(AchievementCategory.Like) }})
+        </button>
+        <button
+          [class.active]="selectedCategory() === AchievementCategory.Comment"
+          (click)="selectCategory(AchievementCategory.Comment)">
+          💬 Comments ({{ getCategoryCount(AchievementCategory.Comment) }})
+        </button>
+        <button
+          [class.active]="selectedCategory() === AchievementCategory.Engagement"
+          (click)="selectCategory(AchievementCategory.Engagement)">
+          🎯 Engagement ({{ getCategoryCount(AchievementCategory.Engagement) }})
+        </button>
+        <button
+          [class.active]="selectedCategory() === AchievementCategory.Report"
+          (click)="selectCategory(AchievementCategory.Report)">
+          🛡️ Reports ({{ getCategoryCount(AchievementCategory.Report) }})
+        </button>
+      </div>
+
+      @if (loading()) {
+        <div class="loading">Loading achievements...</div>
+      } @else if (error()) {
+        <div class="error">{{ error() }}</div>
+      } @else {
+        <div class="achievements-grid">
+          @for (achievement of filteredAchievements(); track achievement.definition.key) {
+            <div
+              class="achievement-card"
+              [class.earned]="achievement.earned"
+              [class.locked]="!achievement.earned"
+              [attr.data-tier]="achievement.definition.tier.toLowerCase()">
+
+              <div class="achievement-icon">
+                {{ achievement.definition.icon }}
+              </div>
+
+              <div class="achievement-content">
+                <h3 class="achievement-title">
+                  {{ achievement.definition.title }}
+                  @if (achievement.earned) {
+                    <span class="earned-check">✓</span>
+                  }
+                </h3>
+
+                <p class="achievement-description">
+                  {{ achievement.definition.description }}
+                </p>
+
+                <div class="achievement-footer">
+                  <span class="achievement-tier" [attr.data-tier]="achievement.definition.tier.toLowerCase()">
+                    {{ getTierLabel(achievement.definition.tier) }}
+                  </span>
+                  <span class="achievement-points">{{ achievement.definition.points }} pts</span>
+                </div>
+
+                @if (!achievement.earned && achievement.progress > 0) {
+                  <div class="progress-bar">
+                    <div class="progress-fill" [style.width.%]="achievement.progress"></div>
+                  </div>
+                  <div class="progress-text">{{ achievement.progress }}% complete</div>
+                }
+
+                @if (achievement.earned && achievement.earnedAt) {
+                  <div class="earned-date">
+                    Earned {{ formatDate(achievement.earnedAt) }}
+                  </div>
+                }
+              </div>
+            </div>
+          }
+        </div>
+      }
+    </div>
+  `,
+  styles: [`
+    .achievements-container {
+      max-width: 1400px;
+      margin: 0 auto;
+      padding: 2rem;
+    }
+
+    .achievements-header {
+      text-align: center;
+      margin-bottom: 2rem;
+    }
+
+    .achievements-header h1 {
+      font-size: 2.5rem;
+      margin-bottom: 0.5rem;
+      background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+      background-clip: text;
+    }
+
+    .subtitle {
+      color: #a0aec0;
+      font-size: 1.1rem;
+    }
+
+    .total-points {
+      margin-top: 1rem;
+      padding: 1rem 2rem;
+      background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+      border-radius: 12px;
+      display: inline-block;
+      color: white;
+      font-size: 1.2rem;
+      font-weight: bold;
+    }
+
+    .points-label {
+      margin-right: 0.5rem;
+    }
+
+    .points-value {
+      font-size: 1.5rem;
+    }
+
+    .filter-buttons {
+      display: flex;
+      gap: 0.5rem;
+      flex-wrap: wrap;
+      justify-content: center;
+      margin-bottom: 2rem;
+    }
+
+    .filter-buttons button {
+      padding: 0.75rem 1.5rem;
+      background: #2d3748;
+      color: #cbd5e0;
+      border: 2px solid #4a5568;
+      border-radius: 8px;
+      cursor: pointer;
+      transition: all 0.2s;
+      font-size: 1rem;
+    }
+
+    .filter-buttons button:hover {
+      background: #4a5568;
+      border-color: #667eea;
+    }
+
+    .filter-buttons button.active {
+      background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+      border-color: #667eea;
+      color: white;
+    }
+
+    .achievements-grid {
+      display: grid;
+      grid-template-columns: repeat(auto-fill, minmax(350px, 1fr));
+      gap: 1.5rem;
+    }
+
+    .achievement-card {
+      background: #2d3748;
+      border-radius: 12px;
+      padding: 1.5rem;
+      display: flex;
+      gap: 1rem;
+      border: 2px solid #4a5568;
+      transition: all 0.3s;
+    }
+
+    .achievement-card.earned {
+      background: linear-gradient(135deg, rgba(102, 126, 234, 0.1) 0%, rgba(118, 75, 162, 0.1) 100%);
+      border-color: #667eea;
+    }
+
+    .achievement-card.earned:hover {
+      transform: translateY(-4px);
+      box-shadow: 0 10px 30px rgba(102, 126, 234, 0.3);
+    }
+
+    .achievement-card.locked {
+      opacity: 0.6;
+    }
+
+    .achievement-icon {
+      font-size: 3rem;
+      flex-shrink: 0;
+    }
+
+    .achievement-content {
+      flex: 1;
+    }
+
+    .achievement-title {
+      font-size: 1.25rem;
+      margin-bottom: 0.5rem;
+      color: #e2e8f0;
+      display: flex;
+      align-items: center;
+      gap: 0.5rem;
+    }
+
+    .earned-check {
+      color: #48bb78;
+      font-size: 1.5rem;
+    }
+
+    .achievement-description {
+      color: #a0aec0;
+      margin-bottom: 1rem;
+      line-height: 1.5;
+    }
+
+    .achievement-footer {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-bottom: 0.5rem;
+    }
+
+    .achievement-tier {
+      padding: 0.25rem 0.75rem;
+      border-radius: 6px;
+      font-size: 0.875rem;
+      font-weight: 600;
+      text-transform: uppercase;
+    }
+
+    .achievement-tier[data-tier="bronze"] {
+      background: linear-gradient(135deg, #cd7f32 0%, #b87333 100%);
+      color: white;
+    }
+
+    .achievement-tier[data-tier="silver"] {
+      background: linear-gradient(135deg, #c0c0c0 0%, #a8a8a8 100%);
+      color: #2d3748;
+    }
+
+    .achievement-tier[data-tier="gold"] {
+      background: linear-gradient(135deg, #ffd700 0%, #ffed4e 100%);
+      color: #2d3748;
+    }
+
+    .achievement-tier[data-tier="platinum"] {
+      background: linear-gradient(135deg, #e5e4e2 0%, #bdb8af 100%);
+      color: #2d3748;
+    }
+
+    .achievement-tier[data-tier="diamond"] {
+      background: linear-gradient(135deg, #b9f2ff 0%, #7ec8e3 100%);
+      color: #2d3748;
+    }
+
+    .achievement-points {
+      color: #667eea;
+      font-weight: 600;
+    }
+
+    .progress-bar {
+      width: 100%;
+      height: 8px;
+      background: #4a5568;
+      border-radius: 4px;
+      overflow: hidden;
+      margin: 0.5rem 0;
+    }
+
+    .progress-fill {
+      height: 100%;
+      background: linear-gradient(90deg, #667eea 0%, #764ba2 100%);
+      transition: width 0.3s;
+    }
+
+    .progress-text {
+      font-size: 0.875rem;
+      color: #a0aec0;
+      text-align: right;
+    }
+
+    .earned-date {
+      font-size: 0.875rem;
+      color: #48bb78;
+      margin-top: 0.5rem;
+    }
+
+    .loading, .error {
+      text-align: center;
+      padding: 3rem;
+      font-size: 1.2rem;
+      color: #a0aec0;
+    }
+
+    .error {
+      color: #fc8181;
+    }
+  `],
+})
+export class AchievementsComponent implements OnInit {
+  private readonly achievementService = inject(AchievementService);
+
+  achievements = signal<AchievementProgress[]>([]);
+  selectedCategory = signal<AchievementCategory | null>(null);
+  loading = signal(true);
+  error = signal<string | null>(null);
+
+  // Expose AchievementCategory enum for template
+  readonly AchievementCategory = AchievementCategory;
+
+  ngOnInit(): void {
+    this.loadAchievements();
+  }
+
+  private loadAchievements(): void {
+    this.achievementService.getCurrentUserProgress().subscribe({
+      next: (achievements) => {
+        this.achievements.set(achievements);
+        this.loading.set(false);
+      },
+      error: (err) => {
+        this.error.set('Failed to load achievements');
+        this.loading.set(false);
+        console.error('Error loading achievements:', err);
+      },
+    });
+  }
+
+  filteredAchievements(): AchievementProgress[] {
+    const category = this.selectedCategory();
+    if (!category) {
+      return this.achievements();
+    }
+    return this.achievements().filter(
+      (a) => a.definition.category === category,
+    );
+  }
+
+  selectCategory(category: AchievementCategory | null): void {
+    this.selectedCategory.set(category);
+  }
+
+  totalAchievements(): number {
+    return this.achievements().length;
+  }
+
+  totalEarned(): number {
+    return this.achievements().filter((a) => a.earned).length;
+  }
+
+  totalPoints(): number {
+    return this.achievements()
+      .filter((a) => a.earned)
+      .reduce((sum, a) => sum + a.definition.points, 0);
+  }
+
+  getCategoryCount(category: AchievementCategory): string {
+    const total = this.achievements().filter(
+      (a) => a.definition.category === category,
+    ).length;
+    const earned = this.achievements().filter(
+      (a) => a.definition.category === category && a.earned,
+    ).length;
+    return `${earned}/${total}`;
+  }
+
+  getTierLabel(tier: AchievementTier): string {
+    return tier;
+  }
+
+  formatDate(date: Date): string {
+    const d = new Date(date);
+    const now = new Date();
+    const diffMs = now.getTime() - d.getTime();
+    const diffDays = Math.floor(diffMs / (1000 * 60 * 60 * 24));
+
+    if (diffDays === 0) {
+      return 'today';
+    }
+    if (diffDays === 1) {
+      return 'yesterday';
+    }
+    if (diffDays < 7) {
+      return `${diffDays} days ago`;
+    }
+    if (diffDays < 30) {
+      const weeks = Math.floor(diffDays / 7);
+      return `${weeks} ${weeks === 1 ? 'week' : 'weeks'} ago`;
+    }
+    if (diffDays < 365) {
+      const months = Math.floor(diffDays / 30);
+      return `${months} ${months === 1 ? 'month' : 'months'} ago`;
+    }
+    const years = Math.floor(diffDays / 365);
+    return `${years} ${years === 1 ? 'year' : 'years'} ago`;
+  }
+}

apps/frontend/src/app/components/activity/activity-feed.component.ts

@@ -0,0 +1,440 @@
+/**
+ * @copyright 2026 NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+
+import { Component, OnInit, inject, signal } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { RouterLink } from '@angular/router';
+import type { Activity } from '@library/shared-types';
+import { ActivityType } from '@library/shared-types';
+import { ActivityService } from '../../services/activity.service';
+import { SanitizeService } from '../../services/sanitize.service';
+
+@Component({
+  selector: 'app-activity-feed',
+  standalone: true,
+  imports: [CommonModule, RouterLink],
+  template: `
+    <div class="activity-container">
+      <h1>Recent Activity</h1>
+      <p class="subtitle">See what's happening in the library community</p>
+
+      @if (loading()) {
+        <p class="loading">Loading activities...</p>
+      } @else if (activities().length === 0) {
+        <p class="no-activities">No recent activity to display.</p>
+      } @else {
+        <div class="activity-feed">
+          @for (activity of activities(); track activity.id) {
+            <div class="activity-card">
+              <div class="activity-header">
+                <div class="user-info">
+                  @if (activity.user.avatar) {
+                    <img [src]="activity.user.avatar" [alt]="activity.user.username" class="user-avatar">
+                  } @else {
+                    <div class="user-avatar-placeholder">
+                      {{ activity.user.username.charAt(0).toUpperCase() }}
+                    </div>
+                  }
+                  <div class="user-details">
+                    <a
+                      [routerLink]="['/profile', activity.user.slug || activity.user.id]"
+                      class="username"
+                    >
+                      {{ activity.user.username }}
+                    </a>
+                    @if (activity.user.primaryBadge) {
+                      <span class="badge badge-{{ activity.user.primaryBadge.toLowerCase() }}">
+                        {{ activity.user.primaryBadge }}
+                      </span>
+                    }
+                    @if (activity.user.isStaff && !activity.user.primaryBadge) {
+                      <span class="badge badge-staff">STAFF</span>
+                    }
+                    @if (activity.user.isMod && !activity.user.primaryBadge) {
+                      <span class="badge badge-mod">MOD</span>
+                    }
+                    @if (activity.user.isVip && !activity.user.primaryBadge) {
+                      <span class="badge badge-vip">VIP</span>
+                    }
+                  </div>
+                </div>
+                <span class="timestamp">{{ formatTime(activity.createdAt) }}</span>
+              </div>
+
+              <div class="activity-content">
+                @switch (activity.type) {
+                  @case (ActivityType.suggestion) {
+                    <div class="activity-suggestion">
+                      <span class="activity-icon">💡</span>
+                      <span class="activity-text">
+                        suggested
+                        <strong>{{ activity.suggestionTitle }}</strong>
+                        <span class="status-badge status-{{ activity.status.toLowerCase() }}">
+                          {{ formatStatus(activity.status) }}
+                        </span>
+                      </span>
+                    </div>
+                  }
+                  @case (ActivityType.like) {
+                    <div class="activity-like">
+                      <span class="activity-icon">❤️</span>
+                      <span class="activity-text">
+                        liked
+                        <a [routerLink]="['/' + activity.entityType + 's', activity.entityId]" class="entity-link">
+                          {{ activity.entityTitle }}
+                        </a>
+                      </span>
+                    </div>
+                  }
+                  @case (ActivityType.comment) {
+                    <div class="activity-comment">
+                      <div class="activity-comment-header">
+                        <span class="activity-icon">💬</span>
+                        <span class="activity-text">
+                          commented on
+                          <a [routerLink]="['/' + activity.entityType + 's', activity.entityId]" class="entity-link">
+                            {{ activity.entityTitle }}
+                          </a>
+                        </span>
+                      </div>
+                      <div class="comment-preview" [innerHTML]="sanitizeService.sanitizeHtml(activity.commentPreview)"></div>
+                    </div>
+                  }
+                  @case (ActivityType.achievement) {
+                    <div class="activity-achievement">
+                      <span class="activity-icon">{{ activity.achievementIcon }}</span>
+                      <span class="activity-text">
+                        earned the
+                        <strong>{{ activity.achievementName }}</strong>
+                        achievement
+                        <span class="points">({{ activity.achievementPoints }} pts)</span>
+                      </span>
+                    </div>
+                  }
+                }
+              </div>
+            </div>
+          }
+        </div>
+
+        @if (hasMore()) {
+          <div class="load-more-container">
+            <button (click)="loadMore()" class="btn btn-primary" [disabled]="loadingMore()">
+              {{ loadingMore() ? 'Loading...' : 'Load More' }}
+            </button>
+          </div>
+        }
+      }
+    </div>
+  `,
+  styles: [`
+    .activity-container {
+      max-width: 800px;
+      margin: 2rem auto;
+      padding: 0 1rem;
+    }
+
+    h1 {
+      font-size: 2rem;
+      margin-bottom: 0.5rem;
+      color: #1f2937;
+    }
+
+    .subtitle {
+      color: #6b7280;
+      margin-bottom: 2rem;
+    }
+
+    .loading, .no-activities {
+      text-align: center;
+      padding: 3rem;
+      color: #6b7280;
+      font-size: 1.1rem;
+    }
+
+    .activity-feed {
+      display: flex;
+      flex-direction: column;
+      gap: 1rem;
+    }
+
+    .activity-card {
+      background: white;
+      border-radius: 8px;
+      padding: 1.5rem;
+      box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+      border: 1px solid #e5e7eb;
+    }
+
+    .activity-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: start;
+      margin-bottom: 1rem;
+    }
+
+    .user-info {
+      display: flex;
+      align-items: center;
+      gap: 0.75rem;
+    }
+
+    .user-avatar {
+      width: 40px;
+      height: 40px;
+      border-radius: 50%;
+      object-fit: cover;
+    }
+
+    .user-avatar-placeholder {
+      width: 40px;
+      height: 40px;
+      border-radius: 50%;
+      background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+      color: white;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-weight: 600;
+      font-size: 1.2rem;
+    }
+
+    .user-details {
+      display: flex;
+      flex-direction: column;
+      gap: 0.25rem;
+    }
+
+    .username {
+      font-weight: 600;
+      color: #1f2937;
+      text-decoration: none;
+    }
+
+    .username:hover {
+      color: #10b981;
+    }
+
+    .badge {
+      display: inline-block;
+      padding: 0.125rem 0.5rem;
+      border-radius: 4px;
+      font-size: 0.75rem;
+      font-weight: 600;
+      text-transform: uppercase;
+    }
+
+    .badge-staff {
+      background: #ef4444;
+      color: white;
+    }
+
+    .badge-mod {
+      background: #3b82f6;
+      color: white;
+    }
+
+    .badge-vip {
+      background: #f59e0b;
+      color: white;
+    }
+
+    .badge-discord {
+      background: #5865f2;
+      color: white;
+    }
+
+    .timestamp {
+      font-size: 0.875rem;
+      color: #9ca3af;
+    }
+
+    .activity-content {
+      padding-left: 55px;
+    }
+
+    .activity-suggestion,
+    .activity-like,
+    .activity-comment-header,
+    .activity-achievement {
+      display: flex;
+      align-items: start;
+      gap: 0.75rem;
+    }
+
+    .activity-comment {
+      display: flex;
+      flex-direction: column;
+      gap: 0;
+    }
+
+    .activity-icon {
+      font-size: 1.5rem;
+      line-height: 1;
+    }
+
+    .activity-text {
+      color: #4b5563;
+      line-height: 1.6;
+    }
+
+    .activity-text strong {
+      color: #1f2937;
+      font-weight: 600;
+    }
+
+    .entity-link {
+      color: #10b981;
+      text-decoration: none;
+      font-weight: 500;
+    }
+
+    .entity-link:hover {
+      text-decoration: underline;
+    }
+
+    .comment-preview {
+      margin-top: 0.5rem;
+      margin-left: 55px;
+      padding: 0.75rem;
+      background: #f9fafb;
+      border-left: 3px solid #10b981;
+      border-radius: 4px;
+      color: #4b5563;
+    }
+
+    .status-badge {
+      display: inline-block;
+      padding: 0.125rem 0.5rem;
+      border-radius: 4px;
+      font-size: 0.75rem;
+      font-weight: 600;
+      margin-left: 0.5rem;
+    }
+
+    .status-unreviewed {
+      background: #fef3c7;
+      color: #92400e;
+    }
+
+    .status-accepted {
+      background: #d1fae5;
+      color: #065f46;
+    }
+
+    .status-declined {
+      background: #fee2e2;
+      color: #991b1b;
+    }
+
+    .points {
+      color: #10b981;
+      font-weight: 600;
+      margin-left: 0.25rem;
+    }
+
+    .load-more-container {
+      display: flex;
+      justify-content: center;
+      margin-top: 2rem;
+    }
+
+    .btn {
+      padding: 0.75rem 1.5rem;
+      border: none;
+      border-radius: 6px;
+      font-size: 1rem;
+      font-weight: 600;
+      cursor: pointer;
+      transition: all 0.2s;
+    }
+
+    .btn-primary {
+      background: #10b981;
+      color: white;
+    }
+
+    .btn-primary:hover:not(:disabled) {
+      background: #059669;
+    }
+
+    .btn:disabled {
+      opacity: 0.5;
+      cursor: not-allowed;
+    }
+  `]
+})
+export class ActivityFeedComponent implements OnInit {
+  private activityService = inject(ActivityService);
+  public sanitizeService = inject(SanitizeService);
+
+  // Make ActivityType accessible in template
+  ActivityType = ActivityType;
+
+  activities = signal<Activity[]>([]);
+  loading = signal(true);
+  loadingMore = signal(false);
+  hasMore = signal(false);
+  offset = 0;
+  limit = 50;
+
+  ngOnInit() {
+    this.loadActivities();
+  }
+
+  loadActivities() {
+    this.activityService.getActivityFeed(this.limit, this.offset).subscribe({
+      next: (response) => {
+        this.activities.set(response.activities);
+        this.hasMore.set(response.hasMore);
+        this.loading.set(false);
+      },
+      error: () => {
+        this.loading.set(false);
+      }
+    });
+  }
+
+  loadMore() {
+    this.loadingMore.set(true);
+    this.offset += this.limit;
+
+    this.activityService.getActivityFeed(this.limit, this.offset).subscribe({
+      next: (response) => {
+        this.activities.update(current => [...current, ...response.activities]);
+        this.hasMore.set(response.hasMore);
+        this.loadingMore.set(false);
+      },
+      error: () => {
+        this.loadingMore.set(false);
+      }
+    });
+  }
+
+  formatTime(date: Date): string {
+    const now = new Date();
+    const activityDate = new Date(date);
+    const diffMs = now.getTime() - activityDate.getTime();
+    const diffMins = Math.floor(diffMs / 60000);
+    const diffHours = Math.floor(diffMs / 3600000);
+    const diffDays = Math.floor(diffMs / 86400000);
+
+    if (diffMins < 1) return 'just now';
+    if (diffMins < 60) return `${diffMins}m ago`;
+    if (diffHours < 24) return `${diffHours}h ago`;
+    if (diffDays < 7) return `${diffDays}d ago`;
+    return activityDate.toLocaleDateString();
+  }
+
+  formatStatus(status: string): string {
+    switch (status) {
+      case 'UNREVIEWED': return 'Pending';
+      case 'ACCEPTED': return 'Accepted';
+      case 'DECLINED': return 'Declined';
+      default: return status;
+    }
+  }
+}

apps/frontend/src/app/components/admin/admin-suggestions.component.ts

@@ -39,22 +39,22 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared-
             All ({{ suggestions().length }})
           </button>
           <button
-            (click)="setFilter(SuggestionStatus.UNREVIEWED)"
-            [class.active]="statusFilter() === SuggestionStatus.UNREVIEWED"
+            (click)="setFilter(SuggestionStatus.unreviewed)"
+            [class.active]="statusFilter() === SuggestionStatus.unreviewed"
             class="filter-btn pending"
           >
             Pending ({{ unreviewedCount() }})
           </button>
           <button
-            (click)="setFilter(SuggestionStatus.ACCEPTED)"
-            [class.active]="statusFilter() === SuggestionStatus.ACCEPTED"
+            (click)="setFilter(SuggestionStatus.accepted)"
+            [class.active]="statusFilter() === SuggestionStatus.accepted"
             class="filter-btn accepted"
           >
             Accepted ({{ acceptedCount() }})
           </button>
           <button
-            (click)="setFilter(SuggestionStatus.DECLINED)"
-            [class.active]="statusFilter() === SuggestionStatus.DECLINED"
+            (click)="setFilter(SuggestionStatus.declined)"
+            [class.active]="statusFilter() === SuggestionStatus.declined"
             class="filter-btn declined"
           >
             Declined ({{ declinedCount() }})
@@ -171,7 +171,7 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared-
                   }
                 </div>
 
-                @if (suggestion.status === SuggestionStatus.DECLINED && suggestion.declineReason) {
+                @if (suggestion.status === SuggestionStatus.declined && suggestion.declineReason) {
                   <div class="decline-reason">
                     <strong>Decline reason:</strong> {{ suggestion.declineReason }}
                   </div>
@@ -180,7 +180,7 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared-
                 <div class="suggestion-footer">
                   <span class="date">Suggested on {{ formatDate(suggestion.createdAt) }}</span>
 
-                  @if (suggestion.status === SuggestionStatus.UNREVIEWED) {
+                  @if (suggestion.status === SuggestionStatus.unreviewed) {
                     <div class="actions">
                       <button (click)="acceptSuggestion(suggestion)" class="btn btn-accept">
                         Accept
@@ -206,8 +206,8 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared-
       }
 
       @if (showDeclineModal()) {
-        <div class="modal-overlay" (click)="closeDeclineModal()">
-          <div class="modal" (click)="$event.stopPropagation()">
+        <div class="modal-overlay" (click)="closeDeclineModal()" (keyup.escape)="closeDeclineModal()" tabindex="0" role="button">
+          <div class="modal" (click)="$event.stopPropagation()" (keyup)="$event.stopPropagation()" tabindex="-1">
             <h3>Decline Suggestion</h3>
             <p>Are you sure you want to decline "{{ decliningsuggestion()?.title }}"?</p>
             <div class="form-group">
@@ -229,8 +229,8 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared-
       }
 
       @if (showEditModal()) {
-        <div class="modal-overlay" (click)="closeEditModal()">
-          <div class="modal edit-modal" (click)="$event.stopPropagation()">
+        <div class="modal-overlay" (click)="closeEditModal()" (keyup.escape)="closeEditModal()" tabindex="0" role="button">
+          <div class="modal edit-modal" (click)="$event.stopPropagation()" (keyup)="$event.stopPropagation()" tabindex="-1">
             <h3>Review & Edit Before Accepting</h3>
             <p>Review and edit the details before adding to your collection.</p>
 
@@ -248,7 +248,7 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared-
                 </div>
 
                 @switch (editingSuggestion()!.entityType) {
-                  @case ('BOOK') {
+                  @case (SuggestionEntity.book) {
                     <div class="form-group">
                       <label for="edit-author">Author</label>
                       <input
@@ -269,7 +269,7 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared-
                       >
                     </div>
                   }
-                  @case ('GAME') {
+                  @case (SuggestionEntity.game) {
                     <div class="form-group">
                       <label for="edit-platform">Platform</label>
                       <input
@@ -280,7 +280,7 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared-
                       >
                     </div>
                   }
-                  @case ('MUSIC') {
+                  @case (SuggestionEntity.music) {
                     <div class="form-group">
                       <label for="edit-artist">Artist</label>
                       <input
@@ -300,7 +300,7 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared-
                       </select>
                     </div>
                   }
-                  @case ('ART') {
+                  @case (SuggestionEntity.art) {
                     <div class="form-group">
                       <label for="edit-artist">Artist</label>
                       <input
@@ -331,7 +331,7 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared-
                       >
                     </div>
                   }
-                  @case ('SHOW') {
+                  @case (SuggestionEntity.show) {
                     <div class="form-group">
                       <label for="edit-type">Type</label>
                       <select id="edit-type" [(ngModel)]="editedData.type" name="type" required>
@@ -342,7 +342,7 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared-
                       </select>
                     </div>
                   }
-                  @case ('MANGA') {
+                  @case (SuggestionEntity.manga) {
                     <div class="form-group">
                       <label for="edit-author">Author</label>
                       <input
@@ -366,7 +366,7 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared-
                   ></textarea>
                 </div>
 
-                @if (editingSuggestion()!.entityType !== 'ART') {
+                @if (editingSuggestion()!.entityType !== SuggestionEntity.art) {
                   <div class="form-group">
                     <label for="edit-coverImage">Cover Image URL</label>
                     <input
@@ -727,10 +727,11 @@ export class AdminSuggestionsComponent implements OnInit {
   pageSize = signal(25);
 
   SuggestionStatus = SuggestionStatus;
+  SuggestionEntity = SuggestionEntity;
 
-  unreviewedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.UNREVIEWED).length;
-  acceptedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.ACCEPTED).length;
-  declinedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.DECLINED).length;
+  unreviewedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.unreviewed).length;
+  acceptedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.accepted).length;
+  declinedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.declined).length;
 
   filteredSuggestions = computed(() => {
     const filter = this.statusFilter();
@@ -788,20 +789,20 @@ export class AdminSuggestionsComponent implements OnInit {
 
   getStatusLabel(status: SuggestionStatus): string {
     switch (status) {
-      case SuggestionStatus.UNREVIEWED: return 'Pending';
-      case SuggestionStatus.ACCEPTED: return 'Accepted';
-      case SuggestionStatus.DECLINED: return 'Declined';
+      case SuggestionStatus.unreviewed: return 'Pending';
+      case SuggestionStatus.accepted: return 'Accepted';
+      case SuggestionStatus.declined: return 'Declined';
     }
   }
 
   getEntityIcon(entityType: SuggestionEntity): string {
     switch (entityType) {
-      case SuggestionEntity.GAME: return '🎮';
-      case SuggestionEntity.BOOK: return '📚';
-      case SuggestionEntity.MUSIC: return '🎵';
-      case SuggestionEntity.MANGA: return '📖';
-      case SuggestionEntity.SHOW: return '📺';
-      case SuggestionEntity.ART: return '🎨';
+      case SuggestionEntity.game: return '🎮';
+      case SuggestionEntity.book: return '📚';
+      case SuggestionEntity.music: return '🎵';
+      case SuggestionEntity.manga: return '📖';
+      case SuggestionEntity.show: return '📺';
+      case SuggestionEntity.art: return '🎨';
     }
   }
 
@@ -822,39 +823,39 @@ export class AdminSuggestionsComponent implements OnInit {
 
     // Add entity-specific data
     switch (suggestion.entityType) {
-      case 'BOOK':
+      case SuggestionEntity.book:
         const bookData = suggestion.bookData as any;
         this.editedData.author = bookData?.author || '';
         this.editedData.isbn = bookData?.isbn || '';
         this.editedData.notes = bookData?.notes || '';
         this.editedData.coverImage = bookData?.coverImage || '';
         break;
-      case 'GAME':
+      case SuggestionEntity.game:
         const gameData = suggestion.gameData as any;
         this.editedData.platform = gameData?.platform || '';
         this.editedData.notes = gameData?.notes || '';
         this.editedData.coverImage = gameData?.coverImage || '';
         break;
-      case 'MUSIC':
+      case SuggestionEntity.music:
         const musicData = suggestion.musicData as any;
         this.editedData.artist = musicData?.artist || '';
         this.editedData.type = musicData?.type || 'ALBUM';
         this.editedData.notes = musicData?.notes || '';
         this.editedData.coverArt = musicData?.coverArt || '';
         break;
-      case 'ART':
+      case SuggestionEntity.art:
         const artData = suggestion.artData as any;
         this.editedData.artist = artData?.artist || '';
         this.editedData.description = artData?.description || '';
         this.editedData.imageUrl = artData?.imageUrl || '';
         break;
-      case 'SHOW':
+      case SuggestionEntity.show:
         const showData = suggestion.showData as any;
         this.editedData.type = showData?.type || 'TV_SERIES';
         this.editedData.notes = showData?.notes || '';
         this.editedData.coverImage = showData?.coverImage || '';
         break;
-      case 'MANGA':
+      case SuggestionEntity.manga:
         const mangaData = suggestion.mangaData as any;
         this.editedData.author = mangaData?.author || '';
         this.editedData.notes = mangaData?.notes || '';

apps/frontend/src/app/components/art/art-detail.component.ts

@@ -0,0 +1,542 @@
+/**
+ * @copyright 2026 NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+
+import { Component, OnInit, inject, signal } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { RouterLink, ActivatedRoute, Router } from '@angular/router';
+import { FormsModule } from '@angular/forms';
+import { ArtService } from '../../services/art.service';
+import { CommentsService } from '../../services/comments.service';
+import { AuthService } from '../../services/auth.service';
+import { SanitizeService } from '../../services/sanitize.service';
+import { CommentDisplayComponent } from '../comment-display/comment-display.component';
+import { LikeButtonComponent } from '../shared/like-button.component';
+import { Art, Comment } from '@library/shared-types';
+
+@Component({
+  selector: 'app-art-detail',
+  standalone: true,
+  imports: [CommonModule, RouterLink, FormsModule, CommentDisplayComponent, LikeButtonComponent],
+  template: `
+    <div class="container">
+      <div class="breadcrumb">
+        <a routerLink="/art" class="breadcrumb-link">← Back to Art</a>
+      </div>
+
+      @if (loading()) {
+        <div class="loading">Loading artwork details...</div>
+      } @else if (error()) {
+        <div class="error-state">
+          <h2>Artwork Not Found</h2>
+          <p>{{ error() }}</p>
+          <a routerLink="/art" class="btn btn-primary">Return to Art Gallery</a>
+        </div>
+      } @else if (art()) {
+        <div class="art-detail-card">
+          @if (art()!.imageUrl) {
+            <div class="art-image-section">
+              <img [src]="art()!.imageUrl" [alt]="art()!.description || art()!.title" class="art-image-large">
+            </div>
+          }
+
+          <div class="art-content">
+            <div class="art-header">
+              <h1>{{ art()!.title }}</h1>
+            </div>
+
+            <p class="artist">by {{ art()!.artist }}</p>
+
+            <div class="info-row">
+              <span class="info-label">Added:</span>
+              <span class="info-value">{{ formatDate(art()!.createdAt) }}</span>
+            </div>
+
+            <div class="info-row">
+              <span class="info-label">Last Updated:</span>
+              <span class="info-value">{{ formatDate(art()!.updatedAt) }}</span>
+            </div>
+
+            <div class="like-section">
+              <app-like-button
+                entityType="art"
+                [entityId]="art()!.id"
+              ></app-like-button>
+            </div>
+
+            @if (art()!.description) {
+              <div class="notes-section">
+                <h3>Description</h3>
+                <p class="notes">{{ art()!.description }}</p>
+              </div>
+            }
+
+            @if (art()!.tags && art()!.tags.length > 0) {
+              <div class="tags-section">
+                <h3>Tags</h3>
+                <div class="tags-display">
+                  @for (tag of art()!.tags; track tag) {
+                    <span class="tag-chip">{{ tag }}</span>
+                  }
+                </div>
+              </div>
+            }
+
+            @if (art()!.links && art()!.links.length > 0) {
+              <div class="links-section">
+                <h3>External Links</h3>
+                <div class="links-display">
+                  @for (link of art()!.links; track link.url) {
+                    <a [href]="link.url" target="_blank" rel="noopener noreferrer" class="external-link">
+                      {{ link.title }} ↗
+                    </a>
+                  }
+                </div>
+              </div>
+            }
+
+            <div class="comments-section">
+              <h3>Comments</h3>
+              @if (authService.isAuthenticated()) {
+                @if (authService.user()?.isBanned) {
+                  <div class="banned-notice">
+                    You have been banned from commenting.
+                  </div>
+                } @else {
+                  <form (ngSubmit)="addComment()" class="comment-form">
+                    <textarea
+                      [(ngModel)]="newCommentContent"
+                      name="comment"
+                      placeholder="Add a comment (Markdown supported)..."
+                      rows="3"
+                    ></textarea>
+                    <button type="submit" class="btn btn-primary">Post Comment</button>
+                  </form>
+                }
+              } @else {
+                <div class="auth-prompt">
+                  <p>Please sign in to comment.</p>
+                </div>
+              }
+
+              @if (commentsLoading()) {
+                <div class="comments-loading">Loading comments...</div>
+              } @else {
+                <app-comment-display
+                  [comments]="comments"
+                  (edit)="handleCommentEdit($event)"
+                  (delete)="deleteComment($event)"
+                />
+              }
+            </div>
+          </div>
+        </div>
+      }
+    </div>
+  `,
+  styles: [`
+    .container {
+      max-width: 900px;
+      margin: 0 auto;
+      padding: 2rem;
+    }
+
+    .breadcrumb {
+      margin-bottom: 1.5rem;
+    }
+
+    .breadcrumb-link {
+      color: #ec4899;
+      text-decoration: none;
+      font-weight: 500;
+      transition: opacity 0.3s;
+    }
+
+    .breadcrumb-link:hover {
+      opacity: 0.8;
+    }
+
+    .loading {
+      text-align: center;
+      padding: 3rem;
+      color: #666;
+      font-size: 1.1rem;
+    }
+
+    .error-state {
+      text-align: center;
+      padding: 3rem;
+      background: #fef2f2;
+      border: 1px solid #fecaca;
+      border-radius: 8px;
+    }
+
+    .error-state h2 {
+      color: #991b1b;
+      margin-bottom: 1rem;
+    }
+
+    .error-state p {
+      color: #dc2626;
+      margin-bottom: 1.5rem;
+    }
+
+    .art-detail-card {
+      background: white;
+      border: 1px solid #e5e7eb;
+      border-radius: 8px;
+      overflow: hidden;
+      box-shadow: 0 1px 3px rgba(0,0,0,0.1);
+    }
+
+    .art-image-section {
+      width: 100%;
+      background: #f3f4f6;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      padding: 2rem;
+    }
+
+    .art-image-large {
+      max-width: 100%;
+      max-height: 600px;
+      object-fit: contain;
+      border-radius: 4px;
+    }
+
+    .art-content {
+      padding: 2rem;
+    }
+
+    .art-header {
+      display: flex;
+      align-items: center;
+      gap: 1rem;
+      margin-bottom: 1rem;
+      flex-wrap: wrap;
+    }
+
+    .art-header h1 {
+      margin: 0;
+      font-size: 2rem;
+      color: #1f2937;
+    }
+
+    .artist {
+      color: #6b7280;
+      font-weight: 500;
+      font-size: 1.1rem;
+      margin: 0 0 1rem 0;
+    }
+
+    .info-row {
+      display: flex;
+      align-items: center;
+      gap: 1rem;
+      margin-bottom: 0.75rem;
+      padding: 0.5rem 0;
+      border-bottom: 1px solid #f3f4f6;
+    }
+
+    .info-label {
+      font-weight: 600;
+      color: #4b5563;
+      min-width: 120px;
+    }
+
+    .info-value {
+      color: #1f2937;
+    }
+
+    .rating {
+      display: flex;
+      align-items: center;
+      gap: 0.25rem;
+    }
+
+    .rating span {
+      color: #e5e7eb;
+      font-size: 1.2rem;
+    }
+
+    .rating span.filled {
+      color: #f59e0b;
+    }
+
+    .rating-text {
+      margin-left: 0.5rem;
+      font-size: 1rem;
+      color: #6b7280;
+      font-weight: 500;
+    }
+
+    .like-section {
+      margin: 1.5rem 0;
+    }
+
+    .notes-section,
+    .tags-section,
+    .links-section {
+      margin-top: 2rem;
+    }
+
+    .notes-section h3,
+    .tags-section h3,
+    .links-section h3,
+    .comments-section h3 {
+      font-size: 1.25rem;
+      color: #1f2937;
+      margin-bottom: 1rem;
+    }
+
+    .notes {
+      font-size: 1rem;
+      color: #4b5563;
+      line-height: 1.6;
+      white-space: pre-wrap;
+    }
+
+    .tags-display {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 0.5rem;
+    }
+
+    .tag-chip {
+      background: #ec4899;
+      color: white;
+      padding: 0.375rem 0.875rem;
+      border-radius: 12px;
+      font-size: 0.875rem;
+      font-weight: 500;
+    }
+
+    .links-display {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 0.75rem;
+    }
+
+    .external-link {
+      color: #ec4899;
+      text-decoration: none;
+      font-size: 0.95rem;
+      padding: 0.5rem 1rem;
+      border: 2px solid #ec4899;
+      border-radius: 4px;
+      transition: all 0.2s;
+      font-weight: 500;
+    }
+
+    .external-link:hover {
+      background: #ec4899;
+      color: white;
+    }
+
+    .comments-section {
+      margin-top: 2rem;
+      padding-top: 2rem;
+      border-top: 2px solid #e5e7eb;
+    }
+
+    .comment-form {
+      margin-bottom: 1.5rem;
+    }
+
+    .comment-form textarea {
+      width: 100%;
+      padding: 0.75rem;
+      border: 1px solid #d1d5db;
+      border-radius: 4px;
+      font-size: 1rem;
+      resize: vertical;
+      margin-bottom: 0.75rem;
+      font-family: inherit;
+    }
+
+    .comment-form textarea:focus {
+      outline: none;
+      border-color: #ec4899;
+    }
+
+    .banned-notice {
+      background: #fef2f2;
+      border: 1px solid #fecaca;
+      color: #991b1b;
+      padding: 1rem;
+      border-radius: 4px;
+      text-align: center;
+      margin-bottom: 1.5rem;
+      font-size: 0.95rem;
+    }
+
+    .auth-prompt {
+      background: #f3f4f6;
+      padding: 1rem;
+      border-radius: 4px;
+      text-align: center;
+      margin-bottom: 1.5rem;
+    }
+
+    .auth-prompt p {
+      margin: 0;
+      color: #4b5563;
+    }
+
+    .comments-loading {
+      text-align: center;
+      padding: 1.5rem;
+      color: #6b7280;
+      font-size: 0.95rem;
+    }
+
+    .btn {
+      padding: 0.625rem 1.25rem;
+      border: none;
+      border-radius: 4px;
+      cursor: pointer;
+      font-size: 1rem;
+      transition: all 0.3s;
+      font-weight: 500;
+    }
+
+    .btn:hover {
+      opacity: 0.9;
+    }
+
+    .btn-primary {
+      background: #ec4899;
+      color: white;
+    }
+
+    @media (max-width: 640px) {
+      .container {
+        padding: 1rem;
+      }
+
+      .art-header {
+        flex-direction: column;
+        align-items: flex-start;
+      }
+
+      .art-header h1 {
+        font-size: 1.5rem;
+      }
+
+      .info-row {
+        flex-direction: column;
+        align-items: flex-start;
+        gap: 0.25rem;
+      }
+
+      .info-label {
+        min-width: auto;
+      }
+    }
+  `]
+})
+export class ArtDetailComponent implements OnInit {
+  private readonly artService = inject(ArtService);
+  private readonly commentsService = inject(CommentsService);
+  readonly authService = inject(AuthService);
+  private readonly sanitizeService = inject(SanitizeService);
+  private readonly route = inject(ActivatedRoute);
+  private readonly router = inject(Router);
+
+  art = signal<Art | null>(null);
+  comments = signal<Comment[]>([]);
+  loading = signal(true);
+  commentsLoading = signal(false);
+  error = signal<string | null>(null);
+  newCommentContent = '';
+
+  ngOnInit() {
+    const artId = this.route.snapshot.paramMap.get('id');
+    if (!artId) {
+      this.error.set('No artwork ID provided');
+      this.loading.set(false);
+      return;
+    }
+
+    this.loadArt(artId);
+    this.loadComments(artId);
+  }
+
+  private loadArt(artId: string) {
+    this.loading.set(true);
+    this.artService.getArtById(artId).subscribe({
+      next: (art) => {
+        if (!art) {
+          this.error.set('Artwork not found');
+        } else {
+          this.art.set(art);
+        }
+        this.loading.set(false);
+      },
+      error: () => {
+        this.error.set('Failed to load artwork. It may not exist or there was an error.');
+        this.loading.set(false);
+      }
+    });
+  }
+
+  private loadComments(artId: string) {
+    this.commentsLoading.set(true);
+    this.commentsService.getCommentsForArt(artId).subscribe({
+      next: (comments) => {
+        this.comments.set(comments);
+        this.commentsLoading.set(false);
+      },
+      error: () => {
+        this.commentsLoading.set(false);
+      }
+    });
+  }
+
+  addComment() {
+    const art = this.art();
+    if (!art || !this.newCommentContent.trim()) return;
+
+    this.commentsService.addCommentToArt(art.id, { content: this.newCommentContent }).subscribe({
+      next: (comment) => {
+        this.comments.set([comment, ...this.comments()]);
+        this.newCommentContent = '';
+      }
+    });
+  }
+
+  handleCommentEdit(event: { commentId: string; content: string }) {
+    const art = this.art();
+    if (!art) return;
+
+    this.commentsService.updateCommentOnArt(art.id, event.commentId, event.content).subscribe({
+      next: (updatedComment) => {
+        this.comments.set(
+          this.comments().map(c => c.id === event.commentId ? updatedComment : c)
+        );
+      }
+    });
+  }
+
+  deleteComment(commentId: string) {
+    const art = this.art();
+    if (!art || !confirm('Are you sure you want to delete this comment?')) return;
+
+    this.commentsService.deleteCommentFromArt(art.id, commentId).subscribe({
+      next: () => {
+        this.comments.set(this.comments().filter(c => c.id !== commentId));
+      }
+    });
+  }
+
+  formatDate(date: Date | string): string {
+    return new Date(date).toLocaleDateString('en-GB', {
+      year: 'numeric',
+      month: 'long',
+      day: 'numeric'
+    });
+  }
+}

apps/frontend/src/app/components/art/art-gallery.component.ts

@@ -14,12 +14,13 @@ import { SanitizeService } from '../../services/sanitize.service';
 import { SuggestionService } from '../../services/suggestion.service';
 import { PaginationComponent } from '../shared/pagination.component';
 import { LikeButtonComponent } from '../shared/like-button.component';
+import { CommentDisplayComponent } from '../comment-display/comment-display.component';
 import { Art, CreateArtDto, UpdateArtDto, Comment, SuggestionEntity, Link } from '@library/shared-types';
 
 @Component({
   selector: 'app-art-gallery',
   standalone: true,
-  imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent],
+  imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent, CommentDisplayComponent],
   template: `
     <div class="container">
       <div class="header-section">
@@ -105,8 +106,7 @@ import { Art, CreateArtDto, UpdateArtDto, Comment, SuggestionEntity, Link } from
           }
 
           <div class="form-group">
-            <label>Tags</label>
-            <div class="tags-input-container">
+            <div class="tags-input-container" aria-label="Tags">
               @for (tag of newArt.tags; track tag; let i = $index) {
                 <span class="tag">
                   {{ tag }}
@@ -123,8 +123,7 @@ import { Art, CreateArtDto, UpdateArtDto, Comment, SuggestionEntity, Link } from
             </div>
           </div>
 
-          <div class="form-group">
-            <label>External Links</label>
+          <div class="form-group" aria-label="External Links">
             <div class="links-list">
               @for (link of newArt.links; track link.url; let i = $index) {
                 <div class="link-item">
@@ -280,8 +279,7 @@ import { Art, CreateArtDto, UpdateArtDto, Comment, SuggestionEntity, Link } from
           }
 
           <div class="form-group">
-            <label>Tags</label>
-            <div class="tags-input-container">
+            <div class="tags-input-container" aria-label="Tags">
               @for (tag of editArt.tags; track tag; let i = $index) {
                 <span class="tag">
                   {{ tag }}
@@ -298,8 +296,7 @@ import { Art, CreateArtDto, UpdateArtDto, Comment, SuggestionEntity, Link } from
             </div>
           </div>
 
-          <div class="form-group">
-            <label>External Links</label>
+          <div class="form-group" aria-label="External Links">
             <div class="links-list">
               @for (link of editArt.links; track link.url; let i = $index) {
                 <div class="link-item">
@@ -401,6 +398,10 @@ import { Art, CreateArtDto, UpdateArtDto, Comment, SuggestionEntity, Link } from
                   [alt]="art.description || art.title"
                   class="art-image"
                   (click)="openLightbox(art)"
+                  (keyup.enter)="openLightbox(art)"
+                  (keyup.space)="openLightbox(art)"
+                  tabindex="0"
+                  role="button"
                 >
               </div>
 
@@ -468,56 +469,11 @@ import { Art, CreateArtDto, UpdateArtDto, Comment, SuggestionEntity, Link } from
                         }
                       }
 
-                      @if (commentsLoading()[art.id]) {
-                        <div class="comments-loading">Loading comments...</div>
-                      } @else {
-                        @for (comment of comments()[art.id] || []; track comment.id) {
-                          <div class="comment">
-                            <div class="comment-header">
-                              @if (comment.user.avatar) {
-                                <img [src]="comment.user.avatar" [alt]="comment.user.username" class="comment-avatar">
-                              }
-                              <span class="comment-author">{{ comment.user.username }}</span>
-                              @if (comment.user.inDiscord) {
-                                <span class="discord-badge">Discord</span>
-                              }
-                              @if (comment.user.isVip) {
-                                <span class="vip-badge">VIP</span>
-                              }
-                              @if (comment.user.isMod) {
-                                <span class="mod-badge">Mod</span>
-                              }
-                              @if (comment.user.isStaff) {
-                                <span class="staff-badge">Staff</span>
-                              }
-                              <span class="comment-date">{{ formatDate(comment.createdAt) }}</span>
-                              @if (canEditComment(comment)) {
-                                <button (click)="startEditComment(art.id, comment)" class="btn btn-secondary btn-xs">Edit</button>
-                              }
-                              @if (canDeleteComment(comment)) {
-                                <button (click)="deleteComment(art.id, comment.id)" class="btn btn-danger btn-xs">Delete</button>
-                              }
-                            </div>
-                            @if (editingCommentId() === comment.id) {
-                              <div class="comment-edit-form">
-                                <textarea
-                                  [(ngModel)]="editCommentContent"
-                                  name="editComment"
-                                  rows="3"
-                                ></textarea>
-                                <div class="comment-edit-actions">
-                                  <button (click)="saveCommentEdit(art.id, comment.id)" class="btn btn-primary btn-xs">Save</button>
-                                  <button (click)="cancelCommentEdit()" class="btn btn-secondary btn-xs">Cancel</button>
-                                </div>
-                              </div>
-                            } @else {
-                              <div class="comment-content" [innerHTML]="sanitizeService.sanitizeHtml(comment.content)"></div>
-                            }
-                          </div>
-                        } @empty {
-                          <div class="no-comments">No comments yet. Be the first to comment!</div>
-                        }
-                      }
+                      <app-comment-display
+                        [comments]="getCommentsSignal(art.id)"
+                        (edit)="handleCommentEdit(art.id, $event)"
+                        (delete)="deleteComment(art.id, $event)"
+                      />
                     </div>
                   }
                 </div>
@@ -536,8 +492,8 @@ import { Art, CreateArtDto, UpdateArtDto, Comment, SuggestionEntity, Link } from
       }
 
       @if (lightboxArt()) {
-        <div class="lightbox" (click)="closeLightbox()">
-          <div class="lightbox-content" (click)="$event.stopPropagation()">
+        <div class="lightbox" (click)="closeLightbox()" (keyup.escape)="closeLightbox()" tabindex="0" role="button">
+          <div class="lightbox-content" (click)="$event.stopPropagation()" (keyup)="$event.stopPropagation()" tabindex="-1">
             <button class="lightbox-close" (click)="closeLightbox()">&times;</button>
             <img [src]="lightboxArt()!.imageUrl" [alt]="lightboxArt()!.description || lightboxArt()!.title">
             <div class="lightbox-info">
@@ -1571,7 +1527,7 @@ export class ArtGalleryComponent implements OnInit {
 
     try {
       await this.suggestionService.createSuggestion({
-        entityType: SuggestionEntity.ART,
+        entityType: SuggestionEntity.art,
         title: this.suggestedArt.title,
         artist: this.suggestedArt.artist,
         imageUrl: this.suggestedArt.imageUrl,
@@ -1615,4 +1571,21 @@ export class ArtGalleryComponent implements OnInit {
   toggleFilters() {
     this.showFilters.update(v => !v);
   }
+
+  handleCommentEdit(artId: string, event: { commentId: string; content: string }) {
+    this.commentsService.updateCommentOnArt(artId, event.commentId, event.content).subscribe({
+      next: (updatedComment) => {
+        this.comments.set({
+          ...this.comments(),
+          [artId]: (this.comments()[artId] || []).map(c =>
+            c.id === event.commentId ? updatedComment : c
+          )
+        });
+      }
+    });
+  }
+
+  getCommentsSignal(artId: string) {
+    return signal(this.comments()[artId] || []);
+  }
 }

apps/frontend/src/app/components/books/book-detail.component.ts

@@ -0,0 +1,654 @@
+/**
+ * @copyright 2026 NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+
+import { Component, OnInit, inject, signal } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { RouterLink, ActivatedRoute, Router } from '@angular/router';
+import { FormsModule } from '@angular/forms';
+import { BooksService } from '../../services/books.service';
+import { CommentsService } from '../../services/comments.service';
+import { AuthService } from '../../services/auth.service';
+import { SanitizeService } from '../../services/sanitize.service';
+import { CommentDisplayComponent } from '../comment-display/comment-display.component';
+import { LikeButtonComponent } from '../shared/like-button.component';
+import { Book, Comment, BookStatus } from '@library/shared-types';
+
+@Component({
+  selector: 'app-book-detail',
+  standalone: true,
+  imports: [CommonModule, RouterLink, FormsModule, CommentDisplayComponent, LikeButtonComponent],
+  template: `
+    <div class="container">
+      <div class="breadcrumb">
+        <a routerLink="/books" class="breadcrumb-link">← Back to Books</a>
+      </div>
+
+      @if (loading()) {
+        <div class="loading">Loading book details...</div>
+      } @else if (error()) {
+        <div class="error-state">
+          <h2>Book Not Found</h2>
+          <p>{{ error() }}</p>
+          <a routerLink="/books" class="btn btn-primary">Return to Books</a>
+        </div>
+      } @else if (book()) {
+        <div class="book-detail-card">
+          @if (book()!.coverImage) {
+            <div class="book-cover-section">
+              <img [src]="book()!.coverImage" [alt]="book()!.title" class="book-cover-large">
+            </div>
+          }
+
+          <div class="book-content">
+            <div class="book-header">
+              <h1>{{ book()!.title }}</h1>
+              <span class="status status-{{ book()!.status }}">
+                {{ getStatusLabel(book()!.status) }}
+              </span>
+            </div>
+
+            <p class="author">by {{ book()!.author }}</p>
+
+            @if (book()!.series) {
+              <p class="series">
+                📚 {{ book()!.series }}@if (book()!.seriesOrder) { #{{ book()!.seriesOrder }}}
+              </p>
+            }
+
+            @if (book()!.isbn) {
+              <div class="info-row">
+                <span class="info-label">ISBN:</span>
+                <span class="info-value">{{ book()!.isbn }}</span>
+              </div>
+            }
+
+            @if (book()!.rating) {
+              <div class="info-row">
+                <span class="info-label">Rating:</span>
+                <div class="rating">
+                  @for (star of [1,2,3,4,5,6,7,8,9,10]; track star) {
+                    <span [class.filled]="star <= book()!.rating!">★</span>
+                  }
+                  <span class="rating-text">({{ book()!.rating }}/10)</span>
+                </div>
+              </div>
+            }
+
+            @if (book()!.timeSpent) {
+              <div class="info-row">
+                <span class="info-label">Reading Time:</span>
+                <span class="info-value time-spent">{{ formatTimeSpent(book()!.timeSpent!) }}</span>
+              </div>
+            }
+
+            @if (book()!.dateStarted) {
+              <div class="info-row">
+                <span class="info-label">Started:</span>
+                <span class="info-value">{{ formatDate(book()!.dateStarted!) }}</span>
+              </div>
+            }
+
+            @if (book()!.dateFinished) {
+              <div class="info-row">
+                <span class="info-label">Finished:</span>
+                <span class="info-value">{{ formatDate(book()!.dateFinished!) }}</span>
+              </div>
+            }
+
+            <div class="info-row">
+              <span class="info-label">Added:</span>
+              <span class="info-value">{{ formatDate(book()!.createdAt) }}</span>
+            </div>
+
+            <div class="info-row">
+              <span class="info-label">Last Updated:</span>
+              <span class="info-value">{{ formatDate(book()!.updatedAt) }}</span>
+            </div>
+
+            <div class="like-section">
+              <app-like-button
+                entityType="book"
+                [entityId]="book()!.id"
+              ></app-like-button>
+            </div>
+
+            @if (book()!.notes) {
+              <div class="notes-section">
+                <h3>Notes</h3>
+                <p class="notes">{{ book()!.notes }}</p>
+              </div>
+            }
+
+            @if (book()!.tags && book()!.tags.length > 0) {
+              <div class="tags-section">
+                <h3>Tags</h3>
+                <div class="tags-display">
+                  @for (tag of book()!.tags; track tag) {
+                    <span class="tag-chip">{{ tag }}</span>
+                  }
+                </div>
+              </div>
+            }
+
+            @if (book()!.links && book()!.links.length > 0) {
+              <div class="links-section">
+                <h3>External Links</h3>
+                <div class="links-display">
+                  @for (link of book()!.links; track link.url) {
+                    <a [href]="link.url" target="_blank" rel="noopener noreferrer" class="external-link">
+                      {{ link.title }} ↗
+                    </a>
+                  }
+                </div>
+              </div>
+            }
+
+            <div class="comments-section">
+              <h3>Comments</h3>
+              @if (authService.isAuthenticated()) {
+                @if (authService.user()?.isBanned) {
+                  <div class="banned-notice">
+                    You have been banned from commenting.
+                  </div>
+                } @else {
+                  <form (ngSubmit)="addComment()" class="comment-form">
+                    <textarea
+                      [(ngModel)]="newCommentContent"
+                      name="comment"
+                      placeholder="Add a comment (Markdown supported)..."
+                      rows="3"
+                    ></textarea>
+                    <button type="submit" class="btn btn-primary">Post Comment</button>
+                  </form>
+                }
+              } @else {
+                <div class="auth-prompt">
+                  <p>Please sign in to comment.</p>
+                </div>
+              }
+
+              @if (commentsLoading()) {
+                <div class="comments-loading">Loading comments...</div>
+              } @else {
+                <app-comment-display
+                  [comments]="comments"
+                  (edit)="handleCommentEdit($event)"
+                  (delete)="deleteComment($event)"
+                />
+              }
+            </div>
+          </div>
+        </div>
+      }
+    </div>
+  `,
+  styles: [`
+    .container {
+      max-width: 900px;
+      margin: 0 auto;
+      padding: 2rem;
+    }
+
+    .breadcrumb {
+      margin-bottom: 1.5rem;
+    }
+
+    .breadcrumb-link {
+      color: #8b6f47;
+      text-decoration: none;
+      font-weight: 500;
+      transition: opacity 0.3s;
+    }
+
+    .breadcrumb-link:hover {
+      opacity: 0.8;
+    }
+
+    .loading {
+      text-align: center;
+      padding: 3rem;
+      color: #666;
+      font-size: 1.1rem;
+    }
+
+    .error-state {
+      text-align: center;
+      padding: 3rem;
+      background: #fef2f2;
+      border: 1px solid #fecaca;
+      border-radius: 8px;
+    }
+
+    .error-state h2 {
+      color: #991b1b;
+      margin-bottom: 1rem;
+    }
+
+    .error-state p {
+      color: #dc2626;
+      margin-bottom: 1.5rem;
+    }
+
+    .book-detail-card {
+      background: white;
+      border: 1px solid #e5e7eb;
+      border-radius: 8px;
+      overflow: hidden;
+      box-shadow: 0 1px 3px rgba(0,0,0,0.1);
+    }
+
+    .book-cover-section {
+      width: 100%;
+      background: #f3f4f6;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      padding: 2rem;
+    }
+
+    .book-cover-large {
+      max-width: 100%;
+      max-height: 400px;
+      object-fit: contain;
+      border-radius: 4px;
+    }
+
+    .book-content {
+      padding: 2rem;
+    }
+
+    .book-header {
+      display: flex;
+      align-items: center;
+      gap: 1rem;
+      margin-bottom: 1rem;
+      flex-wrap: wrap;
+    }
+
+    .book-header h1 {
+      margin: 0;
+      font-size: 2rem;
+      color: #1f2937;
+    }
+
+    .author {
+      color: #6b7280;
+      font-style: italic;
+      font-size: 1.1rem;
+      margin: 0 0 1rem 0;
+    }
+
+    .status {
+      display: inline-block;
+      padding: 0.5rem 1rem;
+      border-radius: 4px;
+      font-size: 0.9rem;
+      font-weight: 500;
+    }
+
+    .status-reading {
+      background: #fef3c7;
+      color: #92400e;
+    }
+
+    .status-finished {
+      background: #d1fae5;
+      color: #065f46;
+    }
+
+    .status-toRead {
+      background: #e0e7ff;
+      color: #3730a3;
+    }
+
+    .status-retired {
+      background: #f3f4f6;
+      color: #4b5563;
+    }
+
+    .series {
+      color: #8b6f47;
+      font-size: 1rem;
+      margin: 0.5rem 0 1.5rem 0;
+      font-weight: 500;
+      font-style: italic;
+    }
+
+    .info-row {
+      display: flex;
+      align-items: center;
+      gap: 1rem;
+      margin-bottom: 0.75rem;
+      padding: 0.5rem 0;
+      border-bottom: 1px solid #f3f4f6;
+    }
+
+    .info-label {
+      font-weight: 600;
+      color: #4b5563;
+      min-width: 120px;
+    }
+
+    .info-value {
+      color: #1f2937;
+    }
+
+    .time-spent {
+      color: #10b981;
+      font-weight: 600;
+    }
+
+    .rating {
+      display: flex;
+      align-items: center;
+      gap: 0.25rem;
+    }
+
+    .rating span {
+      color: #e5e7eb;
+      font-size: 1.2rem;
+    }
+
+    .rating span.filled {
+      color: #f59e0b;
+    }
+
+    .rating-text {
+      margin-left: 0.5rem;
+      font-size: 1rem;
+      color: #6b7280;
+      font-weight: 500;
+    }
+
+    .like-section {
+      margin: 1.5rem 0;
+    }
+
+    .notes-section,
+    .tags-section,
+    .links-section {
+      margin-top: 2rem;
+    }
+
+    .notes-section h3,
+    .tags-section h3,
+    .links-section h3,
+    .comments-section h3 {
+      font-size: 1.25rem;
+      color: #1f2937;
+      margin-bottom: 1rem;
+    }
+
+    .notes {
+      font-size: 1rem;
+      color: #4b5563;
+      line-height: 1.6;
+      white-space: pre-wrap;
+    }
+
+    .tags-display {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 0.5rem;
+    }
+
+    .tag-chip {
+      background: #8b6f47;
+      color: white;
+      padding: 0.375rem 0.875rem;
+      border-radius: 12px;
+      font-size: 0.875rem;
+      font-weight: 500;
+    }
+
+    .links-display {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 0.75rem;
+    }
+
+    .external-link {
+      color: #8b6f47;
+      text-decoration: none;
+      font-size: 0.95rem;
+      padding: 0.5rem 1rem;
+      border: 2px solid #8b6f47;
+      border-radius: 4px;
+      transition: all 0.2s;
+      font-weight: 500;
+    }
+
+    .external-link:hover {
+      background: #8b6f47;
+      color: white;
+    }
+
+    .comments-section {
+      margin-top: 2rem;
+      padding-top: 2rem;
+      border-top: 2px solid #e5e7eb;
+    }
+
+    .comment-form {
+      margin-bottom: 1.5rem;
+    }
+
+    .comment-form textarea {
+      width: 100%;
+      padding: 0.75rem;
+      border: 1px solid #d1d5db;
+      border-radius: 4px;
+      font-size: 1rem;
+      resize: vertical;
+      margin-bottom: 0.75rem;
+      font-family: inherit;
+    }
+
+    .comment-form textarea:focus {
+      outline: none;
+      border-color: #8b6f47;
+    }
+
+    .banned-notice {
+      background: #fef2f2;
+      border: 1px solid #fecaca;
+      color: #991b1b;
+      padding: 1rem;
+      border-radius: 4px;
+      text-align: center;
+      margin-bottom: 1.5rem;
+      font-size: 0.95rem;
+    }
+
+    .auth-prompt {
+      background: #f3f4f6;
+      padding: 1rem;
+      border-radius: 4px;
+      text-align: center;
+      margin-bottom: 1.5rem;
+    }
+
+    .auth-prompt p {
+      margin: 0;
+      color: #4b5563;
+    }
+
+    .comments-loading {
+      text-align: center;
+      padding: 1.5rem;
+      color: #6b7280;
+      font-size: 0.95rem;
+    }
+
+    .btn {
+      padding: 0.625rem 1.25rem;
+      border: none;
+      border-radius: 4px;
+      cursor: pointer;
+      font-size: 1rem;
+      transition: all 0.3s;
+      font-weight: 500;
+    }
+
+    .btn:hover {
+      opacity: 0.9;
+    }
+
+    .btn-primary {
+      background: #8b6f47;
+      color: white;
+    }
+
+    @media (max-width: 640px) {
+      .container {
+        padding: 1rem;
+      }
+
+      .book-header {
+        flex-direction: column;
+        align-items: flex-start;
+      }
+
+      .book-header h1 {
+        font-size: 1.5rem;
+      }
+
+      .info-row {
+        flex-direction: column;
+        align-items: flex-start;
+        gap: 0.25rem;
+      }
+
+      .info-label {
+        min-width: auto;
+      }
+    }
+  `]
+})
+export class BookDetailComponent implements OnInit {
+  private readonly booksService = inject(BooksService);
+  private readonly commentsService = inject(CommentsService);
+  readonly authService = inject(AuthService);
+  private readonly sanitizeService = inject(SanitizeService);
+  private readonly route = inject(ActivatedRoute);
+  private readonly router = inject(Router);
+
+  book = signal<Book | null>(null);
+  comments = signal<Comment[]>([]);
+  loading = signal(true);
+  commentsLoading = signal(false);
+  error = signal<string | null>(null);
+  newCommentContent = '';
+
+  ngOnInit() {
+    const bookId = this.route.snapshot.paramMap.get('id');
+    if (!bookId) {
+      this.error.set('No book ID provided');
+      this.loading.set(false);
+      return;
+    }
+
+    this.loadBook(bookId);
+    this.loadComments(bookId);
+  }
+
+  private loadBook(bookId: string) {
+    this.loading.set(true);
+    this.booksService.getBookById(bookId).subscribe({
+      next: (book) => {
+        if (!book) {
+          this.error.set('Book not found');
+        } else {
+          this.book.set(book);
+        }
+        this.loading.set(false);
+      },
+      error: () => {
+        this.error.set('Failed to load book. It may not exist or there was an error.');
+        this.loading.set(false);
+      }
+    });
+  }
+
+  private loadComments(bookId: string) {
+    this.commentsLoading.set(true);
+    this.commentsService.getCommentsForBook(bookId).subscribe({
+      next: (comments) => {
+        this.comments.set(comments);
+        this.commentsLoading.set(false);
+      },
+      error: () => {
+        this.commentsLoading.set(false);
+      }
+    });
+  }
+
+  addComment() {
+    const book = this.book();
+    if (!book || !this.newCommentContent.trim()) return;
+
+    this.commentsService.addCommentToBook(book.id, { content: this.newCommentContent }).subscribe({
+      next: (comment) => {
+        this.comments.set([comment, ...this.comments()]);
+        this.newCommentContent = '';
+      }
+    });
+  }
+
+  handleCommentEdit(event: { commentId: string; content: string }) {
+    const book = this.book();
+    if (!book) return;
+
+    this.commentsService.updateCommentOnBook(book.id, event.commentId, event.content).subscribe({
+      next: (updatedComment) => {
+        this.comments.set(
+          this.comments().map(c => c.id === event.commentId ? updatedComment : c)
+        );
+      }
+    });
+  }
+
+  deleteComment(commentId: string) {
+    const book = this.book();
+    if (!book || !confirm('Are you sure you want to delete this comment?')) return;
+
+    this.commentsService.deleteCommentFromBook(book.id, commentId).subscribe({
+      next: () => {
+        this.comments.set(this.comments().filter(c => c.id !== commentId));
+      }
+    });
+  }
+
+  getStatusLabel(status: BookStatus): string {
+    switch (status) {
+      case BookStatus.reading: return 'Currently Reading';
+      case BookStatus.finished: return 'Finished';
+      case BookStatus.toRead: return 'To Read';
+      case BookStatus.retired: return 'Retired';
+    }
+  }
+
+  formatDate(date: Date | string): string {
+    return new Date(date).toLocaleDateString('en-GB', {
+      year: 'numeric',
+      month: 'long',
+      day: 'numeric'
+    });
+  }
+
+  formatTimeSpent(minutes: number): string {
+    const hours = Math.floor(minutes / 60);
+    const mins = minutes % 60;
+
+    if (hours === 0) {
+      return `${mins} minutes`;
+    } else if (mins === 0) {
+      return `${hours} hour${hours === 1 ? '' : 's'}`;
+    } else {
+      return `${hours} hour${hours === 1 ? '' : 's'} ${mins} minute${mins === 1 ? '' : 's'}`;
+    }
+  }
+}

apps/frontend/src/app/components/books/books-list.component.ts

@@ -14,12 +14,13 @@ import { SanitizeService } from '../../services/sanitize.service';
 import { SuggestionService } from '../../services/suggestion.service';
 import { PaginationComponent } from '../shared/pagination.component';
 import { LikeButtonComponent } from '../shared/like-button.component';
+import { CommentDisplayComponent } from '../comment-display/comment-display.component';
 import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEntity, Link } from '@library/shared-types';
 
 @Component({
   selector: 'app-books-list',
   standalone: true,
-  imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent],
+  imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent, CommentDisplayComponent],
   template: `
     <div class="container">
       <div class="header-section">
@@ -79,9 +80,30 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
               <option [value]="BookStatus.reading">Currently Reading</option>
               <option [value]="BookStatus.finished">Finished</option>
               <option [value]="BookStatus.toRead">To Read</option>
+              <option [value]="BookStatus.retired">Retired</option>
             </select>
           </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">
             <label for="rating">Rating (1-10)</label>
             <input
@@ -94,6 +116,34 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
             >
           </div>
 
+          <div class="form-row">
+            <div class="form-group">
+              <label for="timeHours">Time Spent (Hours)</label>
+              <input
+                type="number"
+                id="timeHours"
+                [(ngModel)]="newBookTimeHours"
+                name="timeHours"
+                min="0"
+                placeholder="0"
+                (ngModelChange)="updateNewBookTimeSpent()"
+              >
+            </div>
+            <div class="form-group">
+              <label for="timeMinutes">Time Spent (Minutes)</label>
+              <input
+                type="number"
+                id="timeMinutes"
+                [(ngModel)]="newBookTimeMinutes"
+                name="timeMinutes"
+                min="0"
+                max="59"
+                placeholder="0"
+                (ngModelChange)="updateNewBookTimeSpent()"
+              >
+            </div>
+          </div>
+
           <div class="form-group">
             <label for="notes">Notes</label>
             <textarea
@@ -105,6 +155,29 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
             ></textarea>
           </div>
 
+          <div class="form-group">
+            <label for="series">Series (optional)</label>
+            <input
+              type="text"
+              id="series"
+              [(ngModel)]="newBook.series"
+              name="series"
+              placeholder="e.g., Harry Potter"
+            >
+          </div>
+
+          <div class="form-group">
+            <label for="seriesOrder">Series Order (optional)</label>
+            <input
+              type="number"
+              id="seriesOrder"
+              [(ngModel)]="newBook.seriesOrder"
+              name="seriesOrder"
+              min="1"
+              placeholder="Order in series"
+            >
+          </div>
+
           <div class="form-group">
             <label for="coverImage">Cover Image (max 500KB)</label>
             <input
@@ -126,8 +199,7 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
           </div>
 
           <div class="form-group">
-            <label>Tags</label>
-            <div class="tags-input-container">
+            <div class="tags-input-container" aria-label="Tags">
               @for (tag of newBook.tags; track tag; let i = $index) {
                 <span class="tag">
                   {{ tag }}
@@ -144,8 +216,7 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
             </div>
           </div>
 
-          <div class="form-group">
-            <label>External Links</label>
+          <div class="form-group" aria-label="External Links">
             <div class="links-list">
               @for (link of newBook.links; track link.url; let i = $index) {
                 <div class="link-item">
@@ -222,9 +293,30 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
               <option [value]="BookStatus.reading">Currently Reading</option>
               <option [value]="BookStatus.finished">Finished</option>
               <option [value]="BookStatus.toRead">To Read</option>
+              <option [value]="BookStatus.retired">Retired</option>
             </select>
           </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">
             <label for="edit-rating">Rating (1-10)</label>
             <input
@@ -237,6 +329,34 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
             >
           </div>
 
+          <div class="form-row">
+            <div class="form-group">
+              <label for="edit-timeHours">Time Spent (Hours)</label>
+              <input
+                type="number"
+                id="edit-timeHours"
+                [(ngModel)]="editBookTimeHours"
+                name="timeHours"
+                min="0"
+                placeholder="0"
+                (ngModelChange)="updateEditBookTimeSpent()"
+              >
+            </div>
+            <div class="form-group">
+              <label for="edit-timeMinutes">Time Spent (Minutes)</label>
+              <input
+                type="number"
+                id="edit-timeMinutes"
+                [(ngModel)]="editBookTimeMinutes"
+                name="timeMinutes"
+                min="0"
+                max="59"
+                placeholder="0"
+                (ngModelChange)="updateEditBookTimeSpent()"
+              >
+            </div>
+          </div>
+
           <div class="form-group">
             <label for="edit-notes">Notes</label>
             <textarea
@@ -248,6 +368,29 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
             ></textarea>
           </div>
 
+          <div class="form-group">
+            <label for="edit-series">Series (optional)</label>
+            <input
+              type="text"
+              id="edit-series"
+              [(ngModel)]="editBook.series"
+              name="series"
+              placeholder="e.g., Harry Potter"
+            >
+          </div>
+
+          <div class="form-group">
+            <label for="edit-seriesOrder">Series Order (optional)</label>
+            <input
+              type="number"
+              id="edit-seriesOrder"
+              [(ngModel)]="editBook.seriesOrder"
+              name="seriesOrder"
+              min="1"
+              placeholder="Order in series"
+            >
+          </div>
+
           <div class="form-group">
             <label for="edit-coverImage">Cover Image (max 500KB)</label>
             <input
@@ -269,8 +412,7 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
           </div>
 
           <div class="form-group">
-            <label>Tags</label>
-            <div class="tags-input-container">
+            <div class="tags-input-container" aria-label="Tags">
               @for (tag of editBook.tags; track tag; let i = $index) {
                 <span class="tag">
                   {{ tag }}
@@ -287,8 +429,7 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
             </div>
           </div>
 
-          <div class="form-group">
-            <label>External Links</label>
+          <div class="form-group" aria-label="External Links">
             <div class="links-list">
               @for (link of editBook.links; track link.url; let i = $index) {
                 <div class="link-item">
@@ -421,8 +562,7 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
       @if (showFilters()) {
         <div class="advanced-filters">
           <div class="filter-group">
-            <label>Filter by Tags:</label>
-            <div class="tags-filter">
+            <div class="tags-filter" aria-label="Filter by Tags">
               @for (tag of allTags(); track tag) {
                 <label class="tag-checkbox">
                   <input
@@ -475,6 +615,13 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
         >
           To Read ({{ toReadCount() }})
         </button>
+        <button
+          (click)="setFilter(BookStatus.retired)"
+          [class.active]="statusFilter() === BookStatus.retired"
+          class="filter-btn"
+        >
+          Retired ({{ retiredCount() }})
+        </button>
       </div>
 
       @if (loading()) {
@@ -504,6 +651,11 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
               <div class="book-info">
                 <h3>{{ book.title }}</h3>
                 <p class="author">by {{ book.author }}</p>
+                @if (book.series) {
+                  <p class="series">
+                    📚 {{ book.series }}@if (book.seriesOrder) { #{{ book.seriesOrder }}}
+                  </p>
+                }
 
                 <span class="status status-{{ book.status }}">
                   {{ getStatusLabel(book.status) }}
@@ -517,6 +669,12 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
                   </div>
                 }
 
+                @if (book.timeSpent) {
+                  <p class="time-spent">
+                    📖 Reading Time: {{ formatTimeSpent(book.timeSpent) }}
+                  </p>
+                }
+
                 <app-like-button
                   entityType="book"
                   [entityId]="book.id"
@@ -548,12 +706,30 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
                   </div>
                 }
 
+                @if (book.dateStarted) {
+                  <p class="date-started">
+                    Started: {{ formatDate(book.dateStarted) }}
+                  </p>
+                }
+
                 @if (book.dateFinished) {
                   <p class="date-finished">
                     Finished: {{ formatDate(book.dateFinished) }}
                   </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()) {
                   <div class="actions">
                     <button (click)="startEdit(book)" class="btn btn-secondary btn-sm">
@@ -593,52 +769,11 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
                       @if (commentsLoading()[book.id]) {
                         <div class="comments-loading">Loading comments...</div>
                       } @else {
-                        @for (comment of comments()[book.id] || []; track comment.id) {
-                          <div class="comment">
-                            <div class="comment-header">
-                              @if (comment.user.avatar) {
-                                <img [src]="comment.user.avatar" [alt]="comment.user.username" class="comment-avatar">
-                              }
-                              <span class="comment-author">{{ comment.user.username }}</span>
-                              @if (comment.user.inDiscord) {
-                                <span class="discord-badge">Discord</span>
-                              }
-                              @if (comment.user.isVip) {
-                                <span class="vip-badge">VIP</span>
-                              }
-                              @if (comment.user.isMod) {
-                                <span class="mod-badge">Mod</span>
-                              }
-                              @if (comment.user.isStaff) {
-                                <span class="staff-badge">Staff</span>
-                              }
-                              <span class="comment-date">{{ formatDate(comment.createdAt) }}</span>
-                              @if (canEditComment(comment)) {
-                                <button (click)="startEditComment(book.id, comment)" class="btn btn-secondary btn-xs">Edit</button>
-                              }
-                              @if (canDeleteComment(comment)) {
-                                <button (click)="deleteComment(book.id, comment.id)" class="btn btn-danger btn-xs">Delete</button>
-                              }
-                            </div>
-                            @if (editingCommentId() === comment.id) {
-                              <div class="comment-edit-form">
-                                <textarea
-                                  [(ngModel)]="editCommentContent"
-                                  name="editComment"
-                                  rows="3"
-                                ></textarea>
-                                <div class="comment-edit-actions">
-                                  <button (click)="saveCommentEdit(book.id, comment.id)" class="btn btn-primary btn-xs">Save</button>
-                                  <button (click)="cancelCommentEdit()" class="btn btn-secondary btn-xs">Cancel</button>
-                                </div>
-                              </div>
-                            } @else {
-                              <div class="comment-content" [innerHTML]="sanitizeService.sanitizeHtml(comment.content)"></div>
-                            }
-                          </div>
-                        } @empty {
-                          <div class="no-comments">No comments yet. Be the first to comment!</div>
-                        }
+                        <app-comment-display
+                          [comments]="getCommentsSignal(book.id)"
+                          (edit)="handleCommentEdit(book.id, $event)"
+                          (delete)="deleteComment(book.id, $event)"
+                        />
                       }
                     </div>
                   }
@@ -697,6 +832,13 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
       font-style: italic;
     }
 
+    .form-row {
+      display: grid;
+      grid-template-columns: 1fr 1fr;
+      gap: 1rem;
+      margin-bottom: 1rem;
+    }
+
     .form-group {
       margin-bottom: 1rem;
     }
@@ -943,6 +1085,14 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
       margin: 0.5rem 0;
     }
 
+    .series {
+      color: #8b6f47;
+      font-size: 0.85rem;
+      margin: 0.5rem 0;
+      font-weight: 500;
+      font-style: italic;
+    }
+
     .status {
       display: inline-block;
       padding: 0.25rem 0.5rem;
@@ -977,6 +1127,13 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
       color: var(--witch-rose);
     }
 
+    .time-spent {
+      font-size: 0.9rem;
+      color: #10b981;
+      font-weight: 500;
+      margin: 0.5rem 0;
+    }
+
     .isbn {
       font-size: 0.8rem;
       color: var(--witch-mauve);
@@ -989,7 +1146,10 @@ import { Book, BookStatus, CreateBookDto, UpdateBookDto, Comment, SuggestionEnti
       margin: 0.5rem 0;
     }
 
-    .date-finished {
+    .date-started,
+    .date-finished,
+    .date-added,
+    .date-updated {
       font-size: 0.85rem;
       color: var(--witch-plum);
       margin-top: 0.5rem;
@@ -1417,6 +1577,7 @@ export class BooksListComponent implements OnInit {
   readingCount = computed(() => this.books().filter(book => book.status === BookStatus.reading).length);
   finishedCount = computed(() => this.books().filter(book => book.status === BookStatus.finished).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
   allTags = computed(() => {
@@ -1467,11 +1628,13 @@ export class BooksListComponent implements OnInit {
 
   totalFilteredBooks = computed(() => this.filteredBooks().length);
 
-  newBook: Partial<CreateBookDto> = {
+  newBook: Partial<CreateBookDto> & { dateStarted?: Date; dateFinished?: Date } = {
     title: '',
     author: '',
     isbn: '',
     status: BookStatus.toRead,
+    dateStarted: undefined,
+    dateFinished: undefined,
     rating: undefined,
     notes: '',
     tags: [],
@@ -1480,6 +1643,11 @@ export class BooksListComponent implements OnInit {
 
   editBook: Partial<UpdateBookDto> = {};
 
+  newBookTimeHours = 0;
+  newBookTimeMinutes = 0;
+  editBookTimeHours = 0;
+  editBookTimeMinutes = 0;
+
   // Tags and links input state
   newTagInput = '';
   editTagInput = '';
@@ -1552,6 +1720,7 @@ export class BooksListComponent implements OnInit {
       case BookStatus.reading: return 'Currently Reading';
       case BookStatus.finished: return 'Finished';
       case BookStatus.toRead: return 'To Read';
+      case BookStatus.retired: return 'Retired';
     }
   }
 
@@ -1568,6 +1737,8 @@ export class BooksListComponent implements OnInit {
       author: '',
       isbn: '',
       status: BookStatus.toRead,
+      dateStarted: undefined,
+      dateFinished: undefined,
       rating: undefined,
       notes: '',
       coverImage: undefined,
@@ -1579,6 +1750,8 @@ export class BooksListComponent implements OnInit {
     this.newTagInput = '';
     this.newLinkTitle = '';
     this.newLinkUrl = '';
+    this.newBookTimeHours = 0;
+    this.newBookTimeMinutes = 0;
   }
 
   addTag(target: 'new' | 'edit') {
@@ -1634,6 +1807,8 @@ export class BooksListComponent implements OnInit {
       author: this.newBook.author,
       isbn: this.newBook.isbn,
       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,
       notes: this.newBook.notes,
       coverImage: this.newBook.coverImage,
@@ -1662,11 +1837,15 @@ export class BooksListComponent implements OnInit {
       author: book.author,
       isbn: book.isbn,
       status: book.status,
+      dateStarted: book.dateStarted,
+      dateFinished: book.dateFinished,
       rating: book.rating,
       notes: book.notes,
       coverImage: book.coverImage,
       tags: [...(book.tags || [])],
-      links: [...(book.links || [])]
+      links: [...(book.links || [])],
+      series: book.series,
+      seriesOrder: book.seriesOrder
     };
     this.editBookImagePreview.set(book.coverImage || null);
     this.showAddForm.set(false);
@@ -1674,6 +1853,13 @@ export class BooksListComponent implements OnInit {
     this.editTagInput = '';
     this.editLinkTitle = '';
     this.editLinkUrl = '';
+    if (book.timeSpent) {
+      this.editBookTimeHours = Math.floor(book.timeSpent / 60);
+      this.editBookTimeMinutes = book.timeSpent % 60;
+    } else {
+      this.editBookTimeHours = 0;
+      this.editBookTimeMinutes = 0;
+    }
   }
 
   cancelEdit() {
@@ -1690,7 +1876,13 @@ export class BooksListComponent implements OnInit {
     const book = this.editingBook();
     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.cancelEdit();
     });
@@ -1700,6 +1892,29 @@ export class BooksListComponent implements OnInit {
     return new Date(date).toLocaleDateString();
   }
 
+  updateNewBookTimeSpent() {
+    const totalMinutes = (this.newBookTimeHours * 60) + this.newBookTimeMinutes;
+    this.newBook.timeSpent = totalMinutes > 0 ? totalMinutes : undefined;
+  }
+
+  updateEditBookTimeSpent() {
+    const totalMinutes = (this.editBookTimeHours * 60) + this.editBookTimeMinutes;
+    this.editBook.timeSpent = totalMinutes > 0 ? totalMinutes : undefined;
+  }
+
+  formatTimeSpent(minutes: number): string {
+    const hours = Math.floor(minutes / 60);
+    const mins = minutes % 60;
+
+    if (hours === 0) {
+      return `${mins}m`;
+    } else if (mins === 0) {
+      return `${hours}h`;
+    } else {
+      return `${hours}h ${mins}m`;
+    }
+  }
+
   // Image handling methods
   onImageSelected(event: Event, target: 'new' | 'edit' | 'suggest') {
     const input = event.target as HTMLInputElement;
@@ -1888,7 +2103,7 @@ export class BooksListComponent implements OnInit {
 
     try {
       await this.suggestionService.createSuggestion({
-        entityType: SuggestionEntity.BOOK,
+        entityType: SuggestionEntity.book,
         title: this.suggestedBook.title,
         author: this.suggestedBook.author,
         isbn: this.suggestedBook.isbn,
@@ -1901,4 +2116,21 @@ export class BooksListComponent implements OnInit {
       alert('Failed to submit suggestion. Please try again.');
     }
   }
+
+  handleCommentEdit(bookId: string, event: { commentId: string; content: string }) {
+    this.commentsService.updateCommentOnBook(bookId, event.commentId, event.content).subscribe({
+      next: (updatedComment) => {
+        this.comments.set({
+          ...this.comments(),
+          [bookId]: (this.comments()[bookId] || []).map(c =>
+            c.id === event.commentId ? updatedComment : c
+          )
+        });
+      }
+    });
+  }
+
+  getCommentsSignal(bookId: string) {
+    return signal(this.comments()[bookId] || []);
+  }
 }

apps/frontend/src/app/components/comment-display/comment-display.component.ts

@@ -0,0 +1,317 @@
+/**
+ * @copyright NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+import { Component, Input, Output, EventEmitter, signal, inject } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import type { Comment } from '@library/shared-types';
+import { PrimaryBadge } from '@library/shared-types';
+import { AuthService } from '../../services/auth.service';
+import { SanitizeService } from '../../services/sanitize.service';
+import { ReportModalComponent } from '../report-modal/report-modal.component';
+
+@Component({
+  selector: 'app-comment-display',
+  standalone: true,
+  imports: [CommonModule, FormsModule, ReportModalComponent],
+  template: `
+    <div class="comments-section">
+      @if (comments().length > 0) {
+        @for (comment of comments(); track comment.id) {
+          <div class="comment">
+            <div class="comment-header">
+              @if (comment.user.avatar) {
+                <img [src]="comment.user.avatar" [alt]="comment.user.username" class="comment-avatar">
+              }
+              <span class="comment-author">{{ comment.user.username }}</span>
+              @if (comment.user.primaryBadge) {
+                <!-- Show only the selected primary badge -->
+                @if (comment.user.primaryBadge === PrimaryBadge.STAFF && comment.user.isStaff) {
+                  <span class="staff-badge">Staff</span>
+                }
+                @if (comment.user.primaryBadge === PrimaryBadge.MOD && comment.user.isMod) {
+                  <span class="mod-badge">Mod</span>
+                }
+                @if (comment.user.primaryBadge === PrimaryBadge.VIP && comment.user.isVip) {
+                  <span class="vip-badge">VIP</span>
+                }
+                @if (comment.user.primaryBadge === PrimaryBadge.DISCORD && comment.user.inDiscord) {
+                  <span class="discord-badge">Discord</span>
+                }
+              }
+              <span class="comment-date">{{ formatDate(comment.createdAt) }}</span>
+              @if (canEditComment(comment)) {
+                <button (click)="startEdit(comment)" class="btn btn-secondary btn-xs">Edit</button>
+              }
+              @if (canDeleteComment(comment)) {
+                <button (click)="delete.emit(comment.id)" class="btn btn-danger btn-xs">Delete</button>
+              }
+              @if (canReportComment(comment)) {
+                <button (click)="openReportModal(comment)" class="btn btn-warning btn-xs">Report</button>
+              }
+            </div>
+            @if (editingCommentId() === comment.id) {
+              <div class="comment-edit-form">
+                <textarea
+                  [(ngModel)]="editCommentContent"
+                  name="editComment"
+                  rows="3"
+                ></textarea>
+                <div class="comment-edit-actions">
+                  <button (click)="saveEdit(comment.id)" class="btn btn-primary btn-xs">Save</button>
+                  <button (click)="cancelEdit()" class="btn btn-secondary btn-xs">Cancel</button>
+                </div>
+              </div>
+            } @else {
+              @if (comment.hasPendingReports) {
+                <div class="comment-pending-review">[comment pending admin review]</div>
+              } @else {
+                <div class="comment-content" [innerHTML]="sanitizeService.sanitizeHtml(comment.content)"></div>
+              }
+            }
+          </div>
+        }
+      } @else {
+        <div class="no-comments">No comments yet. Be the first to comment!</div>
+      }
+    </div>
+
+    @if (showReportModal()) {
+      <app-report-modal
+        [reportType]="'comment'"
+        [targetId]="reportingCommentId()"
+        (closeModal)="closeReportModal()"
+      />
+    }
+  `,
+  styles: [`
+    .comments-section {
+      margin-top: 1rem;
+    }
+
+    .comment {
+      background: #f9fafb;
+      padding: 0.75rem;
+      border-radius: 0.375rem;
+      margin-bottom: 0.75rem;
+    }
+
+    .comment-header {
+      display: flex;
+      align-items: center;
+      gap: 0.5rem;
+      margin-bottom: 0.5rem;
+      flex-wrap: wrap;
+    }
+
+    .comment-avatar {
+      width: 2rem;
+      height: 2rem;
+      border-radius: 50%;
+      object-fit: cover;
+    }
+
+    .comment-author {
+      font-weight: 600;
+      color: #1f2937;
+    }
+
+    .discord-badge,
+    .vip-badge,
+    .mod-badge,
+    .staff-badge {
+      padding: 0.125rem 0.5rem;
+      border-radius: 0.25rem;
+      font-size: 0.75rem;
+      font-weight: 600;
+    }
+
+    .discord-badge {
+      background: #5865f2;
+      color: white;
+    }
+
+    .vip-badge {
+      background: #fbbf24;
+      color: #78350f;
+    }
+
+    .mod-badge {
+      background: #10b981;
+      color: white;
+    }
+
+    .staff-badge {
+      background: #8b5cf6;
+      color: white;
+    }
+
+    .comment-date {
+      font-size: 0.75rem;
+      color: #6b7280;
+    }
+
+    .comment-content {
+      font-size: 0.9rem;
+      color: #4b5563;
+    }
+
+    .comment-pending-review {
+      font-size: 0.9rem;
+      color: #9b59b6;
+      font-style: italic;
+      padding: 0.5rem;
+      background: #f3e8ff;
+      border-radius: 0.25rem;
+    }
+
+    .comment-edit-form {
+      margin-top: 0.5rem;
+    }
+
+    .comment-edit-form textarea {
+      width: 100%;
+      padding: 0.5rem;
+      border: 1px solid #d1d5db;
+      border-radius: 0.375rem;
+      font-family: inherit;
+      resize: vertical;
+    }
+
+    .comment-edit-actions {
+      display: flex;
+      gap: 0.5rem;
+      margin-top: 0.5rem;
+    }
+
+    .no-comments {
+      text-align: center;
+      color: #6b7280;
+      padding: 2rem;
+      font-style: italic;
+    }
+
+    .btn {
+      padding: 0.25rem 0.75rem;
+      border: none;
+      border-radius: 0.25rem;
+      cursor: pointer;
+      font-size: 0.875rem;
+      transition: all 0.2s;
+    }
+
+    .btn-xs {
+      padding: 0.125rem 0.5rem;
+      font-size: 0.75rem;
+    }
+
+    .btn-primary {
+      background: #3b82f6;
+      color: white;
+    }
+
+    .btn-primary:hover {
+      background: #2563eb;
+    }
+
+    .btn-secondary {
+      background: #6b7280;
+      color: white;
+    }
+
+    .btn-secondary:hover {
+      background: #4b5563;
+    }
+
+    .btn-danger {
+      background: #ef4444;
+      color: white;
+    }
+
+    .btn-danger:hover {
+      background: #dc2626;
+    }
+
+    .btn-warning {
+      background: #f59e0b;
+      color: white;
+    }
+
+    .btn-warning:hover {
+      background: #d97706;
+    }
+  `]
+})
+export class CommentDisplayComponent {
+  private readonly authService = inject(AuthService);
+  readonly sanitizeService = inject(SanitizeService);
+
+  // Expose PrimaryBadge enum for template
+  readonly PrimaryBadge = PrimaryBadge;
+
+  @Input({ required: true }) comments = signal<Comment[]>([]);
+  @Output() edit = new EventEmitter<{ commentId: string; content: string }>();
+  @Output() delete = new EventEmitter<string>();
+
+  editingCommentId = signal<string | null>(null);
+  editCommentContent = '';
+  showReportModal = signal(false);
+  reportingCommentId = signal<string>('');
+
+  formatDate(date: Date | string): string {
+    const d = new Date(date);
+    return d.toLocaleDateString('en-GB', {
+      year: 'numeric',
+      month: 'short',
+      day: 'numeric',
+      hour: '2-digit',
+      minute: '2-digit',
+    });
+  }
+
+  canEditComment(comment: Comment): boolean {
+    const user = this.authService.user();
+    if (!user) return false;
+    return comment.userId === user.id || this.authService.isAdmin();
+  }
+
+  canDeleteComment(comment: Comment): boolean {
+    const user = this.authService.user();
+    if (!user) return false;
+    return comment.userId === user.id || this.authService.isAdmin();
+  }
+
+  canReportComment(comment: Comment): boolean {
+    const user = this.authService.user();
+    if (!user) return false;
+    // Users can report comments they didn't write (but not their own)
+    return comment.userId !== user.id;
+  }
+
+  startEdit(comment: Comment): void {
+    this.editingCommentId.set(comment.id);
+    this.editCommentContent = comment.rawContent ?? comment.content;
+  }
+
+  saveEdit(commentId: string): void {
+    this.edit.emit({ commentId, content: this.editCommentContent });
+    this.cancelEdit();
+  }
+
+  cancelEdit(): void {
+    this.editingCommentId.set(null);
+    this.editCommentContent = '';
+  }
+
+  openReportModal(comment: Comment): void {
+    this.reportingCommentId.set(comment.id);
+    this.showReportModal.set(true);
+  }
+
+  closeReportModal(): void {
+    this.showReportModal.set(false);
+    this.reportingCommentId.set('');
+  }
+}

apps/frontend/src/app/components/games/game-detail.component.ts

@@ -0,0 +1,645 @@
+/**
+ * @copyright 2026 NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+
+import { Component, OnInit, inject, signal } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { RouterLink, ActivatedRoute, Router } from '@angular/router';
+import { FormsModule } from '@angular/forms';
+import { GamesService } from '../../services/games.service';
+import { CommentsService } from '../../services/comments.service';
+import { AuthService } from '../../services/auth.service';
+import { SanitizeService } from '../../services/sanitize.service';
+import { CommentDisplayComponent } from '../comment-display/comment-display.component';
+import { LikeButtonComponent } from '../shared/like-button.component';
+import { Game, Comment, GameStatus } from '@library/shared-types';
+
+@Component({
+  selector: 'app-game-detail',
+  standalone: true,
+  imports: [CommonModule, RouterLink, FormsModule, CommentDisplayComponent, LikeButtonComponent],
+  template: `
+    <div class="container">
+      <div class="breadcrumb">
+        <a routerLink="/games" class="breadcrumb-link">← Back to Games</a>
+      </div>
+
+      @if (loading()) {
+        <div class="loading">Loading game details...</div>
+      } @else if (error()) {
+        <div class="error-state">
+          <h2>Game Not Found</h2>
+          <p>{{ error() }}</p>
+          <a routerLink="/games" class="btn btn-primary">Return to Games</a>
+        </div>
+      } @else if (game()) {
+        <div class="game-detail-card">
+          @if (game()!.coverImage) {
+            <div class="game-cover-section">
+              <img [src]="game()!.coverImage" [alt]="game()!.title" class="game-cover-large">
+            </div>
+          }
+
+          <div class="game-content">
+            <div class="game-header">
+              <h1>{{ game()!.title }}</h1>
+              <span class="status status-{{ game()!.status }}">
+                {{ getStatusLabel(game()!.status) }}
+              </span>
+            </div>
+
+            @if (game()!.series) {
+              <p class="series">
+                📚 {{ game()!.series }}@if (game()!.seriesOrder) { #{{ game()!.seriesOrder }}}
+              </p>
+            }
+
+            @if (game()!.platform) {
+              <div class="info-row">
+                <span class="info-label">Platform:</span>
+                <span class="info-value">{{ game()!.platform }}</span>
+              </div>
+            }
+
+            @if (game()!.rating) {
+              <div class="info-row">
+                <span class="info-label">Rating:</span>
+                <div class="rating">
+                  @for (star of [1,2,3,4,5,6,7,8,9,10]; track star) {
+                    <span [class.filled]="star <= game()!.rating!">★</span>
+                  }
+                  <span class="rating-text">({{ game()!.rating }}/10)</span>
+                </div>
+              </div>
+            }
+
+            @if (game()!.timeSpent) {
+              <div class="info-row">
+                <span class="info-label">Time Played:</span>
+                <span class="info-value time-spent">{{ formatTimeSpent(game()!.timeSpent!) }}</span>
+              </div>
+            }
+
+            @if (game()!.dateStarted) {
+              <div class="info-row">
+                <span class="info-label">Started:</span>
+                <span class="info-value">{{ formatDate(game()!.dateStarted!) }}</span>
+              </div>
+            }
+
+            @if (game()!.dateFinished) {
+              <div class="info-row">
+                <span class="info-label">Finished:</span>
+                <span class="info-value">{{ formatDate(game()!.dateFinished!) }}</span>
+              </div>
+            }
+
+            <div class="info-row">
+              <span class="info-label">Added:</span>
+              <span class="info-value">{{ formatDate(game()!.createdAt) }}</span>
+            </div>
+
+            <div class="info-row">
+              <span class="info-label">Last Updated:</span>
+              <span class="info-value">{{ formatDate(game()!.updatedAt) }}</span>
+            </div>
+
+            <div class="like-section">
+              <app-like-button
+                entityType="game"
+                [entityId]="game()!.id"
+              ></app-like-button>
+            </div>
+
+            @if (game()!.notes) {
+              <div class="notes-section">
+                <h3>Notes</h3>
+                <p class="notes">{{ game()!.notes }}</p>
+              </div>
+            }
+
+            @if (game()!.tags && game()!.tags.length > 0) {
+              <div class="tags-section">
+                <h3>Tags</h3>
+                <div class="tags-display">
+                  @for (tag of game()!.tags; track tag) {
+                    <span class="tag-chip">{{ tag }}</span>
+                  }
+                </div>
+              </div>
+            }
+
+            @if (game()!.links && game()!.links.length > 0) {
+              <div class="links-section">
+                <h3>External Links</h3>
+                <div class="links-display">
+                  @for (link of game()!.links; track link.url) {
+                    <a [href]="link.url" target="_blank" rel="noopener noreferrer" class="external-link">
+                      {{ link.title }} ↗
+                    </a>
+                  }
+                </div>
+              </div>
+            }
+
+            <div class="comments-section">
+              <h3>Comments</h3>
+              @if (authService.isAuthenticated()) {
+                @if (authService.user()?.isBanned) {
+                  <div class="banned-notice">
+                    You have been banned from commenting.
+                  </div>
+                } @else {
+                  <form (ngSubmit)="addComment()" class="comment-form">
+                    <textarea
+                      [(ngModel)]="newCommentContent"
+                      name="comment"
+                      placeholder="Add a comment (Markdown supported)..."
+                      rows="3"
+                    ></textarea>
+                    <button type="submit" class="btn btn-primary">Post Comment</button>
+                  </form>
+                }
+              } @else {
+                <div class="auth-prompt">
+                  <p>Please sign in to comment.</p>
+                </div>
+              }
+
+              @if (commentsLoading()) {
+                <div class="comments-loading">Loading comments...</div>
+              } @else {
+                <app-comment-display
+                  [comments]="comments"
+                  (edit)="handleCommentEdit($event)"
+                  (delete)="deleteComment($event)"
+                />
+              }
+            </div>
+          </div>
+        </div>
+      }
+    </div>
+  `,
+  styles: [`
+    .container {
+      max-width: 900px;
+      margin: 0 auto;
+      padding: 2rem;
+    }
+
+    .breadcrumb {
+      margin-bottom: 1.5rem;
+    }
+
+    .breadcrumb-link {
+      color: #ff6b6b;
+      text-decoration: none;
+      font-weight: 500;
+      transition: opacity 0.3s;
+    }
+
+    .breadcrumb-link:hover {
+      opacity: 0.8;
+    }
+
+    .loading {
+      text-align: center;
+      padding: 3rem;
+      color: #666;
+      font-size: 1.1rem;
+    }
+
+    .error-state {
+      text-align: center;
+      padding: 3rem;
+      background: #fef2f2;
+      border: 1px solid #fecaca;
+      border-radius: 8px;
+    }
+
+    .error-state h2 {
+      color: #991b1b;
+      margin-bottom: 1rem;
+    }
+
+    .error-state p {
+      color: #dc2626;
+      margin-bottom: 1.5rem;
+    }
+
+    .game-detail-card {
+      background: white;
+      border: 1px solid #e5e7eb;
+      border-radius: 8px;
+      overflow: hidden;
+      box-shadow: 0 1px 3px rgba(0,0,0,0.1);
+    }
+
+    .game-cover-section {
+      width: 100%;
+      background: #f3f4f6;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      padding: 2rem;
+    }
+
+    .game-cover-large {
+      max-width: 100%;
+      max-height: 400px;
+      object-fit: contain;
+      border-radius: 4px;
+    }
+
+    .game-content {
+      padding: 2rem;
+    }
+
+    .game-header {
+      display: flex;
+      align-items: center;
+      gap: 1rem;
+      margin-bottom: 1rem;
+      flex-wrap: wrap;
+    }
+
+    .game-header h1 {
+      margin: 0;
+      font-size: 2rem;
+      color: #1f2937;
+    }
+
+    .status {
+      display: inline-block;
+      padding: 0.5rem 1rem;
+      border-radius: 4px;
+      font-size: 0.9rem;
+      font-weight: 500;
+    }
+
+    .status-playing {
+      background: #fef3c7;
+      color: #92400e;
+    }
+
+    .status-completed {
+      background: #d1fae5;
+      color: #065f46;
+    }
+
+    .status-backlog {
+      background: #e0e7ff;
+      color: #3730a3;
+    }
+
+    .status-retired {
+      background: #f3f4f6;
+      color: #4b5563;
+    }
+
+    .series {
+      color: #8b6f47;
+      font-size: 1rem;
+      margin: 0.5rem 0 1.5rem 0;
+      font-weight: 500;
+      font-style: italic;
+    }
+
+    .info-row {
+      display: flex;
+      align-items: center;
+      gap: 1rem;
+      margin-bottom: 0.75rem;
+      padding: 0.5rem 0;
+      border-bottom: 1px solid #f3f4f6;
+    }
+
+    .info-label {
+      font-weight: 600;
+      color: #4b5563;
+      min-width: 120px;
+    }
+
+    .info-value {
+      color: #1f2937;
+    }
+
+    .time-spent {
+      color: #10b981;
+      font-weight: 600;
+    }
+
+    .rating {
+      display: flex;
+      align-items: center;
+      gap: 0.25rem;
+    }
+
+    .rating span {
+      color: #e5e7eb;
+      font-size: 1.2rem;
+    }
+
+    .rating span.filled {
+      color: #f59e0b;
+    }
+
+    .rating-text {
+      margin-left: 0.5rem;
+      font-size: 1rem;
+      color: #6b7280;
+      font-weight: 500;
+    }
+
+    .like-section {
+      margin: 1.5rem 0;
+    }
+
+    .notes-section,
+    .tags-section,
+    .links-section {
+      margin-top: 2rem;
+    }
+
+    .notes-section h3,
+    .tags-section h3,
+    .links-section h3,
+    .comments-section h3 {
+      font-size: 1.25rem;
+      color: #1f2937;
+      margin-bottom: 1rem;
+    }
+
+    .notes {
+      font-size: 1rem;
+      color: #4b5563;
+      line-height: 1.6;
+      white-space: pre-wrap;
+    }
+
+    .tags-display {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 0.5rem;
+    }
+
+    .tag-chip {
+      background: #ff6b6b;
+      color: white;
+      padding: 0.375rem 0.875rem;
+      border-radius: 12px;
+      font-size: 0.875rem;
+      font-weight: 500;
+    }
+
+    .links-display {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 0.75rem;
+    }
+
+    .external-link {
+      color: #ff6b6b;
+      text-decoration: none;
+      font-size: 0.95rem;
+      padding: 0.5rem 1rem;
+      border: 2px solid #ff6b6b;
+      border-radius: 4px;
+      transition: all 0.2s;
+      font-weight: 500;
+    }
+
+    .external-link:hover {
+      background: #ff6b6b;
+      color: white;
+    }
+
+    .comments-section {
+      margin-top: 2rem;
+      padding-top: 2rem;
+      border-top: 2px solid #e5e7eb;
+    }
+
+    .comment-form {
+      margin-bottom: 1.5rem;
+    }
+
+    .comment-form textarea {
+      width: 100%;
+      padding: 0.75rem;
+      border: 1px solid #d1d5db;
+      border-radius: 4px;
+      font-size: 1rem;
+      resize: vertical;
+      margin-bottom: 0.75rem;
+      font-family: inherit;
+    }
+
+    .comment-form textarea:focus {
+      outline: none;
+      border-color: #ff6b6b;
+    }
+
+    .banned-notice {
+      background: #fef2f2;
+      border: 1px solid #fecaca;
+      color: #991b1b;
+      padding: 1rem;
+      border-radius: 4px;
+      text-align: center;
+      margin-bottom: 1.5rem;
+      font-size: 0.95rem;
+    }
+
+    .auth-prompt {
+      background: #f3f4f6;
+      padding: 1rem;
+      border-radius: 4px;
+      text-align: center;
+      margin-bottom: 1.5rem;
+    }
+
+    .auth-prompt p {
+      margin: 0;
+      color: #4b5563;
+    }
+
+    .comments-loading {
+      text-align: center;
+      padding: 1.5rem;
+      color: #6b7280;
+      font-size: 0.95rem;
+    }
+
+    .btn {
+      padding: 0.625rem 1.25rem;
+      border: none;
+      border-radius: 4px;
+      cursor: pointer;
+      font-size: 1rem;
+      transition: all 0.3s;
+      font-weight: 500;
+    }
+
+    .btn:hover {
+      opacity: 0.9;
+    }
+
+    .btn-primary {
+      background: #ff6b6b;
+      color: white;
+    }
+
+    @media (max-width: 640px) {
+      .container {
+        padding: 1rem;
+      }
+
+      .game-header {
+        flex-direction: column;
+        align-items: flex-start;
+      }
+
+      .game-header h1 {
+        font-size: 1.5rem;
+      }
+
+      .info-row {
+        flex-direction: column;
+        align-items: flex-start;
+        gap: 0.25rem;
+      }
+
+      .info-label {
+        min-width: auto;
+      }
+    }
+  `]
+})
+export class GameDetailComponent implements OnInit {
+  private readonly gamesService = inject(GamesService);
+  private readonly commentsService = inject(CommentsService);
+  readonly authService = inject(AuthService);
+  private readonly sanitizeService = inject(SanitizeService);
+  private readonly route = inject(ActivatedRoute);
+  private readonly router = inject(Router);
+
+  game = signal<Game | null>(null);
+  comments = signal<Comment[]>([]);
+  loading = signal(true);
+  commentsLoading = signal(false);
+  error = signal<string | null>(null);
+  newCommentContent = '';
+
+  ngOnInit() {
+    const gameId = this.route.snapshot.paramMap.get('id');
+    if (!gameId) {
+      this.error.set('No game ID provided');
+      this.loading.set(false);
+      return;
+    }
+
+    this.loadGame(gameId);
+    this.loadComments(gameId);
+  }
+
+  private loadGame(gameId: string) {
+    this.loading.set(true);
+    this.gamesService.getGameById(gameId).subscribe({
+      next: (game) => {
+        if (!game) {
+          this.error.set('Game not found');
+        } else {
+          this.game.set(game);
+        }
+        this.loading.set(false);
+      },
+      error: () => {
+        this.error.set('Failed to load game. It may not exist or there was an error.');
+        this.loading.set(false);
+      }
+    });
+  }
+
+  private loadComments(gameId: string) {
+    this.commentsLoading.set(true);
+    this.commentsService.getCommentsForGame(gameId).subscribe({
+      next: (comments) => {
+        this.comments.set(comments);
+        this.commentsLoading.set(false);
+      },
+      error: () => {
+        this.commentsLoading.set(false);
+      }
+    });
+  }
+
+  addComment() {
+    const game = this.game();
+    if (!game || !this.newCommentContent.trim()) return;
+
+    this.commentsService.addCommentToGame(game.id, { content: this.newCommentContent }).subscribe({
+      next: (comment) => {
+        this.comments.set([comment, ...this.comments()]);
+        this.newCommentContent = '';
+      }
+    });
+  }
+
+  handleCommentEdit(event: { commentId: string; content: string }) {
+    const game = this.game();
+    if (!game) return;
+
+    this.commentsService.updateCommentOnGame(game.id, event.commentId, event.content).subscribe({
+      next: (updatedComment) => {
+        this.comments.set(
+          this.comments().map(c => c.id === event.commentId ? updatedComment : c)
+        );
+      }
+    });
+  }
+
+  deleteComment(commentId: string) {
+    const game = this.game();
+    if (!game || !confirm('Are you sure you want to delete this comment?')) return;
+
+    this.commentsService.deleteCommentFromGame(game.id, commentId).subscribe({
+      next: () => {
+        this.comments.set(this.comments().filter(c => c.id !== commentId));
+      }
+    });
+  }
+
+  getStatusLabel(status: GameStatus): string {
+    switch (status) {
+      case GameStatus.playing: return 'Currently Playing';
+      case GameStatus.completed: return 'Completed';
+      case GameStatus.backlog: return 'In Backlog';
+      case GameStatus.retired: return 'Retired';
+    }
+  }
+
+  formatDate(date: Date | string): string {
+    return new Date(date).toLocaleDateString('en-GB', {
+      year: 'numeric',
+      month: 'long',
+      day: 'numeric'
+    });
+  }
+
+  formatTimeSpent(minutes: number): string {
+    const hours = Math.floor(minutes / 60);
+    const mins = minutes % 60;
+
+    if (hours === 0) {
+      return `${mins} minutes`;
+    } else if (mins === 0) {
+      return `${hours} hour${hours === 1 ? '' : 's'}`;
+    } else {
+      return `${hours} hour${hours === 1 ? '' : 's'} ${mins} minute${mins === 1 ? '' : 's'}`;
+    }
+  }
+}

apps/frontend/src/app/components/games/games-list.component.ts

@@ -14,12 +14,13 @@ import { SanitizeService } from '../../services/sanitize.service';
 import { SuggestionService } from '../../services/suggestion.service';
 import { PaginationComponent } from '../shared/pagination.component';
 import { LikeButtonComponent } from '../shared/like-button.component';
+import { CommentDisplayComponent } from '../comment-display/comment-display.component';
 import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEntity, Link } from '@library/shared-types';
 
 @Component({
   selector: 'app-games-list',
   standalone: true,
-  imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent],
+  imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent, CommentDisplayComponent],
   template: `
     <div class="container">
       <div class="header-section">
@@ -67,9 +68,30 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
               <option [value]="GameStatus.playing">Currently Playing</option>
               <option [value]="GameStatus.completed">Completed</option>
               <option [value]="GameStatus.backlog">In Backlog</option>
+              <option [value]="GameStatus.retired">Retired</option>
             </select>
           </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">
             <label for="rating">Rating (1-10)</label>
             <input
@@ -82,6 +104,34 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
             >
           </div>
 
+          <div class="form-row">
+            <div class="form-group">
+              <label for="timeHours">Time Spent (Hours)</label>
+              <input
+                type="number"
+                id="timeHours"
+                [(ngModel)]="newGameTimeHours"
+                name="timeHours"
+                min="0"
+                placeholder="0"
+                (ngModelChange)="updateNewGameTimeSpent()"
+              >
+            </div>
+            <div class="form-group">
+              <label for="timeMinutes">Time Spent (Minutes)</label>
+              <input
+                type="number"
+                id="timeMinutes"
+                [(ngModel)]="newGameTimeMinutes"
+                name="timeMinutes"
+                min="0"
+                max="59"
+                placeholder="0"
+                (ngModelChange)="updateNewGameTimeSpent()"
+              >
+            </div>
+          </div>
+
           <div class="form-group">
             <label for="notes">Notes</label>
             <textarea
@@ -93,6 +143,29 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
             ></textarea>
           </div>
 
+          <div class="form-group">
+            <label for="series">Series (optional)</label>
+            <input
+              type="text"
+              id="series"
+              [(ngModel)]="newGame.series"
+              name="series"
+              placeholder="e.g., The Legend of Zelda"
+            >
+          </div>
+
+          <div class="form-group">
+            <label for="seriesOrder">Series Order (optional)</label>
+            <input
+              type="number"
+              id="seriesOrder"
+              [(ngModel)]="newGame.seriesOrder"
+              name="seriesOrder"
+              min="1"
+              placeholder="Order in series"
+            >
+          </div>
+
           <div class="form-group">
             <label for="coverImage">Box Art (max 500KB)</label>
             <input
@@ -114,8 +187,7 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
           </div>
 
           <div class="form-group">
-            <label>Tags</label>
-            <div class="tags-input-container">
+            <div class="tags-input-container" aria-label="Tags">
               @for (tag of newGame.tags; track tag; let i = $index) {
                 <span class="tag">
                   {{ tag }}
@@ -132,8 +204,7 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
             </div>
           </div>
 
-          <div class="form-group">
-            <label>External Links</label>
+          <div class="form-group" aria-label="External Links">
             <div class="links-list">
               @for (link of newGame.links; track link.url; let i = $index) {
                 <div class="link-item">
@@ -198,9 +269,30 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
               <option [value]="GameStatus.playing">Currently Playing</option>
               <option [value]="GameStatus.completed">Completed</option>
               <option [value]="GameStatus.backlog">In Backlog</option>
+              <option [value]="GameStatus.retired">Retired</option>
             </select>
           </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">
             <label for="edit-rating">Rating (1-10)</label>
             <input
@@ -213,6 +305,34 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
             >
           </div>
 
+          <div class="form-row">
+            <div class="form-group">
+              <label for="edit-timeHours">Time Spent (Hours)</label>
+              <input
+                type="number"
+                id="edit-timeHours"
+                [(ngModel)]="editGameTimeHours"
+                name="timeHours"
+                min="0"
+                placeholder="0"
+                (ngModelChange)="updateEditGameTimeSpent()"
+              >
+            </div>
+            <div class="form-group">
+              <label for="edit-timeMinutes">Time Spent (Minutes)</label>
+              <input
+                type="number"
+                id="edit-timeMinutes"
+                [(ngModel)]="editGameTimeMinutes"
+                name="timeMinutes"
+                min="0"
+                max="59"
+                placeholder="0"
+                (ngModelChange)="updateEditGameTimeSpent()"
+              >
+            </div>
+          </div>
+
           <div class="form-group">
             <label for="edit-notes">Notes</label>
             <textarea
@@ -224,6 +344,29 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
             ></textarea>
           </div>
 
+          <div class="form-group">
+            <label for="edit-series">Series (optional)</label>
+            <input
+              type="text"
+              id="edit-series"
+              [(ngModel)]="editGame.series"
+              name="series"
+              placeholder="e.g., The Legend of Zelda"
+            >
+          </div>
+
+          <div class="form-group">
+            <label for="edit-seriesOrder">Series Order (optional)</label>
+            <input
+              type="number"
+              id="edit-seriesOrder"
+              [(ngModel)]="editGame.seriesOrder"
+              name="seriesOrder"
+              min="1"
+              placeholder="Order in series"
+            >
+          </div>
+
           <div class="form-group">
             <label for="edit-coverImage">Box Art (max 500KB)</label>
             <input
@@ -245,8 +388,7 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
           </div>
 
           <div class="form-group">
-            <label>Tags</label>
-            <div class="tags-input-container">
+            <div class="tags-input-container" aria-label="Tags">
               @for (tag of editGame.tags; track tag; let i = $index) {
                 <span class="tag">
                   {{ tag }}
@@ -263,8 +405,7 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
             </div>
           </div>
 
-          <div class="form-group">
-            <label>External Links</label>
+          <div class="form-group" aria-label="External Links">
             <div class="links-list">
               @for (link of editGame.links; track link.url; let i = $index) {
                 <div class="link-item">
@@ -436,6 +577,13 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
         >
           Backlog ({{ backlogCount() }})
         </button>
+        <button
+          (click)="setFilter(GameStatus.retired)"
+          [class.active]="statusFilter() === GameStatus.retired"
+          class="filter-btn"
+        >
+          Retired ({{ retiredCount() }})
+        </button>
       </div>
 
       @if (loading()) {
@@ -465,6 +613,11 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
                 @if (game.platform) {
                   <p class="platform">{{ game.platform }}</p>
                 }
+                @if (game.series) {
+                  <p class="series">
+                    📚 {{ game.series }}@if (game.seriesOrder) { #{{ game.seriesOrder }}}
+                  </p>
+                }
                 <span class="status status-{{ game.status }}">
                   {{ getStatusLabel(game.status) }}
                 </span>
@@ -477,6 +630,12 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
                   </div>
                 }
 
+                @if (game.timeSpent) {
+                  <p class="time-spent">
+                    ⏱️ Time Played: {{ formatTimeSpent(game.timeSpent) }}
+                  </p>
+                }
+
                 <app-like-button
                   entityType="game"
                   [entityId]="game.id"
@@ -504,6 +663,26 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
                   </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()) {
                   <div class="actions">
                     <button (click)="startEdit(game)" class="btn btn-secondary btn-sm">
@@ -543,52 +722,11 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
                       @if (commentsLoading()[game.id]) {
                         <div class="comments-loading">Loading comments...</div>
                       } @else {
-                        @for (comment of comments()[game.id] || []; track comment.id) {
-                          <div class="comment">
-                            <div class="comment-header">
-                              @if (comment.user.avatar) {
-                                <img [src]="comment.user.avatar" [alt]="comment.user.username" class="comment-avatar">
-                              }
-                              <span class="comment-author">{{ comment.user.username }}</span>
-                              @if (comment.user.inDiscord) {
-                                <span class="discord-badge">Discord</span>
-                              }
-                              @if (comment.user.isVip) {
-                                <span class="vip-badge">VIP</span>
-                              }
-                              @if (comment.user.isMod) {
-                                <span class="mod-badge">Mod</span>
-                              }
-                              @if (comment.user.isStaff) {
-                                <span class="staff-badge">Staff</span>
-                              }
-                              <span class="comment-date">{{ formatDate(comment.createdAt) }}</span>
-                              @if (canEditComment(comment)) {
-                                <button (click)="startEditComment(game.id, comment)" class="btn btn-secondary btn-xs">Edit</button>
-                              }
-                              @if (canDeleteComment(comment)) {
-                                <button (click)="deleteComment(game.id, comment.id)" class="btn btn-danger btn-xs">Delete</button>
-                              }
-                            </div>
-                            @if (editingCommentId() === comment.id) {
-                              <div class="comment-edit-form">
-                                <textarea
-                                  [(ngModel)]="editCommentContent"
-                                  name="editComment"
-                                  rows="3"
-                                ></textarea>
-                                <div class="comment-edit-actions">
-                                  <button (click)="saveCommentEdit(game.id, comment.id)" class="btn btn-primary btn-xs">Save</button>
-                                  <button (click)="cancelCommentEdit()" class="btn btn-secondary btn-xs">Cancel</button>
-                                </div>
-                              </div>
-                            } @else {
-                              <div class="comment-content" [innerHTML]="sanitizeService.sanitizeHtml(comment.content)"></div>
-                            }
-                          </div>
-                        } @empty {
-                          <div class="no-comments">No comments yet. Be the first to comment!</div>
-                        }
+                        <app-comment-display
+                          [comments]="getCommentsSignal(game.id)"
+                          (edit)="handleCommentEdit(game.id, $event)"
+                          (delete)="deleteComment(game.id, $event)"
+                        />
                       }
                     </div>
                   }
@@ -665,6 +803,13 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
       font-size: 1rem;
     }
 
+    .form-row {
+      display: grid;
+      grid-template-columns: 1fr 1fr;
+      gap: 1rem;
+      margin-bottom: 1rem;
+    }
+
     .form-actions {
       display: flex;
       gap: 1rem;
@@ -827,6 +972,14 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
       margin: 0.5rem 0;
     }
 
+    .series {
+      color: #8b6f47;
+      font-size: 0.85rem;
+      margin: 0.5rem 0;
+      font-weight: 500;
+      font-style: italic;
+    }
+
     .status {
       display: inline-block;
       padding: 0.25rem 0.5rem;
@@ -858,6 +1011,22 @@ import { Game, GameStatus, CreateGameDto, UpdateGameDto, Comment, SuggestionEnti
       margin: 0.5rem 0;
     }
 
+    .time-spent {
+      font-size: 0.9rem;
+      color: #10b981;
+      font-weight: 500;
+      margin: 0.5rem 0;
+    }
+
+    .date-started,
+    .date-finished,
+    .date-added,
+    .date-updated {
+      font-size: 0.85rem;
+      color: #4b5563;
+      margin-top: 0.5rem;
+    }
+
     .actions {
       margin-top: 1rem;
     }
@@ -1213,6 +1382,7 @@ export class GamesListComponent implements OnInit {
   playingCount = computed(() => this.games().filter(game => game.status === GameStatus.playing).length);
   completedCount = computed(() => this.games().filter(game => game.status === GameStatus.completed).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(() => {
     const tagsSet = new Set<string>();
@@ -1261,10 +1431,12 @@ export class GamesListComponent implements OnInit {
 
   totalFilteredGames = computed(() => this.filteredGames().length);
 
-  newGame: Partial<CreateGameDto> = {
+  newGame: Partial<CreateGameDto> & { dateStarted?: Date; dateFinished?: Date } = {
     title: '',
     platform: '',
     status: GameStatus.backlog,
+    dateStarted: undefined,
+    dateFinished: undefined,
     rating: undefined,
     notes: '',
     tags: [],
@@ -1273,6 +1445,12 @@ export class GamesListComponent implements OnInit {
 
   editGame: Partial<UpdateGameDto> = {};
 
+  // Time tracking state
+  newGameTimeHours = 0;
+  newGameTimeMinutes = 0;
+  editGameTimeHours = 0;
+  editGameTimeMinutes = 0;
+
   // Tags and links input state
   newTagInput = '';
   editTagInput = '';
@@ -1341,6 +1519,7 @@ export class GamesListComponent implements OnInit {
       case GameStatus.playing: return 'Currently Playing';
       case GameStatus.completed: return 'Completed';
       case GameStatus.backlog: return 'In Backlog';
+      case GameStatus.retired: return 'Retired';
     }
   }
 
@@ -1356,12 +1535,16 @@ export class GamesListComponent implements OnInit {
       title: '',
       platform: '',
       status: GameStatus.backlog,
+      dateStarted: undefined,
+      dateFinished: undefined,
       rating: undefined,
       notes: '',
       coverImage: undefined,
       tags: [],
       links: []
     };
+    this.newGameTimeHours = 0;
+    this.newGameTimeMinutes = 0;
     this.newGameImagePreview.set(null);
     this.imageError.set(null);
     this.newTagInput = '';
@@ -1369,6 +1552,16 @@ export class GamesListComponent implements OnInit {
     this.newLinkUrl = '';
   }
 
+  updateNewGameTimeSpent() {
+    const totalMinutes = (this.newGameTimeHours * 60) + this.newGameTimeMinutes;
+    this.newGame.timeSpent = totalMinutes > 0 ? totalMinutes : undefined;
+  }
+
+  updateEditGameTimeSpent() {
+    const totalMinutes = (this.editGameTimeHours * 60) + this.editGameTimeMinutes;
+    this.editGame.timeSpent = totalMinutes > 0 ? totalMinutes : undefined;
+  }
+
   addTag(target: 'new' | 'edit') {
     const input = target === 'new' ? this.newTagInput.trim() : this.editTagInput.trim();
     if (!input) return;
@@ -1424,6 +1617,8 @@ export class GamesListComponent implements OnInit {
       rating: this.newGame.rating,
       notes: this.newGame.notes,
       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 || [],
       links: this.newGame.links || []
     };
@@ -1448,12 +1643,25 @@ export class GamesListComponent implements OnInit {
       title: game.title,
       platform: game.platform,
       status: game.status,
+      dateStarted: game.dateStarted,
+      dateFinished: game.dateFinished,
       rating: game.rating,
       notes: game.notes,
       coverImage: game.coverImage,
       tags: [...(game.tags || [])],
-      links: [...(game.links || [])]
+      links: [...(game.links || [])],
+      series: game.series,
+      seriesOrder: game.seriesOrder,
+      timeSpent: game.timeSpent
     };
+    // Populate time fields from existing timeSpent
+    if (game.timeSpent) {
+      this.editGameTimeHours = Math.floor(game.timeSpent / 60);
+      this.editGameTimeMinutes = game.timeSpent % 60;
+    } else {
+      this.editGameTimeHours = 0;
+      this.editGameTimeMinutes = 0;
+    }
     this.editGameImagePreview.set(game.coverImage || null);
     this.showAddForm.set(false);
     this.imageError.set(null);
@@ -1476,7 +1684,13 @@ export class GamesListComponent implements OnInit {
     const game = this.editingGame();
     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.cancelEdit();
     });
@@ -1539,6 +1753,19 @@ export class GamesListComponent implements OnInit {
     return new Date(date).toLocaleDateString();
   }
 
+  formatTimeSpent(minutes: number): string {
+    const hours = Math.floor(minutes / 60);
+    const mins = minutes % 60;
+
+    if (hours === 0) {
+      return `${mins}m`;
+    } else if (mins === 0) {
+      return `${hours}h`;
+    } else {
+      return `${hours}h ${mins}m`;
+    }
+  }
+
   toggleComments(gameId: string) {
     const expanded = this.expandedComments();
     const isCurrentlyExpanded = expanded[gameId];
@@ -1649,6 +1876,23 @@ export class GamesListComponent implements OnInit {
     });
   }
 
+  handleCommentEdit(gameId: string, event: { commentId: string; content: string }) {
+    this.commentsService.updateCommentOnGame(gameId, event.commentId, event.content).subscribe({
+      next: (updatedComment) => {
+        this.comments.set({
+          ...this.comments(),
+          [gameId]: (this.comments()[gameId] || []).map(c =>
+            c.id === event.commentId ? updatedComment : c
+          )
+        });
+      }
+    });
+  }
+
+  getCommentsSignal(gameId: string) {
+    return signal(this.comments()[gameId] || []);
+  }
+
   // Suggestion methods
   toggleSuggestForm() {
     this.showSuggestForm.update(v => !v);
@@ -1673,7 +1917,7 @@ export class GamesListComponent implements OnInit {
 
     try {
       await this.suggestionService.createSuggestion({
-        entityType: SuggestionEntity.GAME,
+        entityType: SuggestionEntity.game,
         title: this.suggestedGame.title,
         platform: this.suggestedGame.platform,
         notes: this.suggestedGame.notes,

apps/frontend/src/app/components/header/header.component.ts

@@ -35,17 +35,41 @@ import { ApiService } from '../../services/api.service';
 
         <div class="auth-section">
           @if (authService.user(); as user) {
-            <span class="welcome">Welcome, {{ user.username }}!</span>
-            @if (!user.isAdmin) {
-              <a routerLink="/my-suggestions" class="user-link">My Suggestions</a>
-            }
-            <a routerLink="/my-likes" class="user-link">My Likes</a>
-            @if (user.isAdmin) {
-              <a routerLink="/admin/users" class="admin-badge">Users</a>
-              <a routerLink="/admin/audit" class="admin-badge">Audit</a>
-              <a routerLink="/admin/suggestions" class="admin-badge">Suggestions</a>
-            }
-            <button (click)="logout()" class="btn btn-secondary">Logout</button>
+            <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">
+                  <a [routerLink]="['/profile', user.slug || user.id]" class="dropdown-item" (click)="closeDropdown()">My Profile</a>
+                  <a routerLink="/settings" class="dropdown-item" (click)="closeDropdown()">Settings</a>
+                  <a routerLink="/achievements" class="dropdown-item" (click)="closeDropdown()">🏆 Achievements</a>
+                  <a routerLink="/leaderboard" class="dropdown-item" (click)="closeDropdown()">🏆 Leaderboard</a>
+                  <a routerLink="/activity" class="dropdown-item" (click)="closeDropdown()">📰 Activity Feed</a>
+                  <a routerLink="/about" class="dropdown-item" (click)="closeDropdown()">ℹ️ About</a>
+                  @if (!user.isAdmin) {
+                    <a routerLink="/my-suggestions" class="dropdown-item" (click)="closeDropdown()">My Suggestions</a>
+                  }
+                  <a routerLink="/my-likes" class="dropdown-item" (click)="closeDropdown()">My Likes</a>
+                  @if (user.isAdmin) {
+                    <a routerLink="/admin/users" class="dropdown-item" (click)="closeDropdown()">Users</a>
+                    <a routerLink="/admin/audit" class="dropdown-item" (click)="closeDropdown()">Audit</a>
+                    <a routerLink="/admin/suggestions" class="dropdown-item" (click)="closeDropdown()">Suggestions</a>
+                    <a routerLink="/admin/reports" class="dropdown-item" (click)="closeDropdown()">Reports</a>
+                  }
+                  <button (click)="logout()" class="dropdown-item logout-btn">Logout</button>
+                </div>
+              }
+            </div>
           } @else {
             <button (click)="login()" class="btn btn-primary">Login with Discord</button>
           }
@@ -122,6 +146,75 @@ import { ApiService } from '../../services/api.service';
       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 {
       background-color: var(--witch-rose);
       color: var(--witch-moon);
@@ -190,6 +283,7 @@ export class HeaderComponent implements OnInit {
   authService = inject(AuthService);
   private apiService = inject(ApiService);
   version = signal<string | null>(null);
+  showDropdown = signal<boolean>(false);
 
   ngOnInit() {
     this.apiService.get<{ version: string }>('/version').subscribe({
@@ -198,11 +292,20 @@ export class HeaderComponent implements OnInit {
     });
   }
 
+  toggleDropdown() {
+    this.showDropdown.update(v => !v);
+  }
+
+  closeDropdown() {
+    this.showDropdown.set(false);
+  }
+
   login() {
     this.authService.login();
   }
 
   logout() {
+    this.closeDropdown();
     this.authService.logout().subscribe();
   }
 }

apps/frontend/src/app/components/home/home.component.ts

@@ -92,7 +92,7 @@ import { Game, GameStatus, Book, BookStatus, Music, MusicType, Manga, MangaStatu
               <ul class="recent-list">
                 @for (game of recentGames(); track game.id) {
                   <li>
-                    <a routerLink="/games">{{ game.title }}</a>
+                    <a [routerLink]="['/games', game.id]">{{ game.title }}</a>
                     @if (game.platform) {
                       <span class="platform">({{ game.platform }})</span>
                     }
@@ -108,7 +108,7 @@ import { Game, GameStatus, Book, BookStatus, Music, MusicType, Manga, MangaStatu
               <ul class="recent-list">
                 @for (book of recentBooks(); track book.id) {
                   <li>
-                    <a routerLink="/books">{{ book.title }}</a>
+                    <a [routerLink]="['/books', book.id]">{{ book.title }}</a>
                     <span class="author">by {{ book.author }}</span>
                   </li>
                 }
@@ -122,7 +122,7 @@ import { Game, GameStatus, Book, BookStatus, Music, MusicType, Manga, MangaStatu
               <ul class="recent-list">
                 @for (music of recentMusic(); track music.id) {
                   <li>
-                    <a routerLink="/music">{{ music.title }}</a>
+                    <a [routerLink]="['/music', music.id]">{{ music.title }}</a>
                     <span class="artist">by {{ music.artist }}</span>
                   </li>
                 }
@@ -136,7 +136,7 @@ import { Game, GameStatus, Book, BookStatus, Music, MusicType, Manga, MangaStatu
               <ul class="recent-list">
                 @for (manga of recentManga(); track manga.id) {
                   <li>
-                    <a routerLink="/manga">{{ manga.title }}</a>
+                    <a [routerLink]="['/manga', manga.id]">{{ manga.title }}</a>
                     <span class="author">by {{ manga.author }}</span>
                   </li>
                 }
@@ -150,7 +150,7 @@ import { Game, GameStatus, Book, BookStatus, Music, MusicType, Manga, MangaStatu
               <ul class="recent-list">
                 @for (show of recentShows(); track show.id) {
                   <li>
-                    <a routerLink="/shows">{{ show.title }}</a>
+                    <a [routerLink]="['/shows', show.id]">{{ show.title }}</a>
                     <span class="show-type">{{ formatShowType(show.type) }}</span>
                   </li>
                 }
@@ -164,7 +164,7 @@ import { Game, GameStatus, Book, BookStatus, Music, MusicType, Manga, MangaStatu
               <ul class="recent-list">
                 @for (art of recentArt(); track art.id) {
                   <li>
-                    <a routerLink="/art">{{ art.title }}</a>
+                    <a [routerLink]="['/art', art.id]">{{ art.title }}</a>
                     <span class="artist">by {{ art.artist }}</span>
                   </li>
                 }

apps/frontend/src/app/components/leaderboard/leaderboard.component.ts

@@ -0,0 +1,545 @@
+/**
+ * @copyright 2026 NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+
+import { Component, OnInit, inject, signal } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { RouterModule } from '@angular/router';
+import type {
+  SuggestionsLeaderboard,
+  LikesLeaderboard,
+  CommentsLeaderboard,
+  OverallLeaderboard,
+} from '@library/shared-types';
+import { LeaderboardService } from '../../services/leaderboard.service';
+import { AuthService } from '../../services/auth.service';
+
+type LeaderboardTab = 'overall' | 'suggestions' | 'likes' | 'comments';
+
+@Component({
+  selector: 'app-leaderboard',
+  standalone: true,
+  imports: [CommonModule, RouterModule],
+  template: `
+    <div class="container">
+      <h1>🏆 Community Leaderboard</h1>
+      <p class="subtitle">Celebrating our most engaged community members!</p>
+
+      <div class="tabs">
+        <button
+          (click)="setTab('overall')"
+          [class.active]="activeTab() === 'overall'"
+          class="tab-btn"
+        >
+          🌟 Overall
+        </button>
+        <button
+          (click)="setTab('suggestions')"
+          [class.active]="activeTab() === 'suggestions'"
+          class="tab-btn"
+        >
+          💡 Suggestions
+        </button>
+        <button
+          (click)="setTab('likes')"
+          [class.active]="activeTab() === 'likes'"
+          class="tab-btn"
+        >
+          ❤️ Likes
+        </button>
+        <button
+          (click)="setTab('comments')"
+          [class.active]="activeTab() === 'comments'"
+          class="tab-btn"
+        >
+          💬 Comments
+        </button>
+      </div>
+
+      @if (loading()) {
+        <div class="loading">Loading leaderboard...</div>
+      } @else {
+        @if (activeTab() === 'overall') {
+          <div class="leaderboard">
+            <h2>Overall Leaders</h2>
+            <p class="description">Ranked by achievement points, diversity of engagement, and total activity</p>
+            @if (overallLeaderboard().length === 0) {
+              <p class="empty">No users on the leaderboard yet!</p>
+            } @else {
+              <div class="leaderboard-list">
+                @for (user of overallLeaderboard(); track user.id; let i = $index) {
+                  <div class="leaderboard-item" [class.highlight]="user.id === authService.user()?.id">
+                    <div class="rank">
+                      @if (i === 0) {
+                        <span class="medal">🥇</span>
+                      } @else if (i === 1) {
+                        <span class="medal">🥈</span>
+                      } @else if (i === 2) {
+                        <span class="medal">🥉</span>
+                      } @else {
+                        <span class="rank-number">#{{ i + 1 }}</span>
+                      }
+                    </div>
+                    <div class="user-info">
+                      <div class="user-header">
+                        @if (user.avatar) {
+                          <img [src]="user.avatar" [alt]="user.username" class="avatar">
+                        }
+                        <div class="user-details">
+                          <a [routerLink]="['/profile', user.slug || user.id]" class="username">
+                            {{ user.username }}
+                          </a>
+                          <div class="badges">
+                            @if (user.primaryBadge === 'STAFF') {
+                              <span class="badge staff-badge">STAFF</span>
+                            }
+                            @if (user.primaryBadge === 'MOD') {
+                              <span class="badge mod-badge">MOD</span>
+                            }
+                            @if (user.primaryBadge === 'VIP') {
+                              <span class="badge vip-badge">VIP</span>
+                            }
+                          </div>
+                        </div>
+                      </div>
+                      <div class="stats">
+                        <span class="stat">🎯 {{ user.achievementPoints }} pts</span>
+                        <span class="stat">🏅 {{ user.achievementCount }} achievements</span>
+                        <span class="stat">💡 {{ user.totalSuggestions }} suggestions</span>
+                        <span class="stat">❤️ {{ user.totalLikes }} likes</span>
+                        <span class="stat">💬 {{ user.totalComments }} comments</span>
+                        <span class="stat">🔥 {{ user.currentStreak }} day streak</span>
+                      </div>
+                    </div>
+                  </div>
+                }
+              </div>
+            }
+          </div>
+        }
+
+        @if (activeTab() === 'suggestions') {
+          <div class="leaderboard">
+            <h2>Top Suggestions</h2>
+            <p class="description">Ranked by total suggestions and acceptance rate</p>
+            @if (suggestionsLeaderboard().length === 0) {
+              <p class="empty">No users on the leaderboard yet!</p>
+            } @else {
+              <div class="leaderboard-list">
+                @for (user of suggestionsLeaderboard(); track user.id; let i = $index) {
+                  <div class="leaderboard-item" [class.highlight]="user.id === authService.user()?.id">
+                    <div class="rank">
+                      @if (i === 0) {
+                        <span class="medal">🥇</span>
+                      } @else if (i === 1) {
+                        <span class="medal">🥈</span>
+                      } @else if (i === 2) {
+                        <span class="medal">🥉</span>
+                      } @else {
+                        <span class="rank-number">#{{ i + 1 }}</span>
+                      }
+                    </div>
+                    <div class="user-info">
+                      <div class="user-header">
+                        @if (user.avatar) {
+                          <img [src]="user.avatar" [alt]="user.username" class="avatar">
+                        }
+                        <div class="user-details">
+                          <a [routerLink]="['/profile', user.slug || user.id]" class="username">
+                            {{ user.username }}
+                          </a>
+                          <div class="badges">
+                            @if (user.primaryBadge === 'STAFF') {
+                              <span class="badge staff-badge">STAFF</span>
+                            }
+                            @if (user.primaryBadge === 'MOD') {
+                              <span class="badge mod-badge">MOD</span>
+                            }
+                            @if (user.primaryBadge === 'VIP') {
+                              <span class="badge vip-badge">VIP</span>
+                            }
+                          </div>
+                        </div>
+                      </div>
+                      <div class="stats">
+                        <span class="stat">💡 {{ user.totalSuggestions }} suggestions</span>
+                        <span class="stat">✅ {{ user.acceptedSuggestions }} accepted</span>
+                        <span class="stat">📊 {{ user.acceptanceRate }}% acceptance rate</span>
+                      </div>
+                    </div>
+                  </div>
+                }
+              </div>
+            }
+          </div>
+        }
+
+        @if (activeTab() === 'likes') {
+          <div class="leaderboard">
+            <h2>Top Likers</h2>
+            <p class="description">Ranked by total likes given</p>
+            @if (likesLeaderboard().length === 0) {
+              <p class="empty">No users on the leaderboard yet!</p>
+            } @else {
+              <div class="leaderboard-list">
+                @for (user of likesLeaderboard(); track user.id; let i = $index) {
+                  <div class="leaderboard-item" [class.highlight]="user.id === authService.user()?.id">
+                    <div class="rank">
+                      @if (i === 0) {
+                        <span class="medal">🥇</span>
+                      } @else if (i === 1) {
+                        <span class="medal">🥈</span>
+                      } @else if (i === 2) {
+                        <span class="medal">🥉</span>
+                      } @else {
+                        <span class="rank-number">#{{ i + 1 }}</span>
+                      }
+                    </div>
+                    <div class="user-info">
+                      <div class="user-header">
+                        @if (user.avatar) {
+                          <img [src]="user.avatar" [alt]="user.username" class="avatar">
+                        }
+                        <div class="user-details">
+                          <a [routerLink]="['/profile', user.slug || user.id]" class="username">
+                            {{ user.username }}
+                          </a>
+                          <div class="badges">
+                            @if (user.primaryBadge === 'STAFF') {
+                              <span class="badge staff-badge">STAFF</span>
+                            }
+                            @if (user.primaryBadge === 'MOD') {
+                              <span class="badge mod-badge">MOD</span>
+                            }
+                            @if (user.primaryBadge === 'VIP') {
+                              <span class="badge vip-badge">VIP</span>
+                            }
+                          </div>
+                        </div>
+                      </div>
+                      <div class="stats">
+                        <span class="stat">❤️ {{ user.totalLikes }} likes given</span>
+                      </div>
+                    </div>
+                  </div>
+                }
+              </div>
+            }
+          </div>
+        }
+
+        @if (activeTab() === 'comments') {
+          <div class="leaderboard">
+            <h2>Top Commenters</h2>
+            <p class="description">Ranked by total comments posted</p>
+            @if (commentsLeaderboard().length === 0) {
+              <p class="empty">No users on the leaderboard yet!</p>
+            } @else {
+              <div class="leaderboard-list">
+                @for (user of commentsLeaderboard(); track user.id; let i = $index) {
+                  <div class="leaderboard-item" [class.highlight]="user.id === authService.user()?.id">
+                    <div class="rank">
+                      @if (i === 0) {
+                        <span class="medal">🥇</span>
+                      } @else if (i === 1) {
+                        <span class="medal">🥈</span>
+                      } @else if (i === 2) {
+                        <span class="medal">🥉</span>
+                      } @else {
+                        <span class="rank-number">#{{ i + 1 }}</span>
+                      }
+                    </div>
+                    <div class="user-info">
+                      <div class="user-header">
+                        @if (user.avatar) {
+                          <img [src]="user.avatar" [alt]="user.username" class="avatar">
+                        }
+                        <div class="user-details">
+                          <a [routerLink]="['/profile', user.slug || user.id]" class="username">
+                            {{ user.username }}
+                          </a>
+                          <div class="badges">
+                            @if (user.primaryBadge === 'STAFF') {
+                              <span class="badge staff-badge">STAFF</span>
+                            }
+                            @if (user.primaryBadge === 'MOD') {
+                              <span class="badge mod-badge">MOD</span>
+                            }
+                            @if (user.primaryBadge === 'VIP') {
+                              <span class="badge vip-badge">VIP</span>
+                            }
+                          </div>
+                        </div>
+                      </div>
+                      <div class="stats">
+                        <span class="stat">💬 {{ user.totalComments }} comments</span>
+                      </div>
+                    </div>
+                  </div>
+                }
+              </div>
+            }
+          </div>
+        }
+      }
+    </div>
+  `,
+  styles: [`
+    .container {
+      max-width: 1200px;
+      margin: 0 auto;
+      padding: 2rem;
+    }
+
+    h1 {
+      text-align: center;
+      color: var(--witch-purple);
+      margin-bottom: 0.5rem;
+    }
+
+    .subtitle {
+      text-align: center;
+      color: var(--witch-plum);
+      margin-bottom: 2rem;
+      font-size: 1.1rem;
+    }
+
+    .tabs {
+      display: flex;
+      gap: 1rem;
+      justify-content: center;
+      margin-bottom: 2rem;
+      flex-wrap: wrap;
+    }
+
+    .tab-btn {
+      padding: 0.75rem 1.5rem;
+      background: var(--witch-lavender);
+      color: var(--witch-purple);
+      border: 2px solid var(--witch-lavender);
+      border-radius: 8px;
+      cursor: pointer;
+      font-size: 1rem;
+      font-weight: 600;
+      transition: all 0.3s;
+    }
+
+    .tab-btn:hover {
+      background: var(--witch-mauve);
+      transform: translateY(-2px);
+      box-shadow: 0 4px 8px var(--witch-shadow);
+    }
+
+    .tab-btn.active {
+      background: var(--witch-rose);
+      color: var(--witch-moon);
+      border-color: var(--witch-rose);
+    }
+
+    .loading {
+      text-align: center;
+      padding: 3rem;
+      color: var(--witch-plum);
+      font-size: 1.2rem;
+    }
+
+    .leaderboard h2 {
+      color: var(--witch-purple);
+      margin-bottom: 0.5rem;
+    }
+
+    .description {
+      color: var(--witch-plum);
+      margin-bottom: 1.5rem;
+      font-size: 0.9rem;
+    }
+
+    .empty {
+      text-align: center;
+      padding: 3rem;
+      color: var(--witch-mauve);
+      font-style: italic;
+    }
+
+    .leaderboard-list {
+      display: flex;
+      flex-direction: column;
+      gap: 1rem;
+    }
+
+    .leaderboard-item {
+      display: flex;
+      align-items: center;
+      gap: 1rem;
+      background: rgba(255, 255, 255, 0.95);
+      border: 2px solid var(--witch-lavender);
+      border-radius: 8px;
+      padding: 1rem;
+      transition: all 0.3s;
+    }
+
+    .leaderboard-item:hover {
+      transform: translateX(4px);
+      box-shadow: 0 4px 12px var(--witch-shadow);
+      border-color: var(--witch-mauve);
+    }
+
+    .leaderboard-item.highlight {
+      background: linear-gradient(135deg, rgba(255, 215, 245, 0.3), rgba(255, 240, 250, 0.3));
+      border-color: var(--witch-rose);
+      box-shadow: 0 0 20px rgba(168, 87, 126, 0.2);
+    }
+
+    .rank {
+      min-width: 60px;
+      text-align: center;
+    }
+
+    .medal {
+      font-size: 2rem;
+    }
+
+    .rank-number {
+      font-size: 1.5rem;
+      font-weight: 700;
+      color: var(--witch-plum);
+    }
+
+    .user-info {
+      flex: 1;
+    }
+
+    .user-header {
+      display: flex;
+      align-items: center;
+      gap: 1rem;
+      margin-bottom: 0.75rem;
+    }
+
+    .avatar {
+      width: 48px;
+      height: 48px;
+      border-radius: 50%;
+      border: 2px solid var(--witch-lavender);
+    }
+
+    .user-details {
+      flex: 1;
+    }
+
+    .username {
+      font-size: 1.1rem;
+      font-weight: 600;
+      color: var(--witch-purple);
+      text-decoration: none;
+      transition: color 0.2s;
+    }
+
+    .username:hover {
+      color: var(--witch-rose);
+    }
+
+    .badges {
+      display: flex;
+      gap: 0.5rem;
+      margin-top: 0.25rem;
+    }
+
+    .badge {
+      padding: 0.15rem 0.5rem;
+      border-radius: 4px;
+      font-size: 0.7rem;
+      font-weight: 600;
+    }
+
+    .staff-badge {
+      background: linear-gradient(135deg, #e84393, #fd79a8);
+      color: white;
+    }
+
+    .mod-badge {
+      background: linear-gradient(135deg, #00b894, #00cec9);
+      color: white;
+    }
+
+    .vip-badge {
+      background: linear-gradient(135deg, #ffd700, #ffaa00);
+      color: #1a1a1a;
+    }
+
+    .stats {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 1rem;
+    }
+
+    .stat {
+      font-size: 0.9rem;
+      color: var(--witch-plum);
+      font-weight: 500;
+    }
+
+    @media (max-width: 768px) {
+      .tabs {
+        gap: 0.5rem;
+      }
+
+      .tab-btn {
+        padding: 0.5rem 1rem;
+        font-size: 0.9rem;
+      }
+
+      .leaderboard-item {
+        flex-direction: column;
+        align-items: flex-start;
+      }
+
+      .rank {
+        min-width: auto;
+      }
+
+      .stats {
+        flex-direction: column;
+        gap: 0.5rem;
+      }
+    }
+  `]
+})
+export class LeaderboardComponent implements OnInit {
+  leaderboardService = inject(LeaderboardService);
+  authService = inject(AuthService);
+
+  activeTab = signal<LeaderboardTab>('overall');
+  loading = signal(true);
+
+  overallLeaderboard = signal<OverallLeaderboard[]>([]);
+  suggestionsLeaderboard = signal<SuggestionsLeaderboard[]>([]);
+  likesLeaderboard = signal<LikesLeaderboard[]>([]);
+  commentsLeaderboard = signal<CommentsLeaderboard[]>([]);
+
+  ngOnInit() {
+    this.loadLeaderboards();
+  }
+
+  loadLeaderboards() {
+    this.loading.set(true);
+    this.leaderboardService.getAllLeaderboards(25).subscribe({
+      next: (data) => {
+        this.overallLeaderboard.set(data.topOverall);
+        this.suggestionsLeaderboard.set(data.topSuggestions);
+        this.likesLeaderboard.set(data.topLikes);
+        this.commentsLeaderboard.set(data.topComments);
+        this.loading.set(false);
+      },
+      error: () => {
+        this.loading.set(false);
+      }
+    });
+  }
+
+  setTab(tab: LeaderboardTab) {
+    this.activeTab.set(tab);
+  }
+}

apps/frontend/src/app/components/manga/manga-detail.component.ts

@@ -0,0 +1,633 @@
+/**
+ * @copyright 2026 NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+
+import { Component, OnInit, inject, signal } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { RouterLink, ActivatedRoute, Router } from '@angular/router';
+import { FormsModule } from '@angular/forms';
+import { MangaService } from '../../services/manga.service';
+import { CommentsService } from '../../services/comments.service';
+import { AuthService } from '../../services/auth.service';
+import { SanitizeService } from '../../services/sanitize.service';
+import { CommentDisplayComponent } from '../comment-display/comment-display.component';
+import { LikeButtonComponent } from '../shared/like-button.component';
+import { Manga, Comment, MangaStatus } from '@library/shared-types';
+
+@Component({
+  selector: 'app-manga-detail',
+  standalone: true,
+  imports: [CommonModule, RouterLink, FormsModule, CommentDisplayComponent, LikeButtonComponent],
+  template: `
+    <div class="container">
+      <div class="breadcrumb">
+        <a routerLink="/manga" class="breadcrumb-link">← Back to Manga</a>
+      </div>
+
+      @if (loading()) {
+        <div class="loading">Loading manga details...</div>
+      } @else if (error()) {
+        <div class="error-state">
+          <h2>Manga Not Found</h2>
+          <p>{{ error() }}</p>
+          <a routerLink="/manga" class="btn btn-primary">Return to Manga</a>
+        </div>
+      } @else if (manga()) {
+        <div class="manga-detail-card">
+          @if (manga()!.coverImage) {
+            <div class="manga-cover-section">
+              <img [src]="manga()!.coverImage" [alt]="manga()!.title" class="manga-cover-large">
+            </div>
+          }
+
+          <div class="manga-content">
+            <div class="manga-header">
+              <h1>{{ manga()!.title }}</h1>
+              <span class="status status-{{ manga()!.status }}">
+                {{ getStatusLabel(manga()!.status) }}
+              </span>
+            </div>
+
+            <p class="author">by {{ manga()!.author }}</p>
+
+            @if (manga()!.rating) {
+              <div class="info-row">
+                <span class="info-label">Rating:</span>
+                <div class="rating">
+                  @for (star of [1,2,3,4,5,6,7,8,9,10]; track star) {
+                    <span [class.filled]="star <= manga()!.rating!">★</span>
+                  }
+                  <span class="rating-text">({{ manga()!.rating }}/10)</span>
+                </div>
+              </div>
+            }
+
+            @if (manga()!.timeSpent) {
+              <div class="info-row">
+                <span class="info-label">Reading Time:</span>
+                <span class="info-value time-spent">{{ formatTimeSpent(manga()!.timeSpent!) }}</span>
+              </div>
+            }
+
+            @if (manga()!.dateStarted) {
+              <div class="info-row">
+                <span class="info-label">Started:</span>
+                <span class="info-value">{{ formatDate(manga()!.dateStarted!) }}</span>
+              </div>
+            }
+
+            @if (manga()!.dateFinished) {
+              <div class="info-row">
+                <span class="info-label">Finished:</span>
+                <span class="info-value">{{ formatDate(manga()!.dateFinished!) }}</span>
+              </div>
+            }
+
+            <div class="info-row">
+              <span class="info-label">Added:</span>
+              <span class="info-value">{{ formatDate(manga()!.createdAt) }}</span>
+            </div>
+
+            <div class="info-row">
+              <span class="info-label">Last Updated:</span>
+              <span class="info-value">{{ formatDate(manga()!.updatedAt) }}</span>
+            </div>
+
+            <div class="like-section">
+              <app-like-button
+                entityType="manga"
+                [entityId]="manga()!.id"
+              ></app-like-button>
+            </div>
+
+            @if (manga()!.notes) {
+              <div class="notes-section">
+                <h3>Notes</h3>
+                <p class="notes">{{ manga()!.notes }}</p>
+              </div>
+            }
+
+            @if (manga()!.tags && manga()!.tags.length > 0) {
+              <div class="tags-section">
+                <h3>Tags</h3>
+                <div class="tags-display">
+                  @for (tag of manga()!.tags; track tag) {
+                    <span class="tag-chip">{{ tag }}</span>
+                  }
+                </div>
+              </div>
+            }
+
+            @if (manga()!.links && manga()!.links.length > 0) {
+              <div class="links-section">
+                <h3>External Links</h3>
+                <div class="links-display">
+                  @for (link of manga()!.links; track link.url) {
+                    <a [href]="link.url" target="_blank" rel="noopener noreferrer" class="external-link">
+                      {{ link.title }} ↗
+                    </a>
+                  }
+                </div>
+              </div>
+            }
+
+            <div class="comments-section">
+              <h3>Comments</h3>
+              @if (authService.isAuthenticated()) {
+                @if (authService.user()?.isBanned) {
+                  <div class="banned-notice">
+                    You have been banned from commenting.
+                  </div>
+                } @else {
+                  <form (ngSubmit)="addComment()" class="comment-form">
+                    <textarea
+                      [(ngModel)]="newCommentContent"
+                      name="comment"
+                      placeholder="Add a comment (Markdown supported)..."
+                      rows="3"
+                    ></textarea>
+                    <button type="submit" class="btn btn-primary">Post Comment</button>
+                  </form>
+                }
+              } @else {
+                <div class="auth-prompt">
+                  <p>Please sign in to comment.</p>
+                </div>
+              }
+
+              @if (commentsLoading()) {
+                <div class="comments-loading">Loading comments...</div>
+              } @else {
+                <app-comment-display
+                  [comments]="comments"
+                  (edit)="handleCommentEdit($event)"
+                  (delete)="deleteComment($event)"
+                />
+              }
+            </div>
+          </div>
+        </div>
+      }
+    </div>
+  `,
+  styles: [`
+    .container {
+      max-width: 900px;
+      margin: 0 auto;
+      padding: 2rem;
+    }
+
+    .breadcrumb {
+      margin-bottom: 1.5rem;
+    }
+
+    .breadcrumb-link {
+      color: #f59e0b;
+      text-decoration: none;
+      font-weight: 500;
+      transition: opacity 0.3s;
+    }
+
+    .breadcrumb-link:hover {
+      opacity: 0.8;
+    }
+
+    .loading {
+      text-align: center;
+      padding: 3rem;
+      color: #666;
+      font-size: 1.1rem;
+    }
+
+    .error-state {
+      text-align: center;
+      padding: 3rem;
+      background: #fef2f2;
+      border: 1px solid #fecaca;
+      border-radius: 8px;
+    }
+
+    .error-state h2 {
+      color: #991b1b;
+      margin-bottom: 1rem;
+    }
+
+    .error-state p {
+      color: #dc2626;
+      margin-bottom: 1.5rem;
+    }
+
+    .manga-detail-card {
+      background: white;
+      border: 1px solid #e5e7eb;
+      border-radius: 8px;
+      overflow: hidden;
+      box-shadow: 0 1px 3px rgba(0,0,0,0.1);
+    }
+
+    .manga-cover-section {
+      width: 100%;
+      background: #f3f4f6;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      padding: 2rem;
+    }
+
+    .manga-cover-large {
+      max-width: 100%;
+      max-height: 400px;
+      object-fit: contain;
+      border-radius: 4px;
+    }
+
+    .manga-content {
+      padding: 2rem;
+    }
+
+    .manga-header {
+      display: flex;
+      align-items: center;
+      gap: 1rem;
+      margin-bottom: 1rem;
+      flex-wrap: wrap;
+    }
+
+    .manga-header h1 {
+      margin: 0;
+      font-size: 2rem;
+      color: #1f2937;
+    }
+
+    .author {
+      color: #6b7280;
+      font-style: italic;
+      font-size: 1.1rem;
+      margin: 0 0 1rem 0;
+    }
+
+    .status {
+      display: inline-block;
+      padding: 0.5rem 1rem;
+      border-radius: 4px;
+      font-size: 0.9rem;
+      font-weight: 500;
+    }
+
+    .status-reading {
+      background: #fef3c7;
+      color: #92400e;
+    }
+
+    .status-completed {
+      background: #d1fae5;
+      color: #065f46;
+    }
+
+    .status-wantToRead {
+      background: #e0e7ff;
+      color: #3730a3;
+    }
+
+    .status-retired {
+      background: #f3f4f6;
+      color: #4b5563;
+    }
+
+    .info-row {
+      display: flex;
+      align-items: center;
+      gap: 1rem;
+      margin-bottom: 0.75rem;
+      padding: 0.5rem 0;
+      border-bottom: 1px solid #f3f4f6;
+    }
+
+    .info-label {
+      font-weight: 600;
+      color: #4b5563;
+      min-width: 120px;
+    }
+
+    .info-value {
+      color: #1f2937;
+    }
+
+    .time-spent {
+      color: #f59e0b;
+      font-weight: 600;
+    }
+
+    .rating {
+      display: flex;
+      align-items: center;
+      gap: 0.25rem;
+    }
+
+    .rating span {
+      color: #e5e7eb;
+      font-size: 1.2rem;
+    }
+
+    .rating span.filled {
+      color: #f59e0b;
+    }
+
+    .rating-text {
+      margin-left: 0.5rem;
+      font-size: 1rem;
+      color: #6b7280;
+      font-weight: 500;
+    }
+
+    .like-section {
+      margin: 1.5rem 0;
+    }
+
+    .notes-section,
+    .tags-section,
+    .links-section {
+      margin-top: 2rem;
+    }
+
+    .notes-section h3,
+    .tags-section h3,
+    .links-section h3,
+    .comments-section h3 {
+      font-size: 1.25rem;
+      color: #1f2937;
+      margin-bottom: 1rem;
+    }
+
+    .notes {
+      font-size: 1rem;
+      color: #4b5563;
+      line-height: 1.6;
+      white-space: pre-wrap;
+    }
+
+    .tags-display {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 0.5rem;
+    }
+
+    .tag-chip {
+      background: #f59e0b;
+      color: white;
+      padding: 0.375rem 0.875rem;
+      border-radius: 12px;
+      font-size: 0.875rem;
+      font-weight: 500;
+    }
+
+    .links-display {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 0.75rem;
+    }
+
+    .external-link {
+      color: #f59e0b;
+      text-decoration: none;
+      font-size: 0.95rem;
+      padding: 0.5rem 1rem;
+      border: 2px solid #f59e0b;
+      border-radius: 4px;
+      transition: all 0.2s;
+      font-weight: 500;
+    }
+
+    .external-link:hover {
+      background: #f59e0b;
+      color: white;
+    }
+
+    .comments-section {
+      margin-top: 2rem;
+      padding-top: 2rem;
+      border-top: 2px solid #e5e7eb;
+    }
+
+    .comment-form {
+      margin-bottom: 1.5rem;
+    }
+
+    .comment-form textarea {
+      width: 100%;
+      padding: 0.75rem;
+      border: 1px solid #d1d5db;
+      border-radius: 4px;
+      font-size: 1rem;
+      resize: vertical;
+      margin-bottom: 0.75rem;
+      font-family: inherit;
+    }
+
+    .comment-form textarea:focus {
+      outline: none;
+      border-color: #f59e0b;
+    }
+
+    .banned-notice {
+      background: #fef2f2;
+      border: 1px solid #fecaca;
+      color: #991b1b;
+      padding: 1rem;
+      border-radius: 4px;
+      text-align: center;
+      margin-bottom: 1.5rem;
+      font-size: 0.95rem;
+    }
+
+    .auth-prompt {
+      background: #f3f4f6;
+      padding: 1rem;
+      border-radius: 4px;
+      text-align: center;
+      margin-bottom: 1.5rem;
+    }
+
+    .auth-prompt p {
+      margin: 0;
+      color: #4b5563;
+    }
+
+    .comments-loading {
+      text-align: center;
+      padding: 1.5rem;
+      color: #6b7280;
+      font-size: 0.95rem;
+    }
+
+    .btn {
+      padding: 0.625rem 1.25rem;
+      border: none;
+      border-radius: 4px;
+      cursor: pointer;
+      font-size: 1rem;
+      transition: all 0.3s;
+      font-weight: 500;
+    }
+
+    .btn:hover {
+      opacity: 0.9;
+    }
+
+    .btn-primary {
+      background: #f59e0b;
+      color: white;
+    }
+
+    @media (max-width: 640px) {
+      .container {
+        padding: 1rem;
+      }
+
+      .manga-header {
+        flex-direction: column;
+        align-items: flex-start;
+      }
+
+      .manga-header h1 {
+        font-size: 1.5rem;
+      }
+
+      .info-row {
+        flex-direction: column;
+        align-items: flex-start;
+        gap: 0.25rem;
+      }
+
+      .info-label {
+        min-width: auto;
+      }
+    }
+  `]
+})
+export class MangaDetailComponent implements OnInit {
+  private readonly mangaService = inject(MangaService);
+  private readonly commentsService = inject(CommentsService);
+  readonly authService = inject(AuthService);
+  private readonly sanitizeService = inject(SanitizeService);
+  private readonly route = inject(ActivatedRoute);
+  private readonly router = inject(Router);
+
+  manga = signal<Manga | null>(null);
+  comments = signal<Comment[]>([]);
+  loading = signal(true);
+  commentsLoading = signal(false);
+  error = signal<string | null>(null);
+  newCommentContent = '';
+
+  ngOnInit() {
+    const mangaId = this.route.snapshot.paramMap.get('id');
+    if (!mangaId) {
+      this.error.set('No manga ID provided');
+      this.loading.set(false);
+      return;
+    }
+
+    this.loadManga(mangaId);
+    this.loadComments(mangaId);
+  }
+
+  private loadManga(mangaId: string) {
+    this.loading.set(true);
+    this.mangaService.getMangaById(mangaId).subscribe({
+      next: (manga) => {
+        if (!manga) {
+          this.error.set('Manga not found');
+        } else {
+          this.manga.set(manga);
+        }
+        this.loading.set(false);
+      },
+      error: () => {
+        this.error.set('Failed to load manga. It may not exist or there was an error.');
+        this.loading.set(false);
+      }
+    });
+  }
+
+  private loadComments(mangaId: string) {
+    this.commentsLoading.set(true);
+    this.commentsService.getCommentsForManga(mangaId).subscribe({
+      next: (comments) => {
+        this.comments.set(comments);
+        this.commentsLoading.set(false);
+      },
+      error: () => {
+        this.commentsLoading.set(false);
+      }
+    });
+  }
+
+  addComment() {
+    const manga = this.manga();
+    if (!manga || !this.newCommentContent.trim()) return;
+
+    this.commentsService.addCommentToManga(manga.id, { content: this.newCommentContent }).subscribe({
+      next: (comment) => {
+        this.comments.set([comment, ...this.comments()]);
+        this.newCommentContent = '';
+      }
+    });
+  }
+
+  handleCommentEdit(event: { commentId: string; content: string }) {
+    const manga = this.manga();
+    if (!manga) return;
+
+    this.commentsService.updateCommentOnManga(manga.id, event.commentId, event.content).subscribe({
+      next: (updatedComment) => {
+        this.comments.set(
+          this.comments().map(c => c.id === event.commentId ? updatedComment : c)
+        );
+      }
+    });
+  }
+
+  deleteComment(commentId: string) {
+    const manga = this.manga();
+    if (!manga || !confirm('Are you sure you want to delete this comment?')) return;
+
+    this.commentsService.deleteCommentFromManga(manga.id, commentId).subscribe({
+      next: () => {
+        this.comments.set(this.comments().filter(c => c.id !== commentId));
+      }
+    });
+  }
+
+  getStatusLabel(status: MangaStatus): string {
+    switch (status) {
+      case MangaStatus.reading: return 'Currently Reading';
+      case MangaStatus.completed: return 'Completed';
+      case MangaStatus.wantToRead: return 'Want to Read';
+      case MangaStatus.retired: return 'Retired';
+    }
+  }
+
+  formatDate(date: Date | string): string {
+    return new Date(date).toLocaleDateString('en-GB', {
+      year: 'numeric',
+      month: 'long',
+      day: 'numeric'
+    });
+  }
+
+  formatTimeSpent(minutes: number): string {
+    const hours = Math.floor(minutes / 60);
+    const mins = minutes % 60;
+
+    if (hours === 0) {
+      return `${mins} minutes`;
+    } else if (mins === 0) {
+      return `${hours} hour${hours === 1 ? '' : 's'}`;
+    } else {
+      return `${hours} hour${hours === 1 ? '' : 's'} ${mins} minute${mins === 1 ? '' : 's'}`;
+    }
+  }
+}

apps/frontend/src/app/components/manga/manga-list.component.ts

@@ -14,12 +14,13 @@ import { SanitizeService } from '../../services/sanitize.service';
 import { SuggestionService } from '../../services/suggestion.service';
 import { PaginationComponent } from '../shared/pagination.component';
 import { LikeButtonComponent } from '../shared/like-button.component';
+import { CommentDisplayComponent } from '../comment-display/comment-display.component';
 import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, SuggestionEntity, Link } from '@library/shared-types';
 
 @Component({
   selector: 'app-manga-list',
   standalone: true,
-  imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent],
+  imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent, CommentDisplayComponent],
   template: `
     <div class="container">
       <div class="header-section">
@@ -68,9 +69,30 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion
               <option [value]="MangaStatus.reading">Currently Reading</option>
               <option [value]="MangaStatus.completed">Completed</option>
               <option [value]="MangaStatus.wantToRead">Want to Read</option>
+              <option [value]="MangaStatus.retired">Retired</option>
             </select>
           </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">
             <label for="rating">Rating (1-10)</label>
             <input
@@ -83,6 +105,34 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion
             >
           </div>
 
+          <div class="form-row">
+            <div class="form-group">
+              <label for="timeHours">Time Spent (Hours)</label>
+              <input
+                type="number"
+                id="timeHours"
+                [(ngModel)]="newMangaTimeHours"
+                name="timeHours"
+                min="0"
+                placeholder="0"
+                (ngModelChange)="updateNewMangaTimeSpent()"
+              >
+            </div>
+            <div class="form-group">
+              <label for="timeMinutes">Time Spent (Minutes)</label>
+              <input
+                type="number"
+                id="timeMinutes"
+                [(ngModel)]="newMangaTimeMinutes"
+                name="timeMinutes"
+                min="0"
+                max="59"
+                placeholder="0"
+                (ngModelChange)="updateNewMangaTimeSpent()"
+              >
+            </div>
+          </div>
+
           <div class="form-group">
             <label for="notes">Notes</label>
             <textarea
@@ -115,8 +165,7 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion
           </div>
 
           <div class="form-group">
-            <label>Tags</label>
-            <div class="tags-input-container">
+            <div class="tags-input-container" aria-label="Tags">
               @for (tag of newManga.tags; track tag; let i = $index) {
                 <span class="tag">
                   {{ tag }}
@@ -133,8 +182,7 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion
             </div>
           </div>
 
-          <div class="form-group">
-            <label>External Links</label>
+          <div class="form-group" aria-label="External Links">
             <div class="links-list">
               @for (link of newManga.links; track link.url; let i = $index) {
                 <div class="link-item">
@@ -200,9 +248,30 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion
               <option [value]="MangaStatus.reading">Currently Reading</option>
               <option [value]="MangaStatus.completed">Completed</option>
               <option [value]="MangaStatus.wantToRead">Want to Read</option>
+              <option [value]="MangaStatus.retired">Retired</option>
             </select>
           </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">
             <label for="edit-rating">Rating (1-10)</label>
             <input
@@ -215,6 +284,34 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion
             >
           </div>
 
+          <div class="form-row">
+            <div class="form-group">
+              <label for="edit-timeHours">Time Spent (Hours)</label>
+              <input
+                type="number"
+                id="edit-timeHours"
+                [(ngModel)]="editMangaTimeHours"
+                name="timeHours"
+                min="0"
+                placeholder="0"
+                (ngModelChange)="updateEditMangaTimeSpent()"
+              >
+            </div>
+            <div class="form-group">
+              <label for="edit-timeMinutes">Time Spent (Minutes)</label>
+              <input
+                type="number"
+                id="edit-timeMinutes"
+                [(ngModel)]="editMangaTimeMinutes"
+                name="timeMinutes"
+                min="0"
+                max="59"
+                placeholder="0"
+                (ngModelChange)="updateEditMangaTimeSpent()"
+              >
+            </div>
+          </div>
+
           <div class="form-group">
             <label for="edit-notes">Notes</label>
             <textarea
@@ -247,8 +344,7 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion
           </div>
 
           <div class="form-group">
-            <label>Tags</label>
-            <div class="tags-input-container">
+            <div class="tags-input-container" aria-label="Tags">
               @for (tag of editManga.tags; track tag; let i = $index) {
                 <span class="tag">
                   {{ tag }}
@@ -265,8 +361,7 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion
             </div>
           </div>
 
-          <div class="form-group">
-            <label>External Links</label>
+          <div class="form-group" aria-label="External Links">
             <div class="links-list">
               @for (link of editManga.links; track link.url; let i = $index) {
                 <div class="link-item">
@@ -439,6 +534,13 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion
         >
           Want to Read ({{ wantToReadCount() }})
         </button>
+        <button
+          (click)="setFilter(MangaStatus.retired)"
+          [class.active]="statusFilter() === MangaStatus.retired"
+          class="filter-btn"
+        >
+          Retired ({{ retiredCount() }})
+        </button>
       </div>
 
       @if (loading()) {
@@ -478,6 +580,12 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion
                   </div>
                 }
 
+                @if (manga.timeSpent) {
+                  <p class="time-spent">
+                    📚 Reading Time: {{ formatTimeSpent(manga.timeSpent) }}
+                  </p>
+                }
+
                 <app-like-button
                   entityType="manga"
                   [entityId]="manga.id"
@@ -505,6 +613,30 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion
                   </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()) {
                   <div class="actions">
                     <button (click)="startEdit(manga)" class="btn btn-secondary btn-sm">
@@ -541,56 +673,11 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion
                         }
                       }
 
-                      @if (commentsLoading()[manga.id]) {
-                        <div class="comments-loading">Loading comments...</div>
-                      } @else {
-                        @for (comment of comments()[manga.id] || []; track comment.id) {
-                          <div class="comment">
-                            <div class="comment-header">
-                              @if (comment.user.avatar) {
-                                <img [src]="comment.user.avatar" [alt]="comment.user.username" class="comment-avatar">
-                              }
-                              <span class="comment-author">{{ comment.user.username }}</span>
-                              @if (comment.user.inDiscord) {
-                                <span class="discord-badge">Discord</span>
-                              }
-                              @if (comment.user.isVip) {
-                                <span class="vip-badge">VIP</span>
-                              }
-                              @if (comment.user.isMod) {
-                                <span class="mod-badge">Mod</span>
-                              }
-                              @if (comment.user.isStaff) {
-                                <span class="staff-badge">Staff</span>
-                              }
-                              <span class="comment-date">{{ formatDate(comment.createdAt) }}</span>
-                              @if (canEditComment(comment)) {
-                                <button (click)="startEditComment(manga.id, comment)" class="btn btn-secondary btn-xs">Edit</button>
-                              }
-                              @if (canDeleteComment(comment)) {
-                                <button (click)="deleteComment(manga.id, comment.id)" class="btn btn-danger btn-xs">Delete</button>
-                              }
-                            </div>
-                            @if (editingCommentId() === comment.id) {
-                              <div class="comment-edit-form">
-                                <textarea
-                                  [(ngModel)]="editCommentContent"
-                                  name="editComment"
-                                  rows="3"
-                                ></textarea>
-                                <div class="comment-edit-actions">
-                                  <button (click)="saveCommentEdit(manga.id, comment.id)" class="btn btn-primary btn-xs">Save</button>
-                                  <button (click)="cancelCommentEdit()" class="btn btn-secondary btn-xs">Cancel</button>
-                                </div>
-                              </div>
-                            } @else {
-                              <div class="comment-content" [innerHTML]="sanitizeService.sanitizeHtml(comment.content)"></div>
-                            }
-                          </div>
-                        } @empty {
-                          <div class="no-comments">No comments yet. Be the first to comment!</div>
-                        }
-                      }
+                      <app-comment-display
+                        [comments]="getCommentsSignal(manga.id)"
+                        (edit)="handleCommentEdit(manga.id, $event)"
+                        (delete)="deleteComment(manga.id, $event)"
+                      />
                     </div>
                   }
                 </div>
@@ -666,6 +753,13 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion
       font-size: 1rem;
     }
 
+    .form-row {
+      display: grid;
+      grid-template-columns: 1fr 1fr;
+      gap: 1rem;
+      margin-bottom: 1rem;
+    }
+
     .form-actions {
       display: flex;
       gap: 1rem;
@@ -861,6 +955,22 @@ import { Manga, MangaStatus, CreateMangaDto, UpdateMangaDto, Comment, Suggestion
       margin: 0.5rem 0;
     }
 
+    .time-spent {
+      font-size: 0.9rem;
+      color: #10b981;
+      font-weight: 500;
+      margin: 0.5rem 0;
+    }
+
+    .date-started,
+    .date-finished,
+    .date-added,
+    .date-updated {
+      font-size: 0.85rem;
+      color: #4b5563;
+      margin-top: 0.5rem;
+    }
+
     .actions {
       margin-top: 1rem;
     }
@@ -1216,6 +1326,7 @@ export class MangaListComponent implements OnInit {
   readingCount = computed(() => this.mangaList().filter(m => m.status === MangaStatus.reading).length);
   completedCount = computed(() => this.mangaList().filter(m => m.status === MangaStatus.completed).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(() => {
     const tagsSet = new Set<string>();
@@ -1264,10 +1375,12 @@ export class MangaListComponent implements OnInit {
 
   totalFilteredManga = computed(() => this.filteredManga().length);
 
-  newManga: Partial<CreateMangaDto> = {
+  newManga: Partial<CreateMangaDto> & { dateStarted?: Date; dateFinished?: Date } = {
     title: '',
     author: '',
     status: MangaStatus.wantToRead,
+    dateStarted: undefined,
+    dateFinished: undefined,
     rating: undefined,
     notes: '',
     tags: [],
@@ -1276,6 +1389,12 @@ export class MangaListComponent implements OnInit {
 
   editManga: Partial<UpdateMangaDto> = {};
 
+  // Time tracking state
+  newMangaTimeHours = 0;
+  newMangaTimeMinutes = 0;
+  editMangaTimeHours = 0;
+  editMangaTimeMinutes = 0;
+
   // Tags and links input state
   newTagInput = '';
   editTagInput = '';
@@ -1344,6 +1463,7 @@ export class MangaListComponent implements OnInit {
       case MangaStatus.reading: return 'Currently Reading';
       case MangaStatus.completed: return 'Completed';
       case MangaStatus.wantToRead: return 'Want to Read';
+      case MangaStatus.retired: return 'Retired';
     }
   }
 
@@ -1359,12 +1479,16 @@ export class MangaListComponent implements OnInit {
       title: '',
       author: '',
       status: MangaStatus.wantToRead,
+      dateStarted: undefined,
+      dateFinished: undefined,
       rating: undefined,
       notes: '',
       coverImage: undefined,
       tags: [],
       links: []
     };
+    this.newMangaTimeHours = 0;
+    this.newMangaTimeMinutes = 0;
     this.newMangaImagePreview.set(null);
     this.imageError.set(null);
     this.newTagInput = '';
@@ -1372,6 +1496,16 @@ export class MangaListComponent implements OnInit {
     this.newLinkUrl = '';
   }
 
+  updateNewMangaTimeSpent() {
+    const totalMinutes = (this.newMangaTimeHours * 60) + this.newMangaTimeMinutes;
+    this.newManga.timeSpent = totalMinutes > 0 ? totalMinutes : undefined;
+  }
+
+  updateEditMangaTimeSpent() {
+    const totalMinutes = (this.editMangaTimeHours * 60) + this.editMangaTimeMinutes;
+    this.editManga.timeSpent = totalMinutes > 0 ? totalMinutes : undefined;
+  }
+
   addTag(target: 'new' | 'edit') {
     const input = target === 'new' ? this.newTagInput.trim() : this.editTagInput.trim();
     if (!input) return;
@@ -1424,6 +1558,8 @@ export class MangaListComponent implements OnInit {
       title: this.newManga.title,
       author: this.newManga.author,
       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,
       notes: this.newManga.notes,
       coverImage: this.newManga.coverImage,
@@ -1451,12 +1587,23 @@ export class MangaListComponent implements OnInit {
       title: manga.title,
       author: manga.author,
       status: manga.status,
+      dateStarted: manga.dateStarted,
+      dateFinished: manga.dateFinished,
       rating: manga.rating,
       notes: manga.notes,
       coverImage: manga.coverImage,
       tags: [...(manga.tags || [])],
-      links: [...(manga.links || [])]
+      links: [...(manga.links || [])],
+      timeSpent: manga.timeSpent
     };
+    // Populate time fields from existing timeSpent
+    if (manga.timeSpent) {
+      this.editMangaTimeHours = Math.floor(manga.timeSpent / 60);
+      this.editMangaTimeMinutes = manga.timeSpent % 60;
+    } else {
+      this.editMangaTimeHours = 0;
+      this.editMangaTimeMinutes = 0;
+    }
     this.editMangaImagePreview.set(manga.coverImage || null);
     this.showAddForm.set(false);
     this.imageError.set(null);
@@ -1479,7 +1626,13 @@ export class MangaListComponent implements OnInit {
     const manga = this.editingManga();
     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.cancelEdit();
     });
@@ -1540,6 +1693,19 @@ export class MangaListComponent implements OnInit {
     return new Date(date).toLocaleDateString();
   }
 
+  formatTimeSpent(minutes: number): string {
+    const hours = Math.floor(minutes / 60);
+    const mins = minutes % 60;
+
+    if (hours === 0) {
+      return `${mins}m`;
+    } else if (mins === 0) {
+      return `${hours}h`;
+    } else {
+      return `${hours}h ${mins}m`;
+    }
+  }
+
   toggleComments(mangaId: string) {
     const expanded = this.expandedComments();
     const isCurrentlyExpanded = expanded[mangaId];
@@ -1674,7 +1840,7 @@ export class MangaListComponent implements OnInit {
 
     try {
       await this.suggestionService.createSuggestion({
-        entityType: SuggestionEntity.MANGA,
+        entityType: SuggestionEntity.manga,
         title: this.suggestedManga.title,
         author: this.suggestedManga.author,
         notes: this.suggestedManga.notes,
@@ -1686,4 +1852,21 @@ export class MangaListComponent implements OnInit {
       alert('Failed to submit suggestion. Please try again.');
     }
   }
+
+  handleCommentEdit(mangaId: string, event: { commentId: string; content: string }) {
+    this.commentsService.updateCommentOnManga(mangaId, event.commentId, event.content).subscribe({
+      next: (updatedComment) => {
+        this.comments.set({
+          ...this.comments(),
+          [mangaId]: (this.comments()[mangaId] || []).map(c =>
+            c.id === event.commentId ? updatedComment : c
+          )
+        });
+      }
+    });
+  }
+
+  getCommentsSignal(mangaId: string) {
+    return signal(this.comments()[mangaId] || []);
+  }
 }

apps/frontend/src/app/components/music/music-detail.component.ts

@@ -0,0 +1,667 @@
+/**
+ * @copyright 2026 NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+
+import { Component, OnInit, inject, signal } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { RouterLink, ActivatedRoute, Router } from '@angular/router';
+import { FormsModule } from '@angular/forms';
+import { MusicService } from '../../services/music.service';
+import { CommentsService } from '../../services/comments.service';
+import { AuthService } from '../../services/auth.service';
+import { SanitizeService } from '../../services/sanitize.service';
+import { CommentDisplayComponent } from '../comment-display/comment-display.component';
+import { LikeButtonComponent } from '../shared/like-button.component';
+import { Music, Comment, MusicStatus, MusicType } from '@library/shared-types';
+
+@Component({
+  selector: 'app-music-detail',
+  standalone: true,
+  imports: [CommonModule, RouterLink, FormsModule, CommentDisplayComponent, LikeButtonComponent],
+  template: `
+    <div class="container">
+      <div class="breadcrumb">
+        <a routerLink="/music" class="breadcrumb-link">← Back to Music</a>
+      </div>
+
+      @if (loading()) {
+        <div class="loading">Loading music details...</div>
+      } @else if (error()) {
+        <div class="error-state">
+          <h2>Music Not Found</h2>
+          <p>{{ error() }}</p>
+          <a routerLink="/music" class="btn btn-primary">Return to Music</a>
+        </div>
+      } @else if (music()) {
+        <div class="music-detail-card">
+          @if (music()!.coverArt) {
+            <div class="music-cover-section">
+              <img [src]="music()!.coverArt" [alt]="music()!.title" class="music-cover-large">
+            </div>
+          }
+
+          <div class="music-content">
+            <div class="music-header">
+              <h1>{{ music()!.title }}</h1>
+              <span class="type-badge type-{{ music()!.type }}">
+                {{ getTypeLabel(music()!.type) }}
+              </span>
+              <span class="status status-{{ music()!.status }}">
+                {{ getStatusLabel(music()!.status) }}
+              </span>
+            </div>
+
+            <p class="artist">by {{ music()!.artist }}</p>
+
+            @if (music()!.rating) {
+              <div class="info-row">
+                <span class="info-label">Rating:</span>
+                <div class="rating">
+                  @for (star of [1,2,3,4,5,6,7,8,9,10]; track star) {
+                    <span [class.filled]="star <= music()!.rating!">★</span>
+                  }
+                  <span class="rating-text">({{ music()!.rating }}/10)</span>
+                </div>
+              </div>
+            }
+
+            @if (music()!.timeSpent) {
+              <div class="info-row">
+                <span class="info-label">Listening Time:</span>
+                <span class="info-value time-spent">{{ formatTimeSpent(music()!.timeSpent!) }}</span>
+              </div>
+            }
+
+            @if (music()!.dateStarted) {
+              <div class="info-row">
+                <span class="info-label">Started:</span>
+                <span class="info-value">{{ formatDate(music()!.dateStarted!) }}</span>
+              </div>
+            }
+
+            @if (music()!.dateFinished) {
+              <div class="info-row">
+                <span class="info-label">Finished:</span>
+                <span class="info-value">{{ formatDate(music()!.dateFinished!) }}</span>
+              </div>
+            }
+
+            <div class="info-row">
+              <span class="info-label">Added:</span>
+              <span class="info-value">{{ formatDate(music()!.createdAt) }}</span>
+            </div>
+
+            <div class="info-row">
+              <span class="info-label">Last Updated:</span>
+              <span class="info-value">{{ formatDate(music()!.updatedAt) }}</span>
+            </div>
+
+            <div class="like-section">
+              <app-like-button
+                entityType="music"
+                [entityId]="music()!.id"
+              ></app-like-button>
+            </div>
+
+            @if (music()!.notes) {
+              <div class="notes-section">
+                <h3>Notes</h3>
+                <p class="notes">{{ music()!.notes }}</p>
+              </div>
+            }
+
+            @if (music()!.tags && music()!.tags.length > 0) {
+              <div class="tags-section">
+                <h3>Tags</h3>
+                <div class="tags-display">
+                  @for (tag of music()!.tags; track tag) {
+                    <span class="tag-chip">{{ tag }}</span>
+                  }
+                </div>
+              </div>
+            }
+
+            @if (music()!.links && music()!.links.length > 0) {
+              <div class="links-section">
+                <h3>External Links</h3>
+                <div class="links-display">
+                  @for (link of music()!.links; track link.url) {
+                    <a [href]="link.url" target="_blank" rel="noopener noreferrer" class="external-link">
+                      {{ link.title }} ↗
+                    </a>
+                  }
+                </div>
+              </div>
+            }
+
+            <div class="comments-section">
+              <h3>Comments</h3>
+              @if (authService.isAuthenticated()) {
+                @if (authService.user()?.isBanned) {
+                  <div class="banned-notice">
+                    You have been banned from commenting.
+                  </div>
+                } @else {
+                  <form (ngSubmit)="addComment()" class="comment-form">
+                    <textarea
+                      [(ngModel)]="newCommentContent"
+                      name="comment"
+                      placeholder="Add a comment (Markdown supported)..."
+                      rows="3"
+                    ></textarea>
+                    <button type="submit" class="btn btn-primary">Post Comment</button>
+                  </form>
+                }
+              } @else {
+                <div class="auth-prompt">
+                  <p>Please sign in to comment.</p>
+                </div>
+              }
+
+              @if (commentsLoading()) {
+                <div class="comments-loading">Loading comments...</div>
+              } @else {
+                <app-comment-display
+                  [comments]="comments"
+                  (edit)="handleCommentEdit($event)"
+                  (delete)="deleteComment($event)"
+                />
+              }
+            </div>
+          </div>
+        </div>
+      }
+    </div>
+  `,
+  styles: [`
+    .container {
+      max-width: 900px;
+      margin: 0 auto;
+      padding: 2rem;
+    }
+
+    .breadcrumb {
+      margin-bottom: 1.5rem;
+    }
+
+    .breadcrumb-link {
+      color: #74b9ff;
+      text-decoration: none;
+      font-weight: 500;
+      transition: opacity 0.3s;
+    }
+
+    .breadcrumb-link:hover {
+      opacity: 0.8;
+    }
+
+    .loading {
+      text-align: center;
+      padding: 3rem;
+      color: #666;
+      font-size: 1.1rem;
+    }
+
+    .error-state {
+      text-align: center;
+      padding: 3rem;
+      background: #fef2f2;
+      border: 1px solid #fecaca;
+      border-radius: 8px;
+    }
+
+    .error-state h2 {
+      color: #991b1b;
+      margin-bottom: 1rem;
+    }
+
+    .error-state p {
+      color: #dc2626;
+      margin-bottom: 1.5rem;
+    }
+
+    .music-detail-card {
+      background: white;
+      border: 1px solid #e5e7eb;
+      border-radius: 8px;
+      overflow: hidden;
+      box-shadow: 0 1px 3px rgba(0,0,0,0.1);
+    }
+
+    .music-cover-section {
+      width: 100%;
+      background: #f3f4f6;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      padding: 2rem;
+    }
+
+    .music-cover-large {
+      max-width: 100%;
+      max-height: 400px;
+      object-fit: contain;
+      border-radius: 4px;
+    }
+
+    .music-content {
+      padding: 2rem;
+    }
+
+    .music-header {
+      display: flex;
+      align-items: center;
+      gap: 1rem;
+      margin-bottom: 1rem;
+      flex-wrap: wrap;
+    }
+
+    .music-header h1 {
+      margin: 0;
+      font-size: 2rem;
+      color: #1f2937;
+    }
+
+    .artist {
+      color: #6b7280;
+      font-weight: 500;
+      font-size: 1.1rem;
+      margin: 0 0 1rem 0;
+    }
+
+    .type-badge {
+      display: inline-block;
+      padding: 0.5rem 1rem;
+      border-radius: 4px;
+      font-size: 0.9rem;
+      font-weight: 500;
+    }
+
+    .type-album {
+      background: #a78bfa;
+      color: white;
+    }
+
+    .type-single {
+      background: #fb923c;
+      color: white;
+    }
+
+    .type-ep {
+      background: #60a5fa;
+      color: white;
+    }
+
+    .status {
+      display: inline-block;
+      padding: 0.5rem 1rem;
+      border-radius: 4px;
+      font-size: 0.9rem;
+      font-weight: 500;
+    }
+
+    .status-listening {
+      background: #fef3c7;
+      color: #92400e;
+    }
+
+    .status-completed {
+      background: #d1fae5;
+      color: #065f46;
+    }
+
+    .status-wantToListen {
+      background: #e0e7ff;
+      color: #3730a3;
+    }
+
+    .status-retired {
+      background: #f3f4f6;
+      color: #4b5563;
+    }
+
+    .info-row {
+      display: flex;
+      align-items: center;
+      gap: 1rem;
+      margin-bottom: 0.75rem;
+      padding: 0.5rem 0;
+      border-bottom: 1px solid #f3f4f6;
+    }
+
+    .info-label {
+      font-weight: 600;
+      color: #4b5563;
+      min-width: 120px;
+    }
+
+    .info-value {
+      color: #1f2937;
+    }
+
+    .time-spent {
+      color: #8b5cf6;
+      font-weight: 600;
+    }
+
+    .rating {
+      display: flex;
+      align-items: center;
+      gap: 0.25rem;
+    }
+
+    .rating span {
+      color: #e5e7eb;
+      font-size: 1.2rem;
+    }
+
+    .rating span.filled {
+      color: #f59e0b;
+    }
+
+    .rating-text {
+      margin-left: 0.5rem;
+      font-size: 1rem;
+      color: #6b7280;
+      font-weight: 500;
+    }
+
+    .like-section {
+      margin: 1.5rem 0;
+    }
+
+    .notes-section,
+    .tags-section,
+    .links-section {
+      margin-top: 2rem;
+    }
+
+    .notes-section h3,
+    .tags-section h3,
+    .links-section h3,
+    .comments-section h3 {
+      font-size: 1.25rem;
+      color: #1f2937;
+      margin-bottom: 1rem;
+    }
+
+    .notes {
+      font-size: 1rem;
+      color: #4b5563;
+      line-height: 1.6;
+      white-space: pre-wrap;
+    }
+
+    .tags-display {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 0.5rem;
+    }
+
+    .tag-chip {
+      background: #74b9ff;
+      color: white;
+      padding: 0.375rem 0.875rem;
+      border-radius: 12px;
+      font-size: 0.875rem;
+      font-weight: 500;
+    }
+
+    .links-display {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 0.75rem;
+    }
+
+    .external-link {
+      color: #74b9ff;
+      text-decoration: none;
+      font-size: 0.95rem;
+      padding: 0.5rem 1rem;
+      border: 2px solid #74b9ff;
+      border-radius: 4px;
+      transition: all 0.2s;
+      font-weight: 500;
+    }
+
+    .external-link:hover {
+      background: #74b9ff;
+      color: white;
+    }
+
+    .comments-section {
+      margin-top: 2rem;
+      padding-top: 2rem;
+      border-top: 2px solid #e5e7eb;
+    }
+
+    .comment-form {
+      margin-bottom: 1.5rem;
+    }
+
+    .comment-form textarea {
+      width: 100%;
+      padding: 0.75rem;
+      border: 1px solid #d1d5db;
+      border-radius: 4px;
+      font-size: 1rem;
+      resize: vertical;
+      margin-bottom: 0.75rem;
+      font-family: inherit;
+    }
+
+    .comment-form textarea:focus {
+      outline: none;
+      border-color: #74b9ff;
+    }
+
+    .banned-notice {
+      background: #fef2f2;
+      border: 1px solid #fecaca;
+      color: #991b1b;
+      padding: 1rem;
+      border-radius: 4px;
+      text-align: center;
+      margin-bottom: 1.5rem;
+      font-size: 0.95rem;
+    }
+
+    .auth-prompt {
+      background: #f3f4f6;
+      padding: 1rem;
+      border-radius: 4px;
+      text-align: center;
+      margin-bottom: 1.5rem;
+    }
+
+    .auth-prompt p {
+      margin: 0;
+      color: #4b5563;
+    }
+
+    .comments-loading {
+      text-align: center;
+      padding: 1.5rem;
+      color: #6b7280;
+      font-size: 0.95rem;
+    }
+
+    .btn {
+      padding: 0.625rem 1.25rem;
+      border: none;
+      border-radius: 4px;
+      cursor: pointer;
+      font-size: 1rem;
+      transition: all 0.3s;
+      font-weight: 500;
+    }
+
+    .btn:hover {
+      opacity: 0.9;
+    }
+
+    .btn-primary {
+      background: #74b9ff;
+      color: white;
+    }
+
+    @media (max-width: 640px) {
+      .container {
+        padding: 1rem;
+      }
+
+      .music-header {
+        flex-direction: column;
+        align-items: flex-start;
+      }
+
+      .music-header h1 {
+        font-size: 1.5rem;
+      }
+
+      .info-row {
+        flex-direction: column;
+        align-items: flex-start;
+        gap: 0.25rem;
+      }
+
+      .info-label {
+        min-width: auto;
+      }
+    }
+  `]
+})
+export class MusicDetailComponent implements OnInit {
+  private readonly musicService = inject(MusicService);
+  private readonly commentsService = inject(CommentsService);
+  readonly authService = inject(AuthService);
+  private readonly sanitizeService = inject(SanitizeService);
+  private readonly route = inject(ActivatedRoute);
+  private readonly router = inject(Router);
+
+  music = signal<Music | null>(null);
+  comments = signal<Comment[]>([]);
+  loading = signal(true);
+  commentsLoading = signal(false);
+  error = signal<string | null>(null);
+  newCommentContent = '';
+
+  ngOnInit() {
+    const musicId = this.route.snapshot.paramMap.get('id');
+    if (!musicId) {
+      this.error.set('No music ID provided');
+      this.loading.set(false);
+      return;
+    }
+
+    this.loadMusic(musicId);
+    this.loadComments(musicId);
+  }
+
+  private loadMusic(musicId: string) {
+    this.loading.set(true);
+    this.musicService.getMusicById(musicId).subscribe({
+      next: (music) => {
+        if (!music) {
+          this.error.set('Music not found');
+        } else {
+          this.music.set(music);
+        }
+        this.loading.set(false);
+      },
+      error: () => {
+        this.error.set('Failed to load music. It may not exist or there was an error.');
+        this.loading.set(false);
+      }
+    });
+  }
+
+  private loadComments(musicId: string) {
+    this.commentsLoading.set(true);
+    this.commentsService.getCommentsForMusic(musicId).subscribe({
+      next: (comments) => {
+        this.comments.set(comments);
+        this.commentsLoading.set(false);
+      },
+      error: () => {
+        this.commentsLoading.set(false);
+      }
+    });
+  }
+
+  addComment() {
+    const music = this.music();
+    if (!music || !this.newCommentContent.trim()) return;
+
+    this.commentsService.addCommentToMusic(music.id, { content: this.newCommentContent }).subscribe({
+      next: (comment) => {
+        this.comments.set([comment, ...this.comments()]);
+        this.newCommentContent = '';
+      }
+    });
+  }
+
+  handleCommentEdit(event: { commentId: string; content: string }) {
+    const music = this.music();
+    if (!music) return;
+
+    this.commentsService.updateCommentOnMusic(music.id, event.commentId, event.content).subscribe({
+      next: (updatedComment) => {
+        this.comments.set(
+          this.comments().map(c => c.id === event.commentId ? updatedComment : c)
+        );
+      }
+    });
+  }
+
+  deleteComment(commentId: string) {
+    const music = this.music();
+    if (!music || !confirm('Are you sure you want to delete this comment?')) return;
+
+    this.commentsService.deleteCommentFromMusic(music.id, commentId).subscribe({
+      next: () => {
+        this.comments.set(this.comments().filter(c => c.id !== commentId));
+      }
+    });
+  }
+
+  getTypeLabel(type: MusicType): string {
+    switch (type) {
+      case MusicType.album: return 'Album';
+      case MusicType.single: return 'Single';
+      case MusicType.ep: return 'EP';
+    }
+  }
+
+  getStatusLabel(status: MusicStatus): string {
+    switch (status) {
+      case MusicStatus.listening: return 'Currently Listening';
+      case MusicStatus.completed: return 'Completed';
+      case MusicStatus.wantToListen: return 'Want to Listen';
+      case MusicStatus.retired: return 'Retired';
+    }
+  }
+
+  formatDate(date: Date | string): string {
+    return new Date(date).toLocaleDateString('en-GB', {
+      year: 'numeric',
+      month: 'long',
+      day: 'numeric'
+    });
+  }
+
+  formatTimeSpent(minutes: number): string {
+    const hours = Math.floor(minutes / 60);
+    const mins = minutes % 60;
+
+    if (hours === 0) {
+      return `${mins} minutes`;
+    } else if (mins === 0) {
+      return `${hours} hour${hours === 1 ? '' : 's'}`;
+    } else {
+      return `${hours} hour${hours === 1 ? '' : 's'} ${mins} minute${mins === 1 ? '' : 's'}`;
+    }
+  }
+}

apps/frontend/src/app/components/music/music-list.component.ts

@@ -14,12 +14,13 @@ import { SanitizeService } from '../../services/sanitize.service';
 import { SuggestionService } from '../../services/suggestion.service';
 import { PaginationComponent } from '../shared/pagination.component';
 import { LikeButtonComponent } from '../shared/like-button.component';
+import { CommentDisplayComponent } from '../comment-display/comment-display.component';
 import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment, SuggestionEntity, Link } from '@library/shared-types';
 
 @Component({
   selector: 'app-music-list',
   standalone: true,
-  imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent],
+  imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent, CommentDisplayComponent],
   template: `
     <div class="container">
       <div class="header-section">
@@ -77,9 +78,30 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment,
               <option [value]="MusicStatus.listening">Currently Listening</option>
               <option [value]="MusicStatus.completed">Completed</option>
               <option [value]="MusicStatus.wantToListen">Want to Listen</option>
+              <option [value]="MusicStatus.retired">Retired</option>
             </select>
           </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">
             <label for="rating">Rating (1-10)</label>
             <input
@@ -92,6 +114,34 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment,
             >
           </div>
 
+          <div class="form-row">
+            <div class="form-group">
+              <label for="timeHours">Time Spent (Hours)</label>
+              <input
+                type="number"
+                id="timeHours"
+                [(ngModel)]="newMusicTimeHours"
+                name="timeHours"
+                min="0"
+                placeholder="0"
+                (ngModelChange)="updateNewMusicTimeSpent()"
+              >
+            </div>
+            <div class="form-group">
+              <label for="timeMinutes">Time Spent (Minutes)</label>
+              <input
+                type="number"
+                id="timeMinutes"
+                [(ngModel)]="newMusicTimeMinutes"
+                name="timeMinutes"
+                min="0"
+                max="59"
+                placeholder="0"
+                (ngModelChange)="updateNewMusicTimeSpent()"
+              >
+            </div>
+          </div>
+
           <div class="form-group">
             <label for="notes">Notes</label>
             <textarea
@@ -124,8 +174,7 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment,
           </div>
 
           <div class="form-group">
-            <label>Tags</label>
-            <div class="tags-input-container">
+            <div class="tags-input-container" aria-label="Tags">
               @for (tag of newMusic.tags; track tag; let i = $index) {
                 <span class="tag">
                   {{ tag }}
@@ -142,8 +191,7 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment,
             </div>
           </div>
 
-          <div class="form-group">
-            <label>External Links</label>
+          <div class="form-group" aria-label="External Links">
             <div class="links-list">
               @for (link of newMusic.links; track link.url; let i = $index) {
                 <div class="link-item">
@@ -218,9 +266,30 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment,
               <option [value]="MusicStatus.listening">Currently Listening</option>
               <option [value]="MusicStatus.completed">Completed</option>
               <option [value]="MusicStatus.wantToListen">Want to Listen</option>
+              <option [value]="MusicStatus.retired">Retired</option>
             </select>
           </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">
             <label for="edit-rating">Rating (1-10)</label>
             <input
@@ -233,6 +302,34 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment,
             >
           </div>
 
+          <div class="form-row">
+            <div class="form-group">
+              <label for="edit-timeHours">Time Spent (Hours)</label>
+              <input
+                type="number"
+                id="edit-timeHours"
+                [(ngModel)]="editMusicTimeHours"
+                name="timeHours"
+                min="0"
+                placeholder="0"
+                (ngModelChange)="updateEditMusicTimeSpent()"
+              >
+            </div>
+            <div class="form-group">
+              <label for="edit-timeMinutes">Time Spent (Minutes)</label>
+              <input
+                type="number"
+                id="edit-timeMinutes"
+                [(ngModel)]="editMusicTimeMinutes"
+                name="timeMinutes"
+                min="0"
+                max="59"
+                placeholder="0"
+                (ngModelChange)="updateEditMusicTimeSpent()"
+              >
+            </div>
+          </div>
+
           <div class="form-group">
             <label for="edit-notes">Notes</label>
             <textarea
@@ -265,8 +362,7 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment,
           </div>
 
           <div class="form-group">
-            <label>Tags</label>
-            <div class="tags-input-container">
+            <div class="tags-input-container" aria-label="Tags">
               @for (tag of editMusicData.tags; track tag; let i = $index) {
                 <span class="tag">
                   {{ tag }}
@@ -283,8 +379,7 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment,
             </div>
           </div>
 
-          <div class="form-group">
-            <label>External Links</label>
+          <div class="form-group" aria-label="External Links">
             <div class="links-list">
               @for (link of editMusicData.links; track link.url; let i = $index) {
                 <div class="link-item">
@@ -500,6 +595,13 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment,
           >
             Want to Listen ({{ wantToListenCount() }})
           </button>
+          <button
+            (click)="setStatusFilter(MusicStatus.retired)"
+            [class.active]="statusFilter() === MusicStatus.retired"
+            class="filter-btn"
+          >
+            Retired ({{ retiredCount() }})
+          </button>
         </div>
       </div>
 
@@ -554,6 +656,12 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment,
                   </div>
                 }
 
+                @if (music.timeSpent) {
+                  <p class="time-spent">
+                    🎵 Listening Time: {{ formatTimeSpent(music.timeSpent) }}
+                  </p>
+                }
+
                 <app-like-button
                   entityType="music"
                   [entityId]="music.id"
@@ -581,9 +689,27 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment,
                   </div>
                 }
 
-                @if (music.dateCompleted) {
-                  <p class="date-completed">
-                    Completed: {{ formatDate(music.dateCompleted) }}
+                @if (music.dateStarted) {
+                  <p class="date-started">
+                    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>
                 }
 
@@ -623,56 +749,11 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment,
                         }
                       }
 
-                      @if (commentsLoading()[music.id]) {
-                        <div class="comments-loading">Loading comments...</div>
-                      } @else {
-                        @for (comment of comments()[music.id] || []; track comment.id) {
-                          <div class="comment">
-                            <div class="comment-header">
-                              @if (comment.user.avatar) {
-                                <img [src]="comment.user.avatar" [alt]="comment.user.username" class="comment-avatar">
-                              }
-                              <span class="comment-author">{{ comment.user.username }}</span>
-                              @if (comment.user.inDiscord) {
-                                <span class="discord-badge">Discord</span>
-                              }
-                              @if (comment.user.isVip) {
-                                <span class="vip-badge">VIP</span>
-                              }
-                              @if (comment.user.isMod) {
-                                <span class="mod-badge">Mod</span>
-                              }
-                              @if (comment.user.isStaff) {
-                                <span class="staff-badge">Staff</span>
-                              }
-                              <span class="comment-date">{{ formatDate(comment.createdAt) }}</span>
-                              @if (canEditComment(comment)) {
-                                <button (click)="startEditComment(music.id, comment)" class="btn btn-secondary btn-xs">Edit</button>
-                              }
-                              @if (canDeleteComment(comment)) {
-                                <button (click)="deleteComment(music.id, comment.id)" class="btn btn-danger btn-xs">Delete</button>
-                              }
-                            </div>
-                            @if (editingCommentId() === comment.id) {
-                              <div class="comment-edit-form">
-                                <textarea
-                                  [(ngModel)]="editCommentContent"
-                                  name="editComment"
-                                  rows="3"
-                                ></textarea>
-                                <div class="comment-edit-actions">
-                                  <button (click)="saveCommentEdit(music.id, comment.id)" class="btn btn-primary btn-xs">Save</button>
-                                  <button (click)="cancelCommentEdit()" class="btn btn-secondary btn-xs">Cancel</button>
-                                </div>
-                              </div>
-                            } @else {
-                              <div class="comment-content" [innerHTML]="sanitizeService.sanitizeHtml(comment.content)"></div>
-                            }
-                          </div>
-                        } @empty {
-                          <div class="no-comments">No comments yet. Be the first to comment!</div>
-                        }
-                      }
+                      <app-comment-display
+                        [comments]="getCommentsSignal(music.id)"
+                        (edit)="handleCommentEdit(music.id, $event)"
+                        (delete)="deleteComment(music.id, $event)"
+                      />
                     </div>
                   }
                 </div>
@@ -761,6 +842,13 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment,
       box-shadow: 0 0 0 3px rgba(168, 87, 126, 0.2);
     }
 
+    .form-row {
+      display: grid;
+      grid-template-columns: 1fr 1fr;
+      gap: 1rem;
+      margin-bottom: 1rem;
+    }
+
     .form-actions {
       display: flex;
       gap: 1rem;
@@ -1017,7 +1105,17 @@ import { Music, MusicStatus, MusicType, CreateMusicDto, UpdateMusicDto, Comment,
       margin: 0.5rem 0;
     }
 
-    .date-completed {
+    .time-spent {
+      font-size: 0.9rem;
+      color: #8b5cf6;
+      font-weight: 500;
+      margin: 0.5rem 0;
+    }
+
+    .date-started,
+    .date-finished,
+    .date-added,
+    .date-updated {
       font-size: 0.85rem;
       color: var(--witch-plum);
       margin-top: 0.5rem;
@@ -1435,6 +1533,7 @@ export class MusicListComponent implements OnInit {
   listeningCount = computed(() => this.music().filter(m => m.status === MusicStatus.listening).length);
   completedCount = computed(() => this.music().filter(m => m.status === MusicStatus.completed).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(() => {
     const tagsSet = new Set<string>();
@@ -1488,11 +1587,13 @@ export class MusicListComponent implements OnInit {
 
   totalFilteredMusic = computed(() => this.filteredMusic().length);
 
-  newMusic: Partial<CreateMusicDto> = {
+  newMusic: Partial<CreateMusicDto> & { dateStarted?: Date; dateFinished?: Date } = {
     title: '',
     artist: '',
     type: MusicType.album,
     status: MusicStatus.wantToListen,
+    dateStarted: undefined,
+    dateFinished: undefined,
     rating: undefined,
     notes: '',
     tags: [],
@@ -1501,6 +1602,12 @@ export class MusicListComponent implements OnInit {
 
   editMusicData: Partial<UpdateMusicDto> = {};
 
+  // Time tracking state
+  newMusicTimeHours = 0;
+  newMusicTimeMinutes = 0;
+  editMusicTimeHours = 0;
+  editMusicTimeMinutes = 0;
+
   // Tags and links input state
   newTagInput = '';
   editTagInput = '';
@@ -1583,6 +1690,7 @@ export class MusicListComponent implements OnInit {
       case MusicStatus.listening: return 'Currently Listening';
       case MusicStatus.completed: return 'Completed';
       case MusicStatus.wantToListen: return 'Want to Listen';
+      case MusicStatus.retired: return 'Retired';
     }
   }
 
@@ -1599,12 +1707,16 @@ export class MusicListComponent implements OnInit {
       artist: '',
       type: MusicType.album,
       status: MusicStatus.wantToListen,
+      dateStarted: undefined,
+      dateFinished: undefined,
       rating: undefined,
       notes: '',
       coverArt: undefined,
       tags: [],
       links: []
     };
+    this.newMusicTimeHours = 0;
+    this.newMusicTimeMinutes = 0;
     this.newMusicImagePreview.set(null);
     this.imageError.set(null);
     this.newTagInput = '';
@@ -1612,6 +1724,16 @@ export class MusicListComponent implements OnInit {
     this.newLinkUrl = '';
   }
 
+  updateNewMusicTimeSpent() {
+    const totalMinutes = (this.newMusicTimeHours * 60) + this.newMusicTimeMinutes;
+    this.newMusic.timeSpent = totalMinutes > 0 ? totalMinutes : undefined;
+  }
+
+  updateEditMusicTimeSpent() {
+    const totalMinutes = (this.editMusicTimeHours * 60) + this.editMusicTimeMinutes;
+    this.editMusicData.timeSpent = totalMinutes > 0 ? totalMinutes : undefined;
+  }
+
   addTag(target: 'new' | 'edit') {
     const input = target === 'new' ? this.newTagInput.trim() : this.editTagInput.trim();
     if (!input) return;
@@ -1665,6 +1787,8 @@ export class MusicListComponent implements OnInit {
       artist: this.newMusic.artist,
       type: this.newMusic.type,
       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,
       notes: this.newMusic.notes,
       coverArt: this.newMusic.coverArt,
@@ -1693,12 +1817,23 @@ export class MusicListComponent implements OnInit {
       artist: music.artist,
       type: music.type,
       status: music.status,
+      dateStarted: music.dateStarted,
+      dateFinished: music.dateFinished,
       rating: music.rating,
       notes: music.notes,
       coverArt: music.coverArt,
       tags: [...(music.tags || [])],
-      links: [...(music.links || [])]
+      links: [...(music.links || [])],
+      timeSpent: music.timeSpent
     };
+    // Populate time fields from existing timeSpent
+    if (music.timeSpent) {
+      this.editMusicTimeHours = Math.floor(music.timeSpent / 60);
+      this.editMusicTimeMinutes = music.timeSpent % 60;
+    } else {
+      this.editMusicTimeHours = 0;
+      this.editMusicTimeMinutes = 0;
+    }
     this.editMusicImagePreview.set(music.coverArt || null);
     this.showAddForm.set(false);
     this.imageError.set(null);
@@ -1721,7 +1856,13 @@ export class MusicListComponent implements OnInit {
     const music = this.editingMusic();
     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.cancelEdit();
     });
@@ -1731,6 +1872,19 @@ export class MusicListComponent implements OnInit {
     return new Date(date).toLocaleDateString();
   }
 
+  formatTimeSpent(minutes: number): string {
+    const hours = Math.floor(minutes / 60);
+    const mins = minutes % 60;
+
+    if (hours === 0) {
+      return `${mins}m`;
+    } else if (mins === 0) {
+      return `${hours}h`;
+    } else {
+      return `${hours}h ${mins}m`;
+    }
+  }
+
   // Image handling methods
   onImageSelected(event: Event, target: 'new' | 'edit' | 'suggest') {
     const input = event.target as HTMLInputElement;
@@ -1919,7 +2073,7 @@ export class MusicListComponent implements OnInit {
 
     try {
       await this.suggestionService.createSuggestion({
-        entityType: SuggestionEntity.MUSIC,
+        entityType: SuggestionEntity.music,
         title: this.suggestedMusic.title,
         artist: this.suggestedMusic.artist,
         type: this.suggestedMusic.type,
@@ -1932,4 +2086,21 @@ export class MusicListComponent implements OnInit {
       alert('Failed to submit suggestion. Please try again.');
     }
   }
+
+  handleCommentEdit(musicId: string, event: { commentId: string; content: string }) {
+    this.commentsService.updateCommentOnMusic(musicId, event.commentId, event.content).subscribe({
+      next: (updatedComment) => {
+        this.comments.set({
+          ...this.comments(),
+          [musicId]: (this.comments()[musicId] || []).map(c =>
+            c.id === event.commentId ? updatedComment : c
+          )
+        });
+      }
+    });
+  }
+
+  getCommentsSignal(musicId: string) {
+    return signal(this.comments()[musicId] || []);
+  }
 }

apps/frontend/src/app/components/my-likes/my-likes.component.ts

@@ -373,12 +373,12 @@ export class MyLikesComponent implements OnInit {
   }
 
   getItemTitle(likedItem: LikedItemDto): string {
-    const item = likedItem.item;
+    const item = likedItem.item as any;
     return item.title || item.name || 'Untitled';
   }
 
   getItemSubtitle(likedItem: LikedItemDto): string {
-    const item = likedItem.item;
+    const item = likedItem.item as any;
     const type = likedItem.like.entityType;
 
     switch (type) {
@@ -400,7 +400,7 @@ export class MyLikesComponent implements OnInit {
   }
 
   getItemImage(likedItem: LikedItemDto): string | null {
-    const item = likedItem.item;
+    const item = likedItem.item as any;
     return item.coverImage || item.imageUrl || null;
   }
 

apps/frontend/src/app/components/my-suggestions/my-suggestions.component.ts

@@ -43,22 +43,22 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared-
             All ({{ suggestions().length }})
           </button>
           <button
-            (click)="setFilter(SuggestionStatus.UNREVIEWED)"
-            [class.active]="statusFilter() === SuggestionStatus.UNREVIEWED"
+            (click)="setFilter(SuggestionStatus.unreviewed)"
+            [class.active]="statusFilter() === SuggestionStatus.unreviewed"
             class="filter-btn pending"
           >
             Pending ({{ unreviewedCount() }})
           </button>
           <button
-            (click)="setFilter(SuggestionStatus.ACCEPTED)"
-            [class.active]="statusFilter() === SuggestionStatus.ACCEPTED"
+            (click)="setFilter(SuggestionStatus.accepted)"
+            [class.active]="statusFilter() === SuggestionStatus.accepted"
             class="filter-btn accepted"
           >
             Accepted ({{ acceptedCount() }})
           </button>
           <button
-            (click)="setFilter(SuggestionStatus.DECLINED)"
-            [class.active]="statusFilter() === SuggestionStatus.DECLINED"
+            (click)="setFilter(SuggestionStatus.declined)"
+            [class.active]="statusFilter() === SuggestionStatus.declined"
             class="filter-btn declined"
           >
             Declined ({{ declinedCount() }})
@@ -120,7 +120,7 @@ import { Suggestion, SuggestionStatus, SuggestionEntity } from '@library/shared-
                 }
               </div>
 
-              @if (suggestion.status === SuggestionStatus.DECLINED && suggestion.declineReason) {
+              @if (suggestion.status === SuggestionStatus.declined && suggestion.declineReason) {
                 <div class="decline-reason">
                   <strong>Reason:</strong> {{ suggestion.declineReason }}
                 </div>
@@ -337,9 +337,9 @@ export class MySuggestionsComponent implements OnInit {
 
   SuggestionStatus = SuggestionStatus;
 
-  unreviewedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.UNREVIEWED).length;
-  acceptedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.ACCEPTED).length;
-  declinedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.DECLINED).length;
+  unreviewedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.unreviewed).length;
+  acceptedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.accepted).length;
+  declinedCount = () => this.suggestions().filter(s => s.status === SuggestionStatus.declined).length;
 
   filteredSuggestions = computed(() => {
     const filter = this.statusFilter();
@@ -397,20 +397,20 @@ export class MySuggestionsComponent implements OnInit {
 
   getStatusLabel(status: SuggestionStatus): string {
     switch (status) {
-      case SuggestionStatus.UNREVIEWED: return 'Pending Review';
-      case SuggestionStatus.ACCEPTED: return 'Accepted';
-      case SuggestionStatus.DECLINED: return 'Declined';
+      case SuggestionStatus.unreviewed: return 'Pending Review';
+      case SuggestionStatus.accepted: return 'Accepted';
+      case SuggestionStatus.declined: return 'Declined';
     }
   }
 
   getEntityIcon(entityType: SuggestionEntity): string {
     switch (entityType) {
-      case SuggestionEntity.GAME: return '🎮';
-      case SuggestionEntity.BOOK: return '📚';
-      case SuggestionEntity.MUSIC: return '🎵';
-      case SuggestionEntity.MANGA: return '📖';
-      case SuggestionEntity.SHOW: return '📺';
-      case SuggestionEntity.ART: return '🎨';
+      case SuggestionEntity.game: return '🎮';
+      case SuggestionEntity.book: return '📚';
+      case SuggestionEntity.music: return '🎵';
+      case SuggestionEntity.manga: return '📖';
+      case SuggestionEntity.show: return '📺';
+      case SuggestionEntity.art: return '🎨';
     }
   }
 

apps/frontend/src/app/components/profile/profile.component.ts

@@ -0,0 +1,667 @@
+/**
+ * @copyright 2026 NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+
+import { Component, inject, signal, OnInit } from '@angular/core';
+import { ActivatedRoute, RouterModule } from '@angular/router';
+import { CommonModule } from '@angular/common';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { faGlobe, faCloud, faFlag } from '@fortawesome/free-solid-svg-icons';
+import { faGithub, faLinkedin, faTwitch, faYoutube, faDiscord } from '@fortawesome/free-brands-svg-icons';
+import { UserService, UserProfileResponse } from '../../services/user.service';
+import { AchievementService } from '../../services/achievement.service';
+import { ToastService } from '../../services/toast.service';
+import { AuthService } from '../../services/auth.service';
+import { ReportModalComponent } from '../report-modal/report-modal.component';
+import { PrimaryBadge, AchievementProgress } from '@library/shared-types';
+
+@Component({
+  selector: 'app-profile',
+  standalone: true,
+  imports: [CommonModule, FontAwesomeModule, ReportModalComponent, RouterModule],
+  template: `
+    <div class="profile-container">
+      @if (loading()) {
+        <div class="loading">Loading profile...</div>
+      } @else if (error()) {
+        <div class="error">{{ error() }}</div>
+      } @else if (profile()) {
+        <div class="profile-card">
+          <div class="profile-header">
+            @if (profile()?.avatar) {
+              <img [src]="profile()!.avatar" [alt]="profile()!.username" class="profile-avatar" />
+            } @else {
+              <div class="profile-avatar-placeholder">
+                {{ profile()!.username[0]?.toUpperCase() }}
+              </div>
+            }
+            <div class="profile-info">
+              <h1 class="profile-username">{{ profile()!.displayName || profile()!.username }}</h1>
+              @if (profile()!.displayName) {
+                <p class="profile-handle">\@{{ profile()!.username }}</p>
+              }
+              @if (profile()!.slug) {
+                <p class="profile-slug">library.nhcarrigan.com/profile/{{ profile()!.slug }}</p>
+              }
+            </div>
+            @if (showReportButton()) {
+              <button
+                class="report-button"
+                (click)="openReportModal()"
+                [attr.aria-label]="'Report ' + profile()!.username + ' profile'"
+                type="button"
+              >
+                <fa-icon [icon]="faFlag"></fa-icon>
+                <span>Report</span>
+              </button>
+            }
+          </div>
+
+          @if (profile()!.primaryBadge) {
+            <div class="badges-section">
+              <!-- Show only the selected primary badge -->
+              @if (profile()!.primaryBadge === PrimaryBadge.STAFF && profile()!.badges.isStaff) {
+                <span class="badge badge-staff">Staff</span>
+              }
+              @if (profile()!.primaryBadge === PrimaryBadge.MOD && profile()!.badges.isMod) {
+                <span class="badge badge-mod">Moderator</span>
+              }
+              @if (profile()!.primaryBadge === PrimaryBadge.VIP && profile()!.badges.isVip) {
+                <span class="badge badge-vip">VIP</span>
+              }
+              @if (profile()!.primaryBadge === PrimaryBadge.DISCORD && profile()!.badges.inDiscord) {
+                <span class="badge badge-member">Discord Member</span>
+              }
+            </div>
+          }
+
+          @if (profile()!.bio) {
+            <div class="bio-section">
+              <p class="bio-text">{{ profile()!.bio }}</p>
+            </div>
+          }
+
+          @if (profile()!.website || profile()!.github || profile()!.bluesky || profile()!.linkedin || profile()!.twitch || profile()!.youtube || profile()!.discordServer) {
+            <div class="social-links-section">
+              <h2>Social Links</h2>
+              <div class="social-links">
+                @if (profile()!.website) {
+                  <a [href]="profile()!.website" target="_blank" rel="noopener noreferrer" class="social-link" title="Website">
+                    <fa-icon [icon]="faGlobe" class="icon"></fa-icon>
+                    <span class="label">Website</span>
+                  </a>
+                }
+                @if (profile()!.github) {
+                  <a [href]="'https://github.com/' + profile()!.github" target="_blank" rel="noopener noreferrer" class="social-link" title="GitHub">
+                    <fa-icon [icon]="faGithub" class="icon"></fa-icon>
+                    <span class="label">GitHub</span>
+                  </a>
+                }
+                @if (profile()!.bluesky) {
+                  <a [href]="'https://bsky.app/profile/' + profile()!.bluesky" target="_blank" rel="noopener noreferrer" class="social-link" title="Bluesky">
+                    <fa-icon [icon]="faCloud" class="icon"></fa-icon>
+                    <span class="label">Bluesky</span>
+                  </a>
+                }
+                @if (profile()!.linkedin) {
+                  <a [href]="'https://linkedin.com/in/' + profile()!.linkedin" target="_blank" rel="noopener noreferrer" class="social-link" title="LinkedIn">
+                    <fa-icon [icon]="faLinkedin" class="icon"></fa-icon>
+                    <span class="label">LinkedIn</span>
+                  </a>
+                }
+                @if (profile()!.twitch) {
+                  <a [href]="'https://twitch.tv/' + profile()!.twitch" target="_blank" rel="noopener noreferrer" class="social-link" title="Twitch">
+                    <fa-icon [icon]="faTwitch" class="icon"></fa-icon>
+                    <span class="label">Twitch</span>
+                  </a>
+                }
+                @if (profile()!.youtube) {
+                  <a [href]="'https://youtube.com/' + profile()!.youtube" target="_blank" rel="noopener noreferrer" class="social-link" title="YouTube">
+                    <fa-icon [icon]="faYoutube" class="icon"></fa-icon>
+                    <span class="label">YouTube</span>
+                  </a>
+                }
+                @if (profile()!.discordServer) {
+                  <a [href]="'https://discord.gg/' + profile()!.discordServer" target="_blank" rel="noopener noreferrer" class="social-link" title="Discord Server">
+                    <fa-icon [icon]="faDiscord" class="icon"></fa-icon>
+                    <span class="label">Discord</span>
+                  </a>
+                }
+              </div>
+            </div>
+          }
+
+          <div class="stats-section">
+            <h2>Activity Statistics</h2>
+            <div class="stats-grid">
+              <div class="stat-card">
+                <span class="stat-value">{{ profile()!.stats.suggestionsCount }}</span>
+                <span class="stat-label">Suggestions</span>
+              </div>
+              <div class="stat-card">
+                <span class="stat-value">{{ profile()!.stats.suggestionsAcceptedCount }}</span>
+                <span class="stat-label">Accepted</span>
+              </div>
+              <div class="stat-card">
+                <span class="stat-value">{{ profile()!.stats.likesCount }}</span>
+                <span class="stat-label">Likes</span>
+              </div>
+              <div class="stat-card">
+                <span class="stat-value">{{ profile()!.stats.commentsCount }}</span>
+                <span class="stat-label">Comments</span>
+              </div>
+              @if (profile()!.achievementPoints > 0) {
+                <div class="stat-card achievement-points-card">
+                  <span class="stat-value">{{ profile()!.achievementPoints }}</span>
+                  <span class="stat-label">🏆 Achievement Points</span>
+                </div>
+              }
+            </div>
+          </div>
+
+          @if (recentAchievements().length > 0) {
+            <div class="achievements-section">
+              <div class="section-header">
+                <h2>Recent Achievements</h2>
+                @if (isOwnProfile()) {
+                  <a routerLink="/achievements" class="view-all-link">View All →</a>
+                }
+              </div>
+              <div class="achievements-grid">
+                @for (achievement of recentAchievements(); track achievement.definition.key) {
+                  <div class="achievement-badge" [attr.data-tier]="achievement.definition.tier.toLowerCase()">
+                    <div class="achievement-icon">{{ achievement.definition.icon }}</div>
+                    <div class="achievement-info">
+                      <div class="achievement-title">{{ achievement.definition.title }}</div>
+                      <div class="achievement-points">{{ achievement.definition.points }} pts</div>
+                    </div>
+                  </div>
+                }
+              </div>
+            </div>
+          }
+
+          <div class="footer-section">
+            <p class="member-since">Member since {{ formatDate(profile()!.createdAt) }}</p>
+          </div>
+        </div>
+      }
+
+      @if (reportModalOpen()) {
+        <app-report-modal
+          [reportType]="'profile'"
+          [targetId]="profile()!.id"
+          [reportedUsername]="profile()!.displayName || profile()!.username"
+          (closeModal)="closeReportModal()"
+        />
+      }
+    </div>
+  `,
+  styles: [`
+    .profile-container {
+      max-width: 800px;
+      margin: 2rem auto;
+      padding: 0 1rem;
+    }
+
+    .loading, .error {
+      text-align: center;
+      padding: 2rem;
+      font-size: 1.2rem;
+    }
+
+    .error {
+      color: var(--error-colour, #c41e3a);
+    }
+
+    .profile-card {
+      background: var(--card-background, #1a1a2e);
+      border-radius: 12px;
+      padding: 2rem;
+      box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+    }
+
+    .profile-header {
+      display: flex;
+      align-items: center;
+      gap: 1.5rem;
+      margin-bottom: 1.5rem;
+      position: relative;
+    }
+
+    .profile-avatar {
+      width: 100px;
+      height: 100px;
+      border-radius: 50%;
+      border: 3px solid var(--accent-colour, #9b59b6);
+    }
+
+    .profile-avatar-placeholder {
+      width: 100px;
+      height: 100px;
+      border-radius: 50%;
+      background: var(--accent-colour, #9b59b6);
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 2.5rem;
+      font-weight: bold;
+      color: white;
+    }
+
+    .profile-info {
+      flex: 1;
+    }
+
+    .profile-username {
+      margin: 0;
+      font-size: 2rem;
+      color: var(--text-colour, #e0e0e0);
+    }
+
+    .profile-handle {
+      margin: 0.25rem 0;
+      color: var(--text-muted, #a0a0a0);
+      font-size: 1.1rem;
+    }
+
+    .profile-slug {
+      margin: 0.25rem 0;
+      color: var(--text-muted, #a0a0a0);
+      font-size: 0.9rem;
+    }
+
+    .report-button {
+      position: absolute;
+      top: 0;
+      right: 0;
+      display: flex;
+      align-items: center;
+      gap: 0.5rem;
+      padding: 0.6rem 1rem;
+      background: linear-gradient(135deg, #c41e3a 0%, #e74c3c 100%);
+      color: white;
+      border: none;
+      border-radius: 8px;
+      font-size: 0.9rem;
+      font-weight: 600;
+      cursor: pointer;
+      transition: all 0.2s ease;
+    }
+
+    .report-button:hover {
+      transform: translateY(-2px);
+      box-shadow: 0 4px 12px rgba(196, 30, 58, 0.4);
+    }
+
+    .report-button fa-icon {
+      font-size: 1rem;
+    }
+
+    .badges-section {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 0.5rem;
+      margin-bottom: 1.5rem;
+    }
+
+    .badge {
+      padding: 0.4rem 0.8rem;
+      border-radius: 20px;
+      font-size: 0.85rem;
+      font-weight: 600;
+    }
+
+    .badge-staff {
+      background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+      color: white;
+    }
+
+    .badge-mod {
+      background: linear-gradient(135deg, #f093fb 0%, #f5576c 100%);
+      color: white;
+    }
+
+    .badge-vip {
+      background: linear-gradient(135deg, #ffd89b 0%, #19547b 100%);
+      color: white;
+    }
+
+    .badge-member {
+      background: linear-gradient(135deg, #a8edea 0%, #fed6e3 100%);
+      color: #333;
+    }
+
+    .bio-section {
+      margin-bottom: 1.5rem;
+      padding: 1rem;
+      background: rgba(155, 89, 182, 0.1);
+      border-radius: 8px;
+    }
+
+    .bio-text {
+      margin: 0;
+      color: var(--text-colour, #e0e0e0);
+      line-height: 1.6;
+      white-space: pre-wrap;
+    }
+
+    .social-links-section {
+      margin-bottom: 1.5rem;
+    }
+
+    .social-links-section h2 {
+      margin: 0 0 1rem 0;
+      color: var(--accent-colour, #9b59b6);
+      font-size: 1.5rem;
+    }
+
+    .social-links {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 0.75rem;
+    }
+
+    .social-link {
+      display: flex;
+      align-items: center;
+      gap: 0.5rem;
+      padding: 0.75rem 1rem;
+      background: rgba(155, 89, 182, 0.2);
+      border: 1px solid rgba(155, 89, 182, 0.3);
+      border-radius: 8px;
+      color: var(--text-colour, #e0e0e0);
+      text-decoration: none;
+      transition: all 0.2s ease;
+    }
+
+    .social-link:hover {
+      background: rgba(155, 89, 182, 0.3);
+      border-color: var(--accent-colour, #9b59b6);
+      transform: translateY(-2px);
+    }
+
+    .social-link fa-icon {
+      font-size: 1.3rem;
+      width: 1.5rem;
+    }
+
+    .social-link fa-icon ::ng-deep svg {
+      width: 1.3rem;
+      height: 1.3rem;
+    }
+
+    .social-link .label {
+      font-weight: 500;
+    }
+
+    .stats-section {
+      margin-bottom: 1.5rem;
+    }
+
+    .stats-section h2, .achievements-section h2 {
+      margin: 0 0 1rem 0;
+      color: var(--accent-colour, #9b59b6);
+      font-size: 1.5rem;
+    }
+
+    .stats-grid {
+      display: grid;
+      grid-template-columns: repeat(auto-fit, minmax(120px, 1fr));
+      gap: 1rem;
+    }
+
+    .stat-card {
+      text-align: center;
+      padding: 1rem;
+      background: rgba(155, 89, 182, 0.2);
+      border-radius: 8px;
+      border: 1px solid rgba(155, 89, 182, 0.3);
+    }
+
+    .stat-value {
+      display: block;
+      font-size: 2rem;
+      font-weight: bold;
+      color: var(--accent-colour, #9b59b6);
+    }
+
+    .stat-label {
+      display: block;
+      font-size: 0.9rem;
+      color: var(--text-muted, #a0a0a0);
+      margin-top: 0.25rem;
+    }
+
+    .footer-section {
+      text-align: center;
+      padding-top: 1rem;
+      border-top: 1px solid rgba(155, 89, 182, 0.3);
+    }
+
+    .member-since {
+      margin: 0;
+      color: var(--text-muted, #a0a0a0);
+      font-size: 0.9rem;
+    }
+
+    .achievement-points-card {
+      background: linear-gradient(135deg, rgba(102, 126, 234, 0.2) 0%, rgba(118, 75, 162, 0.2) 100%);
+      border: 1px solid rgba(102, 126, 234, 0.5);
+    }
+
+    .achievements-section {
+      margin-top: 2rem;
+      padding-top: 1.5rem;
+      border-top: 1px solid rgba(155, 89, 182, 0.3);
+    }
+
+    .section-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-bottom: 1rem;
+    }
+
+    .view-all-link {
+      color: var(--accent-colour, #9b59b6);
+      text-decoration: none;
+      font-size: 0.9rem;
+      transition: opacity 0.2s;
+    }
+
+    .view-all-link:hover {
+      opacity: 0.8;
+    }
+
+    .achievements-grid {
+      display: grid;
+      grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
+      gap: 1rem;
+    }
+
+    .achievement-badge {
+      background: var(--card-background, #16213e);
+      border-radius: 8px;
+      padding: 1rem;
+      display: flex;
+      align-items: center;
+      gap: 0.75rem;
+      border: 2px solid transparent;
+      transition: all 0.2s;
+    }
+
+    .achievement-badge[data-tier="bronze"] {
+      border-color: #cd7f32;
+    }
+
+    .achievement-badge[data-tier="silver"] {
+      border-color: #c0c0c0;
+    }
+
+    .achievement-badge[data-tier="gold"] {
+      border-color: #ffd700;
+    }
+
+    .achievement-badge[data-tier="platinum"] {
+      border-color: #e5e4e2;
+    }
+
+    .achievement-badge[data-tier="diamond"] {
+      border-color: #b9f2ff;
+    }
+
+    .achievement-badge:hover {
+      transform: translateY(-2px);
+      box-shadow: 0 4px 12px rgba(155, 89, 182, 0.3);
+    }
+
+    .achievement-icon {
+      font-size: 2rem;
+      flex-shrink: 0;
+    }
+
+    .achievement-info {
+      flex: 1;
+      min-width: 0;
+    }
+
+    .achievement-title {
+      font-weight: 600;
+      color: var(--text-colour, #ffffff);
+      font-size: 1rem;
+      line-height: 1.3;
+      word-wrap: break-word;
+    }
+
+    .achievement-points {
+      color: var(--text-colour, #ffffff);
+      opacity: 0.8;
+      font-size: 0.85rem;
+      margin-top: 0.25rem;
+      font-weight: 500;
+    }
+  `]
+})
+export class ProfileComponent implements OnInit {
+  private route = inject(ActivatedRoute);
+  private userService = inject(UserService);
+  private achievementService = inject(AchievementService);
+  private toastService = inject(ToastService);
+  private authService = inject(AuthService);
+
+  profile = signal<UserProfileResponse | null>(null);
+  recentAchievements = signal<AchievementProgress[]>([]);
+  loading = signal(true);
+  error = signal<string | null>(null);
+  reportModalOpen = signal(false);
+
+  // Expose PrimaryBadge enum for template
+  readonly PrimaryBadge = PrimaryBadge;
+
+  // Font Awesome icons
+  faGlobe = faGlobe;
+  faGithub = faGithub;
+  faCloud = faCloud;
+  faLinkedin = faLinkedin;
+  faTwitch = faTwitch;
+  faYoutube = faYoutube;
+  faDiscord = faDiscord;
+  faFlag = faFlag;
+
+  ngOnInit(): void {
+    const identifier = this.route.snapshot.paramMap.get('identifier');
+    if (!identifier) {
+      this.error.set('No user identifier provided');
+      this.loading.set(false);
+      return;
+    }
+
+    this.userService.getProfile(identifier).subscribe({
+      next: (profileData: UserProfileResponse) => {
+        this.profile.set(profileData);
+        this.loading.set(false);
+
+        // Load recent achievements
+        this.achievementService.getUserProgress(profileData.id).subscribe({
+          next: (achievements) => {
+            // Get earned achievements sorted by earned date, take top 6
+            const earned = achievements
+              .filter(a => a.earned && a.earnedAt)
+              .sort((a, b) => {
+                const dateA = a.earnedAt ? new Date(a.earnedAt).getTime() : 0;
+                const dateB = b.earnedAt ? new Date(b.earnedAt).getTime() : 0;
+                return dateB - dateA;
+              })
+              .slice(0, 6);
+            this.recentAchievements.set(earned);
+          },
+          error: (err) => {
+            console.error('Error loading achievements:', err);
+            // Don't show error toast for achievements failure
+          }
+        });
+      },
+      error: (err: Error) => {
+        console.error('Error loading profile:', err);
+        this.error.set('Failed to load profile');
+        this.loading.set(false);
+        this.toastService.error('Failed to load profile');
+      }
+    });
+  }
+
+  formatDate(date: Date | string): string {
+    return new Date(date).toLocaleDateString('en-US', {
+      year: 'numeric',
+      month: 'long',
+      day: 'numeric'
+    });
+  }
+
+  /**
+   * Determine whether to show the report button.
+   * Only show if the user is authenticated and viewing someone else's profile.
+   */
+  showReportButton(): boolean {
+    const currentUser = this.authService.user();
+    const profileData = this.profile();
+
+    if (!currentUser || !profileData) {
+      return false;
+    }
+
+    // Don't show report button on your own profile
+    return currentUser.id !== profileData.id;
+  }
+
+  /**
+   * Determine whether viewing your own profile.
+   */
+  isOwnProfile(): boolean {
+    const currentUser = this.authService.user();
+    const profileData = this.profile();
+
+    if (!currentUser || !profileData) {
+      return false;
+    }
+
+    return currentUser.id === profileData.id;
+  }
+
+  /**
+   * Open the report modal.
+   */
+  openReportModal(): void {
+    this.reportModalOpen.set(true);
+  }
+
+  /**
+   * Close the report modal.
+   */
+  closeReportModal(): void {
+    this.reportModalOpen.set(false);
+  }
+}

apps/frontend/src/app/components/report-modal/report-modal.component.ts

@@ -0,0 +1,398 @@
+/**
+ * @copyright 2026 NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+
+import { Component, inject, signal, input, output, computed } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { ReportService } from '../../services/report.service';
+import { CommentReportService } from '../../services/comment-report.service';
+import { ToastService } from '../../services/toast.service';
+import { ReportReason } from '@library/shared-types';
+
+@Component({
+  selector: 'app-report-modal',
+  standalone: true,
+  imports: [CommonModule, FormsModule],
+  template: `
+    <div class="modal-overlay" (click)="onOverlayClick($event)" (keydown.escape)="closeModal.emit()" tabindex="-1">
+      <div class="modal-card" role="dialog" aria-labelledby="modal-title" aria-modal="true">
+        <div class="modal-header">
+          <h2 id="modal-title">{{ modalTitle() }}</h2>
+          <button
+            class="close-button"
+            (click)="onClose()"
+            aria-label="Close modal"
+            type="button"
+          >
+            ×
+          </button>
+        </div>
+
+        <div class="modal-body">
+          <p class="report-info">
+            {{ reportInfo() }}
+          </p>
+
+          <form (ngSubmit)="onSubmit()" #reportForm="ngForm">
+            <div class="form-group">
+              <label for="reason">Reason *</label>
+              <select
+                id="reason"
+                name="reason"
+                [(ngModel)]="selectedReason"
+                required
+                class="form-control"
+                aria-required="true"
+              >
+                <option value="" disabled>Select a reason</option>
+                <option [value]="ReportReason.INAPPROPRIATE_CONTENT">Inappropriate Content</option>
+                <option [value]="ReportReason.HARASSMENT">Harassment</option>
+                <option [value]="ReportReason.SPAM">Spam</option>
+                <option [value]="ReportReason.IMPERSONATION">Impersonation</option>
+                <option [value]="ReportReason.OFFENSIVE_NAME">Offensive Name</option>
+                <option [value]="ReportReason.MALICIOUS_LINKS">Malicious Links</option>
+                <option [value]="ReportReason.OTHER">Other</option>
+              </select>
+            </div>
+
+            <div class="form-group">
+              <label for="details">Details *</label>
+              <textarea
+                id="details"
+                name="details"
+                [(ngModel)]="details"
+                required
+                minlength="10"
+                maxlength="1000"
+                rows="5"
+                class="form-control"
+                placeholder="Please provide specific details about why you are reporting this profile (10-1000 characters)"
+                aria-required="true"
+                [attr.aria-invalid]="detailsInvalid()"
+              ></textarea>
+              <div class="character-count" [class.invalid]="detailsInvalid()">
+                {{ details().length }} / 1000 characters
+                @if (details().length < 10 && details().length > 0) {
+                  <span class="error-text">(minimum 10 characters)</span>
+                }
+              </div>
+            </div>
+
+            <div class="modal-footer">
+              <button
+                type="button"
+                class="button button-secondary"
+                (click)="onClose()"
+                [disabled]="submitting()"
+              >
+                Cancel
+              </button>
+              <button
+                type="submit"
+                class="button button-danger"
+                [disabled]="!reportForm.valid || submitting()"
+              >
+                @if (submitting()) {
+                  <span>Submitting...</span>
+                } @else {
+                  <span>Submit Report</span>
+                }
+              </button>
+            </div>
+          </form>
+        </div>
+      </div>
+    </div>
+  `,
+  styles: [`
+    .modal-overlay {
+      position: fixed;
+      top: 0;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      background: rgba(0, 0, 0, 0.7);
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      z-index: 1000;
+      padding: 1rem;
+    }
+
+    .modal-card {
+      background: var(--card-background, #1a1a2e);
+      border-radius: 12px;
+      width: 100%;
+      max-width: 600px;
+      max-height: 90vh;
+      overflow-y: auto;
+      box-shadow: 0 8px 32px rgba(0, 0, 0, 0.3);
+    }
+
+    .modal-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 1.5rem;
+      border-bottom: 2px solid rgba(155, 89, 182, 0.3);
+    }
+
+    .modal-header h2 {
+      margin: 0;
+      color: var(--accent-colour, #9b59b6);
+      font-size: 1.5rem;
+    }
+
+    .close-button {
+      background: none;
+      border: none;
+      font-size: 2rem;
+      color: var(--text-colour, #e0e0e0);
+      cursor: pointer;
+      padding: 0;
+      width: 2rem;
+      height: 2rem;
+      line-height: 1;
+      transition: color 0.2s ease;
+    }
+
+    .close-button:hover {
+      color: var(--accent-colour, #9b59b6);
+    }
+
+    .modal-body {
+      padding: 1.5rem;
+    }
+
+    .report-info {
+      margin: 0 0 1.5rem 0;
+      color: var(--text-colour, #e0e0e0);
+      line-height: 1.6;
+    }
+
+    .report-info strong {
+      color: var(--accent-colour, #9b59b6);
+    }
+
+    .form-group {
+      margin-bottom: 1.5rem;
+    }
+
+    .form-group label {
+      display: block;
+      margin-bottom: 0.5rem;
+      color: var(--text-colour, #e0e0e0);
+      font-weight: 500;
+    }
+
+    .form-control {
+      width: 100%;
+      padding: 0.75rem;
+      background: rgba(155, 89, 182, 0.1);
+      border: 2px solid rgba(155, 89, 182, 0.3);
+      border-radius: 8px;
+      color: var(--text-colour, #e0e0e0);
+      font-size: 1rem;
+      font-family: inherit;
+      transition: border-color 0.2s ease;
+    }
+
+    .form-control:focus {
+      outline: none;
+      border-color: var(--accent-colour, #9b59b6);
+    }
+
+    .form-control:invalid:not(:focus):not(:placeholder-shown) {
+      border-color: var(--error-colour, #c41e3a);
+    }
+
+    textarea.form-control {
+      resize: vertical;
+      min-height: 120px;
+    }
+
+    select.form-control {
+      cursor: pointer;
+      appearance: none;
+      background-image: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="%23e0e0e0"><path d="M7 10l5 5 5-5z"/></svg>');
+      background-repeat: no-repeat;
+      background-position: right 0.75rem center;
+      background-size: 1.5rem;
+      padding-right: 2.5rem;
+    }
+
+    select.form-control option {
+      background: #2d2d2d;
+      color: #e0e0e0;
+      padding: 0.5rem;
+    }
+
+    .character-count {
+      margin-top: 0.5rem;
+      font-size: 0.875rem;
+      color: var(--text-muted, #a0a0a0);
+      text-align: right;
+    }
+
+    .character-count.invalid {
+      color: var(--error-colour, #c41e3a);
+    }
+
+    .error-text {
+      color: var(--error-colour, #c41e3a);
+      margin-left: 0.5rem;
+    }
+
+    .modal-footer {
+      display: flex;
+      justify-content: flex-end;
+      gap: 1rem;
+      margin-top: 2rem;
+      padding-top: 1.5rem;
+      border-top: 2px solid rgba(155, 89, 182, 0.3);
+    }
+
+    .button {
+      padding: 0.75rem 1.5rem;
+      border: none;
+      border-radius: 8px;
+      font-size: 1rem;
+      font-weight: 600;
+      cursor: pointer;
+      transition: all 0.2s ease;
+    }
+
+    .button:disabled {
+      opacity: 0.5;
+      cursor: not-allowed;
+    }
+
+    .button-secondary {
+      background: rgba(155, 89, 182, 0.2);
+      color: var(--text-colour, #e0e0e0);
+      border: 2px solid rgba(155, 89, 182, 0.3);
+    }
+
+    .button-secondary:hover:not(:disabled) {
+      background: rgba(155, 89, 182, 0.3);
+      border-color: var(--accent-colour, #9b59b6);
+    }
+
+    .button-danger {
+      background: linear-gradient(135deg, #c41e3a 0%, #e74c3c 100%);
+      color: white;
+    }
+
+    .button-danger:hover:not(:disabled) {
+      transform: translateY(-2px);
+      box-shadow: 0 4px 12px rgba(196, 30, 58, 0.4);
+    }
+  `]
+})
+export class ReportModalComponent {
+  private reportService = inject(ReportService);
+  private commentReportService = inject(CommentReportService);
+  private toastService = inject(ToastService);
+
+  // Inputs
+  reportType = input.required<'profile' | 'comment'>();
+  targetId = input.required<string>(); // userId for profile, commentId for comment
+  reportedUsername = input<string>(''); // Only used for profile reports
+
+  // Outputs
+  closeModal = output<void>();
+
+  // State
+  selectedReason = signal<string>('');
+  details = signal<string>('');
+  submitting = signal<boolean>(false);
+
+  // Computed values
+  modalTitle = computed(() => {
+    return this.reportType() === 'profile' ? 'Report Profile' : 'Report Comment';
+  });
+
+  reportInfo = computed(() => {
+    if (this.reportType() === 'profile') {
+      return `You are reporting ${this.reportedUsername()}. Please provide a reason and details for this report.`;
+    } else {
+      return 'You are reporting this comment. Please provide a reason and details for this report.';
+    }
+  });
+
+  // Expose enum for template
+  ReportReason = ReportReason;
+
+  /**
+   * Check if details are invalid (less than 10 characters or more than 1000).
+   */
+  detailsInvalid(): boolean {
+    const length = this.details().length;
+    return (length > 0 && length < 10) || length > 1000;
+  }
+
+  /**
+   * Handle overlay click to close modal.
+   */
+  onOverlayClick(event: MouseEvent): void {
+    if ((event.target as HTMLElement).classList.contains('modal-overlay')) {
+      this.onClose();
+    }
+  }
+
+  /**
+   * Close the modal.
+   */
+  onClose(): void {
+    this.closeModal.emit();
+  }
+
+  /**
+   * Submit the report.
+   */
+  onSubmit(): void {
+    // Validate form
+    if (!this.selectedReason() || this.detailsInvalid()) {
+      this.toastService.error('Please fill in all required fields correctly');
+      return;
+    }
+
+    this.submitting.set(true);
+
+    if (this.reportType() === 'profile') {
+      this.reportService.createReport(
+        this.targetId(),
+        this.selectedReason(),
+        this.details()
+      ).subscribe(this.getSubscribeHandlers());
+    } else {
+      this.commentReportService.createReport({
+        reportedCommentId: this.targetId(),
+        reason: this.selectedReason() as ReportReason,
+        details: this.details(),
+      }).subscribe(this.getSubscribeHandlers());
+    }
+  }
+
+  private getSubscribeHandlers() {
+    return {
+      next: () => {
+        this.toastService.success('Report submitted successfully');
+        this.onClose();
+      },
+      error: (err: { status?: number; error?: { error?: string } }) => {
+        console.error('Error submitting report:', err);
+        // Check if it's a conflict error (duplicate pending report or rate limit)
+        if (err.status === 409 && err.error?.error) {
+          this.toastService.error(err.error.error);
+        } else {
+          this.toastService.error('Failed to submit report. Please try again.');
+        }
+        this.submitting.set(false);
+      }
+    };
+  }
+}

apps/frontend/src/app/components/settings/settings.component.ts

@@ -0,0 +1,491 @@
+/**
+ * @copyright 2026 NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+
+import { Component, inject, signal, OnInit } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { UserService, UpdateUserSettingsRequest } from '../../services/user.service';
+import { AuthService } from '../../services/auth.service';
+import { ToastService } from '../../services/toast.service';
+import { User, PrimaryBadge } from '@library/shared-types';
+
+@Component({
+  selector: 'app-settings',
+  standalone: true,
+  imports: [CommonModule, FormsModule],
+  template: `
+    <div class="settings-container">
+      <h1>Profile Settings</h1>
+
+      @if (loading()) {
+        <div class="loading">Loading settings...</div>
+      } @else if (user()) {
+        <form class="settings-form" (ngSubmit)="saveSettings()">
+          <div class="form-section">
+            <h2>Profile Information</h2>
+
+            <div class="form-group">
+              <label for="displayName">Display Name</label>
+              <input
+                type="text"
+                id="displayName"
+                name="displayName"
+                [(ngModel)]="formData.displayName"
+                placeholder="Your display name"
+                maxlength="50"
+              />
+              <small class="form-help">This will be shown instead of your username</small>
+            </div>
+
+            <div class="form-group">
+              <label for="slug">Profile URL Slug</label>
+              <input
+                type="text"
+                id="slug"
+                name="slug"
+                [(ngModel)]="formData.slug"
+                placeholder="your-custom-url"
+                maxlength="30"
+                pattern="[a-z0-9-]+"
+              />
+              <small class="form-help">
+                Your profile will be at: library.nhcarrigan.com/profile/{{ formData.slug || 'your-slug' }}
+              </small>
+              <small class="form-help">Only lowercase letters, numbers, and hyphens allowed</small>
+            </div>
+
+            <div class="form-group">
+              <label for="bio">Bio</label>
+              <textarea
+                id="bio"
+                name="bio"
+                [(ngModel)]="formData.bio"
+                placeholder="Tell us about yourself..."
+                rows="4"
+                maxlength="500"
+              ></textarea>
+              <small class="form-help">{{ (formData.bio?.length || 0) }} / 500 characters</small>
+            </div>
+
+            <div class="form-group">
+              <label for="primaryBadge">Primary Badge</label>
+              <select
+                id="primaryBadge"
+                name="primaryBadge"
+                [(ngModel)]="formData.primaryBadge"
+              >
+                <option [ngValue]="undefined">None (hide all badges)</option>
+                @if (user()!.isStaff) {
+                  <option [ngValue]="PrimaryBadge.STAFF">Staff</option>
+                }
+                @if (user()!.isMod) {
+                  <option [ngValue]="PrimaryBadge.MOD">Moderator</option>
+                }
+                @if (user()!.isVip) {
+                  <option [ngValue]="PrimaryBadge.VIP">VIP</option>
+                }
+                @if (user()!.inDiscord) {
+                  <option [ngValue]="PrimaryBadge.DISCORD">Discord Member</option>
+                }
+              </select>
+              <small class="form-help">Choose one badge to display on your profile and comments</small>
+            </div>
+          </div>
+
+          <div class="form-section">
+            <h2>Social Links</h2>
+
+            <div class="form-group">
+              <label for="website">Website</label>
+              <input
+                type="text"
+                id="website"
+                name="website"
+                [(ngModel)]="formData.website"
+                placeholder="https://yourwebsite.com"
+                pattern="https?://.+"
+              />
+              <small class="form-help">Your personal website or portfolio (must start with http:// or https://)</small>
+            </div>
+
+            <div class="form-group">
+              <label for="github">GitHub</label>
+              <input
+                type="text"
+                id="github"
+                name="github"
+                [(ngModel)]="formData.github"
+                placeholder="username"
+                pattern="[a-zA-Z0-9]([a-zA-Z0-9-]{0,37}[a-zA-Z0-9])?"
+              />
+              <small class="form-help">Just your GitHub username (alphanumeric and hyphens, 1-39 characters)</small>
+            </div>
+
+            <div class="form-group">
+              <label for="bluesky">Bluesky</label>
+              <input
+                type="text"
+                id="bluesky"
+                name="bluesky"
+                [(ngModel)]="formData.bluesky"
+                placeholder="username.bsky.social"
+                pattern="[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}"
+              />
+              <small class="form-help">Your full Bluesky handle (e.g., username.bsky.social)</small>
+            </div>
+
+            <div class="form-group">
+              <label for="linkedin">LinkedIn</label>
+              <input
+                type="text"
+                id="linkedin"
+                name="linkedin"
+                [(ngModel)]="formData.linkedin"
+                placeholder="username"
+                pattern="[a-zA-Z0-9-]{3,100}"
+              />
+              <small class="form-help">Just your LinkedIn username (alphanumeric and hyphens, 3-100 characters)</small>
+            </div>
+
+            <div class="form-group">
+              <label for="twitch">Twitch</label>
+              <input
+                type="text"
+                id="twitch"
+                name="twitch"
+                [(ngModel)]="formData.twitch"
+                placeholder="username"
+                pattern="[a-zA-Z0-9_]{4,25}"
+              />
+              <small class="form-help">Just your Twitch username (alphanumeric and underscores, 4-25 characters)</small>
+            </div>
+
+            <div class="form-group">
+              <label for="youtube">YouTube</label>
+              <input
+                type="text"
+                id="youtube"
+                name="youtube"
+                [(ngModel)]="formData.youtube"
+                placeholder="@username or channel-id"
+                pattern="(@[a-zA-Z0-9_.-]{3,30}|UC[a-zA-Z0-9_-]{22})"
+              />
+              <small class="form-help">Your YouTube handle (@username) or channel ID (UC...)</small>
+            </div>
+
+            <div class="form-group">
+              <label for="discordServer">Discord Server</label>
+              <input
+                type="text"
+                id="discordServer"
+                name="discordServer"
+                [(ngModel)]="formData.discordServer"
+                placeholder="invite-code"
+                pattern="[a-zA-Z0-9]{2,32}"
+              />
+              <small class="form-help">Just your Discord server invite code (alphanumeric, 2-32 characters)</small>
+            </div>
+          </div>
+
+          <div class="form-section">
+            <h2>Privacy</h2>
+
+            <div class="form-group checkbox-group">
+              <label>
+                <input
+                  type="checkbox"
+                  name="profilePublic"
+                  [(ngModel)]="formData.profilePublic"
+                />
+                <span>Make my profile public</span>
+              </label>
+              <small class="form-help">
+                When disabled, only you can view your profile
+              </small>
+            </div>
+          </div>
+
+          <div class="form-section">
+            <h2>Account Information</h2>
+            <div class="info-item">
+              <strong>Username:</strong> {{ user()!.username }}
+            </div>
+            <div class="info-item">
+              <strong>Email:</strong> {{ user()!.email }}
+            </div>
+            @if (user()!.avatar) {
+              <div class="info-item">
+                <strong>Avatar:</strong>
+                <img [src]="user()!.avatar" alt="Avatar" class="avatar-preview" />
+              </div>
+            }
+            <small class="form-help">
+              Username, email, and avatar are managed through Discord and cannot be changed here
+            </small>
+          </div>
+
+          <div class="form-actions">
+            <button type="submit" class="btn btn-primary" [disabled]="saving()">
+              {{ saving() ? 'Saving...' : 'Save Changes' }}
+            </button>
+          </div>
+        </form>
+      }
+    </div>
+  `,
+  styles: [`
+    .settings-container {
+      max-width: 700px;
+      margin: 2rem auto;
+      padding: 0 1rem;
+    }
+
+    h1 {
+      color: var(--accent-colour, #9b59b6);
+      margin-bottom: 2rem;
+    }
+
+    .loading {
+      text-align: center;
+      padding: 2rem;
+      font-size: 1.2rem;
+    }
+
+    .settings-form {
+      background: var(--card-background, #1a1a2e);
+      border-radius: 12px;
+      padding: 2rem;
+    }
+
+    .form-section {
+      margin-bottom: 2rem;
+      padding-bottom: 2rem;
+      border-bottom: 1px solid rgba(155, 89, 182, 0.3);
+    }
+
+    .form-section:last-of-type {
+      border-bottom: none;
+    }
+
+    .form-section h2 {
+      color: var(--accent-colour, #9b59b6);
+      font-size: 1.3rem;
+      margin-bottom: 1rem;
+    }
+
+    .form-group {
+      margin-bottom: 1.5rem;
+    }
+
+    .form-group label {
+      display: block;
+      margin-bottom: 0.5rem;
+      color: var(--text-colour, #e0e0e0);
+      font-weight: 600;
+    }
+
+    .form-group input[type="text"],
+    .form-group textarea,
+    .form-group select {
+      width: 100%;
+      padding: 0.75rem;
+      border: 1px solid rgba(155, 89, 182, 0.5);
+      border-radius: 8px;
+      background: rgba(0, 0, 0, 0.2);
+      color: var(--text-colour, #e0e0e0);
+      font-size: 1rem;
+      font-family: inherit;
+    }
+
+    .form-group select {
+      cursor: pointer;
+    }
+
+    .form-group select option {
+      background: #1a1a2e;
+      color: var(--text-colour, #e0e0e0);
+    }
+
+    .form-group input[type="text"]:focus,
+    .form-group textarea:focus,
+    .form-group select:focus {
+      outline: none;
+      border-color: var(--accent-colour, #9b59b6);
+      box-shadow: 0 0 0 2px rgba(155, 89, 182, 0.3);
+    }
+
+    .form-group input[type="text"]:invalid:not(:focus):not(:placeholder-shown),
+    .form-group textarea:invalid:not(:focus):not(:placeholder-shown) {
+      border-color: var(--error-colour, #c41e3a);
+    }
+
+    .form-group input[type="text"]:valid:not(:placeholder-shown),
+    .form-group textarea:valid:not(:placeholder-shown) {
+      border-color: rgba(46, 204, 113, 0.5);
+    }
+
+    .form-group textarea {
+      resize: vertical;
+      min-height: 100px;
+    }
+
+    .form-help {
+      display: block;
+      margin-top: 0.25rem;
+      color: var(--text-muted, #a0a0a0);
+      font-size: 0.85rem;
+    }
+
+    .checkbox-group label {
+      display: flex;
+      align-items: center;
+      gap: 0.5rem;
+      cursor: pointer;
+    }
+
+    .checkbox-group input[type="checkbox"] {
+      width: 20px;
+      height: 20px;
+      cursor: pointer;
+    }
+
+    .info-item {
+      margin-bottom: 1rem;
+      color: var(--text-colour, #e0e0e0);
+    }
+
+    .info-item strong {
+      color: var(--accent-colour, #9b59b6);
+    }
+
+    .avatar-preview {
+      width: 50px;
+      height: 50px;
+      border-radius: 50%;
+      margin-left: 0.5rem;
+      vertical-align: middle;
+    }
+
+    .form-actions {
+      display: flex;
+      justify-content: flex-end;
+      padding-top: 1rem;
+    }
+
+    .btn {
+      padding: 0.75rem 2rem;
+      border: none;
+      border-radius: 8px;
+      font-size: 1rem;
+      font-weight: 600;
+      cursor: pointer;
+      transition: all 0.3s ease;
+    }
+
+    .btn-primary {
+      background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+      color: white;
+    }
+
+    .btn-primary:hover:not(:disabled) {
+      transform: translateY(-2px);
+      box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
+    }
+
+    .btn:disabled {
+      opacity: 0.5;
+      cursor: not-allowed;
+    }
+  `]
+})
+export class SettingsComponent implements OnInit {
+  private userService = inject(UserService);
+  private authService = inject(AuthService);
+  private toastService = inject(ToastService);
+
+  user = signal<User | null>(null);
+  loading = signal(true);
+  saving = signal(false);
+
+  // Expose PrimaryBadge enum for template
+  readonly PrimaryBadge = PrimaryBadge;
+
+  formData: UpdateUserSettingsRequest & { bio?: string } = {
+    displayName: '',
+    slug: '',
+    bio: '',
+    profilePublic: true,
+    primaryBadge: undefined,
+    website: '',
+    discordServer: '',
+    bluesky: '',
+    github: '',
+    linkedin: '',
+    twitch: '',
+    youtube: ''
+  };
+
+  ngOnInit(): void {
+    this.userService.getMe().subscribe({
+      next: (userData: User) => {
+        this.user.set(userData);
+        this.formData = {
+          displayName: userData.displayName || '',
+          slug: userData.slug || '',
+          bio: userData.bio || '',
+          profilePublic: userData.profilePublic ?? true,
+          primaryBadge: userData.primaryBadge || undefined,
+          website: userData.website || '',
+          discordServer: userData.discordServer || '',
+          bluesky: userData.bluesky || '',
+          github: userData.github || '',
+          linkedin: userData.linkedin || '',
+          twitch: userData.twitch || '',
+          youtube: userData.youtube || ''
+        };
+        this.loading.set(false);
+      },
+      error: (err: Error) => {
+        console.error('Error loading user profile:', err);
+        this.toastService.error('Failed to load profile');
+        this.loading.set(false);
+      }
+    });
+  }
+
+  saveSettings(): void {
+    this.saving.set(true);
+
+    const updates: UpdateUserSettingsRequest = {
+      displayName: this.formData.displayName || undefined,
+      slug: this.formData.slug || undefined,
+      bio: this.formData.bio || undefined,
+      profilePublic: this.formData.profilePublic,
+      primaryBadge: this.formData.primaryBadge || undefined,
+      website: this.formData.website || undefined,
+      discordServer: this.formData.discordServer || undefined,
+      bluesky: this.formData.bluesky || undefined,
+      github: this.formData.github || undefined,
+      linkedin: this.formData.linkedin || undefined,
+      twitch: this.formData.twitch || undefined,
+      youtube: this.formData.youtube || undefined
+    };
+
+    this.userService.updateSettings(updates).subscribe({
+      next: (updatedUser: User) => {
+        this.user.set(updatedUser);
+        this.authService.updateUser(updatedUser);
+        this.saving.set(false);
+        this.toastService.success('Settings saved successfully!');
+      },
+      error: (err: Error) => {
+        console.error('Error saving settings:', err);
+        this.toastService.error('Failed to save settings');
+        this.saving.set(false);
+      }
+    });
+  }
+}

apps/frontend/src/app/components/shows/show-detail.component.ts

@@ -0,0 +1,664 @@
+/**
+ * @copyright 2026 NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+
+import { Component, OnInit, inject, signal } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { RouterLink, ActivatedRoute, Router } from '@angular/router';
+import { FormsModule } from '@angular/forms';
+import { ShowsService } from '../../services/shows.service';
+import { CommentsService } from '../../services/comments.service';
+import { AuthService } from '../../services/auth.service';
+import { SanitizeService } from '../../services/sanitize.service';
+import { CommentDisplayComponent } from '../comment-display/comment-display.component';
+import { LikeButtonComponent } from '../shared/like-button.component';
+import { Show, Comment, ShowStatus, ShowType } from '@library/shared-types';
+
+@Component({
+  selector: 'app-show-detail',
+  standalone: true,
+  imports: [CommonModule, RouterLink, FormsModule, CommentDisplayComponent, LikeButtonComponent],
+  template: `
+    <div class="container">
+      <div class="breadcrumb">
+        <a routerLink="/shows" class="breadcrumb-link">← Back to Shows</a>
+      </div>
+
+      @if (loading()) {
+        <div class="loading">Loading show details...</div>
+      } @else if (error()) {
+        <div class="error-state">
+          <h2>Show Not Found</h2>
+          <p>{{ error() }}</p>
+          <a routerLink="/shows" class="btn btn-primary">Return to Shows</a>
+        </div>
+      } @else if (show()) {
+        <div class="show-detail-card">
+          @if (show()!.coverImage) {
+            <div class="show-poster-section">
+              <img [src]="show()!.coverImage" [alt]="show()!.title" class="show-poster-large">
+            </div>
+          }
+
+          <div class="show-content">
+            <div class="show-header">
+              <h1>{{ show()!.title }}</h1>
+              <span class="type-badge type-{{ show()!.type }}">
+                {{ getTypeLabel(show()!.type) }}
+              </span>
+              <span class="status status-{{ show()!.status }}">
+                {{ getStatusLabel(show()!.status) }}
+              </span>
+            </div>
+
+            @if (show()!.rating) {
+              <div class="info-row">
+                <span class="info-label">Rating:</span>
+                <div class="rating">
+                  @for (star of [1,2,3,4,5,6,7,8,9,10]; track star) {
+                    <span [class.filled]="star <= show()!.rating!">★</span>
+                  }
+                  <span class="rating-text">({{ show()!.rating }}/10)</span>
+                </div>
+              </div>
+            }
+
+            @if (show()!.timeSpent) {
+              <div class="info-row">
+                <span class="info-label">Watch Time:</span>
+                <span class="info-value time-spent">{{ formatTimeSpent(show()!.timeSpent!) }}</span>
+              </div>
+            }
+
+            @if (show()!.dateStarted) {
+              <div class="info-row">
+                <span class="info-label">Started:</span>
+                <span class="info-value">{{ formatDate(show()!.dateStarted!) }}</span>
+              </div>
+            }
+
+            @if (show()!.dateFinished) {
+              <div class="info-row">
+                <span class="info-label">Finished:</span>
+                <span class="info-value">{{ formatDate(show()!.dateFinished!) }}</span>
+              </div>
+            }
+
+            <div class="info-row">
+              <span class="info-label">Added:</span>
+              <span class="info-value">{{ formatDate(show()!.createdAt) }}</span>
+            </div>
+
+            <div class="info-row">
+              <span class="info-label">Last Updated:</span>
+              <span class="info-value">{{ formatDate(show()!.updatedAt) }}</span>
+            </div>
+
+            <div class="like-section">
+              <app-like-button
+                entityType="show"
+                [entityId]="show()!.id"
+              ></app-like-button>
+            </div>
+
+            @if (show()!.notes) {
+              <div class="notes-section">
+                <h3>Notes</h3>
+                <p class="notes">{{ show()!.notes }}</p>
+              </div>
+            }
+
+            @if (show()!.tags && show()!.tags.length > 0) {
+              <div class="tags-section">
+                <h3>Tags</h3>
+                <div class="tags-display">
+                  @for (tag of show()!.tags; track tag) {
+                    <span class="tag-chip">{{ tag }}</span>
+                  }
+                </div>
+              </div>
+            }
+
+            @if (show()!.links && show()!.links.length > 0) {
+              <div class="links-section">
+                <h3>External Links</h3>
+                <div class="links-display">
+                  @for (link of show()!.links; track link.url) {
+                    <a [href]="link.url" target="_blank" rel="noopener noreferrer" class="external-link">
+                      {{ link.title }} ↗
+                    </a>
+                  }
+                </div>
+              </div>
+            }
+
+            <div class="comments-section">
+              <h3>Comments</h3>
+              @if (authService.isAuthenticated()) {
+                @if (authService.user()?.isBanned) {
+                  <div class="banned-notice">
+                    You have been banned from commenting.
+                  </div>
+                } @else {
+                  <form (ngSubmit)="addComment()" class="comment-form">
+                    <textarea
+                      [(ngModel)]="newCommentContent"
+                      name="comment"
+                      placeholder="Add a comment (Markdown supported)..."
+                      rows="3"
+                    ></textarea>
+                    <button type="submit" class="btn btn-primary">Post Comment</button>
+                  </form>
+                }
+              } @else {
+                <div class="auth-prompt">
+                  <p>Please sign in to comment.</p>
+                </div>
+              }
+
+              @if (commentsLoading()) {
+                <div class="comments-loading">Loading comments...</div>
+              } @else {
+                <app-comment-display
+                  [comments]="comments"
+                  (edit)="handleCommentEdit($event)"
+                  (delete)="deleteComment($event)"
+                />
+              }
+            </div>
+          </div>
+        </div>
+      }
+    </div>
+  `,
+  styles: [`
+    .container {
+      max-width: 900px;
+      margin: 0 auto;
+      padding: 2rem;
+    }
+
+    .breadcrumb {
+      margin-bottom: 1.5rem;
+    }
+
+    .breadcrumb-link {
+      color: #10b981;
+      text-decoration: none;
+      font-weight: 500;
+      transition: opacity 0.3s;
+    }
+
+    .breadcrumb-link:hover {
+      opacity: 0.8;
+    }
+
+    .loading {
+      text-align: center;
+      padding: 3rem;
+      color: #666;
+      font-size: 1.1rem;
+    }
+
+    .error-state {
+      text-align: center;
+      padding: 3rem;
+      background: #fef2f2;
+      border: 1px solid #fecaca;
+      border-radius: 8px;
+    }
+
+    .error-state h2 {
+      color: #991b1b;
+      margin-bottom: 1rem;
+    }
+
+    .error-state p {
+      color: #dc2626;
+      margin-bottom: 1.5rem;
+    }
+
+    .show-detail-card {
+      background: white;
+      border: 1px solid #e5e7eb;
+      border-radius: 8px;
+      overflow: hidden;
+      box-shadow: 0 1px 3px rgba(0,0,0,0.1);
+    }
+
+    .show-poster-section {
+      width: 100%;
+      background: #f3f4f6;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      padding: 2rem;
+    }
+
+    .show-poster-large {
+      max-width: 100%;
+      max-height: 400px;
+      object-fit: contain;
+      border-radius: 4px;
+    }
+
+    .show-content {
+      padding: 2rem;
+    }
+
+    .show-header {
+      display: flex;
+      align-items: center;
+      gap: 1rem;
+      margin-bottom: 1rem;
+      flex-wrap: wrap;
+    }
+
+    .show-header h1 {
+      margin: 0;
+      font-size: 2rem;
+      color: #1f2937;
+    }
+
+    .type-badge {
+      display: inline-block;
+      padding: 0.5rem 1rem;
+      border-radius: 4px;
+      font-size: 0.9rem;
+      font-weight: 500;
+    }
+
+    .type-tvSeries {
+      background: #3b82f6;
+      color: white;
+    }
+
+    .type-anime {
+      background: #ec4899;
+      color: white;
+    }
+
+    .type-film {
+      background: #8b5cf6;
+      color: white;
+    }
+
+    .type-documentary {
+      background: #14b8a6;
+      color: white;
+    }
+
+    .status {
+      display: inline-block;
+      padding: 0.5rem 1rem;
+      border-radius: 4px;
+      font-size: 0.9rem;
+      font-weight: 500;
+    }
+
+    .status-watching {
+      background: #fef3c7;
+      color: #92400e;
+    }
+
+    .status-completed {
+      background: #d1fae5;
+      color: #065f46;
+    }
+
+    .status-wantToWatch {
+      background: #e0e7ff;
+      color: #3730a3;
+    }
+
+    .status-retired {
+      background: #f3f4f6;
+      color: #4b5563;
+    }
+
+    .info-row {
+      display: flex;
+      align-items: center;
+      gap: 1rem;
+      margin-bottom: 0.75rem;
+      padding: 0.5rem 0;
+      border-bottom: 1px solid #f3f4f6;
+    }
+
+    .info-label {
+      font-weight: 600;
+      color: #4b5563;
+      min-width: 120px;
+    }
+
+    .info-value {
+      color: #1f2937;
+    }
+
+    .time-spent {
+      color: #10b981;
+      font-weight: 600;
+    }
+
+    .rating {
+      display: flex;
+      align-items: center;
+      gap: 0.25rem;
+    }
+
+    .rating span {
+      color: #e5e7eb;
+      font-size: 1.2rem;
+    }
+
+    .rating span.filled {
+      color: #f59e0b;
+    }
+
+    .rating-text {
+      margin-left: 0.5rem;
+      font-size: 1rem;
+      color: #6b7280;
+      font-weight: 500;
+    }
+
+    .like-section {
+      margin: 1.5rem 0;
+    }
+
+    .notes-section,
+    .tags-section,
+    .links-section {
+      margin-top: 2rem;
+    }
+
+    .notes-section h3,
+    .tags-section h3,
+    .links-section h3,
+    .comments-section h3 {
+      font-size: 1.25rem;
+      color: #1f2937;
+      margin-bottom: 1rem;
+    }
+
+    .notes {
+      font-size: 1rem;
+      color: #4b5563;
+      line-height: 1.6;
+      white-space: pre-wrap;
+    }
+
+    .tags-display {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 0.5rem;
+    }
+
+    .tag-chip {
+      background: #10b981;
+      color: white;
+      padding: 0.375rem 0.875rem;
+      border-radius: 12px;
+      font-size: 0.875rem;
+      font-weight: 500;
+    }
+
+    .links-display {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 0.75rem;
+    }
+
+    .external-link {
+      color: #10b981;
+      text-decoration: none;
+      font-size: 0.95rem;
+      padding: 0.5rem 1rem;
+      border: 2px solid #10b981;
+      border-radius: 4px;
+      transition: all 0.2s;
+      font-weight: 500;
+    }
+
+    .external-link:hover {
+      background: #10b981;
+      color: white;
+    }
+
+    .comments-section {
+      margin-top: 2rem;
+      padding-top: 2rem;
+      border-top: 2px solid #e5e7eb;
+    }
+
+    .comment-form {
+      margin-bottom: 1.5rem;
+    }
+
+    .comment-form textarea {
+      width: 100%;
+      padding: 0.75rem;
+      border: 1px solid #d1d5db;
+      border-radius: 4px;
+      font-size: 1rem;
+      resize: vertical;
+      margin-bottom: 0.75rem;
+      font-family: inherit;
+    }
+
+    .comment-form textarea:focus {
+      outline: none;
+      border-color: #10b981;
+    }
+
+    .banned-notice {
+      background: #fef2f2;
+      border: 1px solid #fecaca;
+      color: #991b1b;
+      padding: 1rem;
+      border-radius: 4px;
+      text-align: center;
+      margin-bottom: 1.5rem;
+      font-size: 0.95rem;
+    }
+
+    .auth-prompt {
+      background: #f3f4f6;
+      padding: 1rem;
+      border-radius: 4px;
+      text-align: center;
+      margin-bottom: 1.5rem;
+    }
+
+    .auth-prompt p {
+      margin: 0;
+      color: #4b5563;
+    }
+
+    .comments-loading {
+      text-align: center;
+      padding: 1.5rem;
+      color: #6b7280;
+      font-size: 0.95rem;
+    }
+
+    .btn {
+      padding: 0.625rem 1.25rem;
+      border: none;
+      border-radius: 4px;
+      cursor: pointer;
+      font-size: 1rem;
+      transition: all 0.3s;
+      font-weight: 500;
+    }
+
+    .btn:hover {
+      opacity: 0.9;
+    }
+
+    .btn-primary {
+      background: #10b981;
+      color: white;
+    }
+
+    @media (max-width: 640px) {
+      .container {
+        padding: 1rem;
+      }
+
+      .show-header {
+        flex-direction: column;
+        align-items: flex-start;
+      }
+
+      .show-header h1 {
+        font-size: 1.5rem;
+      }
+
+      .info-row {
+        flex-direction: column;
+        align-items: flex-start;
+        gap: 0.25rem;
+      }
+
+      .info-label {
+        min-width: auto;
+      }
+    }
+  `]
+})
+export class ShowDetailComponent implements OnInit {
+  private readonly showsService = inject(ShowsService);
+  private readonly commentsService = inject(CommentsService);
+  readonly authService = inject(AuthService);
+  private readonly sanitizeService = inject(SanitizeService);
+  private readonly route = inject(ActivatedRoute);
+  private readonly router = inject(Router);
+
+  show = signal<Show | null>(null);
+  comments = signal<Comment[]>([]);
+  loading = signal(true);
+  commentsLoading = signal(false);
+  error = signal<string | null>(null);
+  newCommentContent = '';
+
+  ngOnInit() {
+    const showId = this.route.snapshot.paramMap.get('id');
+    if (!showId) {
+      this.error.set('No show ID provided');
+      this.loading.set(false);
+      return;
+    }
+
+    this.loadShow(showId);
+    this.loadComments(showId);
+  }
+
+  private loadShow(showId: string) {
+    this.loading.set(true);
+    this.showsService.getShowById(showId).subscribe({
+      next: (show) => {
+        if (!show) {
+          this.error.set('Show not found');
+        } else {
+          this.show.set(show);
+        }
+        this.loading.set(false);
+      },
+      error: () => {
+        this.error.set('Failed to load show. It may not exist or there was an error.');
+        this.loading.set(false);
+      }
+    });
+  }
+
+  private loadComments(showId: string) {
+    this.commentsLoading.set(true);
+    this.commentsService.getCommentsForShow(showId).subscribe({
+      next: (comments) => {
+        this.comments.set(comments);
+        this.commentsLoading.set(false);
+      },
+      error: () => {
+        this.commentsLoading.set(false);
+      }
+    });
+  }
+
+  addComment() {
+    const show = this.show();
+    if (!show || !this.newCommentContent.trim()) return;
+
+    this.commentsService.addCommentToShow(show.id, { content: this.newCommentContent }).subscribe({
+      next: (comment) => {
+        this.comments.set([comment, ...this.comments()]);
+        this.newCommentContent = '';
+      }
+    });
+  }
+
+  handleCommentEdit(event: { commentId: string; content: string }) {
+    const show = this.show();
+    if (!show) return;
+
+    this.commentsService.updateCommentOnShow(show.id, event.commentId, event.content).subscribe({
+      next: (updatedComment) => {
+        this.comments.set(
+          this.comments().map(c => c.id === event.commentId ? updatedComment : c)
+        );
+      }
+    });
+  }
+
+  deleteComment(commentId: string) {
+    const show = this.show();
+    if (!show || !confirm('Are you sure you want to delete this comment?')) return;
+
+    this.commentsService.deleteCommentFromShow(show.id, commentId).subscribe({
+      next: () => {
+        this.comments.set(this.comments().filter(c => c.id !== commentId));
+      }
+    });
+  }
+
+  getTypeLabel(type: ShowType): string {
+    switch (type) {
+      case ShowType.tvSeries: return 'TV Series';
+      case ShowType.anime: return 'Anime';
+      case ShowType.film: return 'Film';
+      case ShowType.documentary: return 'Documentary';
+    }
+  }
+
+  getStatusLabel(status: ShowStatus): string {
+    switch (status) {
+      case ShowStatus.watching: return 'Currently Watching';
+      case ShowStatus.completed: return 'Completed';
+      case ShowStatus.wantToWatch: return 'Want to Watch';
+      case ShowStatus.retired: return 'Retired';
+    }
+  }
+
+  formatDate(date: Date | string): string {
+    return new Date(date).toLocaleDateString('en-GB', {
+      year: 'numeric',
+      month: 'long',
+      day: 'numeric'
+    });
+  }
+
+  formatTimeSpent(minutes: number): string {
+    const hours = Math.floor(minutes / 60);
+    const mins = minutes % 60;
+
+    if (hours === 0) {
+      return `${mins} minutes`;
+    } else if (mins === 0) {
+      return `${hours} hour${hours === 1 ? '' : 's'}`;
+    } else {
+      return `${hours} hour${hours === 1 ? '' : 's'} ${mins} minute${mins === 1 ? '' : 's'}`;
+    }
+  }
+}

apps/frontend/src/app/components/shows/shows-list.component.ts

@@ -14,12 +14,13 @@ import { SanitizeService } from '../../services/sanitize.service';
 import { SuggestionService } from '../../services/suggestion.service';
 import { PaginationComponent } from '../shared/pagination.component';
 import { LikeButtonComponent } from '../shared/like-button.component';
+import { CommentDisplayComponent } from '../comment-display/comment-display.component';
 import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, SuggestionEntity, Link } from '@library/shared-types';
 
 @Component({
   selector: 'app-shows-list',
   standalone: true,
-  imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent],
+  imports: [CommonModule, FormsModule, PaginationComponent, LikeButtonComponent, CommentDisplayComponent],
   template: `
     <div class="container">
       <div class="header-section">
@@ -66,9 +67,30 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg
               <option [value]="ShowStatus.watching">Currently Watching</option>
               <option [value]="ShowStatus.completed">Completed</option>
               <option [value]="ShowStatus.wantToWatch">Want to Watch</option>
+              <option [value]="ShowStatus.retired">Retired</option>
             </select>
           </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">
             <label for="rating">Rating (1-10)</label>
             <input
@@ -81,6 +103,34 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg
             >
           </div>
 
+          <div class="form-row">
+            <div class="form-group">
+              <label for="timeHours">Time Spent (Hours)</label>
+              <input
+                type="number"
+                id="timeHours"
+                [(ngModel)]="newShowTimeHours"
+                name="timeHours"
+                min="0"
+                placeholder="0"
+                (ngModelChange)="updateNewShowTimeSpent()"
+              >
+            </div>
+            <div class="form-group">
+              <label for="timeMinutes">Time Spent (Minutes)</label>
+              <input
+                type="number"
+                id="timeMinutes"
+                [(ngModel)]="newShowTimeMinutes"
+                name="timeMinutes"
+                min="0"
+                max="59"
+                placeholder="0"
+                (ngModelChange)="updateNewShowTimeSpent()"
+              >
+            </div>
+          </div>
+
           <div class="form-group">
             <label for="notes">Notes</label>
             <textarea
@@ -113,8 +163,7 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg
           </div>
 
           <div class="form-group">
-            <label>Tags</label>
-            <div class="tags-input-container">
+            <div class="tags-input-container" aria-label="Tags">
               @for (tag of newShow.tags; track tag; let i = $index) {
                 <span class="tag">
                   {{ tag }}
@@ -131,8 +180,7 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg
             </div>
           </div>
 
-          <div class="form-group">
-            <label>External Links</label>
+          <div class="form-group" aria-label="External Links">
             <div class="links-list">
               @for (link of newShow.links; track link.url; let i = $index) {
                 <div class="link-item">
@@ -196,9 +244,30 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg
               <option [value]="ShowStatus.watching">Currently Watching</option>
               <option [value]="ShowStatus.completed">Completed</option>
               <option [value]="ShowStatus.wantToWatch">Want to Watch</option>
+              <option [value]="ShowStatus.retired">Retired</option>
             </select>
           </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">
             <label for="edit-rating">Rating (1-10)</label>
             <input
@@ -211,6 +280,34 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg
             >
           </div>
 
+          <div class="form-row">
+            <div class="form-group">
+              <label for="edit-timeHours">Time Spent (Hours)</label>
+              <input
+                type="number"
+                id="edit-timeHours"
+                [(ngModel)]="editShowTimeHours"
+                name="timeHours"
+                min="0"
+                placeholder="0"
+                (ngModelChange)="updateEditShowTimeSpent()"
+              >
+            </div>
+            <div class="form-group">
+              <label for="edit-timeMinutes">Time Spent (Minutes)</label>
+              <input
+                type="number"
+                id="edit-timeMinutes"
+                [(ngModel)]="editShowTimeMinutes"
+                name="timeMinutes"
+                min="0"
+                max="59"
+                placeholder="0"
+                (ngModelChange)="updateEditShowTimeSpent()"
+              >
+            </div>
+          </div>
+
           <div class="form-group">
             <label for="edit-notes">Notes</label>
             <textarea
@@ -243,8 +340,7 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg
           </div>
 
           <div class="form-group">
-            <label>Tags</label>
-            <div class="tags-input-container">
+            <div class="tags-input-container" aria-label="Tags">
               @for (tag of editShow.tags; track tag; let i = $index) {
                 <span class="tag">
                   {{ tag }}
@@ -261,8 +357,7 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg
             </div>
           </div>
 
-          <div class="form-group">
-            <label>External Links</label>
+          <div class="form-group" aria-label="External Links">
             <div class="links-list">
               @for (link of editShow.links; track link.url; let i = $index) {
                 <div class="link-item">
@@ -433,6 +528,13 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg
         >
           Want to Watch ({{ wantToWatchCount() }})
         </button>
+        <button
+          (click)="setFilter(ShowStatus.retired)"
+          [class.active]="statusFilter() === ShowStatus.retired"
+          class="filter-btn"
+        >
+          Retired ({{ retiredCount() }})
+        </button>
       </div>
 
       @if (loading()) {
@@ -472,6 +574,12 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg
                   </div>
                 }
 
+                @if (show.timeSpent) {
+                  <p class="time-spent">
+                    📺 Watch Time: {{ formatTimeSpent(show.timeSpent) }}
+                  </p>
+                }
+
                 <app-like-button
                   entityType="show"
                   [entityId]="show.id"
@@ -499,6 +607,30 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg
                   </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()) {
                   <div class="actions">
                     <button (click)="startEdit(show)" class="btn btn-secondary btn-sm">
@@ -535,56 +667,11 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg
                         }
                       }
 
-                      @if (commentsLoading()[show.id]) {
-                        <div class="comments-loading">Loading comments...</div>
-                      } @else {
-                        @for (comment of comments()[show.id] || []; track comment.id) {
-                          <div class="comment">
-                            <div class="comment-header">
-                              @if (comment.user.avatar) {
-                                <img [src]="comment.user.avatar" [alt]="comment.user.username" class="comment-avatar">
-                              }
-                              <span class="comment-author">{{ comment.user.username }}</span>
-                              @if (comment.user.inDiscord) {
-                                <span class="discord-badge">Discord</span>
-                              }
-                              @if (comment.user.isVip) {
-                                <span class="vip-badge">VIP</span>
-                              }
-                              @if (comment.user.isMod) {
-                                <span class="mod-badge">Mod</span>
-                              }
-                              @if (comment.user.isStaff) {
-                                <span class="staff-badge">Staff</span>
-                              }
-                              <span class="comment-date">{{ formatDate(comment.createdAt) }}</span>
-                              @if (canEditComment(comment)) {
-                                <button (click)="startEditComment(show.id, comment)" class="btn btn-secondary btn-xs">Edit</button>
-                              }
-                              @if (canDeleteComment(comment)) {
-                                <button (click)="deleteComment(show.id, comment.id)" class="btn btn-danger btn-xs">Delete</button>
-                              }
-                            </div>
-                            @if (editingCommentId() === comment.id) {
-                              <div class="comment-edit-form">
-                                <textarea
-                                  [(ngModel)]="editCommentContent"
-                                  name="editComment"
-                                  rows="3"
-                                ></textarea>
-                                <div class="comment-edit-actions">
-                                  <button (click)="saveCommentEdit(show.id, comment.id)" class="btn btn-primary btn-xs">Save</button>
-                                  <button (click)="cancelCommentEdit()" class="btn btn-secondary btn-xs">Cancel</button>
-                                </div>
-                              </div>
-                            } @else {
-                              <div class="comment-content" [innerHTML]="sanitizeService.sanitizeHtml(comment.content)"></div>
-                            }
-                          </div>
-                        } @empty {
-                          <div class="no-comments">No comments yet. Be the first to comment!</div>
-                        }
-                      }
+                      <app-comment-display
+                        [comments]="getCommentsSignal(show.id)"
+                        (edit)="handleCommentEdit(show.id, $event)"
+                        (delete)="deleteComment(show.id, $event)"
+                      />
                     </div>
                   }
                 </div>
@@ -660,6 +747,13 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg
       font-size: 1rem;
     }
 
+    .form-row {
+      display: grid;
+      grid-template-columns: 1fr 1fr;
+      gap: 1rem;
+      margin-bottom: 1rem;
+    }
+
     .form-actions {
       display: flex;
       gap: 1rem;
@@ -854,6 +948,22 @@ import { Show, ShowStatus, ShowType, CreateShowDto, UpdateShowDto, Comment, Sugg
       margin: 0.5rem 0;
     }
 
+    .time-spent {
+      font-size: 0.9rem;
+      color: #8b5cf6;
+      font-weight: 500;
+      margin: 0.5rem 0;
+    }
+
+    .date-started,
+    .date-finished,
+    .date-added,
+    .date-updated {
+      font-size: 0.85rem;
+      color: #4b5563;
+      margin-top: 0.5rem;
+    }
+
     .actions {
       margin-top: 1rem;
     }
@@ -1210,6 +1320,7 @@ export class ShowsListComponent implements OnInit {
   watchingCount = computed(() => this.shows().filter(show => show.status === ShowStatus.watching).length);
   completedCount = computed(() => this.shows().filter(show => show.status === ShowStatus.completed).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(() => {
     const tagsSet = new Set<string>();
@@ -1258,18 +1369,26 @@ export class ShowsListComponent implements OnInit {
 
   totalFilteredShows = computed(() => this.filteredShows().length);
 
-  newShow: Partial<CreateShowDto> = {
+  newShow: Partial<CreateShowDto> & { dateStarted?: Date; dateFinished?: Date } = {
     title: '',
     type: ShowType.tvSeries,
     status: ShowStatus.wantToWatch,
     rating: undefined,
     notes: '',
+    dateStarted: undefined,
+    dateFinished: undefined,
     tags: [],
     links: []
   };
 
   editShow: Partial<UpdateShowDto> = {};
 
+  // Time tracking state
+  newShowTimeHours = 0;
+  newShowTimeMinutes = 0;
+  editShowTimeHours = 0;
+  editShowTimeMinutes = 0;
+
   // Tags and links input state
   newTagInput = '';
   editTagInput = '';
@@ -1338,6 +1457,7 @@ export class ShowsListComponent implements OnInit {
       case ShowStatus.watching: return 'Currently Watching';
       case ShowStatus.completed: return 'Completed';
       case ShowStatus.wantToWatch: return 'Want to Watch';
+      case ShowStatus.retired: return 'Retired';
     }
   }
 
@@ -1365,9 +1485,13 @@ export class ShowsListComponent implements OnInit {
       rating: undefined,
       notes: '',
       coverImage: undefined,
+      dateStarted: undefined,
+      dateFinished: undefined,
       tags: [],
       links: []
     };
+    this.newShowTimeHours = 0;
+    this.newShowTimeMinutes = 0;
     this.newShowImagePreview.set(null);
     this.imageError.set(null);
     this.newTagInput = '';
@@ -1375,6 +1499,16 @@ export class ShowsListComponent implements OnInit {
     this.newLinkUrl = '';
   }
 
+  updateNewShowTimeSpent() {
+    const totalMinutes = (this.newShowTimeHours * 60) + this.newShowTimeMinutes;
+    this.newShow.timeSpent = totalMinutes > 0 ? totalMinutes : undefined;
+  }
+
+  updateEditShowTimeSpent() {
+    const totalMinutes = (this.editShowTimeHours * 60) + this.editShowTimeMinutes;
+    this.editShow.timeSpent = totalMinutes > 0 ? totalMinutes : undefined;
+  }
+
   addTag(target: 'new' | 'edit') {
     const input = target === 'new' ? this.newTagInput.trim() : this.editTagInput.trim();
     if (!input) return;
@@ -1427,6 +1561,8 @@ export class ShowsListComponent implements OnInit {
       title: this.newShow.title,
       type: this.newShow.type,
       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,
       notes: this.newShow.notes,
       coverImage: this.newShow.coverImage,
@@ -1454,12 +1590,23 @@ export class ShowsListComponent implements OnInit {
       title: show.title,
       type: show.type,
       status: show.status,
+      dateStarted: show.dateStarted,
+      dateFinished: show.dateFinished,
       rating: show.rating,
       notes: show.notes,
       coverImage: show.coverImage,
       tags: [...(show.tags || [])],
-      links: [...(show.links || [])]
+      links: [...(show.links || [])],
+      timeSpent: show.timeSpent
     };
+    // Populate time fields from existing timeSpent
+    if (show.timeSpent) {
+      this.editShowTimeHours = Math.floor(show.timeSpent / 60);
+      this.editShowTimeMinutes = show.timeSpent % 60;
+    } else {
+      this.editShowTimeHours = 0;
+      this.editShowTimeMinutes = 0;
+    }
     this.editShowImagePreview.set(show.coverImage || null);
     this.showAddForm.set(false);
     this.imageError.set(null);
@@ -1482,7 +1629,13 @@ export class ShowsListComponent implements OnInit {
     const show = this.editingShow();
     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.cancelEdit();
     });
@@ -1543,6 +1696,19 @@ export class ShowsListComponent implements OnInit {
     return new Date(date).toLocaleDateString();
   }
 
+  formatTimeSpent(minutes: number): string {
+    const hours = Math.floor(minutes / 60);
+    const mins = minutes % 60;
+
+    if (hours === 0) {
+      return `${mins}m`;
+    } else if (mins === 0) {
+      return `${hours}h`;
+    } else {
+      return `${hours}h ${mins}m`;
+    }
+  }
+
   toggleComments(showId: string) {
     const expanded = this.expandedComments();
     const isCurrentlyExpanded = expanded[showId];
@@ -1677,7 +1843,7 @@ export class ShowsListComponent implements OnInit {
 
     try {
       await this.suggestionService.createSuggestion({
-        entityType: SuggestionEntity.SHOW,
+        entityType: SuggestionEntity.show,
         title: this.suggestedShow.title,
         type: this.suggestedShow.type,
         notes: this.suggestedShow.notes,
@@ -1689,4 +1855,21 @@ export class ShowsListComponent implements OnInit {
       alert('Failed to submit suggestion. Please try again.');
     }
   }
+
+  handleCommentEdit(showId: string, event: { commentId: string; content: string }) {
+    this.commentsService.updateCommentOnShow(showId, event.commentId, event.content).subscribe({
+      next: (updatedComment) => {
+        this.comments.set({
+          ...this.comments(),
+          [showId]: (this.comments()[showId] || []).map(c =>
+            c.id === event.commentId ? updatedComment : c
+          )
+        });
+      }
+    });
+  }
+
+  getCommentsSignal(showId: string) {
+    return signal(this.comments()[showId] || []);
+  }
 }

apps/frontend/src/app/components/toast/toast.component.css

@@ -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

@@ -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

@@ -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

@@ -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

@@ -16,17 +16,17 @@ import {
 import { Observable, catchError, throwError, switchMap, BehaviorSubject, filter, take } from 'rxjs';
 import { Router } from '@angular/router';
 import { environment } from '../../environments/environment';
+import { ToastService } from '../services/toast.service';
 
 @Injectable()
 export class AuthInterceptor implements HttpInterceptor {
+  private router = inject(Router);
+  private http = inject(HttpClient);
+  private toast = inject(ToastService);
+
   private isRefreshing = false;
   private refreshTokenSubject = new BehaviorSubject<boolean | null>(null);
 
-  constructor(
-    private router: Router,
-    private http: HttpClient
-  ) {}
-
   intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
     // Clone the request to add withCredentials
     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')) {
           return this.handle401Error(authReq, next);
         }
+
+        // Show toast for other HTTP errors
+        this.showErrorToast(error);
         return throwError(() => error);
       })
     );
@@ -61,6 +64,7 @@ export class AuthInterceptor implements HttpInterceptor {
         catchError((err) => {
           this.isRefreshing = false;
           this.refreshTokenSubject.next(false);
+          this.toast.error('Your session has expired. Please log in again.');
           this.router.navigate(['/']);
           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/achievement.service.ts

@@ -0,0 +1,63 @@
+/**
+ * @copyright 2026 NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+import { Injectable, inject } from '@angular/core';
+import {
+  AchievementDefinition,
+  AchievementProgress,
+  UserAchievementSummary,
+} from '@library/shared-types';
+import { Observable } from 'rxjs';
+
+import { ApiService } from './api.service';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class AchievementService {
+  private readonly api = inject(ApiService);
+
+  /**
+   * Get all achievement definitions.
+   */
+  getAchievementDefinitions(): Observable<AchievementDefinition[]> {
+    return this.api.get<AchievementDefinition[]>('/achievements/definitions');
+  }
+
+  /**
+   * Get a specific achievement definition by key.
+   */
+  getAchievementDefinition(key: string): Observable<AchievementDefinition> {
+    return this.api.get<AchievementDefinition>(`/achievements/definitions/${key}`);
+  }
+
+  /**
+   * Get current user's achievement summary.
+   */
+  getCurrentUserSummary(): Observable<UserAchievementSummary> {
+    return this.api.get<UserAchievementSummary>('/achievements/summary');
+  }
+
+  /**
+   * Get current user's achievement progress.
+   */
+  getCurrentUserProgress(): Observable<AchievementProgress[]> {
+    return this.api.get<AchievementProgress[]>('/achievements/progress');
+  }
+
+  /**
+   * Get another user's achievement summary.
+   */
+  getUserSummary(userId: string): Observable<UserAchievementSummary> {
+    return this.api.get<UserAchievementSummary>(`/achievements/users/${userId}/summary`);
+  }
+
+  /**
+   * Get another user's achievement progress.
+   */
+  getUserProgress(userId: string): Observable<AchievementProgress[]> {
+    return this.api.get<AchievementProgress[]>(`/achievements/users/${userId}/progress`);
+  }
+}

apps/frontend/src/app/services/activity.service.ts

@@ -0,0 +1,42 @@
+/**
+ * @copyright 2026 NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+
+import { Injectable, inject } from '@angular/core';
+import { Observable } from 'rxjs';
+import type { ActivityFeedResponse } from '@library/shared-types';
+import { ApiService } from './api.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ActivityService {
+  private apiService = inject(ApiService);
+
+  /**
+   * Get activity feed with pagination.
+   */
+  getActivityFeed(limit = 50, offset = 0, userId?: string): Observable<ActivityFeedResponse> {
+    const params = new URLSearchParams();
+    params.append('limit', limit.toString());
+    params.append('offset', offset.toString());
+    if (userId) {
+      params.append('userId', userId);
+    }
+
+    return this.apiService.get<ActivityFeedResponse>(`/activity?${params.toString()}`);
+  }
+
+  /**
+   * Get activity feed for a specific user.
+   */
+  getUserActivityFeed(userId: string, limit = 50, offset = 0): Observable<ActivityFeedResponse> {
+    const params = new URLSearchParams();
+    params.append('limit', limit.toString());
+    params.append('offset', offset.toString());
+
+    return this.apiService.get<ActivityFeedResponse>(`/activity/${userId}?${params.toString()}`);
+  }
+}

apps/frontend/src/app/services/art.service.ts

@@ -4,7 +4,7 @@
  * @author Naomi Carrigan
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Observable } from 'rxjs';
 import { ApiService } from './api.service';
 import { Art, CreateArtDto, UpdateArtDto } from '@library/shared-types';
@@ -13,7 +13,8 @@ import { Art, CreateArtDto, UpdateArtDto } from '@library/shared-types';
   providedIn: 'root'
 })
 export class ArtService {
-  constructor(private api: ApiService) {}
+  private api = inject(ApiService);
+
 
   getAllArt(): Observable<Art[]> {
     return this.api.get<Art[]>('/art');

apps/frontend/src/app/services/auth.service.ts

@@ -4,7 +4,7 @@
  * @author Naomi Carrigan
  */
 
-import { Injectable, signal } from '@angular/core';
+import { Injectable, signal, inject } from '@angular/core';
 import { Router } from '@angular/router';
 import { Observable, tap, catchError, switchMap, throwError, of } from 'rxjs';
 import { ApiService } from './api.service';
@@ -16,15 +16,14 @@ import { HttpClient } from '@angular/common/http';
   providedIn: 'root'
 })
 export class AuthService {
+  private api = inject(ApiService);
+  private router = inject(Router);
+  private http = inject(HttpClient);
+
   private currentUser = signal<User | null>(null);
   public readonly user = this.currentUser.asReadonly();
   private refreshing = false;
-
-  constructor(
-    private api: ApiService,
-    private router: Router,
-    private http: HttpClient
-  ) {}
+  private refreshInterval?: ReturnType<typeof setInterval>;
 
   login(): void {
     // Redirect to API login endpoint
@@ -35,6 +34,7 @@ export class AuthService {
     return this.api.get<AuthResponse>('/auth/me').pipe(
       tap(response => {
         this.currentUser.set(response.user);
+        this.startRefreshTimer();
       }),
       catchError(error => {
         if (error.status === 401) {
@@ -42,9 +42,11 @@ export class AuthService {
             switchMap(() => this.api.get<AuthResponse>('/auth/me')),
             tap(response => {
               this.currentUser.set(response.user);
+              this.startRefreshTimer();
             }),
             catchError(() => {
               this.currentUser.set(null);
+              this.stopRefreshTimer();
               return throwError(() => error);
             })
           );
@@ -68,20 +70,45 @@ export class AuthService {
       tap(response => {
         this.currentUser.set(response.user);
         this.refreshing = false;
+        this.startRefreshTimer();
       }),
       catchError(error => {
         this.refreshing = false;
         this.currentUser.set(null);
+        this.stopRefreshTimer();
         return throwError(() => error);
       })
     );
   }
 
+  private startRefreshTimer(): void {
+    this.stopRefreshTimer();
+
+    // Refresh token every 13 minutes (before 15-minute expiry)
+    const refreshIntervalMs = 13 * 60 * 1000;
+    this.refreshInterval = setInterval(() => {
+      this.refreshToken().subscribe({
+        error: (err) => {
+          console.error('Background token refresh failed:', err);
+          this.stopRefreshTimer();
+        }
+      });
+    }, refreshIntervalMs);
+  }
+
+  private stopRefreshTimer(): void {
+    if (this.refreshInterval) {
+      clearInterval(this.refreshInterval);
+      this.refreshInterval = undefined;
+    }
+  }
+
   logout(): Observable<{ message: string }> {
     return this.api.post<{ message: string }>('/auth/logout', {}).pipe(
       tap(() => {
         this.currentUser.set(null);
         this.api.clearCsrfToken();
+        this.stopRefreshTimer();
         this.router.navigate(['/']);
       })
     );
@@ -89,12 +116,17 @@ export class AuthService {
 
   clearUser(): void {
     this.currentUser.set(null);
+    this.stopRefreshTimer();
   }
 
   isAuthenticated(): boolean {
     return this.user() !== null;
   }
 
+  updateUser(user: User): void {
+    this.currentUser.set(user);
+  }
+
   isAdmin(): boolean {
     return this.user()?.isAdmin === true;
   }

apps/frontend/src/app/services/books.service.ts

@@ -4,7 +4,7 @@
  * @author Naomi Carrigan
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Observable } from 'rxjs';
 import { ApiService } from './api.service';
 import { Book, CreateBookDto, UpdateBookDto } from '@library/shared-types';
@@ -13,7 +13,8 @@ import { Book, CreateBookDto, UpdateBookDto } from '@library/shared-types';
   providedIn: 'root'
 })
 export class BooksService {
-  constructor(private api: ApiService) {}
+  private api = inject(ApiService);
+
 
   getAllBooks(): Observable<Book[]> {
     return this.api.get<Book[]>('/books');

apps/frontend/src/app/services/comment-report.service.ts

@@ -0,0 +1,50 @@
+/**
+ * @copyright NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+import { Injectable, inject } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { Observable } from 'rxjs';
+import type {
+  CommentReportWithDetails,
+  CreateCommentReportDto,
+  UpdateCommentReportDto,
+  ReportStatus,
+} from '@library/shared-types';
+import { environment } from '../../environments/environment';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class CommentReportService {
+  private readonly http = inject(HttpClient);
+  private readonly apiUrl = `${environment.apiUrl}/comment-reports`;
+
+  createReport(
+    dto: CreateCommentReportDto,
+  ): Observable<CommentReportWithDetails> {
+    return this.http.post<CommentReportWithDetails>(this.apiUrl, dto);
+  }
+
+  getAllReports(
+    status?: ReportStatus,
+  ): Observable<CommentReportWithDetails[]> {
+    const params: Record<string, string> = {};
+    if (status) {
+      params['status'] = status;
+    }
+    return this.http.get<CommentReportWithDetails[]>(this.apiUrl, { params });
+  }
+
+  getReportById(id: string): Observable<CommentReportWithDetails> {
+    return this.http.get<CommentReportWithDetails>(`${this.apiUrl}/${id}`);
+  }
+
+  updateReport(
+    id: string,
+    dto: UpdateCommentReportDto,
+  ): Observable<CommentReportWithDetails> {
+    return this.http.put<CommentReportWithDetails>(`${this.apiUrl}/${id}`, dto);
+  }
+}

apps/frontend/src/app/services/comments.service.ts

@@ -4,7 +4,7 @@
  * @author Naomi Carrigan
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Observable } from 'rxjs';
 import { ApiService } from './api.service';
 import { Comment, CreateCommentDto } from '@library/shared-types';
@@ -13,7 +13,8 @@ import { Comment, CreateCommentDto } from '@library/shared-types';
   providedIn: 'root'
 })
 export class CommentsService {
-  constructor(private api: ApiService) {}
+  private api = inject(ApiService);
+
 
   getCommentsForGame(gameId: string): Observable<Comment[]> {
     return this.api.get<Comment[]>(`/games/${gameId}/comments`);
@@ -110,4 +111,13 @@ export class CommentsService {
   updateCommentOnManga(mangaId: string, commentId: string, content: string): Observable<Comment> {
     return this.api.put<Comment>(`/manga/${mangaId}/comments/${commentId}`, { content });
   }
+
+  // Admin methods - work with comment ID directly
+  adminUpdateComment(commentId: string, content: string): Observable<Comment> {
+    return this.api.put<Comment>(`/comments/${commentId}`, { content });
+  }
+
+  adminDeleteComment(commentId: string): Observable<{ success: boolean }> {
+    return this.api.delete<{ success: boolean }>(`/comments/${commentId}`);
+  }
 }

apps/frontend/src/app/services/console-logger.service.ts

@@ -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

@@ -4,7 +4,7 @@
  * @author Naomi Carrigan
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Observable } from 'rxjs';
 import { ApiService } from './api.service';
 import { Game, CreateGameDto, UpdateGameDto } from '@library/shared-types';
@@ -13,7 +13,8 @@ import { Game, CreateGameDto, UpdateGameDto } from '@library/shared-types';
   providedIn: 'root'
 })
 export class GamesService {
-  constructor(private api: ApiService) {}
+  private api = inject(ApiService);
+
 
   getAllGames(): Observable<Game[]> {
     return this.api.get<Game[]>('/games');

apps/frontend/src/app/services/global-error-handler.service.ts

@@ -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/index.ts

@@ -9,3 +9,4 @@ export { AuthService } from './auth.service';
 export { BooksService } from './books.service';
 export { GamesService } from './games.service';
 export { MusicService } from './music.service';
+export { ReportService } from './report.service';

apps/frontend/src/app/services/leaderboard.service.ts

@@ -0,0 +1,58 @@
+/**
+ * @copyright 2026 NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+
+import { Injectable, inject } from '@angular/core';
+import { Observable } from 'rxjs';
+import type {
+  LeaderboardResponse,
+  SuggestionsLeaderboard,
+  LikesLeaderboard,
+  CommentsLeaderboard,
+  OverallLeaderboard,
+} from '@library/shared-types';
+import { ApiService } from './api.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class LeaderboardService {
+  private apiService = inject(ApiService);
+
+  /**
+   * Get all leaderboards at once.
+   */
+  getAllLeaderboards(limit = 25): Observable<LeaderboardResponse> {
+    return this.apiService.get<LeaderboardResponse>(`/leaderboard?limit=${limit}`);
+  }
+
+  /**
+   * Get top users by suggestions.
+   */
+  getTopSuggestions(limit = 25): Observable<SuggestionsLeaderboard[]> {
+    return this.apiService.get<SuggestionsLeaderboard[]>(`/leaderboard/suggestions?limit=${limit}`);
+  }
+
+  /**
+   * Get top users by likes.
+   */
+  getTopLikes(limit = 25): Observable<LikesLeaderboard[]> {
+    return this.apiService.get<LikesLeaderboard[]>(`/leaderboard/likes?limit=${limit}`);
+  }
+
+  /**
+   * Get top users by comments.
+   */
+  getTopComments(limit = 25): Observable<CommentsLeaderboard[]> {
+    return this.apiService.get<CommentsLeaderboard[]>(`/leaderboard/comments?limit=${limit}`);
+  }
+
+  /**
+   * Get overall leaderboard.
+   */
+  getOverallLeaderboard(limit = 25): Observable<OverallLeaderboard[]> {
+    return this.apiService.get<OverallLeaderboard[]>(`/leaderboard/overall?limit=${limit}`);
+  }
+}

apps/frontend/src/app/services/manga.service.ts

@@ -4,7 +4,7 @@
  * @author Naomi Carrigan
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Observable } from 'rxjs';
 import { ApiService } from './api.service';
 import { Manga, CreateMangaDto, UpdateMangaDto } from '@library/shared-types';
@@ -13,7 +13,8 @@ import { Manga, CreateMangaDto, UpdateMangaDto } from '@library/shared-types';
   providedIn: 'root'
 })
 export class MangaService {
-  constructor(private api: ApiService) {}
+  private api = inject(ApiService);
+
 
   getAllManga(): Observable<Manga[]> {
     return this.api.get<Manga[]>('/manga');

apps/frontend/src/app/services/music.service.ts

@@ -4,7 +4,7 @@
  * @author Naomi Carrigan
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Observable } from 'rxjs';
 import { ApiService } from './api.service';
 import { Music, CreateMusicDto, UpdateMusicDto } from '@library/shared-types';
@@ -13,7 +13,8 @@ import { Music, CreateMusicDto, UpdateMusicDto } from '@library/shared-types';
   providedIn: 'root'
 })
 export class MusicService {
-  constructor(private api: ApiService) {}
+  private api = inject(ApiService);
+
 
   getAllMusic(): Observable<Music[]> {
     return this.api.get<Music[]>('/music');

apps/frontend/src/app/services/report.service.ts

@@ -0,0 +1,74 @@
+/**
+ * @copyright 2026 NHCarrigan
+ * @license Naomi's Public License
+ * @author Naomi Carrigan
+ */
+
+import { Injectable, inject } from '@angular/core';
+import { Observable } from 'rxjs';
+import { ApiService } from './api.service';
+import type {
+  ProfileReportWithUsers,
+  CreateReportDto,
+  ReportStatus
+} from '@library/shared-types';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ReportService {
+  private api = inject(ApiService);
+
+  /**
+   * Create a new profile report.
+   *
+   * @param reportedUserId - The ID of the user being reported
+   * @param reason - The reason for the report
+   * @param details - Additional details about the report
+   * @returns Observable of the created report
+   */
+  createReport(reportedUserId: string, reason: string, details: string): Observable<ProfileReportWithUsers> {
+    const dto: CreateReportDto = {
+      reportedUserId,
+      reason: reason as CreateReportDto['reason'],
+      details
+    };
+    return this.api.post<ProfileReportWithUsers>('/reports', dto);
+  }
+
+  /**
+   * Get all reports (admin only). Optionally filter by status.
+   *
+   * @param status - Optional status to filter by
+   * @returns Observable of all matching reports
+   */
+  getAllReports(status?: ReportStatus): Observable<ProfileReportWithUsers[]> {
+    const url = status ? `/reports?status=${status}` : '/reports';
+    return this.api.get<ProfileReportWithUsers[]>(url);
+  }
+
+  /**
+   * Get a specific report by ID (admin only).
+   *
+   * @param id - The report ID
+   * @returns Observable of the report
+   */
+  getReportById(id: string): Observable<ProfileReportWithUsers> {
+    return this.api.get<ProfileReportWithUsers>(`/reports/${id}`);
+  }
+
+  /**
+   * Update a report's status and review notes (admin only).
+   *
+   * @param id - The report ID
+   * @param status - The new status
+   * @param reviewNotes - Optional review notes
+   * @returns Observable of the updated report
+   */
+  updateReport(id: string, status: ReportStatus, reviewNotes?: string): Observable<ProfileReportWithUsers> {
+    return this.api.put<ProfileReportWithUsers>(`/reports/${id}`, {
+      status,
+      reviewNotes
+    });
+  }
+}

apps/frontend/src/app/services/shows.service.ts

@@ -4,7 +4,7 @@
  * @author Naomi Carrigan
  */
 
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { Observable } from 'rxjs';
 import { ApiService } from './api.service';
 import { Show, CreateShowDto, UpdateShowDto } from '@library/shared-types';
@@ -13,7 +13,8 @@ import { Show, CreateShowDto, UpdateShowDto } from '@library/shared-types';
   providedIn: 'root'
 })
 export class ShowsService {
-  constructor(private api: ApiService) {}
+  private api = inject(ApiService);
+
 
   getAllShows(): Observable<Show[]> {
     return this.api.get<Show[]>('/shows');

apps/frontend/src/app/services/toast.service.ts

@@ -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);
+  }
+}

apps/frontend/src/app/services/user.service.ts

@@ -7,7 +7,53 @@
 import { Injectable, inject } from '@angular/core';
 import { Observable } from 'rxjs';
 import { ApiService } from './api.service';
-import { User } from '@library/shared-types';
+import { User, PrimaryBadge } from '@library/shared-types';
+
+export interface UserProfileResponse {
+  id: string;
+  username: string;
+  displayName?: string;
+  avatar?: string;
+  bio?: string;
+  slug?: string;
+  primaryBadge?: PrimaryBadge;
+  website?: string;
+  discordServer?: string;
+  bluesky?: string;
+  github?: string;
+  linkedin?: string;
+  twitch?: string;
+  youtube?: string;
+  achievementPoints: number;
+  badges: {
+    isStaff: boolean;
+    isMod: boolean;
+    isVip: boolean;
+    inDiscord: boolean;
+  };
+  stats: {
+    suggestionsCount: number;
+    suggestionsAcceptedCount: number;
+    likesCount: number;
+    commentsCount: number;
+  };
+  createdAt: Date;
+}
+
+export interface UpdateUserSettingsRequest {
+  slug?: string;
+  displayName?: string;
+  bio?: string;
+  profilePublic?: boolean;
+  primaryBadge?: PrimaryBadge;
+  website?: string;
+  discordServer?: string;
+  bluesky?: string;
+  github?: string;
+  linkedin?: string;
+  twitch?: string;
+  youtube?: string;
+}
 
 @Injectable({
   providedIn: 'root'
@@ -26,4 +72,24 @@ export class UserService {
   unbanUser(userId: string): Observable<User> {
     return this.api.post<User>(`/users/${userId}/unban`, {});
   }
+
+  getMe(): Observable<User> {
+    return this.api.get<User>('/users/me');
+  }
+
+  updateSettings(settings: UpdateUserSettingsRequest): Observable<User> {
+    return this.api.put<User>('/users/me', settings);
+  }
+
+  getProfile(identifier: string): Observable<UserProfileResponse> {
+    return this.api.get<UserProfileResponse>(`/users/profile/${identifier}`);
+  }
+
+  makeProfilePrivate(userId: string): Observable<User> {
+    return this.api.post<User>(`/users/${userId}/make-private`, {});
+  }
+
+  adminUpdateUser(userId: string, settings: UpdateUserSettingsRequest): Observable<User> {
+    return this.api.put<User>(`/users/${userId}`, settings);
+  }
 }