mirror of
https://github.com/JuLi0n21/pwa-player.git
synced 2026-04-19 23:40:05 +00:00
minor improvements
This commit is contained in:
@@ -1,98 +1,91 @@
|
||||
<script setup lang="ts">
|
||||
import SongItem from '../components/SongItem.vue'
|
||||
import { type Song, mapApiToCollection } from '../script/types'
|
||||
import { ref, onMounted, onBeforeUnmount } from 'vue'
|
||||
import { useRoute } from 'vue-router'
|
||||
import CollectionListItem from '../components/CollectionListItem.vue'
|
||||
import { useAudio } from '@/composables/useAudio'
|
||||
import { useApi } from '@/composables/useApi'
|
||||
import SongItem from "../components/SongItem.vue";
|
||||
import { type Song, mapApiToCollection } from "../script/types";
|
||||
import { ref, onMounted, onBeforeUnmount } from "vue";
|
||||
import { useRoute } from "vue-router";
|
||||
import CollectionListItem from "../components/CollectionListItem.vue";
|
||||
import { useAudio } from "@/composables/useAudio";
|
||||
import { useApi } from "@/composables/useApi";
|
||||
|
||||
const route = useRoute()
|
||||
const audioStore = useAudio()
|
||||
const { musicApi } = useApi()
|
||||
const route = useRoute();
|
||||
const audioStore = useAudio();
|
||||
const { musicApi } = useApi();
|
||||
|
||||
const songs = ref<Song[]>([])
|
||||
const name = ref('name')
|
||||
const limit = 50
|
||||
let offset = ref(0)
|
||||
let loading = ref(false)
|
||||
let hasMore = ref(true)
|
||||
const songs = ref<Song[]>([]);
|
||||
const name = ref("name");
|
||||
const limit = 50;
|
||||
let offset = ref(0);
|
||||
let loading = ref(false);
|
||||
let hasMore = ref(true);
|
||||
|
||||
const fetchMoreSongs = async () => {
|
||||
if (loading.value || !hasMore.value) return
|
||||
if (loading.value || !hasMore.value) return;
|
||||
|
||||
loading.value = true
|
||||
loading.value = true;
|
||||
try {
|
||||
const response = await musicApi().musicBackendCollections(
|
||||
"",
|
||||
Array.isArray(route.params.id) ? route.params.id[0] : route.params.id,
|
||||
limit,
|
||||
offset.value
|
||||
)
|
||||
const response = await musicApi.value.musicBackendCollections("", route.params.id, limit, offset.value);
|
||||
|
||||
const col = mapApiToCollection(response.data)
|
||||
const col = mapApiToCollection(response.data);
|
||||
|
||||
if (offset.value === 0) {
|
||||
name.value = col.name
|
||||
songs.value = col.songs
|
||||
name.value = col.name;
|
||||
songs.value = col.songs;
|
||||
} else {
|
||||
songs.value.push(...col.songs)
|
||||
songs.value.push(...col.songs);
|
||||
}
|
||||
|
||||
audioStore.setCollection(songs.value)
|
||||
audioStore.setCollection(songs.value);
|
||||
|
||||
if (col.songs.length < limit) {
|
||||
hasMore.value = false
|
||||
hasMore.value = false;
|
||||
}
|
||||
|
||||
offset.value += limit
|
||||
offset.value += limit;
|
||||
} catch (error) {
|
||||
console.error('Error fetching songs:', error)
|
||||
console.error("Error fetching songs:", error);
|
||||
} finally {
|
||||
loading.value = false
|
||||
loading.value = false;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const onScroll = (e: Event) => {
|
||||
const target = e.target as HTMLElement
|
||||
const scrollTop = target.scrollTop
|
||||
const scrollHeight = target.scrollHeight
|
||||
const clientHeight = target.clientHeight
|
||||
const target = e.target as HTMLElement;
|
||||
const scrollTop = target.scrollTop;
|
||||
const scrollHeight = target.scrollHeight;
|
||||
const clientHeight = target.clientHeight;
|
||||
|
||||
if (scrollTop + clientHeight >= scrollHeight * 0.9) {
|
||||
fetchMoreSongs()
|
||||
fetchMoreSongs();
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
onMounted(() => {
|
||||
fetchMoreSongs()
|
||||
const container = document.querySelector('.coll-container')
|
||||
container?.addEventListener('scroll', onScroll)
|
||||
})
|
||||
fetchMoreSongs();
|
||||
const container = document.querySelector(".coll-container");
|
||||
container?.addEventListener("scroll", onScroll);
|
||||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
const container = document.querySelector('.coll-container')
|
||||
container?.removeEventListener('scroll', onScroll)
|
||||
})
|
||||
const container = document.querySelector(".coll-container");
|
||||
container?.removeEventListener("scroll", onScroll);
|
||||
});
|
||||
</script>
|
||||
|
||||
|
||||
<template>
|
||||
<main class="flex-1 text-center flex flex-col h-full overflow-y-hidden">
|
||||
<main class="flex flex-col flex-1 h-full overflow-y-hidden text-center">
|
||||
<header v-show="true">
|
||||
<div class="wrapper">
|
||||
<nav class="flex justify-start my-2 mx-1 space-x-1 overflow-y-scroll flex-nowrap text-nowrap">
|
||||
<RouterLink class="p-1 rounded-full backdrop--light shadow-xl" to="/menu/collections"><i class="fa-solid fa-arrow-left"></i>
|
||||
<nav class="flex flex-nowrap justify-start space-x-1 mx-1 my-2 overflow-y-scroll text-nowrap">
|
||||
<RouterLink class="shadow-xl backdrop--light p-1 rounded-full" to="/menu/collections"
|
||||
><i class="fa-arrow-left fa-solid"></i>
|
||||
</RouterLink>
|
||||
<p class="p-1 rounded-full backdrop--light shadow-xl">{{ name }}</p>
|
||||
<p class="shadow-xl backdrop--light p-1 rounded-full">{{ name }}</p>
|
||||
</nav>
|
||||
<hr>
|
||||
<hr />
|
||||
</div>
|
||||
</header>
|
||||
<div
|
||||
class="flex-1 flex-col overflow-y-scroll coll-container justify-start"
|
||||
>
|
||||
<div class="flex-col flex-1 justify-start overflow-y-scroll coll-container">
|
||||
<SongItem v-for="(song, index) in songs" :key="index" :song="song" />
|
||||
</div>
|
||||
</main>
|
||||
</template>
|
||||
</main>
|
||||
</template>
|
||||
|
||||
Reference in New Issue
Block a user