mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-11-22 13:10:29 +00:00
e3bf18f9a6
The invite notification links to /collections/:id, a list the invitee cannot read until they accept. The phone screen had no invite UI at all and showed "Start your first collection", and on desktop the rail with the invites is hidden below 1080px while the empty state had no way to open it. useCollections now recognises a route id that is a pending invite, keeps it out of the route sync and puts it first in the invites it hands out. The phone screen shows the pending invites as cards above the lists, and the desktop body shows them when the person has no lists of their own, or the one invite the route points at. Both reuse the existing invite strings. A route id that is neither a list nor an invite (declined, withdrawn, deleted) now drops back to /collections once the lists are in, instead of leaving the page on a list it cannot show. Refs #2645
101 lines
3.7 KiB
TypeScript
101 lines
3.7 KiB
TypeScript
import React from 'react'
|
|
import { Plus, Layers, Users, Upload } from 'lucide-react'
|
|
import type { Collection } from '@trek/shared'
|
|
import type { TranslationFn } from '../../types'
|
|
import { ALL_SAVED } from '../../store/collectionStore'
|
|
import type { ActiveCollectionId, IncomingCollectionInvite } from '../../store/collectionStore'
|
|
import CollectionInviteCard from './CollectionInviteCard'
|
|
|
|
interface ListsRailProps {
|
|
ownedLists: Collection[]
|
|
sharedLists: Collection[]
|
|
activeId: ActiveCollectionId
|
|
incomingInvites: IncomingCollectionInvite[]
|
|
onSelect: (id: ActiveCollectionId) => void
|
|
onNewList: () => void
|
|
/** Read a list file as a new list (#2198). */
|
|
onImportList: () => void
|
|
onAcceptInvite: (id: number) => void
|
|
onDeclineInvite: (id: number) => void
|
|
t: TranslationFn
|
|
}
|
|
|
|
function ListRow({ list, active, onSelect }: { list: Collection; active: boolean; onSelect: (id: number) => void }): React.ReactElement {
|
|
return (
|
|
<div className="col-row">
|
|
<button type="button" onClick={() => onSelect(list.id)} className={`col-row-btn${active ? ' on' : ''}`}>
|
|
<span className="dot" style={{ background: list.color || '#6366f1' }} />
|
|
<span className="nm">{list.name}</span>
|
|
<span className="ct">{list.place_count ?? 0}</span>
|
|
</button>
|
|
</div>
|
|
)
|
|
}
|
|
|
|
/**
|
|
* Left rail of the user's lists: "New list" and "Import list" actions, the "All saved" union
|
|
* pseudo-list, owned lists (colour dot + count), a shared section, and an
|
|
* incoming-invites block. Selecting a list makes it active; editing / deleting
|
|
* happens from the Edit button in the hero of the active list.
|
|
*/
|
|
export default function ListsRail(props: ListsRailProps): React.ReactElement {
|
|
const {
|
|
ownedLists, sharedLists, activeId, incomingInvites,
|
|
onSelect, onNewList, onImportList, onAcceptInvite, onDeclineInvite, t,
|
|
} = props
|
|
|
|
return (
|
|
<>
|
|
<div className="col-rail-newrow">
|
|
<button type="button" onClick={onNewList} className="col-rail-new">
|
|
<Plus size={16} /> {t('collections.newList')}
|
|
</button>
|
|
{/* Import sits beside New rather than in the hero: a file becomes a NEW
|
|
list, so it belongs where lists are made, not on the one open. */}
|
|
<button
|
|
type="button"
|
|
onClick={onImportList}
|
|
className="col-rail-new col-rail-import"
|
|
aria-label={t('collections.file.importButton')}
|
|
title={t('collections.file.importTitle')}
|
|
>
|
|
<Upload size={15} />
|
|
</button>
|
|
</div>
|
|
|
|
<div className="col-row">
|
|
<button type="button" onClick={() => onSelect(ALL_SAVED)} className={`col-row-btn${activeId === ALL_SAVED ? ' on' : ''}`}>
|
|
<span className="ico"><Layers size={16} /></span>
|
|
<span className="nm">{t('collections.allSaved')}</span>
|
|
</button>
|
|
</div>
|
|
|
|
{ownedLists.length > 0 && <div className="col-rail-sep" />}
|
|
{ownedLists.map(list => (
|
|
<ListRow key={list.id} list={list} active={activeId === list.id} onSelect={onSelect} />
|
|
))}
|
|
|
|
{sharedLists.length > 0 && (
|
|
<>
|
|
<div className="col-rail-label"><Users size={12} /> {t('collections.shared')}</div>
|
|
{sharedLists.map(list => (
|
|
<ListRow key={list.id} list={list} active={activeId === list.id} onSelect={onSelect} />
|
|
))}
|
|
</>
|
|
)}
|
|
|
|
{incomingInvites.length > 0 && (
|
|
<>
|
|
<div className="col-rail-label">
|
|
{t('collections.invites.title')}
|
|
<span className="badge">{incomingInvites.length}</span>
|
|
</div>
|
|
{incomingInvites.map(inv => (
|
|
<CollectionInviteCard key={inv.collection_id} invite={inv} onAccept={onAcceptInvite} onDecline={onDeclineInvite} t={t} />
|
|
))}
|
|
</>
|
|
)}
|
|
</>
|
|
)
|
|
}
|