Skip to content

Commit

Permalink
Merge branch 'next'
Browse files Browse the repository at this point in the history
  • Loading branch information
hzrd149 committed Dec 5, 2023
2 parents cf1ab35 + ab88415 commit 7000b2d
Show file tree
Hide file tree
Showing 268 changed files with 7,460 additions and 2,425 deletions.
5 changes: 5 additions & 0 deletions .changeset/afraid-apricots-fix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"nostrudel": minor
---

Add option to hide usernames
5 changes: 5 additions & 0 deletions .changeset/angry-turkeys-glow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"nostrudel": minor
---

Add Torrent create view
5 changes: 5 additions & 0 deletions .changeset/dull-rivers-wave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"nostrudel": minor
---

Add support for default bookmark list
5 changes: 5 additions & 0 deletions .changeset/eleven-buckets-decide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"nostrudel": minor
---

Add decrypt all button to DMs
5 changes: 5 additions & 0 deletions .changeset/fluffy-actors-breathe.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"nostrudel": minor
---

Change "Copy Share Link" to use njump.me
5 changes: 5 additions & 0 deletions .changeset/itchy-bags-march.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"nostrudel": minor
---

Replace "Copy Note Id" with "Copy Embed Code"
5 changes: 5 additions & 0 deletions .changeset/late-insects-return.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"nostrudel": minor
---

Add colors to notifications view
5 changes: 5 additions & 0 deletions .changeset/long-lies-clean.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"nostrudel": minor
---

Add simple torrents view
5 changes: 5 additions & 0 deletions .changeset/polite-fishes-exist.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"nostrudel": minor
---

Add Channels view
5 changes: 5 additions & 0 deletions .changeset/poor-dogs-look.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"nostrudel": minor
---

Use nevent instead of note1 in urls
5 changes: 5 additions & 0 deletions .changeset/quick-garlics-work.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"nostrudel": minor
---

Add local relay cache option
5 changes: 5 additions & 0 deletions .changeset/quick-radios-collect.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"nostrudel": minor
---

Add support for Nostr Signing Device
5 changes: 5 additions & 0 deletions .changeset/rotten-cycles-teach.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"nostrudel": minor
---

Rebuild notifications view
5 changes: 5 additions & 0 deletions .changeset/short-plants-hide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"nostrudel": minor
---

Rebuild tools view
5 changes: 5 additions & 0 deletions .changeset/sixty-comics-search.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"nostrudel": minor
---

Show reposts in note details modal
5 changes: 5 additions & 0 deletions .changeset/smart-monkeys-boil.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"nostrudel": minor
---

Cache decrypted events
5 changes: 5 additions & 0 deletions .changeset/strange-mails-film.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"nostrudel": minor
---

Add comments to torrents
5 changes: 5 additions & 0 deletions .changeset/stupid-trees-tan.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"nostrudel": minor
---

Blur videos from strangers
5 changes: 5 additions & 0 deletions .changeset/three-cats-refuse.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"nostrudel": minor
---

Rebuild thread loading
5 changes: 5 additions & 0 deletions .changeset/violet-moles-peel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"nostrudel": minor
---

