Resolve merge conflicts: merge all Go backend and React frontend changes

web/src/types/index.ts

@@ -271,6 +271,27 @@ export interface NotifyProviderInfo {
   description: string
 }
 
+// ─── Play Profiles ──────────────────────────────────────────────────────────
+
+export interface PlayProfile {
+  id: string
+  user_id: string
+  name: string
+  is_default: boolean
+  content_rating_limit?: string
+  allow_adult: boolean
+  require_pin: boolean
+  preferred_subtitle_lang?: string
+  preferred_audio_lang?: string
+  autoplay_next: boolean
+  skip_intro: boolean
+  allowed_library_ids: string[]
+  total_watch_time: number
+  last_active_at?: string
+  created_at: string
+  updated_at: string
+}
+
 // Scheduler task config
 export interface SchedulerTaskConfig {
   id: string
@@ -322,3 +343,50 @@ export interface AuthTypeInfo {
   name: string
   description: string
 }
+
+// ─── History helpers ────────────────────────────────────────────────────────
+
+export interface HistoryItem {
+  id: string
+  user_id: string
+  media_id: string
+  position_ms: number
+  duration_ms: number
+  watched_at: string
+  completed: boolean
+  media?: Media
+}
+
+export interface HistoryStats {
+  total: number
+  completed: number
+  watched_ms: number
+  watched_hours: number
+  last_watched?: string
+}
+
+// ─── Discover ───────────────────────────────────────────────────────────────
+
+export interface DiscoverSection {
+  key: string
+  label: string
+}
+
+export interface DiscoverItem {
+  TMDbID?: number
+  Title?: string
+  Overview?: string
+  Rating?: number
+  Year?: number
+  PosterURL?: string
+  BackdropURL?: string
+  // Match struct (Go) is exported with capitalised JSON keys; the API
+  // returns lower-cased aliases below for convenience.
+  tmdb_id?: number
+  title?: string
+  overview?: string
+  rating?: number
+  year?: number
+  poster_url?: string
+  backdrop_url?: string
+}