mirror of
https://github.com/dergigi/boris.git
synced 2026-01-10 10:24:21 +01:00
- Merge settings load and subscription setup into single useEffect - Ensure settings are loaded immediately upon successful login - Set up watchSettings subscription at the same time as initial load - Add eventStore as dependency to ensure proper initialization - Improves timing and prevents race conditions
213 lines
7.8 KiB
TypeScript
213 lines
7.8 KiB
TypeScript
import React, { useState, useEffect } from 'react'
|
|
import { Hooks } from 'applesauce-react'
|
|
import { useEventStore } from 'applesauce-react/hooks'
|
|
import { RelayPool } from 'applesauce-relay'
|
|
import { EventFactory } from 'applesauce-factory'
|
|
import { Bookmark } from '../types/bookmarks'
|
|
import { Highlight } from '../types/highlights'
|
|
import { BookmarkList } from './BookmarkList'
|
|
import { fetchBookmarks } from '../services/bookmarkService'
|
|
import { fetchHighlights } from '../services/highlightService'
|
|
import ContentPanel from './ContentPanel'
|
|
import { HighlightsPanel } from './HighlightsPanel'
|
|
import { fetchReadableContent, ReadableContent } from '../services/readerService'
|
|
import Settings from './Settings'
|
|
import { UserSettings, loadSettings, saveSettings, watchSettings } from '../services/settingsService'
|
|
import { loadFont, getFontFamily } from '../utils/fontLoader'
|
|
export type ViewMode = 'compact' | 'cards' | 'large'
|
|
|
|
interface BookmarksProps {
|
|
relayPool: RelayPool | null
|
|
onLogout: () => void
|
|
}
|
|
|
|
const RELAY_URLS = [
|
|
'wss://relay.damus.io', 'wss://nos.lol', 'wss://relay.nostr.band',
|
|
'wss://relay.dergigi.com', 'wss://wot.dergigi.com'
|
|
]
|
|
|
|
const Bookmarks: React.FC<BookmarksProps> = ({ relayPool, onLogout }) => {
|
|
const [bookmarks, setBookmarks] = useState<Bookmark[]>([])
|
|
const [highlights, setHighlights] = useState<Highlight[]>([])
|
|
const [highlightsLoading, setHighlightsLoading] = useState(true)
|
|
const [selectedUrl, setSelectedUrl] = useState<string | undefined>(undefined)
|
|
const [readerLoading, setReaderLoading] = useState(false)
|
|
const [readerContent, setReaderContent] = useState<ReadableContent | undefined>(undefined)
|
|
const [isCollapsed, setIsCollapsed] = useState(false)
|
|
const [isHighlightsCollapsed, setIsHighlightsCollapsed] = useState(false)
|
|
const [viewMode, setViewMode] = useState<ViewMode>('compact')
|
|
const [showUnderlines, setShowUnderlines] = useState(true)
|
|
const [selectedHighlightId, setSelectedHighlightId] = useState<string | undefined>(undefined)
|
|
const [showSettings, setShowSettings] = useState(false)
|
|
const [settings, setSettings] = useState<UserSettings>({})
|
|
const [isSavingSettings, setIsSavingSettings] = useState(false)
|
|
const activeAccount = Hooks.useActiveAccount()
|
|
const accountManager = Hooks.useAccountManager()
|
|
const eventStore = useEventStore()
|
|
|
|
// Load initial data and set up settings subscription on login
|
|
useEffect(() => {
|
|
if (!relayPool || !activeAccount || !eventStore) return
|
|
|
|
// Fetch bookmarks and highlights
|
|
handleFetchBookmarks()
|
|
handleFetchHighlights()
|
|
|
|
// Load settings from Nostr and set up live subscription
|
|
handleLoadSettings()
|
|
|
|
const subscription = watchSettings(eventStore, activeAccount.pubkey, (loadedSettings) => {
|
|
if (loadedSettings) {
|
|
setSettings(loadedSettings)
|
|
}
|
|
})
|
|
|
|
return () => {
|
|
subscription.unsubscribe()
|
|
}
|
|
}, [relayPool, activeAccount?.pubkey, eventStore])
|
|
|
|
useEffect(() => {
|
|
const root = document.documentElement.style
|
|
if (settings.defaultViewMode) setViewMode(settings.defaultViewMode)
|
|
if (settings.showUnderlines !== undefined) setShowUnderlines(settings.showUnderlines)
|
|
if (settings.sidebarCollapsed !== undefined) setIsCollapsed(settings.sidebarCollapsed)
|
|
if (settings.highlightsCollapsed !== undefined) setIsHighlightsCollapsed(settings.highlightsCollapsed)
|
|
|
|
// Always set font variables (use defaults if not specified)
|
|
const fontKey = settings.readingFont || 'system'
|
|
if (fontKey !== 'system') loadFont(fontKey)
|
|
root.setProperty('--reading-font', getFontFamily(fontKey))
|
|
root.setProperty('--reading-font-size', `${settings.fontSize || 16}px`)
|
|
}, [settings])
|
|
|
|
const handleFetchBookmarks = async () => {
|
|
if (!relayPool || !activeAccount) return
|
|
const fullAccount = accountManager.getActive()
|
|
await fetchBookmarks(relayPool, fullAccount || activeAccount, setBookmarks)
|
|
}
|
|
|
|
const handleFetchHighlights = async () => {
|
|
if (!relayPool || !activeAccount) return
|
|
setHighlightsLoading(true)
|
|
try {
|
|
const fetchedHighlights = await fetchHighlights(relayPool, activeAccount.pubkey)
|
|
setHighlights(fetchedHighlights)
|
|
} catch (err) {
|
|
console.error('Failed to fetch highlights:', err)
|
|
} finally {
|
|
setHighlightsLoading(false)
|
|
}
|
|
}
|
|
|
|
const handleLoadSettings = async () => {
|
|
if (!relayPool || !activeAccount) return
|
|
try {
|
|
const loadedSettings = await loadSettings(relayPool, eventStore, activeAccount.pubkey, RELAY_URLS)
|
|
if (loadedSettings) {
|
|
setSettings(loadedSettings)
|
|
}
|
|
} catch (err) {
|
|
console.error('Failed to load settings:', err)
|
|
}
|
|
}
|
|
|
|
const handleSaveSettings = async (newSettings: UserSettings) => {
|
|
if (!relayPool || !activeAccount) return
|
|
setIsSavingSettings(true)
|
|
try {
|
|
const fullAccount = accountManager.getActive()
|
|
if (!fullAccount) throw new Error('No active account')
|
|
const factory = new EventFactory({ signer: fullAccount })
|
|
await saveSettings(relayPool, eventStore, factory, newSettings, RELAY_URLS)
|
|
setSettings(newSettings)
|
|
setShowSettings(false)
|
|
} catch (err) {
|
|
console.error('Failed to save settings:', err)
|
|
} finally {
|
|
setIsSavingSettings(false)
|
|
}
|
|
}
|
|
|
|
const handleSelectUrl = async (url: string) => {
|
|
setSelectedUrl(url)
|
|
setReaderLoading(true)
|
|
setReaderContent(undefined)
|
|
setShowSettings(false)
|
|
if (settings.collapseOnArticleOpen !== false) setIsCollapsed(true)
|
|
try {
|
|
const content = await fetchReadableContent(url)
|
|
setReaderContent(content)
|
|
} catch (err) {
|
|
console.warn('Failed to fetch readable content:', err)
|
|
} finally {
|
|
setReaderLoading(false)
|
|
}
|
|
}
|
|
|
|
return (
|
|
<>
|
|
<div className={`three-pane ${isCollapsed ? 'sidebar-collapsed' : ''} ${isHighlightsCollapsed ? 'highlights-collapsed' : ''}`}>
|
|
<div className="pane sidebar">
|
|
<BookmarkList
|
|
bookmarks={bookmarks}
|
|
onSelectUrl={handleSelectUrl}
|
|
isCollapsed={isCollapsed}
|
|
onToggleCollapse={() => setIsCollapsed(!isCollapsed)}
|
|
onLogout={onLogout}
|
|
viewMode={viewMode}
|
|
onViewModeChange={setViewMode}
|
|
selectedUrl={selectedUrl}
|
|
onOpenSettings={() => {
|
|
setShowSettings(true)
|
|
setIsCollapsed(true)
|
|
setIsHighlightsCollapsed(true)
|
|
}}
|
|
/>
|
|
</div>
|
|
<div className="pane main">
|
|
{showSettings ? (
|
|
<Settings
|
|
settings={settings}
|
|
onSave={handleSaveSettings}
|
|
onClose={() => setShowSettings(false)}
|
|
isSaving={isSavingSettings}
|
|
/>
|
|
) : (
|
|
<ContentPanel
|
|
loading={readerLoading}
|
|
title={readerContent?.title}
|
|
html={readerContent?.html}
|
|
markdown={readerContent?.markdown}
|
|
selectedUrl={selectedUrl}
|
|
highlights={highlights}
|
|
showUnderlines={showUnderlines}
|
|
onHighlightClick={(id) => {
|
|
setSelectedHighlightId(id)
|
|
if (isHighlightsCollapsed) setIsHighlightsCollapsed(false)
|
|
}}
|
|
selectedHighlightId={selectedHighlightId}
|
|
/>
|
|
)}
|
|
</div>
|
|
<div className="pane highlights">
|
|
<HighlightsPanel
|
|
highlights={highlights}
|
|
loading={highlightsLoading}
|
|
isCollapsed={isHighlightsCollapsed}
|
|
onToggleCollapse={() => setIsHighlightsCollapsed(!isHighlightsCollapsed)}
|
|
onSelectUrl={handleSelectUrl}
|
|
selectedUrl={selectedUrl}
|
|
onToggleUnderlines={setShowUnderlines}
|
|
selectedHighlightId={selectedHighlightId}
|
|
onRefresh={handleFetchHighlights}
|
|
onHighlightClick={setSelectedHighlightId}
|
|
/>
|
|
</div>
|
|
</div>
|
|
</>
|
|
)
|
|
}
|
|
|
|
export default Bookmarks
|