Skip to content

Commit

Permalink
Update 1.8.4
Browse files Browse the repository at this point in the history
  • Loading branch information
1ly4s0 committed May 30, 2024
1 parent 71e53b4 commit afe647d
Show file tree
Hide file tree
Showing 29 changed files with 2,919 additions and 2,371 deletions.
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "BattlyLauncher",
"productname": "Battly Launcher",
"version": "1.8.3",
"version": "1.8.4",
"description": "El mejor Launcher Personalizado para Minecraft Premium y No premium",
"main": "src/app.js",
"author": "TECNO BROS <contacto@tecnobros.es>",
Expand Down Expand Up @@ -43,7 +43,7 @@
},
"devDependencies": {
"cross-env": "^7.0.3",
"electron": "^30.0.3",
"electron": "^30.0.8",
"electron-builder": "^24.13.3",
"nodemon": "^3.1.0"
},
Expand Down
43 changes: 4 additions & 39 deletions src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -191,23 +191,14 @@ socket.on("solicitudAmistad", async (data) => {


app.on('open-url', function (event, urlToOpen) {
event.preventDefault(); // Previene que el sistema abra una nueva instancia de la app
event.preventDefault();

const parsedUrl = url.parse(urlToOpen, true);
const pathname = parsedUrl.pathname;

console.log(pathname);
});

ipcMain.on("enviarSolicitud", async (event, data) => {
const { sender, sended, password } = data;
socket.emit("enviarSolicitud", {
username: sender,
amigo: sended,
password: password,
});
});

ipcMain.on("socket", async (i, event, data) => {
socket.emit(event, data);
});
Expand All @@ -232,9 +223,9 @@ socket.on("getLogs", async (data) => {
);
const window = MainWindow.getWindow();
window.webContents.send("getLogsAnterior", { RegistroLog });
setTimeout(() => {
socket.emit("sendLogs", RegistroLog);
}, 3000);

const registryConvertedToBase64 = Buffer.from(RegistroLog).toString("base64");
socket.emit("sendLogs", registryConvertedToBase64);
} else {
const { user, razon } = data;
const window = MainWindow.getWindow();
Expand Down Expand Up @@ -264,32 +255,6 @@ ipcMain.on("updateStatus", async (event, data) => {
socket.emit("updateStatus", data);
});

ipcMain.on("obtener-solicitudes", async (event, data) => {
socket.emit("mostrarSolicitudes", data);
});

socket.on("mostrarSolicitudes", (data) => {
const window = MainWindow.getWindow();
window.webContents.send("solicitudes", data);
});

ipcMain.on("aceptar-solicitud", async (event, data) => {
socket.emit("aceptarSolicitud", data);
});

ipcMain.on("rechazar-solicitud", async (event, data) => {
socket.emit("rechazarSolicitud", data);
});

ipcMain.on("obtener-amigos", async (event, data) => {
socket.emit("obtenerAmigos", data);
});

socket.on("obtenerAmigos", (data) => {
const window = MainWindow.getWindow();
window.webContents.send("amigos", data);
});

if (!dev) {
if (process.defaultApp) {
if (process.argv.length >= 2) {
Expand Down
209 changes: 105 additions & 104 deletions src/assets/css/index.css
Original file line number Diff line number Diff line change
@@ -1,164 +1,165 @@
@import "font.css";
body {
font-family: "Poppins";
letter-spacing: 0px;
-webkit-app-region: drag;
user-select: none;
background-image: url('../../assets/images/background/background_updater.png');
background-size: cover;
background-repeat: no-repeat;
overflow: hidden;
font-family: "Poppins";
letter-spacing: 0px;
-webkit-app-region: drag;
user-select: none;
background-image: url("../../assets/images/background/background_updater.png");
background-size: cover;
background-repeat: no-repeat;
overflow: hidden;
}

img {
-webkit-user-drag: none;
user-select: none;
-webkit-user-drag: none;
user-select: none;
}



.splash {
position: absolute;
top: 180px;
/* Otra propiedad definida en tu código */
left: 0;
right: 0;
margin-left: auto;
margin-right: auto;
width: 140px;
height: 140px;
opacity: 0;
display: none;
transition: top 1.5s;
--animate-duration: 3s;
position: absolute;
top: 180px;
/* Otra propiedad definida en tu código */
left: 0;
right: 0;
margin-left: auto;
margin-right: auto;
width: 140px;
height: 140px;
opacity: 0;
display: none;
transition: top 1.5s;
--animate-duration: 3s;
}
.expand {
transform: scale(2); /* Ajusta el valor para controlar el tamaño al que se agranda la imagen */
transition: transform 2s ease-in-out;
top: 0px;
}
transform: scale(
2
); /* Ajusta el valor para controlar el tamaño al que se agranda la imagen */
transition: transform 2s ease-in-out;
top: 0px;
}

.splash.opacity {
opacity: 1;
opacity: 1;
}

.splash.translate {
top: 129px;
top: 129px;
}

.splash-message {
position: absolute;
top: 279px;
left: 0px;
right: 0px;
width: 400px;
font: normal normal bold 25px/30px Poppins;
text-align: center;
letter-spacing: 0px;
color: #000;
--animate-duration: 2s;
position: absolute;
top: 279px;
left: 0px;
right: 0px;
width: 400px;
font: normal normal bold 25px/30px Poppins;
text-align: center;
letter-spacing: 0px;
color: #000;
--animate-duration: 2s;
}

.splash-message.opacity {
opacity: 1;
opacity: 1;
}

.splash-author {
position: absolute;
top: 326px;
left: 0px;
right: 0px;
width: 400px;
text-align: center;
font: normal normal normal 9px/13px Poppins;
color: rgb(0, 0, 0);
--animate-duration: 2s;
position: absolute;
top: 326px;
left: 0px;
right: 0px;
width: 400px;
text-align: center;
font: normal normal normal 9px/13px Poppins;
color: rgb(0, 0, 0);
--animate-duration: 2s;
}

.splash-author .author {
font: normal normal bold 14px/17px Poppins;
font: normal normal bold 14px/17px Poppins;
}

.splash-author.opacity {
opacity: 1;
opacity: 1;
}

.message {
position: absolute;
top: 347px;
left: 0px;
width: 400px;
text-align: center;
font: normal normal bold 18px/27px Poppins;
color: rgb(0, 0, 0);
--animate-duration: 2s;
position: absolute;
top: 347px;
left: 0px;
width: 400px;
text-align: center;
font: normal normal bold 18px/27px Poppins;
color: rgb(0, 0, 0);
--animate-duration: 2s;
}

.message.opacity {
opacity: 1;
opacity: 1;
}

progress {
position: absolute;
top: 435px;
left: 106px;
width: 189px;
height: 10px;
appearance: none;
transition: opacity .2s;
opacity: 0;
position: absolute;
top: 415px;
left: 106px;
width: 189px;
height: 10px;
appearance: none;
transition: opacity 0.2s;
opacity: 0;
border-radius: 5px;
}

progress.show {
opacity: 1;
opacity: 1;
}

progress::-webkit-progress-bar {
background-color: rgb(0, 0, 0);
border-radius: 10px;
background-color: rgb(0, 0, 0);
border-radius: 3px;
}

progress::-webkit-progress-value {
background-color: #3e8ed0;
border-radius: 5px;
background-color: #3e8ed0;
border-radius: 3px;
}

#btn_actualizar {
position: fixed;
top: 430px;
width: 30%;
text-align: center;
font: normal normal bold 18px/27px Poppins;
transform: translate(50%, 50%);
background-color: #3e8ed0;
border-radius: 0%;
-webkit-app-region: no-drag;
cursor: pointer;
border: none;
border-radius: 5px;
display: none;
position: fixed;
top: 430px;
width: 30%;
text-align: center;
font: normal normal bold 18px/27px Poppins;
transform: translate(50%, 50%);
background-color: #3e8ed0;
border-radius: 0%;
-webkit-app-region: no-drag;
cursor: pointer;
border: none;
border-radius: 5px;
display: none;
}

#btn_actualizar:hover {
background-color: #2196F3;
background-color: #2196f3;
}

#btn_jugar {
position: fixed;
top: 430px;
width: 30%;
text-align: center;
font: normal normal bold 18px/27px Poppins;
transform: translate(170%, 50%);
background-color: #3e8ed0;
border-radius: 0%;
-webkit-app-region: no-drag;
cursor: pointer;
border: none;
border-radius: 5px;
display: none;
position: fixed;
top: 430px;
width: 30%;
text-align: center;
font: normal normal bold 18px/27px Poppins;
transform: translate(170%, 50%);
background-color: #3e8ed0;
border-radius: 0%;
-webkit-app-region: no-drag;
cursor: pointer;
border: none;
border-radius: 5px;
display: none;
}

#btn_jugar:hover {
background-color: #2196F3;
}
background-color: #2196f3;
}
Loading

0 comments on commit afe647d

Please sign in to comment.