+
+
+
+ +
+
+
diff --git a/frontend/src/composables/useUser.ts b/frontend/src/composables/useUser.ts
index be88142..cdca8e4 100644
--- a/frontend/src/composables/useUser.ts
+++ b/frontend/src/composables/useUser.ts
@@ -6,7 +6,7 @@ let userInstance: ReturnType | null = null;
function createUser() {
const user = ref(null);
const baseUrl = ref(import.meta.env.VITE_BACKEND_URL || 'http://localhost:8080');
- const proxyUrl = ref(import.meta.env.VITE_PROXY_URL || 'http://localhost:8081');
+ const proxyUrl = ref(import.meta.env.VITE_PROXY_URL || 'https://proxy.illegalesachen.download');
function saveUser(u: Me | null) {
localStorage.setItem('activeUser', JSON.stringify(u));
diff --git a/frontend/src/script/types.ts b/frontend/src/script/types.ts
index 8436166..334dc42 100644
--- a/frontend/src/script/types.ts
+++ b/frontend/src/script/types.ts
@@ -1,4 +1,4 @@
-import type { Apiv1Song, v1CollectionPreview } from '@/generated';
+import type { Apiv1Song, v1CollectionPreview, v1Collection } from '@/generated';
export type Song = {
hash: string;
@@ -36,16 +36,36 @@ export type CollectionPreview = {
previewimage: string;
};
+export type Collection = {
+ name: string;
+ items: number;
+ songs: Song[];
+}
+
+export function mapApiToCollection(coll : v1Collection): Collection {
+
+ return {
+ name: coll.name,
+ items: coll.items,
+ songs: mapApiToSongs(coll.songs)
+ }
+}
+
export function mapToCollectionPreview(
apiCollection: v1CollectionPreview,
index: number
): CollectionPreview {
+ const image = apiCollection.image;
+ const imageIsMissing = !image || image === "404.png";
+
return {
index,
name: apiCollection.name,
length: apiCollection.items,
- previewimage: `${basePath}/api/v1/image/${apiCollection.image}`,
+ previewimage: imageIsMissing
+ ? "/404.gif"
+ : `${basePath}/api/v1/image/${btoa(image).replace(/=+$/, '')}`,
};
}
diff --git a/frontend/src/views/CollectionView.vue b/frontend/src/views/CollectionView.vue
index 81bc387..0a6c34d 100644
--- a/frontend/src/views/CollectionView.vue
+++ b/frontend/src/views/CollectionView.vue
@@ -18,8 +18,8 @@ const fetchCollections = async () => {
if (isLoading.value) return;
isLoading.value = true;
- const response = await api.musicBackendCollections(offset.value, limit.value);
- let songs = mapApiToCollectionPreview(response.data.songs)
+ const response = await api.musicBackendSearchCollections("", limit.value, offset.value);
+ let songs = mapApiToCollectionPreview(response.data.collections)
collections.value = [...collections.value, ...songs];
offset.value += limit.value;
@@ -46,8 +46,8 @@ onMounted(async () => {
-
-
+
+
diff --git a/frontend/src/views/HistoryView.vue b/frontend/src/views/HistoryView.vue
index 55e9df6..884bff2 100644
--- a/frontend/src/views/HistoryView.vue
+++ b/frontend/src/views/HistoryView.vue
@@ -1,7 +1,7 @@
-
-
+
+
History
No songs found
{{ userStore.user.value.name }}
{{ userStore.user.value.endpoint == "" ? 'Not Connected' : 'Connected' }}
-Sharing: