feat: add community search to search page

This commit is contained in:
Xyphyn committed 2023-09-04 10:49:31 -07:00
1 parent 819fde66ab
commit e946d0de48
44 files changed
+79 -218

No files matched your search

+1 -3
View File
@@ -4,15 +4,13 @@
import { navigating } from '$app/stores'
import nProgress from 'nprogress'
import 'nprogress/nprogress.css'
import ToastContainer from '$lib/components/ui/toasts/ToastContainer.svelte'
import Moderation from '$lib/components/lemmy/moderation/Moderation.svelte'
import Sidebar from '$lib/components/ui/sidebar/Sidebar.svelte'
import { onMount } from 'svelte'
// @ts-ignore
import { pwaInfo } from 'virtual:pwa-info'
import PwaReload from '$lib/PwaReload.svelte'
import { inDarkTheme } from '$lib/ui/colors.js'
import { userSettings } from '$lib/settings.js'
import { ToastContainer } from 'mono-svelte'
nProgress.configure({
minimum: 0.4,
+12 -4
View File
@@ -11,7 +11,7 @@
import EditableList from '$lib/components/ui/list/EditableList.svelte'
import Menu from '$lib/components/ui/menu/Menu.svelte'
import MenuButton from '$lib/components/ui/menu/MenuButton.svelte'
import { toast } from '$lib/components/ui/toasts/toasts.js'
import { toast } from 'mono-svelte'
import DebugObject from '$lib/components/util/debug/DebugObject.svelte'
import {
DEFAULT_INSTANCE_URL,
@@ -173,7 +173,12 @@
</div>
<div class="ml-auto" />
<Menu alignment="bottom-right">
<Button let:toggleOpen on:click={toggleOpen} size="square-md" slot="button">
<Button
let:toggleOpen
on:click={toggleOpen}
size="square-md"
slot="button"
>
<Icon src={EllipsisHorizontal} mini size="16" slot="prefix" />
</Button>
<MenuButton on:click={() => moveProfile(profile.id, true)}>
@@ -246,12 +251,15 @@
label="Guest instance"
bind:value={newInstance}
disabled={LINKED_INSTANCE_URL != undefined}
/>
size="sm"
>
<span slot="prefix">https://</span>
</TextInput>
<Button
color="primary"
{loading}
disabled={loading || LINKED_INSTANCE_URL != undefined}
class="h-[42px] self-end"
class="self-end"
>
Change
</Button>
@@ -4,7 +4,7 @@
import Card from '$lib/components/ui/Card.svelte'
import SectionTitle from '$lib/components/ui/SectionTitle.svelte'
import { toast } from '$lib/components/ui/toasts/toasts.js'
import { toast } from 'mono-svelte'
import { getClient } from '$lib/lemmy.js'
import type { RegistrationApplicationView } from 'lemmy-js-client'
import { Button } from 'mono-svelte'
+1 -1
View File
@@ -1,7 +1,7 @@
<script lang="ts">
import { profile } from '$lib/auth.js'
import MarkdownEditor from '$lib/components/markdown/MarkdownEditor.svelte'
import { toast } from '$lib/components/ui/toasts/toasts.js'
import { toast } from 'mono-svelte'
import { getClient } from '$lib/lemmy.js'
import type { EditSite } from 'lemmy-js-client'
import type { PageData } from './$types.js'
+1 -1
View File
@@ -4,7 +4,7 @@
import MarkdownEditor from '$lib/components/markdown/MarkdownEditor.svelte'
import Placeholder from '$lib/components/ui/Placeholder.svelte'
import EditableList from '$lib/components/ui/list/EditableList.svelte'
import { toast } from '$lib/components/ui/toasts/toasts.js'
import { toast } from 'mono-svelte'
import { getClient } from '$lib/lemmy.js'
import type { Tagline } from 'lemmy-js-client'
import { Button } from 'mono-svelte'
+1 -1
View File
@@ -3,7 +3,7 @@
import UserLink from '$lib/components/lemmy/user/UserLink.svelte'
import Placeholder from '$lib/components/ui/Placeholder.svelte'
import EditableList from '$lib/components/ui/list/EditableList.svelte'
import { toast } from '$lib/components/ui/toasts/toasts.js'
import { toast } from 'mono-svelte'
import { instance } from '$lib/instance.js'
import { getClient } from '$lib/lemmy.js'
import { addAdmin } from '$lib/lemmy/user.js'
@@ -5,7 +5,7 @@
import { Icon, Plus, Trash } from 'svelte-hero-icons'
import type { PageData } from './$types.js'
import { profile } from '$lib/auth.js'
import { toast } from '$lib/components/ui/toasts/toasts.js'
import { toast } from 'mono-svelte'
import { getClient } from '$lib/lemmy.js'
import { flip } from 'svelte/animate'
import { Button, TextInput } from 'mono-svelte'
+1 -1
View File
@@ -2,7 +2,7 @@
import { getClient } from '$lib/lemmy.js'
import type { CommunityView } from 'lemmy-js-client'
import { profile } from '$lib/auth.js'
import { toast } from '$lib/components/ui/toasts/toasts.js'
import { toast } from 'mono-svelte'
export let community: CommunityView
+1 -1
View File
@@ -13,7 +13,7 @@
} from 'lemmy-js-client'
import { ChatBubbleOvalLeft, Check, Icon } from 'svelte-hero-icons'
import { page } from '$app/stores'
import { toast } from '$lib/components/ui/toasts/toasts.js'
import { toast } from 'mono-svelte'
import PostMeta from '$lib/components/lemmy/post/PostMeta.svelte'
import SectionTitle from '$lib/components/ui/SectionTitle.svelte'
import { Button } from 'mono-svelte'
+1 -1
View File
@@ -2,7 +2,7 @@
import { goto } from '$app/navigation'
import { setUser } from '$lib/auth.js'
import Link from '$lib/components/input/Link.svelte'
import { toast } from '$lib/components/ui/toasts/toasts.js'
import { toast } from 'mono-svelte'
import { DEFAULT_INSTANCE_URL, LINKED_INSTANCE_URL } from '$lib/instance.js'
import { getClient, validateInstance } from '$lib/lemmy.js'
import { Button, TextInput } from 'mono-svelte'
+1 -1
View File
@@ -1,7 +1,7 @@
<script lang="ts">
import CommentItem from '$lib/components/lemmy/comment/CommentItem.svelte'
import Post from '$lib/components/lemmy/post/Post.svelte'
import { toast } from '$lib/components/ui/toasts/toasts.js'
import { toast } from 'mono-svelte'
import { getClient } from '$lib/lemmy.js'
import { isCommentReport, isPostReport } from '$lib/lemmy/item.js'
import type {
@@ -13,7 +13,7 @@
import Card from '$lib/components/ui/Card.svelte'
import PostLink from '$lib/components/lemmy/post/PostLink.svelte'
import PostMeta from '$lib/components/lemmy/post/PostMeta.svelte'
import { removeToast, toast } from '$lib/components/ui/toasts/toasts.js'
import { removeToast, toast } from 'mono-svelte'
import type { CommentSortType } from 'lemmy-js-client'
import MultiSelect from '$lib/components/input/MultiSelect.svelte'
import { profile } from '$lib/auth.js'
@@ -4,7 +4,7 @@
import FileInput from '$lib/components/input/FileInput.svelte'
import MarkdownEditor from '$lib/components/markdown/MarkdownEditor.svelte'
import Card from '$lib/components/ui/Card.svelte'
import { removeToast, toast } from '$lib/components/ui/toasts/toasts.js'
import { removeToast, toast } from 'mono-svelte'
import { getClient, uploadImage } from '$lib/lemmy.js'
import type { SaveUserSettings } from 'lemmy-js-client'
import { Button, Checkbox, Modal, TextInput } from 'mono-svelte'
+14 -2
View File
@@ -1,5 +1,7 @@
<script lang="ts">
import { page } from '$app/stores'
import { profile } from '$lib/auth.js'
import ObjectAutocomplete from '$lib/components/lemmy/ObjectAutocomplete.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'
@@ -29,7 +31,7 @@
export let data
let query = ''
let query = data.query || ''
let pageNum = data.page
</script>
@@ -50,7 +52,7 @@
Type
</span>
<option value="All">All</option>
<option value="Local">Posts</option>
<option value="Posts">Posts</option>
<option value="Comments">Comments</option>
<option value="Communities">Communities</option>
<option value="Users">Users</option>
@@ -70,6 +72,16 @@
</Button>
</div>
</div>
<div class="max-w-sm mt-2">
<ObjectAutocomplete
label="Community"
jwt={$profile?.jwt}
listing_type={'All'}
showWhenEmpty={true}
on:select={(c) =>
searchParam($page.url, 'community', c.detail?.id || undefined, 'page')}
/>
</div>
{#if !data.results}
<Placeholder
icon={MagnifyingGlass}
+6 -2
View File
@@ -15,7 +15,7 @@ import { get } from 'svelte/store'
export async function load({ url, fetch }) {
const query = url.searchParams.get('q')
const page = Number(url.searchParams.get('page')) || 1
const community = url.searchParams.get('community_name')
const community = Number(url.searchParams.get('community')) || undefined
const sort = url.searchParams.get('sort') || 'New'
const type = url.searchParams.get('type') || 'All'
@@ -23,7 +23,7 @@ export async function load({ url, fetch }) {
const results = await getClient(undefined, fetch).search({
q: query,
auth: get(profile)?.jwt,
community_name: community ?? undefined,
community_id: community ?? undefined,
limit: 40,
page: page,
sort: (sort as SortType) || 'New',
@@ -47,6 +47,7 @@ export async function load({ url, fetch }) {
type: type,
sort: sort,
page: page,
query: query,
results: everything,
streamed: {
object: get(profile)?.jwt
@@ -61,5 +62,8 @@ export async function load({ url, fetch }) {
return {
page: 1,
sort: sort,
type: type,
query: query,
}
}
+1 -1
View File
@@ -3,7 +3,7 @@
import Setting from './Setting.svelte'
import MultiSelect from '$lib/components/input/MultiSelect.svelte'
import Sort from '$lib/components/lemmy/Sort.svelte'
import { toast } from '$lib/components/ui/toasts/toasts.js'
import { toast } from 'mono-svelte'
import SectionTitle from '$lib/components/ui/SectionTitle.svelte'
import Link from '$lib/components/input/Link.svelte'
import {
+1 -1
View File
@@ -1,6 +1,6 @@
<script lang="ts">
import { goto } from '$app/navigation'
import { toast } from '$lib/components/ui/toasts/toasts.js'
import { toast } from 'mono-svelte'
import { DEFAULT_INSTANCE_URL } from '$lib/instance.js'
import { validateInstance } from '$lib/lemmy.js'
import { Button, TextInput } from 'mono-svelte'
+1 -1
View File
@@ -8,7 +8,7 @@
import Card from '$lib/components/ui/Card.svelte'
import Placeholder from '$lib/components/ui/Placeholder.svelte'
import Spinner from '$lib/components/ui/loader/Spinner.svelte'
import { toast } from '$lib/components/ui/toasts/toasts.js'
import { toast } from 'mono-svelte'
import { getClient } from '$lib/lemmy.js'
import type { GetCaptchaResponse } from 'lemmy-js-client'
import { Button, TextArea, TextInput } from 'mono-svelte'
+1 -1
View File
@@ -24,7 +24,7 @@
import { isCommentView } from '$lib/lemmy/item.js'
import { getClient } from '$lib/lemmy.js'
import { isBlocked } from '$lib/lemmy/user.js'
import { toast } from '$lib/components/ui/toasts/toasts.js'
import { toast } from 'mono-svelte'
import UserLink from '$lib/components/lemmy/user/UserLink.svelte'
import { profile } from '$lib/auth.js'
import { ban, isAdmin } from '$lib/components/lemmy/moderation/moderation.js'