merge: upstream

This commit is contained in:
Marie 2023-12-23 02:09:23 +01:00
commit 5db583a3eb
701 changed files with 50809 additions and 13660 deletions

View file

@ -50,7 +50,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</template>
<script lang="ts" setup>
import { computed, onMounted } from 'vue';
import { computed, onMounted, ref } from 'vue';
import MkChannelPreview from '@/components/MkChannelPreview.vue';
import MkChannelList from '@/components/MkChannelList.vue';
import MkPagination from '@/components/MkPagination.vue';
@ -69,15 +69,15 @@ const props = defineProps<{
type?: string;
}>();
let key = $ref('');
let tab = $ref('featured');
let searchQuery = $ref('');
let searchType = $ref('nameAndDescription');
let channelPagination = $ref();
const key = ref('');
const tab = ref('featured');
const searchQuery = ref('');
const searchType = ref('nameAndDescription');
const channelPagination = ref();
onMounted(() => {
searchQuery = props.query ?? '';
searchType = props.type ?? 'nameAndDescription';
searchQuery.value = props.query ?? '';
searchType.value = props.type ?? 'nameAndDescription';
});
const featuredPagination = {
@ -99,35 +99,35 @@ const ownedPagination = {
};
async function search() {
const query = searchQuery.toString().trim();
const query = searchQuery.value.toString().trim();
if (query == null) return;
const type = searchType.toString().trim();
const type = searchType.value.toString().trim();
channelPagination = {
channelPagination.value = {
endpoint: 'channels/search',
limit: 10,
params: {
query: searchQuery,
query: searchQuery.value,
type: type,
},
};
key = query + type;
key.value = query + type;
}
function create() {
router.push('/channels/new');
}
const headerActions = $computed(() => [{
const headerActions = computed(() => [{
icon: 'ph-plus ph-bold ph-lg',
text: i18n.ts.create,
handler: create,
}]);
const headerTabs = $computed(() => [{
const headerTabs = computed(() => [{
key: 'search',
title: i18n.ts.search,
icon: 'ph-magnifying-glass ph-bold ph-lg',