login-user-settings #7

Merged
gpatti merged 2 commits from login-user-settings into main 2026-04-05 22:17:53 +00:00
11 changed files with 363 additions and 9 deletions
Showing only changes of commit 5b5503b7a6 - Show all commits

View File

@@ -0,0 +1,39 @@
import { NextRequest, NextResponse } from 'next/server'
import { requireAuth } from '@/lib/auth'
import { getUserSettings, updateUserSettings } from '@/lib/settings'
import type { UserSettings } from '@/types'
export async function GET(req: NextRequest) {
const auth = await requireAuth(req)
if (auth instanceof NextResponse) return auth
const settings = getUserSettings(auth.session.userId)
return NextResponse.json(settings)
}
export async function PUT(req: NextRequest) {
const auth = await requireAuth(req)
if (auth instanceof NextResponse) return auth
let body: unknown
try {
body = await req.json()
} catch {
return NextResponse.json({ error: 'Invalid JSON' }, { status: 400 })
}
const s = body as Record<string, unknown>
const boolFields: (keyof UserSettings)[] = [
'mixedAutoplay', 'mixedLoop', 'mixedMuted',
'moviesAutoplay', 'moviesLoop', 'moviesMuted',
'tvAutoplay', 'tvLoop', 'tvMuted',
]
for (const field of boolFields) {
if (typeof s[field] !== 'boolean') {
return NextResponse.json({ error: `Invalid value for ${field}` }, { status: 400 })
}
}
updateUserSettings(auth.session.userId, s as unknown as UserSettings)
return NextResponse.json({ ok: true })
}

View File

@@ -0,0 +1,136 @@
'use client'
import { useState } from 'react'
import type { UserSettings } from '@/types'
interface Props {
initialSettings: UserSettings
}
interface ToggleProps {
label: string
checked: boolean
onChange: (v: boolean) => void
}
function Toggle({ label, checked, onChange }: ToggleProps) {
return (
<label className="flex items-center justify-between py-2 cursor-pointer select-none">
<span className="text-sm" style={{ color: 'var(--text-primary)' }}>
{label}
</span>
<button
type="button"
role="switch"
aria-checked={checked}
onClick={() => onChange(!checked)}
className="relative w-10 h-6 rounded-full transition-colors flex-shrink-0"
style={{
backgroundColor: checked ? 'var(--accent)' : 'var(--border)',
}}
>
<span
className="absolute top-0.5 left-0.5 w-5 h-5 rounded-full bg-white shadow transition-transform"
style={{ transform: checked ? 'translateX(16px)' : 'translateX(0)' }}
/>
</button>
</label>
)
}
interface SectionProps {
title: string
icon: string
children: React.ReactNode
}
function SettingsSection({ title, icon, children }: SectionProps) {
return (
<div
className="rounded-xl p-5 mb-4"
style={{ backgroundColor: 'var(--surface)', border: '1px solid var(--border)' }}
>
<h2 className="text-sm font-semibold uppercase tracking-wider mb-3 flex items-center gap-2"
style={{ color: 'var(--text-secondary)' }}>
<span>{icon}</span>
{title}
</h2>
<div className="divide-y" style={{ borderColor: 'var(--border)' }}>
{children}
</div>
</div>
)
}
export default function SettingsForm({ initialSettings }: Props) {
const [settings, setSettings] = useState<UserSettings>(initialSettings)
const [saving, setSaving] = useState(false)
const [saved, setSaved] = useState(false)
const [error, setError] = useState<string | null>(null)
function set<K extends keyof UserSettings>(key: K, value: boolean) {
setSettings((prev) => ({ ...prev, [key]: value }))
setSaved(false)
}
async function handleSave() {
setSaving(true)
setError(null)
try {
const res = await fetch('/api/settings', {
method: 'PUT',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(settings),
})
if (!res.ok) throw new Error('Failed to save')
setSaved(true)
} catch {
setError('Failed to save settings. Please try again.')
} finally {
setSaving(false)
}
}
return (
<div className="max-w-md">
<SettingsSection title="Mixed Library" icon="🗂️">
<Toggle label="Autoplay" checked={settings.mixedAutoplay} onChange={(v) => set('mixedAutoplay', v)} />
<Toggle label="Loop" checked={settings.mixedLoop} onChange={(v) => set('mixedLoop', v)} />
<Toggle label="Start muted" checked={settings.mixedMuted} onChange={(v) => set('mixedMuted', v)} />
</SettingsSection>
<SettingsSection title="Movies" icon="🎬">
<Toggle label="Autoplay" checked={settings.moviesAutoplay} onChange={(v) => set('moviesAutoplay', v)} />
<Toggle label="Loop" checked={settings.moviesLoop} onChange={(v) => set('moviesLoop', v)} />
<Toggle label="Start muted" checked={settings.moviesMuted} onChange={(v) => set('moviesMuted', v)} />
</SettingsSection>
<SettingsSection title="TV Shows" icon="📺">
<Toggle label="Autoplay" checked={settings.tvAutoplay} onChange={(v) => set('tvAutoplay', v)} />
<Toggle label="Loop" checked={settings.tvLoop} onChange={(v) => set('tvLoop', v)} />
<Toggle label="Start muted" checked={settings.tvMuted} onChange={(v) => set('tvMuted', v)} />
</SettingsSection>
<div className="flex items-center gap-3 mt-2">
<button
onClick={handleSave}
disabled={saving}
className="px-4 py-2 rounded-lg text-sm font-medium transition-opacity"
style={{ backgroundColor: 'var(--accent)', color: '#fff', opacity: saving ? 0.6 : 1 }}
>
{saving ? 'Saving…' : 'Save Settings'}
</button>
{saved && (
<span className="text-sm" style={{ color: 'var(--text-secondary)' }}>
Saved
</span>
)}
{error && (
<span className="text-sm" style={{ color: '#ef4444' }}>
{error}
</span>
)}
</div>
</div>
)
}

