From f4fd454fdc2d539a1fc9243f37ec2cbef18873d4 Mon Sep 17 00:00:00 2001 From: JuLi0n21 Date: Sun, 22 Sep 2024 15:28:50 +0200 Subject: [PATCH] update api routing me -> /me --- frontend/src/components/CollectionItem.vue | 4 ++-- frontend/src/stores/userStore.ts | 20 ++++++++++---------- frontend/src/views/CollectionView.vue | 2 +- frontend/src/views/MeView.vue | 2 +- frontend/src/views/RecentView.vue | 4 ++-- frontend/src/views/SearchView.vue | 8 ++++---- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/frontend/src/components/CollectionItem.vue b/frontend/src/components/CollectionItem.vue index b2ef669..905851f 100644 --- a/frontend/src/components/CollectionItem.vue +++ b/frontend/src/components/CollectionItem.vue @@ -19,8 +19,8 @@ onMounted(async () => { console.log(data) data.songs.forEach(song => { - song.previewimage = `${userStore.baseUrl}api/v1/images/${song.previewimage}`; - song.url = `${userStore.baseUrl}api/v1/audio/${song.url}`; + song.previewimage = `${userStore.baseUrl}/api/v1/images/${song.previewimage}`; + song.url = `${userStore.baseUrl}/api/v1/audio/${song.url}`; }); name.value = data.name; diff --git a/frontend/src/stores/userStore.ts b/frontend/src/stores/userStore.ts index 3e0f218..9149867 100644 --- a/frontend/src/stores/userStore.ts +++ b/frontend/src/stores/userStore.ts @@ -4,8 +4,8 @@ import type { Song, CollectionPreview, Me } from '@/script/types'; export const useUserStore = defineStore('userStore', () => { const userId = ref(null) - const baseUrl = ref('https://service.illegalesachen.download/') - const proxyUrl = ref('https://proxy.illegalesachen.download/') + const baseUrl = ref('https://service.illegalesachen.download') + const proxyUrl = ref('https://proxy.illegalesachen.download') const User = ref(null) @@ -26,7 +26,7 @@ export const useUserStore = defineStore('userStore', () => { async function fetchSong(hash: string): Promise { try { - const response = await fetch(`${baseUrl}api/v1/songs/${hash}`); + const response = await fetch(`${baseUrl}/api/v1/songs/${hash}`); if (!response.ok) { throw new Error(`HTTP error! status: ${response.status}`); } @@ -79,42 +79,42 @@ export const useUserStore = defineStore('userStore', () => { async function fetchCollections(offset: number, limit: number): Promise { const cacheKey = `collections_cache_${offset}_${limit}`; - const url = `${baseUrl.value}api/v1/collections/?offset=${offset}&limit=${limit}`; + const url = `${baseUrl.value}/api/v1/collections/?offset=${offset}&limit=${limit}`; return fetchWithCache(cacheKey, url); } async function fetchCollection(index: number): Promise { const cacheKey = `collection_${index}_cache`; - const url = `${baseUrl.value}api/v1/collection/${index}`; + const url = `${baseUrl.value}/api/v1/collection/${index}`; return fetchWithCache(cacheKey, url); } async function fetchFavorites(limit: number, offset: number): Promise { const cacheKey = `favorites_${limit}_${offset}_cache`; - const url = `${baseUrl.value}api/v1/recent?limit=${limit}&offset=${offset}`; + const url = `${baseUrl.value}/api/v1/recent?limit=${limit}&offset=${offset}`; return fetchWithCache(cacheKey, url); } async function fetchRecent(limit: number, offset: number): Promise { const cacheKey = `recent_${limit}_${offset}_cache`; - const url = `${baseUrl.value}api/v1/songs/recent?limit=${limit}&offset=${offset}`; + const url = `${baseUrl.value}/api/v1/songs/recent?limit=${limit}&offset=${offset}`; return fetchWithCache(cacheKey, url); } async function fetchActiveSearch(query: string): Promise<{}> { const cacheKey = `collections_activeSearch_${query}`; - const url = `${baseUrl.value}api/v1/search/active?q=${query}`; + const url = `${baseUrl.value}/api/v1/search/active?q=${query}`; return fetchWithCache(cacheKey, url); } async function fetchSearchArtist(query: string): Promise { const cacheKey = `collections_artist_${query}`; - const url = `${baseUrl.value}api/v1/search/artist?q=${query}`; + const url = `${baseUrl.value}/api/v1/search/artist?q=${query}`; return fetchWithCache(cacheKey, url); } async function fetchMe(): Promise { - const url = `${proxyUrl.value}me`; + const url = `${proxyUrl.value}/me`; try { const response = await fetch(url, { diff --git a/frontend/src/views/CollectionView.vue b/frontend/src/views/CollectionView.vue index 762591a..11cb737 100644 --- a/frontend/src/views/CollectionView.vue +++ b/frontend/src/views/CollectionView.vue @@ -17,7 +17,7 @@ const fetchCollections = async () => { const data = await userStore.fetchCollections(offset.value, limit.value); data.forEach(song => { - song.previewimage = `${userStore.baseUrl}api/v1/images/${song.previewimage}?h=80&w=80`; + song.previewimage = `${userStore.baseUrl}/api/v1/images/${song.previewimage}?h=80&w=80`; }); collections.value = [...collections.value, ...data]; diff --git a/frontend/src/views/MeView.vue b/frontend/src/views/MeView.vue index e1e5c7e..01b7096 100644 --- a/frontend/src/views/MeView.vue +++ b/frontend/src/views/MeView.vue @@ -87,7 +87,7 @@ function reset() {

Meeeeee

- +
diff --git a/frontend/src/views/RecentView.vue b/frontend/src/views/RecentView.vue index 47c3e4c..3d2b65b 100644 --- a/frontend/src/views/RecentView.vue +++ b/frontend/src/views/RecentView.vue @@ -26,8 +26,8 @@ const fetchRecent = async () => { const data = await userStore.fetchRecent(limit.value, offset.value); data.forEach(song => { - song.previewimage = `${userStore.baseUrl}api/v1/images/${song.previewimage}`; - song.url = `${userStore.baseUrl}api/v1/audio/${song.url}`; + song.previewimage = `${userStore.baseUrl}/api/v1/images/${song.previewimage}`; + song.url = `${userStore.baseUrl}/api/v1/audio/${song.url}`; }); offset.value += limit.value; diff --git a/frontend/src/views/SearchView.vue b/frontend/src/views/SearchView.vue index ddad0f5..032921c 100644 --- a/frontend/src/views/SearchView.vue +++ b/frontend/src/views/SearchView.vue @@ -34,8 +34,8 @@ onMounted(async () => { searchTerm.value = target.value data.songs.forEach(song => { - song.previewimage = `${userStore.baseUrl}api/v1/images/${song.previewimage}`; - song.url = `${userStore.baseUrl}api/v1/audio/${song.url}`; + song.previewimage = `${userStore.baseUrl}/api/v1/images/${song.previewimage}`; + song.url = `${userStore.baseUrl}/api/v1/audio/${song.url}`; }); activesongs.value = data.songs; @@ -73,8 +73,8 @@ async function loadartistifexist() { console.log(data); data.forEach(song => { - song.previewimage = `${userStore.baseUrl}api/v1/images/${song.previewimage}`; - song.url = `${userStore.baseUrl}api/v1/audio/${song.url}`; + song.previewimage = `${userStore.baseUrl}/api/v1/images/${song.previewimage}`; + song.url = `${userStore.baseUrl}/api/v1/audio/${song.url}`; }); songs.value = data;