feat: Add search function
This commit is contained in:
1 parent
91134d05e4
commit
1dd179d636
22 files changed
+455
-70
No files matched your search
@@ -5,7 +5,7 @@
|
||||
import Post from '../../../lib/components/lemmy/post/Post.svelte'
|
||||
import { goto } from '$app/navigation'
|
||||
import Card from '$lib/components/ui/StickyCard.svelte'
|
||||
import CommunityCard from '$lib/components/community/CommunityCard.svelte'
|
||||
import CommunityCard from '$lib/components/lemmy/community/CommunityCard.svelte'
|
||||
import Button from '$lib/components/input/Button.svelte'
|
||||
import { Color } from '$lib/ui/colors'
|
||||
import { fly } from 'svelte/transition'
|
||||
|
||||
@@ -9,8 +9,7 @@
|
||||
QuestionMarkCircle,
|
||||
UserGroup,
|
||||
} from 'svelte-hero-icons'
|
||||
import CommunityLink from '$lib/components/community/CommunityLink.svelte'
|
||||
import { Color } from '$lib/ui/colors.js'
|
||||
import CommunityLink from '$lib/components/lemmy/community/CommunityLink.svelte'
|
||||
import TextInput from '$lib/components/input/TextInput.svelte'
|
||||
import Subscribe from './Subscribe.svelte'
|
||||
import Button from '$lib/components/input/Button.svelte'
|
||||
@@ -38,7 +37,8 @@
|
||||
}}
|
||||
/>
|
||||
<div class="flex flex-col sm:flex-row gap-2 sm:ml-auto items-center">
|
||||
<TextInput bind:value={search}
|
||||
<TextInput
|
||||
bind:value={search}
|
||||
on:change={() => {
|
||||
$page.url.searchParams.set('q', search)
|
||||
goto($page.url.toString(), {
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
<h1 class="font-bold text-4xl">I don't take donations.</h1>
|
||||
|
||||
<p>
|
||||
This is a project that I'm making because it's fun, not to gain money. If you
|
||||
want to support me, contribute! Report bugs, fix typos, etc.
|
||||
</p>
|
||||
@@ -33,12 +33,16 @@
|
||||
return false
|
||||
}
|
||||
|
||||
let markingAsRead = false
|
||||
|
||||
async function markAllAsRead() {
|
||||
if (!$user) {
|
||||
goto('/login')
|
||||
return
|
||||
}
|
||||
|
||||
markingAsRead = true
|
||||
|
||||
const response = await getClient().markAllAsRead({
|
||||
auth: $authData!.token,
|
||||
})
|
||||
@@ -47,6 +51,8 @@
|
||||
|
||||
goto($page.url, {
|
||||
invalidateAll: true,
|
||||
}).then(() => {
|
||||
markingAsRead = false
|
||||
})
|
||||
|
||||
return response.replies
|
||||
@@ -59,8 +65,13 @@
|
||||
|
||||
<div class="flex flex-row justify-between">
|
||||
<h1 class="font-bold text-3xl">Inbox</h1>
|
||||
<Button on:click={markAllAsRead}>
|
||||
<Icon src={Check} width={16} mini />
|
||||
<Button
|
||||
on:click={markAllAsRead}
|
||||
loading={markingAsRead}
|
||||
disabled={markingAsRead}
|
||||
size="md"
|
||||
>
|
||||
<Icon src={Check} width={16} mini slot="icon" />
|
||||
Mark all as read
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
buildCommentsTreeAsync,
|
||||
} from '$lib/components/lemmy/comment/comments.js'
|
||||
import Comments from '$lib/components/lemmy/comment/Comments.svelte'
|
||||
import CommunityLink from '$lib/components/community/CommunityLink.svelte'
|
||||
import CommunityLink from '$lib/components/lemmy/community/CommunityLink.svelte'
|
||||
import { isImage } from '$lib/ui/image.js'
|
||||
import { authData, getClient, user } from '$lib/lemmy.js'
|
||||
import CommentForm from '$lib/components/lemmy/comment/CommentForm.svelte'
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
import InboxItem from '../inbox/InboxItem.svelte'
|
||||
import Card from '$lib/components/ui/Card.svelte'
|
||||
import Post from '$lib/components/lemmy/post/Post.svelte'
|
||||
import CommunityLink from '$lib/components/community/CommunityLink.svelte'
|
||||
import CommunityLink from '$lib/components/lemmy/community/CommunityLink.svelte'
|
||||
import Link from '$lib/components/input/Link.svelte'
|
||||
import Comment from '$lib/components/lemmy/comment/Comment.svelte'
|
||||
import { fly } from 'svelte/transition'
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
<script>
|
||||
import { page } from '$app/stores'
|
||||
</script>
|
||||
|
||||
<div class="text-center">
|
||||
<h1 class="text-4xl font-black">{$page.status}</h1>
|
||||
<span>The search timed out. This is an issue on the server's side.</span>
|
||||
</div>
|
||||
@@ -0,0 +1,98 @@
|
||||
<script lang="ts">
|
||||
import { goto } from '$app/navigation'
|
||||
import { page } from '$app/stores'
|
||||
import MultiSelect from '$lib/components/input/MultiSelect.svelte'
|
||||
import TextInput from '$lib/components/input/TextInput.svelte'
|
||||
import Comment from '$lib/components/lemmy/comment/Comment.svelte'
|
||||
import CommentItem from '$lib/components/lemmy/comment/CommentItem.svelte'
|
||||
import CommunityItem from '$lib/components/lemmy/community/CommunityItem.svelte'
|
||||
import Post from '$lib/components/lemmy/post/Post.svelte'
|
||||
import UserItem from '$lib/components/lemmy/user/UserItem.svelte'
|
||||
import Pageination from '$lib/components/ui/Pageination.svelte'
|
||||
import type {
|
||||
CommentView,
|
||||
CommunityView,
|
||||
PersonView,
|
||||
PostView,
|
||||
} from 'lemmy-js-client'
|
||||
import { Icon, MagnifyingGlass } from 'svelte-hero-icons'
|
||||
|
||||
type Result = PostView | CommentView | PersonView | CommunityView
|
||||
|
||||
export let data
|
||||
|
||||
let query = ''
|
||||
|
||||
const isPost = (item: Result): item is PostView =>
|
||||
'post' in item && !('comment' in item)
|
||||
|
||||
const isComment = (item: Result): item is CommentView => 'comment' in item
|
||||
|
||||
const isCommunity = (item: Result): item is CommunityView =>
|
||||
'community' in item
|
||||
|
||||
const isUser = (item: Result): item is PersonView => 'person' in item
|
||||
|
||||
let pageNum = data.page
|
||||
</script>
|
||||
|
||||
<svelte:head>
|
||||
<title>Search</title>
|
||||
</svelte:head>
|
||||
|
||||
<div class="flex flex-row flex-wrap sm:justify-between items-center gap-4">
|
||||
<MultiSelect
|
||||
options={['All', 'Posts', 'Comments', 'Users', 'Communities']}
|
||||
selected={$page.url.searchParams.get('type') ?? 'All'}
|
||||
on:select={(e) => {
|
||||
const url = $page.url
|
||||
url.searchParams.set('type', e.detail)
|
||||
url.searchParams.delete('page')
|
||||
goto(url, {
|
||||
invalidateAll: true,
|
||||
})
|
||||
}}
|
||||
/>
|
||||
<TextInput
|
||||
bind:value={query}
|
||||
placeholder="Search for something..."
|
||||
on:change={() => {
|
||||
$page.url.searchParams.set('q', query)
|
||||
goto($page.url.toString(), {
|
||||
invalidateAll: true,
|
||||
})
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
{#if !data.results}
|
||||
<div
|
||||
class="text-slate-600 dark:text-zinc-400 flex flex-col justify-center items-center py-8"
|
||||
>
|
||||
<Icon src={MagnifyingGlass} size="48" solid />
|
||||
<h1 class="font-bold text-3xl">No results</h1>
|
||||
<p class="mt-2 text-center">Search for something!</p>
|
||||
</div>
|
||||
{:else}
|
||||
<div class="flex flex-col gap-4 mt-4">
|
||||
{#each data.results as result}
|
||||
{#if isPost(result)}
|
||||
<Post post={result} />
|
||||
{:else if isComment(result)}
|
||||
<CommentItem comment={result} />
|
||||
{:else if isCommunity(result)}
|
||||
<CommunityItem community={result} />
|
||||
{:else if isUser(result)}
|
||||
<UserItem user={result} />
|
||||
{/if}
|
||||
{/each}
|
||||
</div>
|
||||
<Pageination
|
||||
bind:page={pageNum}
|
||||
on:change={(p) => {
|
||||
$page.url.searchParams.set('page', p.detail.toString())
|
||||
goto($page.url, {
|
||||
invalidateAll: true,
|
||||
})
|
||||
}}
|
||||
/>
|
||||
{/if}
|
||||
@@ -0,0 +1,74 @@
|
||||
import { authData, getClient } from '$lib/lemmy.js'
|
||||
import type {
|
||||
CommentView,
|
||||
CommunityView,
|
||||
PersonView,
|
||||
PostView,
|
||||
SearchResponse,
|
||||
SearchType,
|
||||
SortType,
|
||||
} from 'lemmy-js-client'
|
||||
import { get } from 'svelte/store'
|
||||
|
||||
function getSearchItemPublished(
|
||||
item: PostView | CommentView | PersonView | CommunityView
|
||||
) {
|
||||
if ('comment' in item) {
|
||||
return item.comment.published
|
||||
} else if ('post' in item) {
|
||||
return item.post.published
|
||||
}
|
||||
|
||||
if ('person' in item) {
|
||||
return item.person.published
|
||||
}
|
||||
|
||||
if ('community' in item) {
|
||||
return item.community.published
|
||||
}
|
||||
|
||||
return ''
|
||||
}
|
||||
|
||||
export async function load({ url }) {
|
||||
const query = url.searchParams.get('q')
|
||||
const page = Number(url.searchParams.get('page')) || 1
|
||||
const community = url.searchParams.get('community_name')
|
||||
const sort = url.searchParams.get('sort')
|
||||
const type = url.searchParams.get('type')
|
||||
|
||||
if (query) {
|
||||
const results = await getClient().search({
|
||||
q: query,
|
||||
auth: get(authData)?.token,
|
||||
community_name: community ?? undefined,
|
||||
limit: 40,
|
||||
page: page,
|
||||
sort: (sort as SortType) || 'New',
|
||||
listing_type: 'All',
|
||||
type_: (type as SearchType) ?? 'All',
|
||||
})
|
||||
|
||||
const [posts, comments, users, communities] = [
|
||||
results.posts,
|
||||
results.comments,
|
||||
results.users,
|
||||
results.communities,
|
||||
]
|
||||
|
||||
const everything = [...posts, ...comments, ...users, ...communities].sort(
|
||||
(a, b) =>
|
||||
Date.parse(getSearchItemPublished(b)) -
|
||||
Date.parse(getSearchItemPublished(a))
|
||||
)
|
||||
|
||||
return {
|
||||
page: page,
|
||||
results: everything,
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
page: 1,
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
import CommunityLink from '$lib/components/community/CommunityLink.svelte'
|
||||
import CommunityLink from '$lib/components/lemmy/community/CommunityLink.svelte'
|
||||
import Link from '$lib/components/input/Link.svelte'
|
||||
import Post from '$lib/components/lemmy/post/Post.svelte'
|
||||
import Comment from '$lib/components/lemmy/comment/Comment.svelte'
|
||||
|
||||
Reference in new issue
Block a user