nostr
/
lume
mirror of https://github.com/luminous-devs/lume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: add global column

This commit is contained in:
reya 2024-01-31 09:12:26 +07:00
parent 02e0309a41
commit ad488ff72d
13 changed files with 333 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/desktop/package.json
View File

@ -10,6 +10,7 @@
"@columns/antenas": "workspace:^",
"@columns/default": "workspace:^",
"@columns/foryou": "workspace:^",
"@columns/global": "workspace:^",
"@columns/group": "workspace:^",
"@columns/hashtag": "workspace:^",
"@columns/thread": "workspace:^",

BIN
apps/desktop/public/columns/global.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 119 KiB

BIN
apps/desktop/public/columns/global@2x.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 448 KiB

3
apps/desktop/src/routes/home/index.tsx
View File

@ -1,6 +1,7 @@
import { Antenas } from "@columns/antenas";
import { Default } from "@columns/default";
import { ForYou } from "@columns/foryou";
import { Global } from "@columns/global";
import { Group } from "@columns/group";
import { Hashtag } from "@columns/hashtag";
import { Thread } from "@columns/thread";
@ -46,6 +47,8 @@ export function HomeScreen() {
return <Group key={column.id} column={column} />;
case COL_TYPES.antenas:
return <Antenas key={column.id} column={column} />;
case COL_TYPES.global:
return <Global key={column.id} column={column} />;
case COL_TYPES.trendingNotes:
return <TrendingNotes key={column.id} column={column} />;
default:

33
packages/lume-column-default/src/index.tsx
View File

@ -115,6 +115,39 @@ export function Default({ column }: { column: IColumn }) {
</button>
</div>
</div>
<div className="flex flex-col rounded-xl overflow-hidden bg-neutral-50 dark:bg-neutral-950 ring-1 ring-neutral-100 dark:ring-neutral-900">
<div className="h-[100px] w-full px-3 pt-3">
<img
src="/columns/global.jpg"
srcSet="/columns/global@2x.jpg 2x"
alt="global"
loading="lazy"
decoding="async"
className="w-full h-auto object-cover rounded-lg"
/>
</div>
<div className="h-16 shrink-0 px-3 flex items-center justify-between">
<div>
<h1 className="font-semibold">Global</h1>
<p className="max-w-[18rem] truncate text-sm text-neutral-600 dark:text-neutral-500">
All things around the world
</p>
</div>
<button
type="button"
onClick={() => {
addColumn({
kind: COL_TYPES.global,
title: "",
content: "",
});
}}
className="shrink-0 w-16 h-8 rounded-lg text-sm font-semibold bg-neutral-100 dark:bg-neutral-900 text-blue-500 hover:bg-neutral-200 dark:hover:bg-neutral-800 inline-flex items-center justify-center"
>
Add
</button>
</div>
</div>
</div>
</Column.Root>
);

26
packages/lume-column-global/package.json Normal file
View File

@ -0,0 +1,26 @@
{
"name": "@columns/global",
"version": "0.0.0",
"private": true,
"main": "./src/index.tsx",
"dependencies": {
"@lume/ark": "workspace:^",
"@lume/icons": "workspace:^",
"@lume/ui": "workspace:^",
"@lume/utils": "workspace:^",
"@nostr-dev-kit/ndk": "^2.3.3",
"@tanstack/react-query": "^5.17.19",
"react": "^18.2.0",
"react-router-dom": "^6.21.3",
"sonner": "^1.4.0",
"virtua": "^0.23.0"
},
"devDependencies": {
"@lume/tailwindcss": "workspace:^",
"@lume/tsconfig": "workspace:^",
"@lume/types": "workspace:^",
"@types/react": "^18.2.48",
"tailwind": "^4.0.0",
"typescript": "^5.3.3"
}
}

126
packages/lume-column-global/src/home.tsx Normal file
View File

@ -0,0 +1,126 @@
import { RepostNote, TextNote, useArk } from "@lume/ark";
import { ArrowRightCircleIcon, LoaderIcon, SearchIcon } from "@lume/icons";
import { EmptyFeed } from "@lume/ui";
import { FETCH_LIMIT } from "@lume/utils";
import { type NDKEvent, NDKKind } from "@nostr-dev-kit/ndk";
import { useInfiniteQuery } from "@tanstack/react-query";
import { useEffect, useMemo, useRef } from "react";
import { Link } from "react-router-dom";
import { CacheSnapshot, VList, VListHandle } from "virtua";
export function HomeRoute({ colKey }: { colKey: string }) {
const ark = useArk();
const ref = useRef<VListHandle>();
const cacheKey = `${colKey}-vlist`;
const [offset, cache] = useMemo(() => {
const serialized = sessionStorage.getItem(cacheKey);
if (!serialized) return [];
return JSON.parse(serialized) as [number, CacheSnapshot];
}, []);
const { data, hasNextPage, isLoading, isFetchingNextPage, fetchNextPage } =
useInfiniteQuery({
queryKey: [colKey],
initialPageParam: 0,
queryFn: async ({
signal,
pageParam,
}: {
signal: AbortSignal;
pageParam: number;
}) => {
if (!ark.account.contacts.length) return [];
const events = await ark.getInfiniteEvents({
filter: {
kinds: [NDKKind.Text, NDKKind.Repost],
},
limit: FETCH_LIMIT,
pageParam,
signal,
});
return events;
},
getNextPageParam: (lastPage) => {
const lastEvent = lastPage.at(-1);
if (!lastEvent) return;
return lastEvent.created_at - 1;
},
select: (data) => data?.pages.flatMap((page) => page),
refetchOnWindowFocus: false,
refetchOnMount: false,
});
const renderItem = (event: NDKEvent) => {
switch (event.kind) {
case NDKKind.Text:
return <TextNote key={event.id} event={event} className="mt-3" />;
case NDKKind.Repost:
return <RepostNote key={event.id} event={event} className="mt-3" />;
default:
return <TextNote key={event.id} event={event} className="mt-3" />;
}
};
useEffect(() => {
if (!ref.current) return;
const handle = ref.current;
if (offset) {
handle.scrollTo(offset);
}
return () => {
sessionStorage.setItem(
cacheKey,
JSON.stringify([handle.scrollOffset, handle.cache]),
);
};
}, []);
return (
<div className="w-full h-full">
<VList ref={ref} cache={cache} overscan={2} className="flex-1 px-3">
{isLoading ? (
<div className="w-full flex h-16 items-center justify-center gap-2 px-3 py-1.5">
<LoaderIcon className="size-5 animate-spin" />
</div>
) : !data.length ? (
<div className="px-3 mt-3">
<EmptyFeed />
<Link
to="/suggest"
className="mt-3 w-full gap-2 inline-flex items-center justify-center text-sm font-medium rounded-lg h-9 bg-blue-500 hover:bg-blue-600 text-white"
>
<SearchIcon className="size-5" />
Find accounts to follow
</Link>
</div>
) : (
data.map((item) => renderItem(item))
)}
<div className="flex items-center justify-center h-16">
{hasNextPage ? (
<button
type="button"
onClick={() => fetchNextPage()}
disabled={!hasNextPage || isFetchingNextPage}
className="inline-flex items-center justify-center w-full h-12 gap-2 font-medium bg-neutral-100 hover:bg-neutral-200 dark:bg-neutral-900 dark:hover:bg-neutral-800 rounded-xl focus:outline-none"
>
{isFetchingNextPage ? (
<LoaderIcon className="size-5 animate-spin" />
) : (
<>
<ArrowRightCircleIcon className="size-5" />
Load more
</>
)}
</button>
) : null}
</div>
</VList>
</div>
);
}

19
packages/lume-column-global/src/index.tsx Normal file
View File

@ -0,0 +1,19 @@
import { Column } from "@lume/ark";
import { IColumn } from "@lume/types";
import { EventRoute, UserRoute } from "@lume/ui";
import { HomeRoute } from "./home";
export function Global({ column }: { column: IColumn }) {
const colKey = `global-${column.id}`;
return (
<Column.Root>
<Column.Header id={column.id} queryKey={[colKey]} title="Global" />
<Column.Content>
<Column.Route path="/" element={<HomeRoute colKey={colKey} />} />
<Column.Route path="/events/:id" element={<EventRoute />} />
<Column.Route path="/users/:id" element={<UserRoute />} />
</Column.Content>
</Column.Root>
);
}

8
packages/lume-column-global/tailwind.config.js Normal file
View File

@ -0,0 +1,8 @@
import sharedConfig from "@lume/tailwindcss";
const config = {
content: ["./src/**/*.{js,ts,jsx,tsx}"],
presets: [sharedConfig],
};
export default config;

8
packages/lume-column-global/tsconfig.json Normal file
View File

@ -0,0 +1,8 @@
{
"extends": "@lume/tsconfig/base.json",
"compilerOptions": {
"outDir": "dist"
},
"include": ["src"],
"exclude": ["node_modules", "dist"]
}

3
packages/lume-column-timeline/src/home.tsx
View File

@ -3,7 +3,7 @@ import { ArrowRightCircleIcon, LoaderIcon, SearchIcon } from "@lume/icons";
import { EmptyFeed } from "@lume/ui";
import { FETCH_LIMIT } from "@lume/utils";
import { NDKEvent, NDKKind } from "@nostr-dev-kit/ndk";
import { useInfiniteQuery, useQueryClient } from "@tanstack/react-query";
import { useInfiniteQuery } from "@tanstack/react-query";
import { useEffect, useMemo, useRef } from "react";
import { Link } from "react-router-dom";
import { CacheSnapshot, VList, VListHandle } from "virtua";
@ -12,7 +12,6 @@ export function HomeRoute({ colKey }: { colKey: string }) {
const ark = useArk();
const ref = useRef<VListHandle>();
const cacheKey = `${colKey}-vlist`;
const queryClient = useQueryClient();
const [offset, cache] = useMemo(() => {
const serialized = sessionStorage.getItem(cacheKey);

1
packages/utils/src/constants.ts
View File

@ -57,6 +57,7 @@ export const COL_TYPES = {
hashtag: 3,
group: 4,
antenas: 5,
global: 6,
trendingNotes: 9000,
foryou: 9998,
newsfeed: 9999,

107
pnpm-lock.yaml
View File

@ -72,6 +72,9 @@ importers:
'@columns/foryou':
specifier: workspace:^
version: link:../../packages/lume-column-foryou
'@columns/global':
specifier: workspace:^
version: link:../../packages/lume-column-global
'@columns/group':
specifier: workspace:^
version: link:../../packages/lume-column-group
@ -593,6 +596,58 @@ importers:
specifier: ^5.3.3
version: 5.3.3
packages/lume-column-global:
dependencies:
'@lume/ark':
specifier: workspace:^
version: link:../ark
'@lume/icons':
specifier: workspace:^
version: link:../icons
'@lume/ui':
specifier: workspace:^
version: link:../ui
'@lume/utils':
specifier: workspace:^
version: link:../utils
'@nostr-dev-kit/ndk':
specifier: ^2.3.3
version: 2.3.3(typescript@5.3.3)
'@tanstack/react-query':
specifier: ^5.17.19
version: 5.17.19(react@18.2.0)
react:
specifier: ^18.2.0
version: 18.2.0
react-router-dom:
specifier: ^6.21.3
version: 6.21.3(react-dom@18.2.0)(react@18.2.0)
sonner:
specifier: ^1.4.0
version: 1.4.0(react-dom@18.2.0)(react@18.2.0)
virtua:
specifier: ^0.23.0
version: 0.23.0(react-dom@18.2.0)(react@18.2.0)
devDependencies:
'@lume/tailwindcss':
specifier: workspace:^
version: link:../tailwindcss
'@lume/tsconfig':
specifier: workspace:^
version: link:../tsconfig
'@lume/types':
specifier: workspace:^
version: link:../types
'@types/react':
specifier: ^18.2.48
version: 18.2.48
tailwind:
specifier: ^4.0.0
version: 4.0.0
typescript:
specifier: ^5.3.3
version: 5.3.3
packages/lume-column-group:
dependencies:
'@lume/ark':
@ -697,6 +752,58 @@ importers:
specifier: ^5.3.3
version: 5.3.3
packages/lume-column-relay:
dependencies:
'@lume/ark':
specifier: workspace:^
version: link:../ark
'@lume/icons':
specifier: workspace:^
version: link:../icons
'@lume/ui':
specifier: workspace:^
version: link:../ui
'@lume/utils':
specifier: workspace:^
version: link:../utils
'@nostr-dev-kit/ndk':
specifier: ^2.3.3
version: 2.3.3(typescript@5.3.3)
'@tanstack/react-query':
specifier: ^5.17.19
version: 5.17.19(react@18.2.0)
react:
specifier: ^18.2.0
version: 18.2.0
react-router-dom:
specifier: ^6.21.3
version: 6.21.3(react-dom@18.2.0)(react@18.2.0)
sonner:
specifier: ^1.4.0
version: 1.4.0(react-dom@18.2.0)(react@18.2.0)
virtua:
specifier: ^0.23.0
version: 0.23.0(react-dom@18.2.0)(react@18.2.0)
devDependencies:
'@lume/tailwindcss':
specifier: workspace:^
version: link:../tailwindcss
'@lume/tsconfig':
specifier: workspace:^
version: link:../tsconfig
'@lume/types':
specifier: workspace:^
version: link:../types
'@types/react':
specifier: ^18.2.48
version: 18.2.48
tailwind:
specifier: ^4.0.0
version: 4.0.0
typescript:
specifier: ^5.3.3
version: 5.3.3
packages/lume-column-thread:
dependencies:
'@lume/ark':