From 08ad305cc258769e0a07ece25c0c3a6fae0e9d5b Mon Sep 17 00:00:00 2001 From: "@s.roertgen" Date: Tue, 15 Apr 2025 15:11:21 +0200 Subject: [PATCH] Forking of boards, better routing, lots of other stuff --- src/lib/components/Board.svelte | 45 ++++++++++++++++---------- src/lib/components/BoardCard.svelte | 22 ++++++++++--- src/lib/components/Navbar.svelte | 17 ++++------ src/lib/db.js | 46 ++++++++++++++++++++++---- src/lib/ndk.js | 50 ++++++++++++++++++++++------- src/routes/+page.svelte | 41 +++++++++++++++++------ src/routes/board/[id]/+page.svelte | 8 ++--- 7 files changed, 165 insertions(+), 64 deletions(-) diff --git a/src/lib/components/Board.svelte b/src/lib/components/Board.svelte index 6747d0b..dd81375 100644 --- a/src/lib/components/Board.svelte +++ b/src/lib/components/Board.svelte @@ -4,10 +4,10 @@ import { dndzone } from 'svelte-dnd-action'; import AddColumnModal from './AddColumnModal.svelte'; import AddCardModal from './AddCardModal.svelte'; - import { cardsForColumn, columnsForBoard, selectedColumn, currentBoard } from '$lib/db'; - import { publishBoard, publishCards } from '$lib/ndk'; + import { cardsForColumn, columnsForBoard, selectedColumn, currentBoard, user } from '$lib/db'; + import { eventTitle, publishBoard, publishCards } from '$lib/ndk'; - export let boardId; + export let boardAddress; let addColumnModal; let addCardModal; @@ -23,7 +23,6 @@ col.items = cardsForColumn(col.id); return col; }); - $: console.log('items', items); const flipDurationMs = 200; @@ -62,8 +61,12 @@ } - - +
+

{eventTitle($currentBoard)}