Show list links on muted by view
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"cSpell.words": ["Bech", "Chakra", "Msat", "nostr", "noStrudel", "Npub", "pubkeys", "Sats", "webln"]
"cSpell.words": ["Bech", "Chakra", "lnurl", "Msat", "nostr", "noStrudel", "Npub", "pubkeys", "Sats", "webln"]
}
16 changes: 11 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@
"@chakra-ui/styled-system": "^2.9.1",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@getalby/bitcoin-connect-react": "^2.3.1",
"@getalby/bitcoin-connect-react": "^2.4.2",
"@noble/hashes": "^1.3.2",
"@noble/secp256k1": "^1.7.0",
"@webscopeio/react-textarea-autocomplete": "^4.9.2",
"bech32": "^2.0.0",
"cheerio": "^1.0.0-rc.12",
Expand All @@ -43,7 +45,6 @@
"match-sorter": "^6.3.1",
"nanoid": "^5.0.2",
"ngeohash": "^0.6.3",
"noble-secp256k1": "^1.2.14",
"nostr-tools": "^1.17.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand All @@ -61,12 +62,14 @@
"three": "^0.157.0",
"three-spritetext": "^1.8.1",
"webln": "^0.3.2",
"webtorrent": "^2.1.29",
"yet-another-react-lightbox": "^3.12.1"
},
"devDependencies": {
"@changesets/cli": "^2.26.2",
"@types/chroma-js": "^2.4.1",
"@types/debug": "^4.1.8",
"@types/dom-serial": "^1.0.6",
"@types/identicon.js": "^2.3.1",
"@types/leaflet": "^1.9.3",
"@types/leaflet.locatecontrol": "^0.74.1",
Expand All @@ -76,12 +79,15 @@
"@types/react-dom": "^18.2.7",
"@types/three": "^0.157.2",
"@types/webscopeio__react-textarea-autocomplete": "^4.7.2",
"@types/webtorrent": "^0.109.7",
"@vitejs/plugin-react": "^4.0.4",
"camelcase": "^8.0.0",
"prettier": "^3.0.2",
"typescript": "^5.1.6",
"vite": "^4.4.9",
"vite-plugin-pwa": "^0.16.4"
"typescript": "^5.3.2",
"vite": "^5.0.2",
"vite-plugin-pwa": "^0.17.2",
"workbox-build": "^7.0.0",
"workbox-window": "^7.0.0"
},
"resolutions": {
"@types/react": "^18.2.22",
Expand Down
40 changes: 36 additions & 4 deletions src/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import SettingsView from "./views/settings";
import NostrLinkView from "./views/link";
import ProfileView from "./views/profile";
import HashTagView from "./views/hashtag";
import NoteView from "./views/note";
import ThreadView from "./views/note";
import NotificationsView from "./views/notifications";
import DirectMessagesView from "./views/messages";
import DirectMessageChatView from "./views/messages/chat";
Expand All @@ -39,6 +39,7 @@ import UserListsTab from "./views/user/lists";
import UserGoalsTab from "./views/user/goals";
import MutedByView from "./views/user/muted-by";
import UserArticlesTab from "./views/user/articles";
const UserTorrentsTab = lazy(() => import("./views/user/torrents"));

import ListsView from "./views/lists";
import ListDetailsView from "./views/lists/list-details";
Expand Down Expand Up @@ -88,6 +89,14 @@ const StreamView = lazy(() => import("./views/streams/stream"));
const SearchView = lazy(() => import("./views/search"));
const MapView = lazy(() => import("./views/map"));

const ChannelsHomeView = lazy(() => import("./views/channels"));
const ChannelView = lazy(() => import("./views/channels/channel"));

const TorrentsView = lazy(() => import("./views/torrents"));
const TorrentDetailsView = lazy(() => import("./views/torrents/torrent"));
const TorrentPreviewView = lazy(() => import("./views/torrents/preview"));
const NewTorrentView = lazy(() => import("./views/torrents/new"));

const overrideReactTextareaAutocompleteStyles = css`
.rta__autocomplete {
z-index: var(--chakra-zIndices-popover);
Expand Down Expand Up @@ -205,11 +214,12 @@ const router = createHashRouter([
{ path: "reports", element: <UserReportsTab /> },
{ path: "muted-by", element: <MutedByView /> },
{ path: "dms", element: <UserDMsTab /> },
{ path: "torrents", element: <UserTorrentsTab /> },
],
},
{
path: "/n/:id",
element: <NoteView />,
element: <ThreadView />,
},
{ path: "settings", element: <SettingsView /> },
{
Expand All @@ -223,8 +233,11 @@ const router = createHashRouter([
{ path: "r/:relay", element: <RelayView /> },
{ path: "notifications", element: <NotificationsView /> },
{ path: "search", element: <SearchView /> },
{ path: "dm", element: <DirectMessagesView /> },
{ path: "dm/:key", element: <DirectMessageChatView /> },
{
path: "dm",
element: <DirectMessagesView />,
children: [{ path: ":pubkey", element: <DirectMessageChatView /> }],
},
{ path: "profile", element: <ProfileView /> },
{
path: "tools",
Expand Down Expand Up @@ -274,6 +287,25 @@ const router = createHashRouter([
},
],
},
{
path: "torrents/:id/preview",
element: <TorrentPreviewView />,
},
{
path: "torrents",
children: [
{ path: "", element: <TorrentsView /> },
{ path: "new", element: <NewTorrentView /> },
{ path: ":id", element: <TorrentDetailsView /> },
],
},
{
path: "channels",
children: [
{ path: "", element: <ChannelsHomeView /> },
{ path: ":id", element: <ChannelView /> },
],
},
{
path: "goals",
children: [
Expand Down
Loading

0 comments on commit 7000b2d

Please sign in to comment.