nostr/coracle
1
0
Fork 0
mirror of https://github.com/coracle-social/coracle.git synced 2024-09-18 19:23:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-organize views/shared components

Browse Source
This commit is contained in:
Jonathan Staab 2023-04-10 10:50:49 -05:00
parent 72203afb94
commit e2b9e88373
99 changed files with 300 additions and 355 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/ui/App.svelte → src/app2/App.svelte
View File

@ -21,18 +21,16 @@
import {loadAppData} from "src/app"
import {theme, getThemeVariables} from "src/app/ui"
import {modal, openModals, logUsage} from "src/app/ui"
import SideNav from "src/ui/SideNav.svelte"
import Main from "src/ui/Main.svelte"
import Toast from "src/ui/Toast.svelte"
import TopNav from "src/ui/TopNav.svelte"
import Modal from "src/ui/Modal.svelte"
import ForegroundButtons from "src/ui/ForegroundButtons.svelte"
import SideNav from "src/app2/SideNav.svelte"
import Routes from "src/app2/Routes.svelte"
import Toast from "src/app2/Toast.svelte"
import TopNav from "src/app2/TopNav.svelte"
import Modal from "src/app2/Modal.svelte"
import ForegroundButtons from "src/app2/ForegroundButtons.svelte"
Object.assign(window, {cmd, user, keys, network, pool, sync, tables, bech32ToHex, hexToBech32})
export let url = location.pathname
let scrollY
export let pathname = location.pathname
const style = document.createElement("style")
@ -54,6 +52,8 @@
}
onMount(() => {
let scrollY
// Log modals
const unsubModal = modal.subscribe($modal => {
if ($modal) {
@ -83,7 +83,7 @@
// Log usage on navigate
const unsubHistory = globalHistory.listen(({location}) => {
url = location.pathname
pathname = location.pathname
if (!location.hash) {
logUsage(btoa(["page", getPageName()].join(":")))
@ -93,9 +93,9 @@
logUsage(btoa(["page", getPageName()].join(":")))
return () => {
unsubHistory()
unsubModal()
unsubOpenModals()
unsubHistory()
}
})
@ -106,15 +106,6 @@
if (pubkey) {
loadAppData(pubkey)
const person = people.get(pubkey)
// Temporary migration for version 0.2.18. We changed where user profile
// is stored, so if they appear to have an incomplete profile on page load,
// go ahead and copy the person record over.
if (person && user.getRelays().length === 0) {
user.profile.update($p => ({...$p, ...person}))
}
}
const interval = setInterval(async () => {
@ -163,9 +154,9 @@
})
</script>
<Router {url}>
<Router url={pathname}>
<div use:links>
<Main />
<Routes />
<ForegroundButtons />
<SideNav />
<TopNav />

14
src/ui/views/EnsureData.svelte → src/app2/EnsureData.svelte
View File

@ -1,11 +1,11 @@
<script>
import Anchor from "src/ui/partials/Anchor.svelte"
import Content from "src/ui/partials/Content.svelte"
import Modal from "src/ui/partials/Modal.svelte"
import PersonInfo from "src/ui/views/person/PersonInfo.svelte"
import RelaySearch from "src/ui/views/relays/RelaySearch.svelte"
import RelayCard from "src/ui/views/relays/RelayCard.svelte"
import PersonSearch from "src/ui/views/person/PersonSearch.svelte"
import Anchor from "src/partials/Anchor.svelte"
import Content from "src/partials/Content.svelte"
import Modal from "src/partials/Modal.svelte"
import PersonInfo from "src/app2/shared/PersonInfo.svelte"
import RelaySearch from "src/app2/shared/RelaySearch.svelte"
import RelayCard from "src/app2/shared/RelayCard.svelte"
import PersonSearch from "src/app2/shared/PersonSearch.svelte"
import {getPersonWithFallback} from "src/agent/tables"
import user from "src/agent/user"

0
src/ui/ForegroundButtons.svelte → src/app2/ForegroundButtons.svelte
View File

34
src/ui/Modal.svelte → src/app2/Modal.svelte
View File

@ -1,19 +1,19 @@
<script lang="ts">
import {modal, menuIsOpen} from "src/app/ui"
import Modal from "src/ui/partials/Modal.svelte"
import Content from "src/ui/partials/Content.svelte"
import Spinner from "src/ui/partials/Spinner.svelte"
import ChatEdit from "src/ui/views/chat/ChatEdit.svelte"
import ConnectUser from "src/ui/views/login/ConnectUser.svelte"
import PrivKeyLogin from "src/ui/views/login/PrivKeyLogin.svelte"
import PubKeyLogin from "src/ui/views/login/PubKeyLogin.svelte"
import Onboarding from "src/ui/views/onboarding/Onboarding.svelte"
import NoteCreate from "src/ui/views/notes/NoteCreate.svelte"
import NoteDetail from "src/ui/views/notes/NoteDetail.svelte"
import PersonList from "src/ui/views/person/PersonList.svelte"
import PersonProfileInfo from "src/ui/views/person/PersonProfileInfo.svelte"
import PersonShare from "src/ui/views/person/PersonShare.svelte"
import AddRelay from "src/ui/views/relays/AddRelay.svelte"
import Modal from "src/partials/Modal.svelte"
import Content from "src/partials/Content.svelte"
import Spinner from "src/partials/Spinner.svelte"
import ChatEdit from "src/app2/views/ChatEdit.svelte"
import LoginConnect from "src/app2/views/LoginConnect.svelte"
import LoginPrivKey from "src/app2/views/LoginPrivKey.svelte"
import LoginPubKey from "src/app2/views/LoginPubKey.svelte"
import Onboarding from "src/app2/views/Onboarding.svelte"
import NoteCreate from "src/app2/views/NoteCreate.svelte"
import NoteDetail from "src/app2/views/NoteDetail.svelte"
import PersonList from "src/app2/shared/PersonList.svelte"
import PersonProfileInfo from "src/app2/views/PersonProfileInfo.svelte"
import PersonShare from "src/app2/views/PersonShare.svelte"
import AddRelay from "src/app2/views/RelayAdd.svelte"
const closeModal = async () => {
modal.clear()
@ -36,11 +36,11 @@
{:else if $modal.type === "room/edit"}
<ChatEdit {...$modal} />
{:else if $modal.type === "login/privkey"}
<PrivKeyLogin />
<LoginPrivKey />
{:else if $modal.type === "login/pubkey"}
<PubKeyLogin />
<LoginPubKey />
{:else if $modal.type === "login/connect"}
<ConnectUser />
<LoginConnect />
{:else if $modal.type === "person/info"}
<PersonProfileInfo person={$modal.person} />
{:else if $modal.type === "person/share"}

46
src/ui/Main.svelte → src/app2/Routes.svelte
View File

@ -1,26 +1,25 @@
<script lang="ts">
import {Route} from "svelte-routing"
import {onReady} from "src/agent/tables"
import Notifications from "src/ui/routes/Notifications.svelte"
import Bech32Entity from "src/ui/routes/Bech32Entity.svelte"
import ChatDetail from "src/ui/routes/ChatDetail.svelte"
import ChatList from "src/ui/routes/ChatList.svelte"
import Debug from "src/ui/routes/Debug.svelte"
import Feeds from "src/ui/routes/Feeds.svelte"
import Keys from "src/ui/routes/Keys.svelte"
import Login from "src/ui/routes/Login.svelte"
import Logout from "src/ui/routes/Logout.svelte"
import MessagesDetail from "src/ui/routes/MessagesDetail.svelte"
import MessagesList from "src/ui/routes/MessagesList.svelte"
import NotFound from "src/ui/routes/NotFound.svelte"
import PersonDetail from "src/ui/routes/PersonDetail.svelte"
import Search from "src/ui/routes/Search.svelte"
import Scan from "src/ui/routes/Scan.svelte"
import RelayDetail from "src/ui/routes/RelayDetail.svelte"
import RelayList from "src/ui/routes/RelayList.svelte"
import EnsureData from "src/ui/views/EnsureData.svelte"
import Profile from "src/ui/views/Profile.svelte"
import Settings from "src/ui/views/Settings.svelte"
import EnsureData from "src/app2/EnsureData.svelte"
import Notifications from "src/app2/views/Notifications.svelte"
import Bech32Entity from "src/app2/views/Bech32Entity.svelte"
import ChatDetail from "src/app2/views/ChatDetail.svelte"
import ChatList from "src/app2/views/ChatList.svelte"
import Feeds from "src/app2/views/Feeds.svelte"
import UserKeys from "src/app2/views/UserKeys.svelte"
import Login from "src/app2/views/Login.svelte"
import Logout from "src/app2/views/Logout.svelte"
import MessagesDetail from "src/app2/views/MessagesDetail.svelte"
import MessagesList from "src/app2/views/MessagesList.svelte"
import NotFound from "src/app2/views/NotFound.svelte"
import PersonDetail from "src/app2/views/PersonDetail.svelte"
import Search from "src/app2/views/Search.svelte"
import Scan from "src/app2/views/Scan.svelte"
import RelayDetail from "src/app2/views/RelayDetail.svelte"
import RelayList from "src/app2/views/RelayList.svelte"
import UserProfile from "src/app2/views/UserProfile.svelte"
import UserSettings from "src/app2/views/UserSettings.svelte"
let ready = false
@ -64,18 +63,17 @@
<MessagesDetail entity={params.entity} />
{/key}
</Route>
<Route path="/keys" component={Keys} />
<Route path="/keys" component={UserKeys} />
<Route path="/relays" component={RelayList} />
<Route path="/relays/:b64url" let:params>
{#key params.b64url}
<RelayDetail url={atob(params.b64url)} />
{/key}
</Route>
<Route path="/profile" component={Profile} />
<Route path="/settings" component={Settings} />
<Route path="/profile" component={UserProfile} />
<Route path="/settings" component={UserSettings} />
<Route path="/login" component={Login} />
<Route path="/logout" component={Logout} />
<Route path="/debug" component={Debug} />
<Route path="/:entity" let:params>
{#key params.entity}
<Bech32Entity entity={params.entity} />

2
src/ui/SideNav.svelte → src/app2/SideNav.svelte
View File

@ -6,7 +6,7 @@
import {menuIsOpen, installPrompt, routes} from "src/app/ui"
import {newNotifications, newDirectMessages, newChatMessages} from "src/app/listener"
import {slowConnections} from "src/app/connection"
import PersonCircle from "src/ui/partials/PersonCircle.svelte"
import PersonCircle from "src/partials/PersonCircle.svelte"
const {profile, canPublish} = user

0
src/ui/Toast.svelte → src/app2/Toast.svelte
View File

2
src/ui/TopNav.svelte → src/app2/TopNav.svelte
View File

@ -1,6 +1,6 @@
<script lang="ts">
import {onMount} from "svelte"
import Anchor from "src/ui/partials/Anchor.svelte"
import Anchor from "src/partials/Anchor.svelte"
import {menuIsOpen} from "src/app/ui"
import {newNotifications} from "src/app/listener"
import {theme} from "src/app/ui"

10
src/ui/views/feed/Feed.svelte → src/app2/shared/Feed.svelte
View File

@ -5,11 +5,11 @@
import {quantify} from "hurdak/lib/hurdak"
import {createScroller, now, timedelta, Cursor} from "src/util/misc"
import {asDisplayEvent, mergeFilter} from "src/util/nostr"
import Spinner from "src/ui/partials/Spinner.svelte"
import Modal from "src/ui/partials/Modal.svelte"
import Content from "src/ui/partials/Content.svelte"
import RelayFeed from "src/ui/views/feed/RelayFeed.svelte"
import Note from "src/ui/views/notes/Note.svelte"
import Spinner from "src/partials/Spinner.svelte"
import Modal from "src/partials/Modal.svelte"
import Content from "src/partials/Content.svelte"
import RelayFeed from "src/app2/shared/RelayFeed.svelte"
import Note from "src/app2/shared/Note.svelte"
import user from "src/agent/user"
import network from "src/agent/network"
import {modal} from "src/app/ui"

36
src/ui/views/notes/Note.svelte → src/app2/shared/Note.svelte
View File

@ -31,24 +31,24 @@
} from "src/util/misc"
import {isMobile, copyToClipboard} from "src/util/html"
import {invoiceAmount} from "src/util/lightning"
import QRCode from "src/ui/partials/QRCode.svelte"
import OverflowMenu from "src/ui/partials/OverflowMenu.svelte"
import ImageInput from "src/ui/partials/ImageInput.svelte"
import Input from "src/ui/partials/Input.svelte"
import Textarea from "src/ui/partials/Textarea.svelte"
import CopyValue from "src/ui/partials/CopyValue.svelte"
import Content from "src/ui/partials/Content.svelte"
import Badge from "src/ui/partials/Badge.svelte"
import Popover from "src/ui/partials/Popover.svelte"
import PersonCircle from "src/ui/partials/PersonCircle.svelte"
import PersonSummary from "src/ui/views/person/PersonSummary.svelte"
import RelayCard from "src/ui/views/relays/RelayCard.svelte"
import Modal from "src/ui/partials/Modal.svelte"
import Media from "src/ui/partials/Media.svelte"
import Anchor from "src/ui/partials/Anchor.svelte"
import QRCode from "src/partials/QRCode.svelte"
import OverflowMenu from "src/partials/OverflowMenu.svelte"
import ImageInput from "src/partials/ImageInput.svelte"
import Input from "src/partials/Input.svelte"
import Textarea from "src/partials/Textarea.svelte"
import CopyValue from "src/partials/CopyValue.svelte"
import Content from "src/partials/Content.svelte"
import Badge from "src/partials/Badge.svelte"
import Popover from "src/partials/Popover.svelte"
import PersonCircle from "src/partials/PersonCircle.svelte"
import PersonSummary from "src/app2/shared/PersonSummary.svelte"
import RelayCard from "src/app2/shared/RelayCard.svelte"
import Modal from "src/partials/Modal.svelte"
import Media from "src/partials/Media.svelte"
import Anchor from "src/partials/Anchor.svelte"
import {toast, modal} from "src/app/ui"
import Compose from "src/ui/partials/Compose.svelte"
import Card from "src/ui/partials/Card.svelte"
import Compose from "src/partials/Compose.svelte"
import Card from "src/partials/Card.svelte"
import user from "src/agent/user"
import pool from "src/agent/pool"
import keys from "src/agent/keys"
@ -59,7 +59,7 @@
import cmd from "src/agent/cmd"
import {routes} from "src/app/ui"
import {publishWithToast} from "src/app"
import NoteContent from "src/ui/views/notes/NoteContent.svelte"
import NoteContent from "src/app2/shared/NoteContent.svelte"
export let note
export let feedRelay

10
src/ui/views/notes/NoteContent.svelte → src/app2/shared/NoteContent.svelte
View File

@ -6,11 +6,11 @@
import {warn} from "src/util/logger"
import {parseContent} from "src/util/html"
import {displayPerson, Tags} from "src/util/nostr"
import MediaSet from "src/ui/partials/MediaSet.svelte"
import Card from "src/ui/partials/Card.svelte"
import Spinner from "src/ui/partials/Spinner.svelte"
import Anchor from "src/ui/partials/Anchor.svelte"
import PersonCircle from "src/ui/partials/PersonCircle.svelte"
import MediaSet from "src/partials/MediaSet.svelte"
import Card from "src/partials/Card.svelte"
import Spinner from "src/partials/Spinner.svelte"
import Anchor from "src/partials/Anchor.svelte"
import PersonCircle from "src/partials/PersonCircle.svelte"
import {sampleRelays} from "src/agent/relays"
import user from "src/agent/user"
import network from "src/agent/network"

2
src/ui/views/person/PersonInfo.svelte → src/app2/shared/PersonInfo.svelte
View File

@ -1,6 +1,6 @@
<script lang="ts">
import {displayPerson} from "src/util/nostr"
import PersonInfo from "src/ui/partials/PersonInfo.svelte"
import PersonInfo from "src/partials/PersonInfo.svelte"
import {getPubkeyWriteRelays, sampleRelays} from "src/agent/relays"
import user from "src/agent/user"

6
src/ui/views/person/PersonList.svelte → src/app2/shared/PersonList.svelte
View File

@ -2,9 +2,9 @@
import {onMount} from "svelte"
import {uniq, sortBy, pluck} from "ramda"
import {Tags} from "src/util/nostr"
import Content from "src/ui/partials/Content.svelte"
import Spinner from "src/ui/partials/Spinner.svelte"
import PersonInfo from "src/ui/views/person/PersonInfo.svelte"
import Content from "src/partials/Content.svelte"
import Spinner from "src/partials/Spinner.svelte"
import PersonInfo from "src/app2/shared/PersonInfo.svelte"
import {sampleRelays, getPubkeyWriteRelays} from "src/agent/relays"
import {getPersonWithFallback} from "src/agent/tables"
import {watch} from "src/agent/storage"

6
src/ui/views/person/PersonSearch.svelte → src/app2/shared/PersonSearch.svelte
View File

@ -1,9 +1,9 @@
<script>
import {fuzzy} from "src/util/misc"
import {personKinds} from "src/util/nostr"
import Input from "src/ui/partials/Input.svelte"
import Spinner from "src/ui/partials/Spinner.svelte"
import PersonInfo from "src/ui/views/person/PersonInfo.svelte"
import Input from "src/partials/Input.svelte"
import Spinner from "src/partials/Spinner.svelte"
import PersonInfo from "src/app2/shared/PersonInfo.svelte"
import {getUserReadRelays} from "src/agent/relays"
import {watch} from "src/agent/storage"
import network from "src/agent/network"

6
src/ui/views/person/PersonSummary.svelte → src/app2/shared/PersonSummary.svelte
View File

@ -2,14 +2,14 @@
import {last} from "ramda"
import {navigate} from "svelte-routing"
import {displayPerson} from "src/util/nostr"
import Anchor from "src/ui/partials/Anchor.svelte"
import Anchor from "src/partials/Anchor.svelte"
import user from "src/agent/user"
import {sampleRelays, getPubkeyWriteRelays} from "src/agent/relays"
import {getPersonWithFallback} from "src/agent/tables"
import {watch} from "src/agent/storage"
import {routes} from "src/app/ui"
import PersonCircle from "src/ui/partials/PersonCircle.svelte"
import PersonAbout from "src/ui/partials/PersonAbout.svelte"
import PersonCircle from "src/partials/PersonCircle.svelte"
import PersonAbout from "src/partials/PersonAbout.svelte"
export let pubkey

6
src/ui/views/relays/RelayActions.svelte → src/app2/shared/RelayActions.svelte
View File

@ -1,8 +1,8 @@
<script lang="ts">
import {find, last, propEq} from "ramda"
import Anchor from "src/ui/partials/Anchor.svelte"
import Popover from "src/ui/partials/Popover.svelte"
import OverflowMenu from "src/ui/partials/OverflowMenu.svelte"
import Anchor from "src/partials/Anchor.svelte"
import Popover from "src/partials/Popover.svelte"
import OverflowMenu from "src/partials/OverflowMenu.svelte"
import user from "src/agent/user"
import {getRelayWithFallback} from "src/agent/tables"

4
src/ui/views/relays/RelayCard.svelte → src/app2/shared/RelayCard.svelte
View File

@ -2,8 +2,8 @@
import {find, propEq} from "ramda"
import {onMount} from "svelte"
import {poll} from "src/util/misc"
import Toggle from "src/ui/partials/Toggle.svelte"
import RelayCard from "src/ui/partials/RelayCard.svelte"
import Toggle from "src/partials/Toggle.svelte"
import RelayCard from "src/partials/RelayCard.svelte"
import pool from "src/agent/pool"
import user from "src/agent/user"
import keys from "src/agent/keys"

10
src/ui/views/feed/RelayFeed.svelte → src/app2/shared/RelayFeed.svelte
View File

@ -1,10 +1,10 @@
<script lang="ts">
import {displayRelay} from "src/util/nostr"
import Content from "src/ui/partials/Content.svelte"
import Spinner from "src/ui/partials/Spinner.svelte"
import RelayTitle from "src/ui/views/relays/RelayTitle.svelte"
import RelayActions from "src/ui/views/relays/RelayActions.svelte"
import Note from "src/ui/views/notes/Note.svelte"
import Content from "src/partials/Content.svelte"
import Spinner from "src/partials/Spinner.svelte"
import RelayTitle from "src/app2/shared/RelayTitle.svelte"
import RelayActions from "src/app2/shared/RelayActions.svelte"
import Note from "src/app2/shared/Note.svelte"
export let depth
export let showContext = false

4
src/ui/views/relays/RelaySearch.svelte → src/app2/shared/RelaySearch.svelte
View File

@ -1,8 +1,8 @@
<script>
import {pluck} from "ramda"
import {fuzzy} from "src/util/misc"
import Input from "src/ui/partials/Input.svelte"
import RelayCard from "src/ui/views/relays/RelayCard.svelte"
import Input from "src/partials/Input.svelte"
import RelayCard from "src/app2/shared/RelayCard.svelte"
import {watch} from "src/agent/storage"
import user from "src/agent/user"

2
src/ui/views/relays/RelayTitle.svelte → src/app2/shared/RelayTitle.svelte
View File

@ -3,7 +3,7 @@
import {between} from "hurdak/lib/hurdak"
import {displayRelay} from "src/util/nostr"
import {poll, stringToHue, hsl} from "src/util/misc"
import Anchor from "src/ui/partials/Anchor.svelte"
import Anchor from "src/partials/Anchor.svelte"
import pool from "src/agent/pool"
export let relay

6
src/ui/routes/Bech32Entity.svelte → src/app2/views/Bech32Entity.svelte
View File

@ -3,9 +3,9 @@
import {onMount} from "svelte"
import {nip19} from "nostr-tools"
import {warn} from "src/util/logger"
import Content from "src/ui/partials/Content.svelte"
import NoteDetail from "src/ui/views/notes/NoteDetail.svelte"
import PersonDetail from "src/ui/routes/PersonDetail.svelte"
import Content from "src/partials/Content.svelte"
import NoteDetail from "src/app2/views/NoteDetail.svelte"
import PersonDetail from "src/app2/views/PersonDetail.svelte"
import {sampleRelays} from "src/agent/relays"
export let entity

8
src/ui/routes/ChatDetail.svelte → src/app2/views/ChatDetail.svelte
View File

@ -3,10 +3,10 @@
import {updateIn} from "hurdak/lib/hurdak"
import {now, formatTimestamp} from "src/util/misc"
import {toHex} from "src/util/nostr"
import Channel from "src/ui/partials/Channel.svelte"
import Badge from "src/ui/partials/Badge.svelte"
import Anchor from "src/ui/partials/Anchor.svelte"
import NoteContent from "src/ui/views/notes/NoteContent.svelte"
import Channel from "src/partials/Channel.svelte"
import Badge from "src/partials/Badge.svelte"
import Anchor from "src/partials/Anchor.svelte"
import NoteContent from "src/app2/shared/NoteContent.svelte"
import user from "src/agent/user"
import {getRelaysForEventChildren, sampleRelays} from "src/agent/relays"
import network from "src/agent/network"

8
src/ui/views/chat/ChatEdit.svelte → src/app2/views/ChatEdit.svelte
View File

@ -3,10 +3,10 @@
import {fly} from "svelte/transition"
import {error} from "src/util/logger"
import {stripExifData} from "src/util/html"
import Input from "src/ui/partials/Input.svelte"
import Content from "src/ui/partials/Content.svelte"
import Textarea from "src/ui/partials/Textarea.svelte"
import Button from "src/ui/partials/Button.svelte"
import Input from "src/partials/Input.svelte"
import Content from "src/partials/Content.svelte"
import Textarea from "src/partials/Textarea.svelte"
import Button from "src/partials/Button.svelte"
import {getUserWriteRelays} from "src/agent/relays"
import {rooms} from "src/agent/tables"
import cmd from "src/agent/cmd"

8
src/ui/routes/ChatList.svelte → src/app2/views/ChatList.svelte
View File

@ -1,10 +1,10 @@
<script>
import {onMount} from "svelte"
import {fuzzy} from "src/util/misc"
import Input from "src/ui/partials/Input.svelte"
import Content from "src/ui/partials/Content.svelte"
import Anchor from "src/ui/partials/Anchor.svelte"
import ChatListItem from "src/ui/views/chat/ChatListItem.svelte"
import Input from "src/partials/Input.svelte"
import Content from "src/partials/Content.svelte"
import Anchor from "src/partials/Anchor.svelte"
import ChatListItem from "src/app2/views/ChatListItem.svelte"
import {watch} from "src/agent/storage"
import network from "src/agent/network"
import {getUserReadRelays} from "src/agent/relays"

2
src/ui/views/chat/ChatListItem.svelte → src/app2/views/ChatListItem.svelte
View File

@ -3,7 +3,7 @@
import {navigate} from "svelte-routing"
import {fly} from "svelte/transition"
import {ellipsize} from "hurdak/lib/hurdak"
import Anchor from "src/ui/partials/Anchor.svelte"
import Anchor from "src/partials/Anchor.svelte"
import {rooms} from "src/agent/tables"
export let room

14
src/ui/routes/Feeds.svelte → src/app2/views/Feeds.svelte
View File

@ -1,11 +1,11 @@
<script>
import {navigate} from "svelte-routing"
import {toTitle} from "hurdak/lib/hurdak"
import Anchor from "src/ui/partials/Anchor.svelte"
import Content from "src/ui/partials/Content.svelte"
import Tabs from "src/ui/partials/Tabs.svelte"
import Follows from "src/ui/views/feed/Follows.svelte"
import Network from "src/ui/views/feed/Network.svelte"
import Anchor from "src/partials/Anchor.svelte"
import Content from "src/partials/Content.svelte"
import Tabs from "src/partials/Tabs.svelte"
import FeedsFollows from "src/app2/views/FeedsFollows.svelte"
import FeedsNetwork from "src/app2/views/FeedsNetwork.svelte"
import user from "src/agent/user"
export let activeTab
@ -27,9 +27,9 @@
<div>
<Tabs tabs={["follows", "network"]} {activeTab} {setActiveTab} />
{#if activeTab === "follows"}
<Follows />
<FeedsFollows />
{:else}
<Network />
<FeedsNetwork />
{/if}
</div>
</Content>

2
src/ui/views/feed/Follows.svelte → src/app2/views/FeedsFollows.svelte
View File

@ -1,6 +1,6 @@
<script>
import {shuffle} from "src/util/misc"
import Feed from "src/ui/views/feed/Feed.svelte"
import Feed from "src/app2/shared/Feed.svelte"
import {getUserFollows} from "src/agent/social"
import {sampleRelays, getAllPubkeyWriteRelays} from "src/agent/relays"

2
src/ui/views/feed/Network.svelte → src/app2/views/FeedsNetwork.svelte
View File

@ -1,6 +1,6 @@
<script>
import {shuffle} from "src/util/misc"
import Feed from "src/ui/views/feed/Feed.svelte"
import Feed from "src/app2/shared/Feed.svelte"
import {getUserNetwork} from "src/agent/social"
import {sampleRelays, getAllPubkeyWriteRelays} from "src/agent/relays"

6
src/ui/routes/Login.svelte → src/app2/views/Login.svelte
View File

@ -1,9 +1,9 @@
<script lang="ts">
import {fly} from "svelte/transition"
import {navigate} from "svelte-routing"
import Anchor from "src/ui/partials/Anchor.svelte"
import Content from "src/ui/partials/Content.svelte"
import Heading from "src/ui/partials/Heading.svelte"
import Anchor from "src/partials/Anchor.svelte"
import Content from "src/partials/Content.svelte"
import Heading from "src/partials/Heading.svelte"
import user from "src/agent/user"
import {modal} from "src/app/ui"
import {login} from "src/app"

14
src/ui/views/login/ConnectUser.svelte → src/app2/views/LoginConnect.svelte
View File

@ -5,13 +5,13 @@
import {navigate} from "svelte-routing"
import {sleep, shuffle} from "src/util/misc"
import {isRelay, userKinds} from "src/util/nostr"
import Content from "src/ui/partials/Content.svelte"
import Spinner from "src/ui/partials/Spinner.svelte"
import Input from "src/ui/partials/Input.svelte"
import Heading from "src/ui/partials/Heading.svelte"
import RelayCardSimple from "src/ui/partials/RelayCardSimple.svelte"
import Anchor from "src/ui/partials/Anchor.svelte"
import Modal from "src/ui/partials/Modal.svelte"
import Content from "src/partials/Content.svelte"
import Spinner from "src/partials/Spinner.svelte"
import Input from "src/partials/Input.svelte"
import Heading from "src/partials/Heading.svelte"
import RelayCardSimple from "src/partials/RelayCardSimple.svelte"
import Anchor from "src/partials/Anchor.svelte"
import Modal from "src/partials/Modal.svelte"
import {watch} from "src/agent/storage"
import network from "src/agent/network"
import user from "src/agent/user"

8
src/ui/views/login/PrivKeyLogin.svelte → src/app2/views/LoginPrivKey.svelte
View File

@ -1,9 +1,9 @@
<script lang="ts">
import {toHex} from "src/util/nostr"
import Input from "src/ui/partials/Input.svelte"
import Anchor from "src/ui/partials/Anchor.svelte"
import Content from "src/ui/partials/Content.svelte"
import Heading from "src/ui/partials/Heading.svelte"
import Input from "src/partials/Input.svelte"
import Anchor from "src/partials/Anchor.svelte"
import Content from "src/partials/Content.svelte"
import Heading from "src/partials/Heading.svelte"
import keys from "src/agent/keys"
import {toast} from "src/app/ui"
import {login} from "src/app"

8
src/ui/views/login/PubKeyLogin.svelte → src/app2/views/LoginPubKey.svelte
View File

@ -1,9 +1,9 @@
<script lang="ts">
import {toHex} from "src/util/nostr"
import Input from "src/ui/partials/Input.svelte"
import Anchor from "src/ui/partials/Anchor.svelte"
import Content from "src/ui/partials/Content.svelte"
import Heading from "src/ui/partials/Heading.svelte"
import Input from "src/partials/Input.svelte"
import Anchor from "src/partials/Anchor.svelte"
import Content from "src/partials/Content.svelte"
import Heading from "src/partials/Heading.svelte"
import keys from "src/agent/keys"
import {toast} from "src/app/ui"
import {login} from "src/app"

4
src/ui/routes/Logout.svelte → src/app2/views/Logout.svelte
View File

@ -1,7 +1,7 @@
<script>
import {fly} from "svelte/transition"
import Anchor from "src/ui/partials/Anchor.svelte"
import Content from "src/ui/partials/Content.svelte"
import Anchor from "src/partials/Anchor.svelte"
import Content from "src/partials/Content.svelte"
import {dropAll} from "src/agent/storage"
let confirmed = false

10
src/ui/routes/MessagesDetail.svelte → src/app2/views/MessagesDetail.svelte
View File

@ -4,9 +4,9 @@
import {toHex, displayPerson} from "src/util/nostr"
import {now, formatTimestamp} from "src/util/misc"
import {Tags} from "src/util/nostr"
import Channel from "src/ui/partials/Channel.svelte"
import Anchor from "src/ui/partials/Anchor.svelte"
import NoteContent from "src/ui/views/notes/NoteContent.svelte"
import Channel from "src/partials/Channel.svelte"
import Anchor from "src/partials/Anchor.svelte"
import NoteContent from "src/app2/shared/NoteContent.svelte"
import {getAllPubkeyRelays, sampleRelays} from "src/agent/relays"
import {getPersonWithFallback} from "src/agent/tables"
import {watch} from "src/agent/storage"
@ -16,8 +16,8 @@
import cmd from "src/agent/cmd"
import {routes} from "src/app/ui"
import {lastChecked} from "src/app/listener"
import PersonCircle from "src/ui/partials/PersonCircle.svelte"
import PersonAbout from "src/ui/partials/PersonAbout.svelte"
import PersonCircle from "src/partials/PersonCircle.svelte"
import PersonAbout from "src/partials/PersonAbout.svelte"
export let entity

6
src/ui/routes/MessagesList.svelte → src/app2/views/MessagesList.svelte
View File

@ -1,9 +1,9 @@
<script>
import {sortBy} from "ramda"
import {toTitle} from "hurdak/lib/hurdak"
import Tabs from "src/ui/partials/Tabs.svelte"
import Content from "src/ui/partials/Content.svelte"
import MessagesListItem from "src/ui/views/messages/MessagesListItem.svelte"
import Tabs from "src/partials/Tabs.svelte"
import Content from "src/partials/Content.svelte"
import MessagesListItem from "src/app2/views/MessagesListItem.svelte"
import {watch} from "src/agent/storage"
let activeTab = "messages"

4
src/ui/views/messages/MessagesListItem.svelte → src/app2/views/MessagesListItem.svelte
View File

@ -5,8 +5,8 @@
import {displayPerson} from "src/util/nostr"
import {getPersonWithFallback} from "src/agent/tables"
import {lastChecked} from "src/app/listener"
import PersonCircle from "src/ui/partials/PersonCircle.svelte"
import Card from "src/ui/partials/Card.svelte"
import PersonCircle from "src/partials/PersonCircle.svelte"
import Card from "src/partials/Card.svelte"
export let contact

0
src/ui/routes/NotFound.svelte → src/app2/views/NotFound.svelte
View File

18
src/ui/views/notes/NoteCreate.svelte → src/app2/views/NoteCreate.svelte
View File

@ -6,15 +6,15 @@
import {fly} from "svelte/transition"
import {fuzzy, annotateMedia} from "src/util/misc"
import {displayPerson} from "src/util/nostr"
import Button from "src/ui/partials/Button.svelte"
import Compose from "src/ui/partials/Compose.svelte"
import ImageInput from "src/ui/partials/ImageInput.svelte"
import Media from "src/ui/partials/Media.svelte"
import Input from "src/ui/partials/Input.svelte"
import RelayCardSimple from "src/ui/partials/RelayCardSimple.svelte"
import Content from "src/ui/partials/Content.svelte"
import Modal from "src/ui/partials/Modal.svelte"
import Heading from "src/ui/partials/Heading.svelte"
import Button from "src/partials/Button.svelte"
import Compose from "src/partials/Compose.svelte"
import ImageInput from "src/partials/ImageInput.svelte"
import Media from "src/partials/Media.svelte"
import Input from "src/partials/Input.svelte"
import RelayCardSimple from "src/partials/RelayCardSimple.svelte"
import Content from "src/partials/Content.svelte"
import Modal from "src/partials/Modal.svelte"
import Heading from "src/partials/Heading.svelte"
import {getUserWriteRelays} from "src/agent/relays"
import {getPersonWithFallback} from "src/agent/tables"
import {watch} from "src/agent/storage"

10
src/ui/views/notes/NoteDetail.svelte → src/app2/views/NoteDetail.svelte
View File

@ -5,11 +5,11 @@
import {first} from "hurdak/lib/hurdak"
import {log} from "src/util/logger"
import {asDisplayEvent} from "src/util/nostr"
import Content from "src/ui/partials/Content.svelte"
import RelayFeed from "src/ui/views/feed/RelayFeed.svelte"
import Modal from "src/ui/partials/Modal.svelte"
import Spinner from "src/ui/partials/Spinner.svelte"
import Note from "src/ui/views/notes/Note.svelte"
import Content from "src/partials/Content.svelte"
import RelayFeed from "src/app2/shared/RelayFeed.svelte"
import Modal from "src/partials/Modal.svelte"
import Spinner from "src/partials/Spinner.svelte"
import Note from "src/app2/shared/Note.svelte"
import user from "src/agent/user"
import network from "src/agent/network"
import {sampleRelays} from "src/agent/relays"

10
src/ui/views/notifications/Notification.svelte → src/app2/views/Notification.svelte
View File

@ -3,11 +3,11 @@
import {closure, quantify} from "hurdak/lib/hurdak"
import {formatTimestamp, tryJson} from "src/util/misc"
import {Tags} from "src/util/nostr"
import Badge from "src/ui/partials/Badge.svelte"
import Card from "src/ui/partials/Card.svelte"
import Popover from "src/ui/partials/Popover.svelte"
import NoteContent from "src/ui/views/notes/NoteContent.svelte"
import NotificationSection from "src/ui/views/notifications/NotificationSection.svelte"
import Badge from "src/partials/Badge.svelte"
import Card from "src/partials/Card.svelte"
import Popover from "src/partials/Popover.svelte"
import NoteContent from "src/app2/shared/NoteContent.svelte"
import NotificationSection from "src/app2/views/NotificationSection.svelte"
import {getPersonWithFallback, userEvents} from "src/agent/tables"
import {modal} from "src/app/ui"

2
src/ui/views/notifications/NotificationSection.svelte → src/app2/views/NotificationSection.svelte
View File

@ -1,5 +1,5 @@
<script lang="ts">
import Badge from "src/ui/partials/Badge.svelte"
import Badge from "src/partials/Badge.svelte"
import {getPersonWithFallback} from "src/agent/tables"
export let pubkeys

6
src/ui/routes/Notifications.svelte → src/app2/views/Notifications.svelte
View File

@ -4,9 +4,9 @@
import {fly} from "svelte/transition"
import {now, timedelta, createScroller} from "src/util/misc"
import {findReplyId} from "src/util/nostr"
import Spinner from "src/ui/partials/Spinner.svelte"
import Content from "src/ui/partials/Content.svelte"
import Notification from "src/ui/views/notifications/Notification.svelte"
import Spinner from "src/partials/Spinner.svelte"
import Content from "src/partials/Content.svelte"
import Notification from "src/app2/views/Notification.svelte"
import {watch} from "src/agent/storage"
import user from "src/agent/user"
import {userEvents} from "src/agent/tables"

10
src/ui/views/onboarding/Onboarding.svelte → src/app2/views/Onboarding.svelte
View File

@ -6,11 +6,11 @@
import {navigate} from "svelte-routing"
import {shuffle} from "src/util/misc"
import {displayPerson} from "src/util/nostr"
import OnboardingIntro from "src/ui/views/onboarding/OnboardingIntro.svelte"
import OnboardingKey from "src/ui/views/onboarding/OnboardingKey.svelte"
import OnboardingRelays from "src/ui/views/onboarding/OnboardingRelays.svelte"
import OnboardingFollows from "src/ui/views/onboarding/OnboardingFollows.svelte"
import OnboardingComplete from "src/ui/views/onboarding/OnboardingComplete.svelte"
import OnboardingIntro from "src/app2/views/OnboardingIntro.svelte"
import OnboardingKey from "src/app2/views/OnboardingKey.svelte"
import OnboardingRelays from "src/app2/views/OnboardingRelays.svelte"
import OnboardingFollows from "src/app2/views/OnboardingFollows.svelte"
import OnboardingComplete from "src/app2/views/OnboardingComplete.svelte"
import {getFollows} from "src/agent/social"
import {getPubkeyWriteRelays, sampleRelays} from "src/agent/relays"
import {getPersonWithFallback} from "src/agent/tables"

8
src/ui/views/onboarding/OnboardingComplete.svelte → src/app2/views/OnboardingComplete.svelte
View File

@ -1,8 +1,8 @@
<script lang="ts">
import Anchor from "src/ui/partials/Anchor.svelte"
import Heading from "src/ui/partials/Heading.svelte"
import Content from "src/ui/partials/Content.svelte"
import Spinner from "src/ui/partials/Spinner.svelte"
import Anchor from "src/partials/Anchor.svelte"
import Heading from "src/partials/Heading.svelte"
import Content from "src/partials/Content.svelte"
import Spinner from "src/partials/Spinner.svelte"
export let signup

10
src/ui/views/onboarding/OnboardingFollows.svelte → src/app2/views/OnboardingFollows.svelte
View File

@ -1,11 +1,11 @@
<script lang="ts">
import {without} from "ramda"
import {fuzzy} from "src/util/misc"
import Input from "src/ui/partials/Input.svelte"
import Anchor from "src/ui/partials/Anchor.svelte"
import Heading from "src/ui/partials/Heading.svelte"
import Content from "src/ui/partials/Content.svelte"
import PersonInfo from "src/ui/partials/PersonInfo.svelte"
import Input from "src/partials/Input.svelte"
import Anchor from "src/partials/Anchor.svelte"
import Heading from "src/partials/Heading.svelte"
import Content from "src/partials/Content.svelte"
import PersonInfo from "src/partials/PersonInfo.svelte"
import {getPersonWithFallback} from "src/agent/tables"
import {watch} from "src/agent/storage"
import {modal} from "src/app/ui"

6
src/ui/views/onboarding/OnboardingIntro.svelte → src/app2/views/OnboardingIntro.svelte
View File

@ -1,7 +1,7 @@
<script lang="ts">
import Anchor from "src/ui/partials/Anchor.svelte"
import Heading from "src/ui/partials/Heading.svelte"
import Content from "src/ui/partials/Content.svelte"
import Anchor from "src/partials/Anchor.svelte"
import Heading from "src/partials/Heading.svelte"
import Content from "src/partials/Content.svelte"
import {modal} from "src/app/ui"
const tutorialUrl = "https://nostr.com/"

8
src/ui/views/onboarding/OnboardingKey.svelte → src/app2/views/OnboardingKey.svelte
View File

@ -1,10 +1,10 @@
<script lang="ts">
import {nip19} from "nostr-tools"
import {copyToClipboard} from "src/util/html"
import Input from "src/ui/partials/Input.svelte"
import Anchor from "src/ui/partials/Anchor.svelte"
import Heading from "src/ui/partials/Heading.svelte"
import Content from "src/ui/partials/Content.svelte"
import Input from "src/partials/Input.svelte"
import Anchor from "src/partials/Anchor.svelte"
import Heading from "src/partials/Heading.svelte"
import Content from "src/partials/Content.svelte"
import pool from "src/agent/pool"
import {modal, toast} from "src/app/ui"

10
src/ui/views/onboarding/OnboardingRelays.svelte → src/app2/views/OnboardingRelays.svelte
View File

@ -1,11 +1,11 @@
<script lang="ts">
import {reject, pluck, whereEq} from "ramda"
import {fuzzy} from "src/util/misc"
import Input from "src/ui/partials/Input.svelte"
import Anchor from "src/ui/partials/Anchor.svelte"
import Heading from "src/ui/partials/Heading.svelte"
import Content from "src/ui/partials/Content.svelte"
import RelayCard from "src/ui/partials/RelayCard.svelte"
import Input from "src/partials/Input.svelte"
import Anchor from "src/partials/Anchor.svelte"
import Heading from "src/partials/Heading.svelte"
import Content from "src/partials/Content.svelte"
import RelayCard from "src/partials/RelayCard.svelte"
import {watch} from "src/agent/storage"
import {modal} from "src/app/ui"

18
src/ui/routes/PersonDetail.svelte → src/app2/views/PersonDetail.svelte
View File

@ -8,21 +8,21 @@
import {parseHex} from "src/util/html"
import {numberFmt} from "src/util/misc"
import {displayPerson, toHex} from "src/util/nostr"
import Tabs from "src/ui/partials/Tabs.svelte"
import Content from "src/ui/partials/Content.svelte"
import OverflowMenu from "src/ui/partials/OverflowMenu.svelte"
import Spinner from "src/ui/partials/Spinner.svelte"
import Notes from "src/ui/views/person/Notes.svelte"
import Likes from "src/ui/views/person/Likes.svelte"
import Relays from "src/ui/views/person/Relays.svelte"
import Tabs from "src/partials/Tabs.svelte"
import Content from "src/partials/Content.svelte"
import OverflowMenu from "src/partials/OverflowMenu.svelte"
import Spinner from "src/partials/Spinner.svelte"
import Notes from "src/app2/views/PersonNotes.svelte"
import Likes from "src/app2/views/PersonLikes.svelte"
import Relays from "src/app2/views/PersonRelays.svelte"
import user from "src/agent/user"
import pool from "src/agent/pool"
import {sampleRelays, getPubkeyWriteRelays} from "src/agent/relays"
import network from "src/agent/network"
import {getPersonWithFallback} from "src/agent/tables"
import {routes, modal, theme, getThemeColor} from "src/app/ui"
import PersonCircle from "src/ui/partials/PersonCircle.svelte"
import PersonAbout from "src/ui/partials/PersonAbout.svelte"
import PersonCircle from "src/partials/PersonCircle.svelte"
import PersonAbout from "src/partials/PersonAbout.svelte"
export let npub
export let activeTab

2
src/ui/views/person/Likes.svelte → src/app2/views/PersonLikes.svelte
View File

@ -1,5 +1,5 @@
<script lang="ts">
import Feed from "src/ui/views/feed/Feed.svelte"
import Feed from "src/app2/shared/Feed.svelte"
import {isLike} from "src/util/nostr"
import {timedelta} from "src/util/misc"

2
src/ui/views/person/Notes.svelte → src/app2/views/PersonNotes.svelte
View File

@ -1,6 +1,6 @@
<script lang="ts">
import {timedelta} from "src/util/misc"
import Feed from "src/ui/views/feed/Feed.svelte"
import Feed from "src/app2/shared/Feed.svelte"
export let pubkey
export let relays

6
src/ui/views/person/PersonProfileInfo.svelte → src/app2/views/PersonProfileInfo.svelte
View File

@ -1,8 +1,8 @@
<script lang="ts">
import {nip05, nip19} from "nostr-tools"
import Content from "src/ui/partials/Content.svelte"
import RelayCard from "src/ui/views/relays/RelayCard.svelte"
import CopyValue from "src/ui/partials/CopyValue.svelte"
import Content from "src/partials/Content.svelte"
import RelayCard from "src/app2/shared/RelayCard.svelte"
import CopyValue from "src/partials/CopyValue.svelte"
import {onMount} from "svelte"
import {fly} from "svelte/transition"

4
src/ui/views/person/Relays.svelte → src/app2/views/PersonRelays.svelte
View File

@ -1,7 +1,7 @@
<script>
import {fly} from "svelte/transition"
import Content from "src/ui/partials/Content.svelte"
import RelayCard from "src/ui/views/relays/RelayCard.svelte"
import Content from "src/partials/Content.svelte"
import RelayCard from "src/app2/shared/RelayCard.svelte"
export let relays
</script>

4
src/ui/views/person/PersonShare.svelte → src/app2/views/PersonShare.svelte
View File

@ -1,8 +1,8 @@
<script lang="ts">
import {pluck} from "ramda"
import {nip19} from "nostr-tools"
import Content from "src/ui/partials/Content.svelte"
import QRCode from "src/ui/partials/QRCode.svelte"
import Content from "src/partials/Content.svelte"
import QRCode from "src/partials/QRCode.svelte"
import {getPubkeyWriteRelays} from "src/agent/relays"
export let person

8
src/ui/views/relays/AddRelay.svelte → src/app2/views/RelayAdd.svelte
View File

@ -1,9 +1,9 @@
<script>
import {fly} from "svelte/transition"
import Input from "src/ui/partials/Input.svelte"
import Content from "src/ui/partials/Content.svelte"
import Heading from "src/ui/partials/Heading.svelte"
import Button from "src/ui/partials/Button.svelte"
import Input from "src/partials/Input.svelte"
import Content from "src/partials/Content.svelte"
import Heading from "src/partials/Heading.svelte"
import Button from "src/partials/Button.svelte"
import user from "src/agent/user"
import {toast, modal} from "src/app/ui"
import {loadAppData} from "src/app"

8
src/ui/routes/RelayDetail.svelte → src/app2/views/RelayDetail.svelte
View File

@ -1,9 +1,9 @@
<script lang="ts">
import {displayRelay} from "src/util/nostr"
import Content from "src/ui/partials/Content.svelte"
import Feed from "src/ui/views/feed/Feed.svelte"
import RelayTitle from "src/ui/views/relays/RelayTitle.svelte"
import RelayActions from "src/ui/views/relays/RelayActions.svelte"
import Content from "src/partials/Content.svelte"
import Feed from "src/app2/shared/Feed.svelte"
import RelayTitle from "src/app2/shared/RelayTitle.svelte"
import RelayActions from "src/app2/shared/RelayActions.svelte"
import {relays} from "src/agent/tables"
export let url

8
src/ui/routes/RelayList.svelte → src/app2/views/RelayList.svelte
View File

@ -1,9 +1,9 @@
<script>
import {fly} from "svelte/transition"
import Anchor from "src/ui/partials/Anchor.svelte"
import Content from "src/ui/partials/Content.svelte"
import RelaySearch from "src/ui/views/relays/RelaySearch.svelte"
import RelayCard from "src/ui/views/relays/RelayCard.svelte"
import Anchor from "src/partials/Anchor.svelte"
import Content from "src/partials/Content.svelte"
import RelaySearch from "src/app2/shared/RelaySearch.svelte"
import RelayCard from "src/app2/shared/RelayCard.svelte"
import user from "src/agent/user"
import {modal} from "src/app/ui"

10
src/ui/routes/Scan.svelte → src/app2/views/Scan.svelte
View File

@ -4,11 +4,11 @@
import {navigate} from "svelte-routing"
import {find} from "ramda"
import {nip05, nip19} from "nostr-tools"
import Heading from "src/ui/partials/Heading.svelte"
import Input from "src/ui/partials/Input.svelte"
import Anchor from "src/ui/partials/Anchor.svelte"
import Spinner from "src/ui/partials/Spinner.svelte"
import Content from "src/ui/partials/Content.svelte"
import Heading from "src/partials/Heading.svelte"
import Input from "src/partials/Input.svelte"
import Anchor from "src/partials/Anchor.svelte"
import Spinner from "src/partials/Spinner.svelte"
import Content from "src/partials/Content.svelte"
import {toast} from "src/app/ui"
let video,

6
src/ui/routes/Search.svelte → src/app2/views/Search.svelte
View File

@ -1,7 +1,7 @@
<script>
import Heading from "src/ui/partials/Heading.svelte"
import Content from "src/ui/partials/Content.svelte"
import PersonSearch from "src/ui/views/person/PersonSearch.svelte"
import Heading from "src/partials/Heading.svelte"
import Content from "src/partials/Content.svelte"
import PersonSearch from "src/app2/shared/PersonSearch.svelte"
</script>
<Content>

10
src/ui/routes/Keys.svelte → src/app2/views/UserKeys.svelte
View File

@ -4,11 +4,11 @@
import {navigate} from "svelte-routing"
import {nip19} from "nostr-tools"
import {copyToClipboard} from "src/util/html"
import Input from "src/ui/partials/Input.svelte"
import Anchor from "src/ui/partials/Anchor.svelte"
import Content from "src/ui/partials/Content.svelte"
import Toggle from "src/ui/partials/Toggle.svelte"
import Heading from "src/ui/partials/Heading.svelte"
import Input from "src/partials/Input.svelte"
import Anchor from "src/partials/Anchor.svelte"
import Content from "src/partials/Content.svelte"
import Toggle from "src/partials/Toggle.svelte"
import Heading from "src/partials/Heading.svelte"
import keys from "src/agent/keys"
import {toast} from "src/app/ui"

14
src/ui/views/Profile.svelte → src/app2/views/UserProfile.svelte
View File

@ -2,13 +2,13 @@
import {onMount} from "svelte"
import {fly} from "svelte/transition"
import {navigate} from "svelte-routing"
import Input from "src/ui/partials/Input.svelte"
import ImageInput from "src/ui/partials/ImageInput.svelte"
import Textarea from "src/ui/partials/Textarea.svelte"
import Anchor from "src/ui/partials/Anchor.svelte"
import Button from "src/ui/partials/Button.svelte"
import Content from "src/ui/partials/Content.svelte"
import Heading from "src/ui/partials/Heading.svelte"
import Input from "src/partials/Input.svelte"
import ImageInput from "src/partials/ImageInput.svelte"
import Textarea from "src/partials/Textarea.svelte"
import Anchor from "src/partials/Anchor.svelte"
import Button from "src/partials/Button.svelte"
import Content from "src/partials/Content.svelte"
import Heading from "src/partials/Heading.svelte"
import user from "src/agent/user"
import {getUserWriteRelays} from "src/agent/relays"
import cmd from "src/agent/cmd"

12
src/ui/views/Settings.svelte → src/app2/views/UserSettings.svelte
View File

@ -2,12 +2,12 @@
import {onMount} from "svelte"
import {fly} from "svelte/transition"
import {navigate} from "svelte-routing"
import Toggle from "src/ui/partials/Toggle.svelte"
import Anchor from "src/ui/partials/Anchor.svelte"
import Input from "src/ui/partials/Input.svelte"
import Button from "src/ui/partials/Button.svelte"
import Content from "src/ui/partials/Content.svelte"
import Heading from "src/ui/partials/Heading.svelte"
import Toggle from "src/partials/Toggle.svelte"
import Anchor from "src/partials/Anchor.svelte"
import Input from "src/partials/Input.svelte"
import Button from "src/partials/Button.svelte"
import Content from "src/partials/Content.svelte"
import Heading from "src/partials/Heading.svelte"
import user from "src/agent/user"
import pool from "src/agent/pool"
import {toast} from "src/app/ui"

1
src/assets/svelte.svg
View File

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="26.6" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 308"><path fill="#FF3E00" d="M239.682 40.707C211.113-.182 154.69-12.301 113.895 13.69L42.247 59.356a82.198 82.198 0 0 0-37.135 55.056a86.566 86.566 0 0 0 8.536 55.576a82.425 82.425 0 0 0-12.296 30.719a87.596 87.596 0 0 0 14.964 66.244c28.574 40.893 84.997 53.007 125.787 27.016l71.648-45.664a82.182 82.182 0 0 0 37.135-55.057a86.601 86.601 0 0 0-8.53-55.577a82.409 82.409 0 0 0 12.29-30.718a87.573 87.573 0 0 0-14.963-66.244"></path><path fill="#FFF" d="M106.889 270.841c-23.102 6.007-47.497-3.036-61.103-22.648a52.685 52.685 0 0 1-9.003-39.85a49.978 49.978 0 0 1 1.713-6.693l1.35-4.115l3.671 2.697a92.447 92.447 0 0 0 28.036 14.007l2.663.808l-.245 2.659a16.067 16.067 0 0 0 2.89 10.656a17.143 17.143 0 0 0 18.397 6.828a15.786 15.786 0 0 0 4.403-1.935l71.67-45.672a14.922 14.922 0 0 0 6.734-9.977a15.923 15.923 0 0 0-2.713-12.011a17.156 17.156 0 0 0-18.404-6.832a15.78 15.78 0 0 0-4.396 1.933l-27.35 17.434a52.298 52.298 0 0 1-14.553 6.391c-23.101 6.007-47.497-3.036-61.101-22.649a52.681 52.681 0 0 1-9.004-39.849a49.428 49.428 0 0 1 22.34-33.114l71.664-45.677a52.218 52.218 0 0 1 14.563-6.398c23.101-6.007 47.497 3.036 61.101 22.648a52.685 52.685 0 0 1 9.004 39.85a50.559 50.559 0 0 1-1.713 6.692l-1.35 4.116l-3.67-2.693a92.373 92.373 0 0 0-28.037-14.013l-2.664-.809l.246-2.658a16.099 16.099 0 0 0-2.89-10.656a17.143 17.143 0 0 0-18.398-6.828a15.786 15.786 0 0 0-4.402 1.935l-71.67 45.674a14.898 14.898 0 0 0-6.73 9.975a15.9 15.9 0 0 0 2.709 12.012a17.156 17.156 0 0 0 18.404 6.832a15.841 15.841 0 0 0 4.402-1.935l27.345-17.427a52.147 52.147 0 0 1 14.552-6.397c23.101-6.006 47.497 3.037 61.102 22.65a52.681 52.681 0 0 1 9.003 39.848a49.453 49.453 0 0 1-22.34 33.12l-71.664 45.673a52.218 52.218 0 0 1-14.563 6.398"></path></svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

2
src/main.js
View File

@ -1,7 +1,7 @@
import "src/app.css"
import Bugsnag from "@bugsnag/js"
import App from "src/ui/App.svelte"
import App from "src/app2/App.svelte"
import {installPrompt} from "src/app/ui"
Bugsnag.start({

0
src/ui/partials/Anchor.svelte → src/partials/Anchor.svelte
View File

2
src/ui/partials/Badge.svelte → src/partials/Badge.svelte
View File

@ -3,7 +3,7 @@
import {killEvent} from "src/util/html"
import {displayPerson} from "src/util/nostr"
import {routes} from "src/app/ui"
import PersonCircle from "src/ui/partials/PersonCircle.svelte"
import PersonCircle from "src/partials/PersonCircle.svelte"
export let person
export let inert = false

0
src/ui/partials/Button.svelte → src/partials/Button.svelte
View File

0
src/ui/partials/Card.svelte → src/partials/Card.svelte
View File

2
src/ui/partials/Channel.svelte → src/partials/Channel.svelte
View File

@ -4,7 +4,7 @@
import {navigate} from "svelte-routing"
import {prop, path as getPath, reverse, pluck, uniqBy, sortBy, last} from "ramda"
import {sleep, createScroller, Cursor} from "src/util/misc"
import Spinner from "src/ui/partials/Spinner.svelte"
import Spinner from "src/partials/Spinner.svelte"
import user from "src/agent/user"
import {getPersonWithFallback} from "src/agent/tables"
import network from "src/agent/network"

6
src/ui/partials/Compose.svelte → src/partials/Compose.svelte
View File

@ -3,9 +3,9 @@
import {last, pluck, propEq} from "ramda"
import {fuzzy} from "src/util/misc"
import {displayPerson} from "src/util/nostr"
import Badge from "src/ui/partials/Badge.svelte"
import ContentEditable from "src/ui/partials/ContentEditable.svelte"
import Suggestions from "src/ui/partials/Suggestions.svelte"
import Badge from "src/partials/Badge.svelte"
import ContentEditable from "src/partials/ContentEditable.svelte"
import Suggestions from "src/partials/Suggestions.svelte"
import {watch} from "src/agent/storage"
import {getPubkeyWriteRelays} from "src/agent/relays"

0
src/ui/partials/Content.svelte → src/partials/Content.svelte
View File

0
src/ui/partials/ContentEditable.svelte → src/partials/ContentEditable.svelte
View File

0
src/ui/partials/CopyValue.svelte → src/partials/CopyValue.svelte
View File

0
src/ui/partials/Heading.svelte → src/partials/Heading.svelte
View File

0
src/ui/partials/ImageCircle.svelte → src/partials/ImageCircle.svelte
View File

8
src/ui/partials/ImageInput.svelte → src/partials/ImageInput.svelte
View File

@ -1,9 +1,9 @@
<script lang="ts">
import {filter, identity} from "ramda"
import Input from "src/ui/partials/Input.svelte"
import Modal from "src/ui/partials/Modal.svelte"
import Content from "src/ui/partials/Content.svelte"
import Anchor from "src/ui/partials/Anchor.svelte"
import Input from "src/partials/Input.svelte"
import Modal from "src/partials/Modal.svelte"
import Content from "src/partials/Content.svelte"
import Anchor from "src/partials/Anchor.svelte"
import {listenForFile, stripExifData, blobToFile} from "src/util/html"
import {uploadFile, postJson} from "src/util/misc"
import user from "src/agent/user"

0
src/ui/partials/Input.svelte → src/partials/Input.svelte
View File

0
src/ui/partials/LogoSvg.svelte → src/partials/LogoSvg.svelte
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

4
src/ui/partials/Media.svelte → src/partials/Media.svelte
View File

@ -1,8 +1,8 @@
<script>
import cx from "classnames"
import {ellipsize} from "hurdak/lib/hurdak"
import Anchor from "src/ui/partials/Anchor.svelte"
import Spinner from "src/ui/partials/Spinner.svelte"
import Anchor from "src/partials/Anchor.svelte"
import Spinner from "src/partials/Spinner.svelte"
import user from "src/agent/user"
export let link

6
src/ui/partials/MediaSet.svelte → src/partials/MediaSet.svelte
View File

@ -2,9 +2,9 @@
import {sortBy} from "ramda"
import {slide} from "svelte/transition"
import {annotateMedia} from "src/util/misc"
import Media from "src/ui/partials/Media.svelte"
import Content from "src/ui/partials/Content.svelte"
import Modal from "src/ui/partials/Modal.svelte"
import Media from "src/partials/Media.svelte"
import Content from "src/partials/Content.svelte"
import Modal from "src/partials/Modal.svelte"
export let links
export let onClose = null

0
src/ui/partials/Modal.svelte → src/partials/Modal.svelte
View File

4
src/ui/partials/OverflowMenu.svelte → src/partials/OverflowMenu.svelte
View File

@ -1,6 +1,6 @@
<script lang="ts">
import Anchor from "src/ui/partials/Anchor.svelte"
import Popover from "src/ui/partials/Popover.svelte"
import Anchor from "src/partials/Anchor.svelte"
import Popover from "src/partials/Popover.svelte"
export let actions
export let size = ""

2
src/ui/partials/PersonAbout.svelte → src/partials/PersonAbout.svelte
View File

@ -2,7 +2,7 @@
import {ellipsize} from "hurdak/lib/hurdak"
import {parseContent} from "src/util/html"
import {displayPerson} from "src/util/nostr"
import Anchor from "src/ui/partials/Anchor.svelte"
import Anchor from "src/partials/Anchor.svelte"
import {getPersonWithFallback} from "src/agent/tables"
export let person

4
src/ui/partials/PersonCircle.svelte → src/partials/PersonCircle.svelte
View File

@ -1,7 +1,7 @@
<script lang="ts">
import {stringToHue, hsl} from "src/util/misc"
import ImageCircle from "src/ui/partials/ImageCircle.svelte"
import LogoSvg from "src/ui/partials/LogoSvg.svelte"
import ImageCircle from "src/partials/ImageCircle.svelte"
import LogoSvg from "src/partials/LogoSvg.svelte"
import cx from "classnames"
export let person

6
src/ui/partials/PersonInfo.svelte → src/partials/PersonInfo.svelte
View File

@ -3,9 +3,9 @@
import {fly} from "svelte/transition"
import {noEvent} from "src/util/html"
import {displayPerson} from "src/util/nostr"
import Anchor from "src/ui/partials/Anchor.svelte"
import PersonCircle from "src/ui/partials/PersonCircle.svelte"
import PersonAbout from "src/ui/partials/PersonAbout.svelte"
import Anchor from "src/partials/Anchor.svelte"
import PersonCircle from "src/partials/PersonCircle.svelte"
import PersonAbout from "src/partials/PersonAbout.svelte"
import {routes} from "src/app/ui"
export let person

0
src/ui/partials/Popover.svelte → src/partials/Popover.svelte
View File

2
src/ui/partials/QRCode.svelte → src/partials/QRCode.svelte
View File

@ -1,7 +1,7 @@
<script lang="ts">
import QRCode from "qrcode"
import {onMount} from "svelte"
import Input from "src/ui/partials/Input.svelte"
import Input from "src/partials/Input.svelte"
import {copyToClipboard} from "src/util/html"
import {toast} from "src/app/ui"

2
src/ui/partials/RelayCard.svelte → src/partials/RelayCard.svelte
View File

@ -5,7 +5,7 @@
import {poll, stringToHue, hsl} from "src/util/misc"
import {between} from "hurdak/lib/hurdak"
import {fly} from "svelte/transition"
import Anchor from "src/ui/partials/Anchor.svelte"
import Anchor from "src/partials/Anchor.svelte"
import pool from "src/agent/pool"
export let relay

0
src/ui/partials/RelayCardSimple.svelte → src/partials/RelayCardSimple.svelte
View File

0
src/ui/partials/Select.svelte → src/partials/Select.svelte
View File

0
src/ui/partials/SelectButton.svelte → src/partials/SelectButton.svelte
View File

0
src/ui/partials/Spinner.svelte → src/partials/Spinner.svelte
View File

0
src/ui/partials/Suggestions.svelte → src/partials/Suggestions.svelte
View File

0
src/ui/partials/Tabs.svelte → src/partials/Tabs.svelte
View File

0
src/ui/partials/Textarea.svelte → src/partials/Textarea.svelte
View File

0
src/ui/partials/Toggle.svelte → src/partials/Toggle.svelte
View File

20
src/ui/routes/Debug.svelte
View File

@ -1,20 +0,0 @@
<script lang="ts">
import {flatten} from "ramda"
import {fly} from "svelte/transition"
import {logs} from "src/util/logger.js"
import {formatTimestamp} from "src/util/misc"
import Content from "src/ui/partials/Content.svelte"
document.title = "Debug"
</script>
<Content>
{#each flatten($logs) as { created_at, message }}
<div in:fly={{y: 20}} class="flex flex-col gap-2 text-sm">
<div class="text-gray-1 underline">
{formatTimestamp(created_at / 1000)}
</div>
<pre>{message.map(m => JSON.stringify(m, null, 2)).join(" ")}</pre>
</div>
{/each}
</Content>

14
src/ui/views/NavItem.svelte
View File

@ -1,14 +0,0 @@
<script lang="ts">
import cx from "classnames"
export let href
export let icon
export let inert = false
</script>
<li class={cx($$props.class, {"transition-all hover:bg-accent": !inert}, "cursor-pointer")}>
<a {href} class="flex items-center gap-2 px-4 py-2">
<i class={`fa fa-${icon}`} />
<slot />
</a>
</li>

15
src/util/logger.js
View File

@ -1,12 +1,3 @@
import {writable} from "svelte/store"
export const logs = writable([])
const logAndAppend = (level, ...message) => {
logs.update($logs => $logs.concat({created_at: Date.now(), message}).slice(-100))
console[level](...message)
}
export const log = (...message) => logAndAppend("log", ...message)
export const warn = (...message) => logAndAppend("warn", ...message)
export const error = (...message) => logAndAppend("error", ...message)
export const log = (...message) => console.log(...message)
export const warn = (...message) => console.warn(...message)
export const error = (...message) => console.error(...message)