1.4.4 #84

Merged
dbroqua merged 21 commits from develop into master 2023-03-23 14:34:19 +01:00
Showing only changes of commit 55a9656c42 - Show all commits

View file

@ -32,6 +32,9 @@ Vue.createApp({
this.fetch(); this.fetch();
}, },
methods: { methods: {
formatParams(param) {
return param.replace("&", "%26").replace("+", "%2B");
},
fetch() { fetch() {
this.loading = true; this.loading = true;
this.total = 0; this.total = 0;
@ -64,19 +67,19 @@ Vue.createApp({
let url = `/api/v1/albums?page=${this.page}&limit=${this.limit}&sort=${this.sort}&order=${this.order}`; let url = `/api/v1/albums?page=${this.page}&limit=${this.limit}&sort=${this.sort}&order=${this.order}`;
if (this.artist) { if (this.artist) {
url += `&artists_sort=${this.artist.replace("&", "%26")}`; url += `&artists_sort=${this.formatParams(this.artist)}`;
} }
if (this.format) { if (this.format) {
url += `&format=${this.format.replace("&", "%26")}`; url += `&format=${this.formatParams(this.format)}`;
} }
if (this.year) { if (this.year) {
url += `&year=${this.year}`; url += `&year=${this.year}`;
} }
if (this.genre) { if (this.genre) {
url += `&genre=${this.genre.replace("&", "%26")}`; url += `&genre=${this.formatParams(this.genre)}`;
} }
if (this.style) { if (this.style) {
url += `&style=${this.style.replace("&", "%26")}`; url += `&style=${this.formatParams(this.style)}`;
} }
axios axios
@ -101,19 +104,19 @@ Vue.createApp({
changeUrl() { changeUrl() {
let url = `?page=${this.page}&limit=${this.limit}&sort=${this.sort}&order=${this.order}`; let url = `?page=${this.page}&limit=${this.limit}&sort=${this.sort}&order=${this.order}`;
if (this.artist) { if (this.artist) {
url += `&artists_sort=${this.artist.replace("&", "%26")}`; url += `&artists_sort=${this.formatParams(this.artist)}`;
} }
if (this.format) { if (this.format) {
url += `&format=${this.format.replace("&", "%26")}`; url += `&format=${this.formatParams(this.format)}`;
} }
if (this.year) { if (this.year) {
url += `&year=${this.year}`; url += `&year=${this.year}`;
} }
if (this.genre) { if (this.genre) {
url += `&genre=${this.genre.replace("&", "%26")}`; url += `&genre=${this.formatParams(this.genre)}`;
} }
if (this.style) { if (this.style) {
url += `&style=${this.style.replace("&", "%26")}`; url += `&style=${this.formatParams(this.style)}`;
} }
window.location.href = url; window.location.href = url;