Skip to content

Commit e49b0d5

Browse files
committed
[FIX] Error al guardar perfil sin subir un fondo
1 parent f5c7478 commit e49b0d5

File tree

5 files changed

+66
-10
lines changed

5 files changed

+66
-10
lines changed

src/assets/js/libs/profileSystem.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ class BattlyProfileSystem {
1111
}
1212

1313
try {
14-
const token = localStorage.getItem('battly_token');
14+
const selectedAccount = await getValue("selected-account");
15+
const token = await getValue("accounts").find(acc => acc.token === selectedAccount) || null;
1516
const response = await fetch(`${this.apiUrl}/api/v2/users/profile/${userId}`, {
1617
headers: token ? { 'Authorization': `Bearer ${token}` } : {}
1718
});

src/assets/js/panels/settings.js

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3567,6 +3567,7 @@ class Settings {
35673567
const token = account.token || localStorage.getItem('battly_token');
35683568
const username = account.name || localStorage.getItem('battly_username');
35693569
const isPremium = account.premium || false;
3570+
currentProfile.isPremium = isPremium;
35703571

35713572
elements.tabs = {
35723573
border: document.getElementById('custom-tab-border'),
@@ -3875,9 +3876,9 @@ class Settings {
38753876
return;
38763877
}
38773878

3878-
const response = await fetch(`${baseURL} /api/v2 / users / profile / ${username} `, {
3879+
const response = await fetch(`${baseURL}/api/v2/users/profile/${username}`, {
38793880
headers: {
3880-
'Authorization': `Bearer ${token} `
3881+
'Authorization': `Bearer ${token}`
38813882
}
38823883
});
38833884
const data = await response.json();
@@ -4006,10 +4007,10 @@ class Settings {
40064007
const formData = new FormData();
40074008
formData.append('background', elements.bgImageInput.files[0]);
40084009

4009-
const uploadResponse = await fetch(`${baseURL} /api/v2 / users / profile / upload - background`, {
4010+
const uploadResponse = await fetch(`${baseURL}/api/v2/users/profile/upload-background`, {
40104011
method: 'POST',
40114012
headers: {
4012-
'Authorization': `Bearer ${token} `
4013+
'Authorization': `Bearer ${token}`
40134014
},
40144015
body: formData
40154016
});
@@ -4023,11 +4024,11 @@ class Settings {
40234024
}
40244025
}
40254026

4026-
const response = await fetch(`${baseURL} /api/v2 / users / profile`, {
4027+
const response = await fetch(`${baseURL}/api/v2/users/profile`, {
40274028
method: 'PUT',
40284029
headers: {
40294030
'Content-Type': 'application/json',
4030-
'Authorization': `Bearer ${token} `
4031+
'Authorization': `Bearer ${token}`
40314032
},
40324033
body: JSON.stringify({
40334034
borderColor: currentProfile.borderColor,
@@ -4060,7 +4061,8 @@ class Settings {
40604061
throw new Error(data.message || 'Error al guardar');
40614062
}
40624063
} catch (error) {
4063-
console.error('Error al guardar:', error);
4064+
console.error('Error al guardar:');
4065+
console.error(error);
40644066
new Alert().ShowAlert({
40654067
icon: 'error',
40664068
title: 'Error al guardar',
@@ -4085,10 +4087,10 @@ class Settings {
40854087
if (!confirmDelete.isConfirmed) return;
40864088

40874089
try {
4088-
const response = await fetch(`${baseURL} /api/v2 / users / profile / background`, {
4090+
const response = await fetch(`${baseURL}/api/v2/users/profile/background`, {
40894091
method: 'DELETE',
40904092
headers: {
4091-
'Authorization': `Bearer ${token} `
4093+
'Authorization': `Bearer ${token}`
40924094
}
40934095
});
40944096

src/assets/js/utils/instances.js

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,44 @@ class Instances {
307307

308308
instanciasBtn.addEventListener("click", async () => {
309309

310+
// Load all localized strings
311+
const langs = {
312+
instances: window.stringLoader?.getString("instances.instances") || "Instancias",
313+
welcome_instances: window.stringLoader?.getString("instances.welcomeInstances") || "Bienvenido al gestor de instancias",
314+
loading: window.stringLoader?.getString("common.loading") || "Cargando",
315+
recommended: window.stringLoader?.getString("instances.recommended") || "Recomendado",
316+
latest: window.stringLoader?.getString("instances.latest") || "Última versión",
317+
no_builds: window.stringLoader?.getString("instances.noBuilds") || "Sin builds disponibles",
318+
open_instance: window.stringLoader?.getString("instances.openInstance") || "Abrir instancia",
319+
open_instance_folder: window.stringLoader?.getString("instances.openInstanceFolder") || "Abrir carpeta",
320+
delete_instance: window.stringLoader?.getString("instances.deleteInstance") || "Eliminar",
321+
folder_opened: window.stringLoader?.getString("instances.folderOpened") || "Carpeta abierta",
322+
are_you_sure: window.stringLoader?.getString("settings.are_you_sure") || "¿Estás seguro?",
323+
are_you_sure_text: window.stringLoader?.getString("settings.are_you_sure_text") || "Esta acción no se puede deshacer",
324+
yes_delete: window.stringLoader?.getString("settings.yes_delete") || "Sí, eliminar",
325+
no_cancel: window.stringLoader?.getString("settings.no_cancel") || "No, cancelar",
326+
instance_deleted_correctly: window.stringLoader?.getString("instances.instanceDeletedCorrectly") || "Instancia eliminada correctamente",
327+
create_instance: window.stringLoader?.getString("instances.createInstance") || "Crear instancia",
328+
edit_instance: window.stringLoader?.getString("instances.editInstance") || "Editar instancia",
329+
instance_name: window.stringLoader?.getString("instances.instanceName") || "Nombre de la instancia",
330+
instance_description: window.stringLoader?.getString("instances.instanceDescription") || "Descripción",
331+
instance_image: window.stringLoader?.getString("instances.instanceImage") || "Imagen de la instancia",
332+
select_a_file: window.stringLoader?.getString("common.selectAFile") || "Selecciona un archivo",
333+
instance_version: window.stringLoader?.getString("instances.instanceVersion") || "Versión",
334+
instance_version2: window.stringLoader?.getString("instances.instanceVersion2") || "Selecciona la versión de Minecraft",
335+
save_instance: window.stringLoader?.getString("instances.saveInstance") || "Guardar",
336+
instance_saved_correctly: window.stringLoader?.getString("instances.instanceSavedCorrectly") || "Instancia guardada correctamente",
337+
fill_all_fields: window.stringLoader?.getString("instances.fillAllFields") || "Rellena todos los campos",
338+
name: window.stringLoader?.getString("common.name") || "Nombre",
339+
description: window.stringLoader?.getString("common.description") || "Descripción",
340+
instance_created_correctly: window.stringLoader?.getString("instances.instanceCreatedCorrectly") || "Instancia creada correctamente",
341+
preparing_instance: window.stringLoader?.getString("instances.preparingInstance") || "Preparando instancia",
342+
downloading_version: window.stringLoader?.getString("instances.downloadingVersion") || "Descargando versión",
343+
installing_loader: window.stringLoader?.getString("instances.installingLoader") || "Instalando loader",
344+
downloading_java: window.stringLoader?.getString("instances.downloadingJava") || "Descargando Java",
345+
downloading_loader: window.stringLoader?.getString("instances.downloadingLoader") || "Descargando loader"
346+
};
347+
310348
const { modal, modalCard, modalHeader, closeBtn, listIcon, gridIcon } = createModalBase({
311349
titleText: `<i class="fa-solid fa-folder"></i> ${langs.instances}`
312350
});
@@ -1073,6 +1111,7 @@ class Instances {
10731111

10741112
let inicio = false;
10751113
launch.on("data", (e) => {
1114+
console.log(e);
10761115
if (!inicio) {
10771116
if (e.includes("Launching wrapped minecraft") || e.includes("Setting user: ")) {
10781117
preparingModal.remove();

src/assets/langs/strings.en.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,13 @@
288288
}
289289
},
290290
"instances": {
291+
"instances": "Instances",
291292
"welcome": "👋 Welcome to the new Battly instances panel. Here you can manage the instances you will use in Battly for your versions.",
293+
"welcomeInstances": "👋 Welcome to the instances manager",
294+
"recommended": "Recommended",
295+
"latest": "Latest",
296+
"noBuilds": "No builds available",
297+
"installingLoader": "Installing loader",
292298
"openInstance": "Open",
293299
"openInstanceFolder": "Open folder",
294300
"deleteInstance": "Delete",
@@ -299,6 +305,7 @@
299305
"instanceDescription": "Instance description",
300306
"instanceImage": "Instance image",
301307
"instanceVersion": "Instance version",
308+
"instanceVersion2": "Select Minecraft version",
302309
"instanceVersionWarning": "Editing your instance version may cause problems (especially with modpacks). Make sure the version is compatible with your installed mods.",
303310
"instanceDeletedCorrectly": "Instance deleted successfully.",
304311
"instanceSavedCorrectly": "Instance saved successfully.",

src/assets/langs/strings.es.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,13 @@
288288
}
289289
},
290290
"instances": {
291+
"instances": "Instancias",
291292
"welcome": "👋 Bienvenido/a al nuevo panel de instancias de Battly. Aquí podrás gestionar las instancias que usarás en Battly para tus versiones.",
293+
"welcomeInstances": "👋 Bienvenido al gestor de instancias",
294+
"recommended": "Recomendado",
295+
"latest": "Última versión",
296+
"noBuilds": "Sin builds disponibles",
297+
"installingLoader": "Instalando loader",
292298
"openInstance": "Abrir",
293299
"openInstanceFolder": "Abrir carpeta",
294300
"deleteInstance": "Eliminar",
@@ -299,6 +305,7 @@
299305
"instanceDescription": "Descripción de la instancia",
300306
"instanceImage": "Imagen de la instancia",
301307
"instanceVersion": "Versión de la instancia",
308+
"instanceVersion2": "Selecciona la versión de Minecraft",
302309
"instanceVersionWarning": "Editar la versión de tu instancia puede causar problemas (y más cuando son modpacks), asegúrate de que la versión sea compatible con los mods que tienes instalados.",
303310
"instanceDeletedCorrectly": "Se ha eliminado la instancia correctamente.",
304311
"instanceSavedCorrectly": "Se ha guardado la instancia correctamente.",

0 commit comments

Comments
 (0)