+ {#if $user && $user.pubkey === $currentBoard.pubkey} + + {/if} +
{#each items as column (column.id)}
-
{column.dTag}
- -
- +
+
{column.dTag}
+ {#if $user && $user.pubkey === $currentBoard.pubkey} + + {/if} +
+
+ {#if $user && $user.pubkey === $currentBoard.pubkey} + + {/if}
- import { setBoard } from '$lib/db'; - import { eventTitle } from '$lib/ndk'; + import { setBoard, user, userBoards } from '$lib/db'; + import { eventTitle, forkBoard, deleteBoard } from '$lib/ndk'; export let board; -
+

{eventTitle(board)}

- setBoard(board)} href={`/board/${board.dTag}`} class="btn btn-primary" - >Open Board e.dTag).includes(board.dTag)} +

Already forked

+ {:else} + + {/if} + {/if} + setBoard(board)} + href={`/board/${board.tagAddress()}`} + class="btn btn-primary">Open Board + {#if $user && $userBoards.map((e) => e.dTag).includes(board.dTag)} + + {/if}
diff --git a/src/lib/components/Navbar.svelte b/src/lib/components/Navbar.svelte index 0e4c28e..c9a7c44 100644 --- a/src/lib/components/Navbar.svelte +++ b/src/lib/components/Navbar.svelte @@ -1,5 +1,5 @@ @@ -9,21 +9,18 @@
- +
- {#if $db.user} + {#if $user}
-
+
- Tailwind CSS Navbar component +
  • @@ -40,7 +37,7 @@ diff --git a/src/lib/db.js b/src/lib/db.js index 67e1977..7140eec 100644 --- a/src/lib/db.js +++ b/src/lib/db.js @@ -3,28 +3,39 @@ import NDK from '@nostr-dev-kit/ndk'; import { columnsDsFromBoard } from './ndk'; export const events = writable([]); + export const boards = derived(events, ($events) => { const allBoards = $events.filter((e) => e.kind === 30043); const deduped = deduplicateKeepMostRecent(allBoards); return deduped; }); -export const currentBoardId = writable(''); -export const currentBoard = derived(currentBoardId, ($currentBoardId) => { - return get(events).find((e) => e.dTag === $currentBoardId); +export const currentBoardAddress = writable(''); +export const currentBoard = derived(currentBoardAddress, ($currentBoardAddress) => { + console.log('looking for current board'); + const board = get(events).find((e) => e.tagAddress() === $currentBoardAddress); + console.log(board); + return board; }); export const columns = derived(events, ($events) => { const allColumns = $events.filter((e) => e.kind === 30044); const deduped = deduplicateKeepMostRecent(allColumns); - return deduped; + const sorted = deduped.sort((a, b) => { + return b.created_at - a.created_at; + }); + return sorted; }); export const columnsForBoard = derived( - [events, boards, columns, currentBoardId], - ([$events, $boards, $columns, $currentBoardId]) => { - let currentBoard = $boards.find((e) => e.dTag === $currentBoardId); + [events, boards, columns, currentBoardAddress], + ([$events, $boards, $columns, $currentBoardAddress]) => { + let currentBoard = $boards.find((e) => e.tagAddress() === $currentBoardAddress); + if (currentBoard === undefined) { + return []; + } let boardColumnIds = columnsDsFromBoard(currentBoard); const cols = boardColumnIds.map((d) => { return $columns.find((c) => c.tagAddress() === d); }); + if (cols.includes(undefined)) return []; return cols; } ); @@ -49,6 +60,13 @@ export const cardsForColumn = (columnId) => { } }; +export const user = writable(null); + +export const userBoards = derived([user, boards], ([$user, $boards]) => { + const newUserBoards = $boards.filter((b) => b.pubkey === $user.pubkey); + return newUserBoards; +}); + export const db = writable({ user: null, ndk: await initNDK(), @@ -60,6 +78,20 @@ async function initNDK() { explicitRelayUrls: ['ws://localhost:10547'] }); await ndk.connect(); + + const sub = ndk.subscribe({ kinds: [30043, 30044, 30045] }); // listen for boards, columns indexes + sub.on('event', async (event) => { + events.update((events) => [...events, event]); + }); + + const subDelete = ndk.subscribe({ kinds: [5] }); + subDelete.on('event', async (event) => { + const toBeDeletedDs = event.getMatchingTags('a').map((e) => e[1].split(':')[2]); + events.update((events) => { + return events.filter((e) => !toBeDeletedDs.includes(e.dTag)); + }); + }); + return ndk; } diff --git a/src/lib/ndk.js b/src/lib/ndk.js index 9d41fc7..6849078 100644 --- a/src/lib/ndk.js +++ b/src/lib/ndk.js @@ -1,6 +1,13 @@ import NDK, { NDKNip07Signer, NDKEvent } from '@nostr-dev-kit/ndk'; import { get } from 'svelte/store'; -import { db, events, currentBoardId, currentBoard, selectedColumn } from '$lib/db'; +import { + db, + events, + currentBoardAddress, + currentBoard, + selectedColumn, + user as userStore +} from '$lib/db'; export async function login(method) { const nip07signer = new NDKNip07Signer(); @@ -11,6 +18,8 @@ export async function login(method) { case 'browser-extension': { console.log('login with extension'); const user = await nip07signer.user(); + userStore.set(user); + console.log('user', user); db.update((db) => { return { ...db, ndk, user }; }); @@ -28,17 +37,21 @@ export function addBoard(board) { export async function addColumn(column) { const ndk = get(db).ndk; + const user = get(userStore); const columnEvent = new NDKEvent(ndk, { kind: 30044, content: 'Column Event' }); columnEvent.tags = [['title', column.title]]; await columnEvent.publish(); // add column to Board - const existingBoard = await ndk.fetchEvent({ - kinds: [30043], - authors: [columnEvent.pubkey], - '#d': [get(currentBoardId)] - }); - existingBoard.tags.push(['a', `30044:${columnEvent.pubkey}:${columnEvent.dTag}`]); + const boardD = get(currentBoard).dTag; + console.log('board dtag', boardD); + // const existingBoard = await ndk.fetchEvent({ + // kinds: [30043], + // authors: [user.pubkey], + // '#d': [get(currentBoard).dTag] + // }); + const existingBoard = new NDKEvent(ndk, get(currentBoard)); + existingBoard.tags.push(['a', `30044:${user.pubkey}:${columnEvent.dTag}`]); existingBoard.publishReplaceable(); } @@ -49,7 +62,7 @@ export async function addCard(card) { const columnEvent = await ndk.fetchEvent({ kinds: [30044], - authors: [cardEvent.pubkey], + // authors: [cardEvent.pubkey], '#d': [get(selectedColumn)] }); columnEvent.tags.push(['a', `${cardEvent.kind}:${cardEvent.pubkey}:${cardEvent.dTag}`]); @@ -126,8 +139,8 @@ export async function publishBoard(board) { const ndk = get(db).ndk; const existingBoard = await ndk.fetchEvent({ kinds: [30043], - authors: [board.pubkey], - '#d': [get(currentBoardId)] + // authors: [board.pubkey], + '#d': [get(currentBoardAddress)] }); const columnIds = board.items.map((e) => e.dTag); let tags = existingBoard.tags.filter((t) => t[0] !== 'a'); @@ -142,7 +155,7 @@ export async function publishCards(column) { const ndk = get(db).ndk; const existingColumn = await ndk.fetchEvent({ kinds: [30044], - authors: [column.pubkey], + // authors: [column.pubkey], ids: [column.id] }); const cardIds = column.items.map((e) => e.dTag); @@ -153,3 +166,18 @@ export async function publishCards(column) { existingColumn.tags = tags; existingColumn.publishReplaceable(); } + +export async function forkBoard(board) { + const ndk = get(db).ndk; + const userBoard = new NDKEvent(ndk, { + kind: board.kind, + content: board.content, + tags: board.tags + }); + userBoard.publish(); +} + +export async function deleteBoard(board) { + const ndk = get(db).ndk; + const deletionEvent = await new NDKEvent(ndk, board).delete('user said so', true); +} diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 8b21b7f..94dbbc6 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,6 +1,6 @@ - +
    + +
    -

    Boards

    -{#if $boards.length > 0} -
    - {#each $boards as board (board.id)} - - {/each} -
    -{/if} +
    + {#if $user} +

    Your Boards

    +
    + {#key $userBoards} + {#each $userBoards as board (board.id)} + + {/each} + {/key} +
    + {/if} + + {#if $boards.length > 0} +

    Alle Boards

    +
    + {#if $user} + {#each $boards.filter((e) => e.pubkey !== $user.pubkey) as board (board.id)} + + {/each} + {:else} + {#each $boards as board (board.id)} + + {/each} + {/if} +
    + {/if} +
    diff --git a/src/routes/board/[id]/+page.svelte b/src/routes/board/[id]/+page.svelte index 4e69d1d..ed093ea 100644 --- a/src/routes/board/[id]/+page.svelte +++ b/src/routes/board/[id]/+page.svelte @@ -1,10 +1,10 @@ - +