john-okeefe
a075a5061f
Apply the new design-system primitives across the remaining pages so the whole app shares one visual language: - Auth/entry: redesigned index, login, register (centered card layout, SVG icons, semantic tokens) - Admin: sidebar nav with icons, cohesive admin dashboard/users/library/ processing-issues/settings (tables use border-line + hover states; scan/websocket attributes preserved) - Secondary: analytics (stat cards), devices, progress, conflicts, queue, profile + form/modal all migrated to .card/.btn/.input primitives and SVG action icons - Docs + API explorer + setup wizard + collection/rules/modals + unlinked books + book-detail modals: consistent chrome, modal scrims use --surface-overlay, close buttons use icon-btn - reader.templ and error.templ intentionally left unchanged
243 lines
10 KiB
Templ
243 lines
10 KiB
Templ
package templates
|
|
|
|
import "bookhoard/internal/handlers"
|
|
|
|
templ Conflicts(user User, conflicts []handlers.ConflictDetailResponse, total int, unresolved int, errorMessage string) {
|
|
<!DOCTYPE html>
|
|
<html lang="en">
|
|
<head>
|
|
<meta charset="UTF-8"/>
|
|
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
|
|
<title>Sync Conflicts - Bookhoard</title>
|
|
<script src="/static/htmx.min.js"></script>
|
|
<link href="/static/style.css" rel="stylesheet"/>
|
|
</head>
|
|
<body x-data="conflicts" class="theme-{ user.Theme }">
|
|
@Header(user, "/conflicts")
|
|
<div class="w-full px-4 sm:px-6 lg:px-8 py-8">
|
|
<div class="mb-8">
|
|
<div class="flex justify-between items-center">
|
|
<div>
|
|
<h1 class="text-2xl font-bold tracking-tight text-content">Sync Conflicts</h1>
|
|
<p class="text-content-muted">Resolve conflicts when reading progress differs across devices</p>
|
|
</div>
|
|
<div class="flex space-x-3">
|
|
<select
|
|
id="status-filter"
|
|
onchange="filterConflicts()"
|
|
class="input w-auto"
|
|
>
|
|
<option value="unresolved">Unresolved Only</option>
|
|
<option value="all">All Conflicts</option>
|
|
<option value="resolved">Resolved Only</option>
|
|
</select>
|
|
<button @click="dismissAllResolved()" class="btn btn-secondary">
|
|
Dismiss All Resolved
|
|
</button>
|
|
</div>
|
|
</div>
|
|
<div id="stats-bar" class="mt-4 flex space-x-6 text-sm">
|
|
<span class="text-content-muted">Total: <strong class="text-content">{ total }</strong></span>
|
|
<span class="text-content-muted">Unresolved: <strong class="text-warning">{ unresolved }</strong></span>
|
|
<span class="text-content-muted">Resolved: <strong class="text-success">{ total - unresolved }</strong></span>
|
|
</div>
|
|
<div id="bulk-actions" class="mt-4 hidden">
|
|
<div class="card p-4 flex items-center justify-between">
|
|
<div class="flex items-center space-x-4">
|
|
<span class="text-sm font-semibold text-content">
|
|
<span id="selected-count">0</span> conflicts selected
|
|
</span>
|
|
<select
|
|
id="bulk-strategy"
|
|
class="input w-auto text-sm"
|
|
>
|
|
<option value="most_recent">Most Recent</option>
|
|
<option value="highest_progress">Highest Progress</option>
|
|
</select>
|
|
</div>
|
|
<div class="flex space-x-2">
|
|
<button @click="bulkResolve()" class="btn btn-primary text-sm">
|
|
@Icon("check", "h-4 w-4")
|
|
Resolve Selected
|
|
</button>
|
|
<button @click="bulkDismiss()" class="btn btn-danger text-sm">
|
|
@Icon("x-circle", "h-4 w-4")
|
|
Dismiss Selected
|
|
</button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div id="loading" class="hidden text-center py-16 text-content-muted">
|
|
<div class="loading-spinner mx-auto mb-4"></div>
|
|
<p>Loading conflicts...</p>
|
|
</div>
|
|
<div id="empty-state" class="hidden text-center py-16 text-content-muted">
|
|
<div class="mx-auto mb-4 flex h-14 w-14 items-center justify-center rounded-full bg-brand/15 text-success">
|
|
@Icon("check-circle", "h-7 w-7")
|
|
</div>
|
|
<h3 class="text-xl font-semibold mb-2 text-content">No Conflicts</h3>
|
|
<p>Your devices are in sync! No conflicts to resolve.</p>
|
|
</div>
|
|
<div id="conflicts-list" class="space-y-6">
|
|
<div id="select-all-container" class="mb-4 hidden">
|
|
<label class="flex items-center space-x-2 cursor-pointer">
|
|
<input type="checkbox" id="select-all-conflicts" class="w-5 h-5 rounded" onchange="toggleAllConflicts()"/>
|
|
<span class="text-sm font-semibold text-content">Select All</span>
|
|
</label>
|
|
</div>
|
|
if len(conflicts) == 0 {
|
|
<div class="text-center py-16 text-content-muted">
|
|
<div class="mx-auto mb-4 flex h-14 w-14 items-center justify-center rounded-full bg-brand/15 text-success">
|
|
@Icon("check-circle", "h-7 w-7")
|
|
</div>
|
|
<h3 class="text-xl font-semibold mb-2 text-content">No Conflicts</h3>
|
|
<p>Your devices are in sync! No conflicts to resolve.</p>
|
|
</div>
|
|
}
|
|
for _, conflict := range conflicts {
|
|
<div class="conflict-item card p-6 border-l-4 border-l-warning" data-conflict-id="{ conflict.ID }">
|
|
<div class="flex justify-between items-start mb-4">
|
|
<div class="flex items-start space-x-4">
|
|
<input
|
|
type="checkbox"
|
|
class="conflict-checkbox w-5 h-5 rounded mt-1"
|
|
data-conflict-id="{ conflict.ID }"
|
|
onchange="updateBulkActions()"
|
|
/>
|
|
<div>
|
|
<h3 class="text-lg font-semibold text-content">{ conflict.MediaItemTitle }</h3>
|
|
<p class="text-sm text-content-muted">Type: { conflict.ConflictType }</p>
|
|
</div>
|
|
</div>
|
|
<button @click="showResolveModal('{ conflict.ID }')" class="btn btn-primary">
|
|
Resolve
|
|
</button>
|
|
</div>
|
|
<div class="text-sm text-content-muted">
|
|
Created: { FormatInTimezone(conflict.CreatedAt, user.Timezone) }
|
|
if conflict.ResolvedBy != "" {
|
|
| Resolved by: { conflict.ResolvedBy }
|
|
}
|
|
</div>
|
|
</div>
|
|
}
|
|
</div>
|
|
<div id="conflict-modal" class="hidden fixed inset-0 z-50 flex items-center justify-center overflow-y-auto" style="background-color: var(--surface-overlay);">
|
|
<div class="card p-6 w-full max-w-4xl mx-4 my-8">
|
|
<div class="flex justify-between items-center mb-6">
|
|
<div>
|
|
<h2 class="text-2xl font-bold tracking-tight text-content">Resolve Conflict</h2>
|
|
<p id="conflict-book-title" class="text-sm text-content-muted">Book Title</p>
|
|
</div>
|
|
<button @click="hideResolveModal()" class="icon-btn" aria-label="Close">
|
|
@Icon("close", "h-5 w-5")
|
|
</button>
|
|
</div>
|
|
<form id="conflict-resolution-form" @submit="handleResolveSubmit($event)">
|
|
<input type="hidden" id="conflict-id"/>
|
|
<div id="conflict-details" class="mb-6"></div>
|
|
<div class="card p-4 mb-6 bg-surface">
|
|
<h3 class="font-semibold mb-4 text-content">Resolution Options</h3>
|
|
<div class="space-y-3 mb-6">
|
|
<label class="flex items-center p-3 border border-line rounded-lg cursor-pointer hover:bg-surface-hover">
|
|
<input type="radio" name="winner" value="koreader" class="mr-3" required/>
|
|
<div class="flex-1">
|
|
<span class="font-semibold text-content">Keep KOReader Progress</span>
|
|
<p class="text-xs text-content-muted">Use progress from your KOReader device</p>
|
|
</div>
|
|
</label>
|
|
<label class="flex items-center p-3 border border-line rounded-lg cursor-pointer hover:bg-surface-hover">
|
|
<input type="radio" name="winner" value="kobo" class="mr-3"/>
|
|
<div class="flex-1">
|
|
<span class="font-semibold text-content">Keep Kobo Progress</span>
|
|
<p class="text-xs text-content-muted">Use progress from your Kobo device</p>
|
|
</div>
|
|
</label>
|
|
<label class="flex items-center p-3 border border-line rounded-lg cursor-pointer hover:bg-surface-hover">
|
|
<input type="radio" name="winner" value="web" class="mr-3"/>
|
|
<div class="flex-1">
|
|
<span class="font-semibold text-content">Keep Web Progress</span>
|
|
<p class="text-xs text-content-muted">Use progress from the web interface</p>
|
|
</div>
|
|
</label>
|
|
<label class="flex items-center p-3 border border-line rounded-lg cursor-pointer hover:bg-surface-hover">
|
|
<input type="radio" name="winner" value="manual" class="mr-3"/>
|
|
<div class="flex-1">
|
|
<span class="font-semibold text-content">Manual Override</span>
|
|
<p class="text-xs text-content-muted">Specify a custom progress value</p>
|
|
</div>
|
|
</label>
|
|
</div>
|
|
<div id="manual-override" class="hidden mb-4 p-4 border border-line rounded-lg bg-surface-raised">
|
|
<h4 class="font-semibold mb-3 text-content">Manual Progress</h4>
|
|
<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
|
|
<div>
|
|
<label class="mb-1.5 block text-xs font-semibold uppercase tracking-wide text-content-muted">Percentage (0-100)</label>
|
|
<input
|
|
type="number"
|
|
id="manual-percentage"
|
|
min="0"
|
|
max="100"
|
|
step="0.01"
|
|
class="input"
|
|
/>
|
|
</div>
|
|
<div>
|
|
<label class="mb-1.5 block text-xs font-semibold uppercase tracking-wide text-content-muted">Page Number</label>
|
|
<input
|
|
type="number"
|
|
id="manual-page"
|
|
min="1"
|
|
class="input"
|
|
/>
|
|
</div>
|
|
<div>
|
|
<label class="mb-1.5 block text-xs font-semibold uppercase tracking-wide text-content-muted">EPUB CFI</label>
|
|
<input
|
|
type="text"
|
|
id="manual-epubcfi"
|
|
class="input"
|
|
/>
|
|
</div>
|
|
<div>
|
|
<label class="mb-1.5 block text-xs font-semibold uppercase tracking-wide text-content-muted">Chapter</label>
|
|
<input
|
|
type="number"
|
|
id="manual-chapter"
|
|
min="1"
|
|
class="input"
|
|
/>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="mb-6">
|
|
<label class="flex items-center space-x-3 cursor-pointer">
|
|
<input type="checkbox" id="apply-to-all" class="w-5 h-5 rounded"/>
|
|
<span class="text-content">Apply this resolution to all future conflicts</span>
|
|
</label>
|
|
</div>
|
|
<div class="mb-6">
|
|
<label class="mb-1.5 block text-xs font-semibold uppercase tracking-wide text-content-muted">Resolution Reason (optional)</label>
|
|
<input
|
|
type="text"
|
|
id="resolution-reason"
|
|
class="input"
|
|
placeholder="e.g., Device was offline, using most recent progress"
|
|
/>
|
|
</div>
|
|
</div>
|
|
<div class="flex justify-end space-x-3">
|
|
<button type="button" @click="hideResolveModal()" class="btn btn-secondary">Cancel</button>
|
|
<button type="button" @click="deleteConflict()" class="btn btn-danger">Dismiss</button>
|
|
<button type="submit" class="btn btn-primary">Resolve Conflict</button>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@ErrorToast(errorMessage)
|
|
</body>
|
|
</html>
|
|
}
|