27
src/app/settings/page.tsx Normal file
View File

@@ -0,0 +1,27 @@
import { redirect } from 'next/navigation'
import { getServerSession } from '@/lib/auth'
import { getUserSettings } from '@/lib/settings'
import SettingsForm from './SettingsForm'
export default async function SettingsPage() {
const session = await getServerSession()
if (!session.userId) redirect('/login')
const settings = getUserSettings(session.userId)
return (
<div className="p-6 max-w-2xl">
<h1 className="text-2xl font-semibold mb-1" style={{ color: 'var(--text-primary)' }}>
Settings
</h1>
<p className="text-sm mb-8" style={{ color: 'var(--text-secondary)' }}>
Signed in as <strong>{session.username}</strong>
</p>
<h2 className="text-base font-semibold mb-4" style={{ color: 'var(--text-primary)' }}>
Video Playback
</h2>
<SettingsForm initialSettings={settings} />
</div>
)
}

View File

@@ -1,6 +1,7 @@
'use client' 'use client'
import { useRouter } from 'next/navigation' import { useRouter } from 'next/navigation'
import Link from 'next/link'
import NavLink from './NavLink' import NavLink from './NavLink'
interface Props { interface Props {
@@ -20,9 +21,15 @@ export default function HeaderNav({ username, isAdmin }: Props) {
return ( return (
<div className="flex items-center gap-3"> <div className="flex items-center gap-3">
{isAdmin && <NavLink href="/manage">Manage</NavLink>} {isAdmin && <NavLink href="/manage">Manage</NavLink>}
<span className="text-sm" style={{ color: 'var(--text-secondary)' }}> <Link
href="/settings"
className="text-sm transition-colors"
style={{ color: 'var(--text-secondary)' }}
onMouseEnter={(e) => ((e.currentTarget as HTMLElement).style.color = 'var(--text-primary)')}
onMouseLeave={(e) => ((e.currentTarget as HTMLElement).style.color = 'var(--text-secondary)')}
>
{username} {username}
</span> </Link>
<button <button
onClick={handleLogout} onClick={handleLogout}
className="text-sm px-3 py-1.5 rounded-lg transition-colors" className="text-sm px-3 py-1.5 rounded-lg transition-colors"

View File

@@ -2,6 +2,7 @@
import { useEffect, useRef, useState } from 'react' import { useEffect, useRef, useState } from 'react'
import TagSelector from '@/components/tags/TagSelector' import TagSelector from '@/components/tags/TagSelector'
import { useUserSettings } from '@/hooks/useUserSettings'
interface Props { interface Props {
url: string url: string
@@ -9,9 +10,14 @@ interface Props {
onClose: () => void onClose: () => void
mediaKey?: string mediaKey?: string
onTagsChanged?: () => void onTagsChanged?: () => void
context?: 'mixed' | 'movies' | 'tv'
} }
export default function VideoPlayerModal({ url, name, onClose, mediaKey, onTagsChanged }: Props) { export default function VideoPlayerModal({ url, name, onClose, mediaKey, onTagsChanged, context = 'mixed' }: Props) {
const settings = useUserSettings()
const autoPlay = context === 'mixed' ? settings.mixedAutoplay : context === 'movies' ? settings.moviesAutoplay : settings.tvAutoplay
const loop = context === 'mixed' ? settings.mixedLoop : context === 'movies' ? settings.moviesLoop : settings.tvLoop
const muted = context === 'mixed' ? settings.mixedMuted : context === 'movies' ? settings.moviesMuted : settings.tvMuted
const overlayRef = useRef<HTMLDivElement>(null) const overlayRef = useRef<HTMLDivElement>(null)
const [showTags, setShowTags] = useState( const [showTags, setShowTags] = useState(
() => !!mediaKey && typeof window !== 'undefined' && window.innerWidth >= 1280 () => !!mediaKey && typeof window !== 'undefined' && window.innerWidth >= 1280
@@ -86,9 +92,9 @@ export default function VideoPlayerModal({ url, name, onClose, mediaKey, onTagsC
<video <video
src={url} src={url}
controls controls
autoPlay autoPlay={autoPlay}
muted muted={muted}
loop loop={loop}
className="w-full h-full object-contain rounded-lg" className="w-full h-full object-contain rounded-lg"
style={{ backgroundColor: '#000' }} style={{ backgroundColor: '#000' }}
onClick={(e) => e.stopPropagation()} onClick={(e) => e.stopPropagation()}
@@ -111,9 +117,9 @@ export default function VideoPlayerModal({ url, name, onClose, mediaKey, onTagsC
<video <video
src={url} src={url}
controls controls
autoPlay autoPlay={autoPlay}
muted muted={muted}
loop loop={loop}
className="w-full h-full max-w-4xl object-contain rounded-lg" className="w-full h-full max-w-4xl object-contain rounded-lg"
style={{ backgroundColor: '#000' }} style={{ backgroundColor: '#000' }}
onClick={(e) => e.stopPropagation()} onClick={(e) => e.stopPropagation()}

View File

@@ -72,6 +72,7 @@ export default function MovieDetailModal({ movie, libraryId, onClose, onTagsChan
mediaKey={`${libraryId}:${movie.id}`} mediaKey={`${libraryId}:${movie.id}`}
onTagsChanged={onTagsChanged} onTagsChanged={onTagsChanged}
onClose={() => setPlaying(false)} onClose={() => setPlaying(false)}
context="movies"
/> />
) )
} }

View File

@@ -142,6 +142,7 @@ export default function TvView({ libraryId }: Props) {
url={videoUrl} url={videoUrl}
name={playingEpisode.title} name={playingEpisode.title}
onClose={() => setPlayingEpisode(null)} onClose={() => setPlayingEpisode(null)}
context="tv"
/> />
) )
} }

View File

@@ -0,0 +1,31 @@
'use client'
import { useEffect, useState } from 'react'
import type { UserSettings } from '@/types'
const DEFAULTS: UserSettings = {
mixedAutoplay: true,
mixedLoop: true,
mixedMuted: true,
moviesAutoplay: true,
moviesLoop: false,
moviesMuted: false,
tvAutoplay: true,
tvLoop: false,
tvMuted: false,
}
export function useUserSettings(): UserSettings {
const [settings, setSettings] = useState<UserSettings>(DEFAULTS)
useEffect(() => {
fetch('/api/settings')
.then((r) => (r.ok ? r.json() : null))
.then((data: UserSettings | null) => {
if (data) setSettings(data)
})
.catch(() => {/* fall back to defaults */})
}, [])
return settings
}

View File

@@ -58,6 +58,19 @@ function initDb(db: Database.Database): void {
library_id TEXT NOT NULL REFERENCES libraries(id) ON DELETE CASCADE, library_id TEXT NOT NULL REFERENCES libraries(id) ON DELETE CASCADE,
PRIMARY KEY (user_id, library_id) PRIMARY KEY (user_id, library_id)
); );
CREATE TABLE IF NOT EXISTS user_settings (
user_id TEXT PRIMARY KEY REFERENCES users(id) ON DELETE CASCADE,
mixed_autoplay INTEGER NOT NULL DEFAULT 1,
mixed_loop INTEGER NOT NULL DEFAULT 1,
mixed_muted INTEGER NOT NULL DEFAULT 1,
movies_autoplay INTEGER NOT NULL DEFAULT 1,
movies_loop INTEGER NOT NULL DEFAULT 0,
movies_muted INTEGER NOT NULL DEFAULT 0,
tv_autoplay INTEGER NOT NULL DEFAULT 1,
tv_loop INTEGER NOT NULL DEFAULT 0,
tv_muted INTEGER NOT NULL DEFAULT 0
);
`) `)
migrateLibrariesType(db) migrateLibrariesType(db)

81
src/lib/settings.ts Normal file
View File

@@ -0,0 +1,81 @@
import { getDb } from './db'
import type { UserSettings } from '@/types'
const DEFAULTS: UserSettings = {
mixedAutoplay: true,
mixedLoop: true,
mixedMuted: true,
moviesAutoplay: true,
moviesLoop: false,
moviesMuted: false,
tvAutoplay: true,
tvLoop: false,
tvMuted: false,
}
interface SettingsRow {
mixed_autoplay: number
mixed_loop: number
mixed_muted: number
movies_autoplay: number
movies_loop: number
movies_muted: number
tv_autoplay: number
tv_loop: number
tv_muted: number
}
function rowToSettings(row: SettingsRow): UserSettings {
return {
mixedAutoplay: row.mixed_autoplay === 1,
mixedLoop: row.mixed_loop === 1,
mixedMuted: row.mixed_muted === 1,
moviesAutoplay: row.movies_autoplay === 1,
moviesLoop: row.movies_loop === 1,
moviesMuted: row.movies_muted === 1,
tvAutoplay: row.tv_autoplay === 1,
tvLoop: row.tv_loop === 1,
tvMuted: row.tv_muted === 1,
}
}
export function getUserSettings(userId: string): UserSettings {
const db = getDb()
const row = db
.prepare('SELECT * FROM user_settings WHERE user_id = ?')
.get(userId) as SettingsRow | undefined
return row ? rowToSettings(row) : { ...DEFAULTS }
}
export function updateUserSettings(userId: string, settings: UserSettings): void {
const db = getDb()
db.prepare(`
INSERT INTO user_settings (
user_id,
mixed_autoplay, mixed_loop, mixed_muted,
movies_autoplay, movies_loop, movies_muted,
tv_autoplay, tv_loop, tv_muted
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
ON CONFLICT(user_id) DO UPDATE SET
mixed_autoplay = excluded.mixed_autoplay,
mixed_loop = excluded.mixed_loop,
mixed_muted = excluded.mixed_muted,
movies_autoplay = excluded.movies_autoplay,
movies_loop = excluded.movies_loop,
movies_muted = excluded.movies_muted,
tv_autoplay = excluded.tv_autoplay,
tv_loop = excluded.tv_loop,
tv_muted = excluded.tv_muted
`).run(
userId,
settings.mixedAutoplay ? 1 : 0,
settings.mixedLoop ? 1 : 0,
settings.mixedMuted ? 1 : 0,
settings.moviesAutoplay ? 1 : 0,
settings.moviesLoop ? 1 : 0,
settings.moviesMuted ? 1 : 0,
settings.tvAutoplay ? 1 : 0,
settings.tvLoop ? 1 : 0,
settings.tvMuted ? 1 : 0,
)
}

View File

@@ -95,3 +95,15 @@ export interface Tag {
name: string name: string
categoryId: string categoryId: string
} }
export interface UserSettings {
mixedAutoplay: boolean
mixedLoop: boolean
mixedMuted: boolean
moviesAutoplay: boolean
moviesLoop: boolean
moviesMuted: boolean
tvAutoplay: boolean
tvLoop: boolean
tvMuted: boolean
}