mirror of
https://github.com/coracle-social/coracle.git
synced 2024-09-18 19:23:40 +00:00
Move feed components around
This commit is contained in:
parent
99c27455e9
commit
36bd31fa55
@ -26,7 +26,6 @@
|
||||
import {modal, routes, menuIsOpen, logUsage} from "src/app/ui"
|
||||
import Anchor from "src/partials/Anchor.svelte"
|
||||
import Content from "src/partials/Content.svelte"
|
||||
import EnsureData from "src/partials/EnsureData.svelte"
|
||||
import Modal from "src/partials/Modal.svelte"
|
||||
import Spinner from "src/partials/Spinner.svelte"
|
||||
import Alerts from "src/routes/Alerts.svelte"
|
||||
@ -46,6 +45,7 @@
|
||||
import Scan from "src/routes/Scan.svelte"
|
||||
import RelayDetail from "src/routes/RelayDetail.svelte"
|
||||
import RelayList from "src/routes/RelayList.svelte"
|
||||
import EnsureData from "src/views/EnsureData.svelte"
|
||||
import Profile from "src/views/Profile.svelte"
|
||||
import Settings from "src/views/Settings.svelte"
|
||||
import SideNav from "src/views/SideNav.svelte"
|
||||
|
@ -5,8 +5,8 @@
|
||||
import Content from "src/partials/Content.svelte"
|
||||
import Tabs from "src/partials/Tabs.svelte"
|
||||
import NewNoteButton from "src/views/notes/NewNoteButton.svelte"
|
||||
import Follows from "src/views/notes/Follows.svelte"
|
||||
import Network from "src/views/notes/Network.svelte"
|
||||
import Follows from "src/views/feed/Follows.svelte"
|
||||
import Network from "src/views/feed/Network.svelte"
|
||||
import user from 'src/agent/user'
|
||||
|
||||
export let activeTab
|
||||
|
@ -6,7 +6,7 @@
|
||||
import {between} from 'hurdak/lib/hurdak'
|
||||
import Content from "src/partials/Content.svelte"
|
||||
import Anchor from "src/partials/Anchor.svelte"
|
||||
import Feed from "src/views/notes/Feed.svelte"
|
||||
import Feed from "src/views/feed/Feed.svelte"
|
||||
import database from 'src/agent/database'
|
||||
import pool from 'src/agent/pool'
|
||||
import user from "src/agent/user"
|
||||
|
@ -1,49 +1,8 @@
|
||||
<script>
|
||||
import {fuzzy} from "src/util/misc"
|
||||
import {personKinds} from "src/util/nostr"
|
||||
import Input from "src/partials/Input.svelte"
|
||||
import Spinner from "src/partials/Spinner.svelte"
|
||||
import Content from "src/partials/Content.svelte"
|
||||
import PersonInfo from 'src/views/person/PersonInfo.svelte'
|
||||
import {getUserReadRelays} from 'src/agent/relays'
|
||||
import database from 'src/agent/database'
|
||||
import network from 'src/agent/network'
|
||||
import user from 'src/agent/user'
|
||||
|
||||
export let hideFollowing = false
|
||||
|
||||
let q
|
||||
let results = []
|
||||
|
||||
const {petnamePubkeys} = user
|
||||
const search = database.watch('people', t =>
|
||||
console.log(t.all({'kind0.name:!nil': null}))||
|
||||
fuzzy(
|
||||
t.all({'kind0.name:!nil': null}),
|
||||
{keys: ["kind0.name", "kind0.about", "pubkey"]}
|
||||
)
|
||||
)
|
||||
|
||||
$: results = $search(q).slice(0, 50)
|
||||
|
||||
// Prime our database, in case we don't have any people stored yet
|
||||
network.load({
|
||||
relays: getUserReadRelays(),
|
||||
filter: {kinds: personKinds, limit: 10},
|
||||
})
|
||||
|
||||
document.title = "Search"
|
||||
import Content from 'src/partials/Content.svelte'
|
||||
import PersonSearch from 'src/views/person/PersonSearch.svelte'
|
||||
</script>
|
||||
|
||||
<Content>
|
||||
<Input bind:value={q} placeholder="Search for people">
|
||||
<i slot="before" class="fa-solid fa-search" />
|
||||
</Input>
|
||||
{#each results as person (person.pubkey)}
|
||||
{#if person.pubkey !== user.getPubkey() && !(hideFollowing && $petnamePubkeys.includes(person.pubkey))}
|
||||
<PersonInfo {person} />
|
||||
{/if}
|
||||
{:else}
|
||||
<Spinner />
|
||||
{/each}
|
||||
<PersonSearch />
|
||||
</Content>
|
||||
|
@ -5,7 +5,7 @@
|
||||
import PersonInfo from "src/views/person/PersonInfo.svelte"
|
||||
import RelaySearch from "src/views/relays/RelaySearch.svelte"
|
||||
import RelayCard from "src/views/relays/RelayCard.svelte"
|
||||
import Search from "src/routes/Search.svelte"
|
||||
import PersonSearch from "src/views/person/PersonSearch.svelte"
|
||||
import database from 'src/agent/database'
|
||||
import user from 'src/agent/user'
|
||||
|
||||
@ -76,8 +76,8 @@
|
||||
</div>
|
||||
</div>
|
||||
{/each}
|
||||
<PersonSearch hideFollowing />
|
||||
</Content>
|
||||
<Search hideFollowing />
|
||||
</Modal>
|
||||
{:else if needsPeople()}
|
||||
<Content size="lg">
|
@ -1,6 +1,6 @@
|
||||
<script>
|
||||
import {shuffle} from 'src/util/misc'
|
||||
import Notes from "src/views/notes/Feed.svelte"
|
||||
import Feed from "src/views/feed/Feed.svelte"
|
||||
import {getUserFollows} from 'src/agent/social'
|
||||
import {sampleRelays, getAllPubkeyWriteRelays} from 'src/agent/relays'
|
||||
|
||||
@ -12,4 +12,4 @@
|
||||
const filter = [{kinds: [1], authors}, {kinds: [7], authors}]
|
||||
</script>
|
||||
|
||||
<Notes {relays} {filter} />
|
||||
<Feed {relays} {filter} />
|
@ -1,6 +1,6 @@
|
||||
<script>
|
||||
import {shuffle} from 'src/util/misc'
|
||||
import Notes from "src/views/notes/Feed.svelte"
|
||||
import Feed from "src/views/feed/Feed.svelte"
|
||||
import {getUserNetwork} from 'src/agent/social'
|
||||
import {sampleRelays, getAllPubkeyWriteRelays} from 'src/agent/relays'
|
||||
|
||||
@ -14,4 +14,4 @@
|
||||
const filter = [{kinds: [1], authors}, {kinds: [7], authors}]
|
||||
</script>
|
||||
|
||||
<Notes {relays} {filter} />
|
||||
<Feed {relays} {filter} />
|
@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
import Feed from "src/views/notes/Feed.svelte"
|
||||
import Feed from "src/views/feed/Feed.svelte"
|
||||
import {isLike} from 'src/util/nostr'
|
||||
import {sampleRelays, getPubkeyWriteRelays} from 'src/agent/relays'
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
import Feed from "src/views/notes/Feed.svelte"
|
||||
import Feed from "src/views/feed/Feed.svelte"
|
||||
import {sampleRelays, getPubkeyWriteRelays} from 'src/agent/relays'
|
||||
|
||||
export let pubkey
|
||||
|
45
src/views/person/PersonSearch.svelte
Normal file
45
src/views/person/PersonSearch.svelte
Normal file
@ -0,0 +1,45 @@
|
||||
<script>
|
||||
import {fuzzy} from "src/util/misc"
|
||||
import {personKinds} from "src/util/nostr"
|
||||
import Input from "src/partials/Input.svelte"
|
||||
import Spinner from "src/partials/Spinner.svelte"
|
||||
import PersonInfo from 'src/views/person/PersonInfo.svelte'
|
||||
import {getUserReadRelays} from 'src/agent/relays'
|
||||
import database from 'src/agent/database'
|
||||
import network from 'src/agent/network'
|
||||
import user from 'src/agent/user'
|
||||
|
||||
export let hideFollowing = false
|
||||
|
||||
let q
|
||||
let results = []
|
||||
|
||||
const {petnamePubkeys} = user
|
||||
const search = database.watch('people', t =>
|
||||
fuzzy(
|
||||
t.all({'kind0.name:!nil': null}),
|
||||
{keys: ["kind0.name", "kind0.about", "pubkey"]}
|
||||
)
|
||||
)
|
||||
|
||||
$: results = $search(q).slice(0, 50)
|
||||
|
||||
// Prime our database, in case we don't have any people stored yet
|
||||
network.load({
|
||||
relays: getUserReadRelays(),
|
||||
filter: {kinds: personKinds, limit: 10},
|
||||
})
|
||||
|
||||
document.title = "Search"
|
||||
</script>
|
||||
|
||||
<Input bind:value={q} placeholder="Search for people">
|
||||
<i slot="before" class="fa-solid fa-search" />
|
||||
</Input>
|
||||
{#each results as person (person.pubkey)}
|
||||
{#if person.pubkey !== user.getPubkey() && !(hideFollowing && $petnamePubkeys.includes(person.pubkey))}
|
||||
<PersonInfo {person} />
|
||||
{/if}
|
||||
{:else}
|
||||
<Spinner />
|
||||
{/each}
|
Loading…
Reference in New Issue
Block a user