diff --git a/src-tauri/resources/columns.json b/src-tauri/resources/columns.json index ca69000b..8120758b 100644 --- a/src-tauri/resources/columns.json +++ b/src-tauri/resources/columns.json @@ -11,10 +11,10 @@ { "default": true, "official": true, - "label": "columns_gallery", - "name": "Columns Gallery", + "label": "Launchpad", + "name": "Launchpad", "description": "Expand your experiences.", - "url": "/columns/gallery", + "url": "/columns/launchpad", "picture": "" }, { diff --git a/src-tauri/resources/relays.txt b/src-tauri/resources/relays.txt index 07914bf8..04b51823 100644 --- a/src-tauri/resources/relays.txt +++ b/src-tauri/resources/relays.txt @@ -1,2 +1,3 @@ wss://relay.damus.io, wss://relay.nostr.net, +wss://nos.lol, diff --git a/src/routes.gen.ts b/src/routes.gen.ts index 4bb1622d..792be33e 100644 --- a/src/routes.gen.ts +++ b/src/routes.gen.ts @@ -60,8 +60,8 @@ const ColumnsLayoutOnboardingLazyImport = createFileRoute( const ColumnsLayoutNotificationLazyImport = createFileRoute( '/columns/_layout/notification', )() -const ColumnsLayoutGalleryLazyImport = createFileRoute( - '/columns/_layout/gallery', +const ColumnsLayoutLaunchpadLazyImport = createFileRoute( + '/columns/_layout/launchpad', )() const ColumnsLayoutUsersIdLazyImport = createFileRoute( '/columns/_layout/users/$id', @@ -199,11 +199,13 @@ const ColumnsLayoutNotificationLazyRoute = import('./routes/columns/_layout/notification.lazy').then((d) => d.Route), ) -const ColumnsLayoutGalleryLazyRoute = ColumnsLayoutGalleryLazyImport.update({ - path: '/gallery', - getParentRoute: () => ColumnsLayoutRoute, -} as any).lazy(() => - import('./routes/columns/_layout/gallery.lazy').then((d) => d.Route), +const ColumnsLayoutLaunchpadLazyRoute = ColumnsLayoutLaunchpadLazyImport.update( + { + path: '/launchpad', + getParentRoute: () => ColumnsLayoutRoute, + } as any, +).lazy(() => + import('./routes/columns/_layout/launchpad.lazy').then((d) => d.Route), ) const ColumnsLayoutStoriesRoute = ColumnsLayoutStoriesImport.update({ @@ -525,11 +527,11 @@ declare module '@tanstack/react-router' { preLoaderRoute: typeof ColumnsLayoutStoriesImport parentRoute: typeof ColumnsLayoutImport } - '/columns/_layout/gallery': { - id: '/columns/_layout/gallery' - path: '/gallery' - fullPath: '/columns/gallery' - preLoaderRoute: typeof ColumnsLayoutGalleryLazyImport + '/columns/_layout/launchpad': { + id: '/columns/_layout/launchpad' + path: '/launchpad' + fullPath: '/columns/launchpad' + preLoaderRoute: typeof ColumnsLayoutLaunchpadLazyImport parentRoute: typeof ColumnsLayoutImport } '/columns/_layout/notification': { @@ -682,7 +684,7 @@ interface ColumnsLayoutRouteChildren { ColumnsLayoutGlobalRoute: typeof ColumnsLayoutGlobalRoute ColumnsLayoutNewsfeedRoute: typeof ColumnsLayoutNewsfeedRoute ColumnsLayoutStoriesRoute: typeof ColumnsLayoutStoriesRoute - ColumnsLayoutGalleryLazyRoute: typeof ColumnsLayoutGalleryLazyRoute + ColumnsLayoutLaunchpadLazyRoute: typeof ColumnsLayoutLaunchpadLazyRoute ColumnsLayoutNotificationLazyRoute: typeof ColumnsLayoutNotificationLazyRoute ColumnsLayoutOnboardingLazyRoute: typeof ColumnsLayoutOnboardingLazyRoute ColumnsLayoutSearchLazyRoute: typeof ColumnsLayoutSearchLazyRoute @@ -700,7 +702,7 @@ const ColumnsLayoutRouteChildren: ColumnsLayoutRouteChildren = { ColumnsLayoutGlobalRoute: ColumnsLayoutGlobalRoute, ColumnsLayoutNewsfeedRoute: ColumnsLayoutNewsfeedRoute, ColumnsLayoutStoriesRoute: ColumnsLayoutStoriesRoute, - ColumnsLayoutGalleryLazyRoute: ColumnsLayoutGalleryLazyRoute, + ColumnsLayoutLaunchpadLazyRoute: ColumnsLayoutLaunchpadLazyRoute, ColumnsLayoutNotificationLazyRoute: ColumnsLayoutNotificationLazyRoute, ColumnsLayoutOnboardingLazyRoute: ColumnsLayoutOnboardingLazyRoute, ColumnsLayoutSearchLazyRoute: ColumnsLayoutSearchLazyRoute, @@ -753,7 +755,7 @@ export interface FileRoutesByFullPath { '/columns/global': typeof ColumnsLayoutGlobalRoute '/columns/newsfeed': typeof ColumnsLayoutNewsfeedRoute '/columns/stories': typeof ColumnsLayoutStoriesRoute - '/columns/gallery': typeof ColumnsLayoutGalleryLazyRoute + '/columns/launchpad': typeof ColumnsLayoutLaunchpadLazyRoute '/columns/notification': typeof ColumnsLayoutNotificationLazyRoute '/columns/onboarding': typeof ColumnsLayoutOnboardingLazyRoute '/columns/search': typeof ColumnsLayoutSearchLazyRoute @@ -793,7 +795,7 @@ export interface FileRoutesByTo { '/columns/global': typeof ColumnsLayoutGlobalRoute '/columns/newsfeed': typeof ColumnsLayoutNewsfeedRoute '/columns/stories': typeof ColumnsLayoutStoriesRoute - '/columns/gallery': typeof ColumnsLayoutGalleryLazyRoute + '/columns/launchpad': typeof ColumnsLayoutLaunchpadLazyRoute '/columns/notification': typeof ColumnsLayoutNotificationLazyRoute '/columns/onboarding': typeof ColumnsLayoutOnboardingLazyRoute '/columns/search': typeof ColumnsLayoutSearchLazyRoute @@ -837,7 +839,7 @@ export interface FileRoutesById { '/columns/_layout/global': typeof ColumnsLayoutGlobalRoute '/columns/_layout/newsfeed': typeof ColumnsLayoutNewsfeedRoute '/columns/_layout/stories': typeof ColumnsLayoutStoriesRoute - '/columns/_layout/gallery': typeof ColumnsLayoutGalleryLazyRoute + '/columns/_layout/launchpad': typeof ColumnsLayoutLaunchpadLazyRoute '/columns/_layout/notification': typeof ColumnsLayoutNotificationLazyRoute '/columns/_layout/onboarding': typeof ColumnsLayoutOnboardingLazyRoute '/columns/_layout/search': typeof ColumnsLayoutSearchLazyRoute @@ -879,7 +881,7 @@ export interface FileRouteTypes { | '/columns/global' | '/columns/newsfeed' | '/columns/stories' - | '/columns/gallery' + | '/columns/launchpad' | '/columns/notification' | '/columns/onboarding' | '/columns/search' @@ -918,7 +920,7 @@ export interface FileRouteTypes { | '/columns/global' | '/columns/newsfeed' | '/columns/stories' - | '/columns/gallery' + | '/columns/launchpad' | '/columns/notification' | '/columns/onboarding' | '/columns/search' @@ -960,7 +962,7 @@ export interface FileRouteTypes { | '/columns/_layout/global' | '/columns/_layout/newsfeed' | '/columns/_layout/stories' - | '/columns/_layout/gallery' + | '/columns/_layout/launchpad' | '/columns/_layout/notification' | '/columns/_layout/onboarding' | '/columns/_layout/search' @@ -1091,7 +1093,7 @@ export const routeTree = rootRoute "/columns/_layout/global", "/columns/_layout/newsfeed", "/columns/_layout/stories", - "/columns/_layout/gallery", + "/columns/_layout/launchpad", "/columns/_layout/notification", "/columns/_layout/onboarding", "/columns/_layout/search", @@ -1173,8 +1175,8 @@ export const routeTree = rootRoute "filePath": "columns/_layout/stories.tsx", "parent": "/columns/_layout" }, - "/columns/_layout/gallery": { - "filePath": "columns/_layout/gallery.lazy.tsx", + "/columns/_layout/launchpad": { + "filePath": "columns/_layout/launchpad.lazy.tsx", "parent": "/columns/_layout" }, "/columns/_layout/notification": { diff --git a/src/routes/$account/_app/home.lazy.tsx b/src/routes/$account/_app/home.lazy.tsx index 211b24dc..0ecb5464 100644 --- a/src/routes/$account/_app/home.lazy.tsx +++ b/src/routes/$account/_app/home.lazy.tsx @@ -217,16 +217,16 @@ function ManageButton() { const menuItems = await Promise.all([ MenuItem.new({ - text: "Open Columns Gallery", + text: "Open Launchpad", action: () => LumeWindow.openColumnsGallery(), }), PredefinedMenuItem.new({ item: "Separator" }), MenuItem.new({ - text: "Add local feeds", + text: "Open Newsfeed", action: () => LumeWindow.openLocalFeeds(), }), MenuItem.new({ - text: "Add notification", + text: "Open Notification", action: () => LumeWindow.openNotification(), }), ]); diff --git a/src/routes/columns/_layout/gallery.lazy.tsx b/src/routes/columns/_layout/launchpad.lazy.tsx similarity index 97% rename from src/routes/columns/_layout/gallery.lazy.tsx rename to src/routes/columns/_layout/launchpad.lazy.tsx index ec1a66b2..d7c57ad6 100644 --- a/src/routes/columns/_layout/gallery.lazy.tsx +++ b/src/routes/columns/_layout/launchpad.lazy.tsx @@ -10,7 +10,7 @@ import { resolveResource } from "@tauri-apps/api/path"; import { readTextFile } from "@tauri-apps/plugin-fs"; import { useCallback } from "react"; -export const Route = createLazyFileRoute("/columns/_layout/gallery")({ +export const Route = createLazyFileRoute("/columns/_layout/launchpad")({ component: Screen, }); @@ -116,7 +116,8 @@ function MyGroups() { const renderItem = useCallback( (item: NostrEvent) => { - const name = item.tags.filter((tag) => tag[0] === "d")[0][1] ?? "unnamed"; + const name = + item.tags.find((tag) => tag[0] === "title")?.[1] || "Unnamed"; return (
{ - const name = item.tags.filter((tag) => tag[0] === "d")[0][1] ?? "unnamed"; + const name = + item.tags.find((tag) => tag[0] === "title")?.[1] || "Unnamed"; return (
Added +
+ setHashtag(e.target.value)} + onKeyDown={(event) => { + if (event.key === "Enter") addHashtag(); + }} + className="w-full px-3 text-sm border-none rounded-lg h-9 bg-neutral-100 dark:bg-neutral-900 placeholder:text-neutral-600 focus:border-neutral-500 focus:ring-0 dark:placeholder:text-neutral-400" + /> + +
{hashtags.length ? ( hashtags.map((item: string) => ( @@ -139,50 +157,29 @@ function Screen() { )}
-
- Hashtags -
- setHashtag(e.target.value)} - onKeyDown={(event) => { - if (event.key === "Enter") addHashtag(); - }} - className="w-full px-3 text-sm border-none rounded-lg h-9 bg-neutral-100 dark:bg-neutral-900 placeholder:text-neutral-600 focus:border-neutral-500 focus:ring-0 dark:placeholder:text-neutral-400" - /> - -
-
- {TOPICS.map((topic) => ( -
-
{topic.title}
-
- {topic.content.map((item) => ( - - ))} -
+
+ {TOPICS.map((topic) => ( +
+
{topic.title}
+
+ {topic.content.map((item) => ( + + ))}
- ))} -
+
+ ))}