fixed caching

This commit is contained in:
leca 2025-01-31 17:28:52 +03:00
parent 5c72c3cbc0
commit 69afb6b0df
3 changed files with 52 additions and 85 deletions

79
patch
View File

@ -1,79 +0,0 @@
diff --git a/public/js/skin3d.js b/public/js/skin3d.js
index 84807bb..1bb120e 100644
--- a/public/js/skin3d.js
+++ b/public/js/skin3d.js
@@ -1,52 +1,29 @@
-window.onload = function() {
+window.onload = async function() {
document.getElementById("cape").addEventListener("click", () => { set_cape_type("cape") }, false);
document.getElementById("cape").checked = true;
document.getElementById("elytra").addEventListener("click", () => { set_cape_type("elytra") }, false );
document.getElementById("elytra").checked = false;
-}
-
-
-const username = await(await fetch("/api/getUsername")).json();
-let skinViewer = new skinview3d.SkinViewer({
- canvas: document.getElementById("skin_container"),
- width: 300,
- height: 400,
- skin: `https://launcher.foxarmy.org/skins/${username}.png`,
- cape: `https://launcher.foxarmy.org/cloaks/${username}.png`
-});
-skinViewer.width = 300;
-skinViewer.height = 400;
-skinViewer.nameTag = username;
-skinViewer.loadPanorama("images/panorama.jpeg");
-skinViewer.fov = 120;
-skinViewer.zoom = 0.65;
-skinViewer.autoRotate = true;
-
-function set_cape_type(type) {
- skinViewer.loadCape(`https://launcher.foxarmy.org/cloaks/${username}.png`, { backEquipment: type });
+ const username = await (await (fetch("/api/getUsername"))).text();
+
+ let skinViewer = new skinview3d.SkinViewer({
+ canvas: document.getElementById("skin_container"),
+ width: 300,
+ height: 400,
+ skin: `https://launcher.foxarmy.org/skins/${username}.png`,
+ cape: `https://launcher.foxarmy.org/cloaks/${username}.png`
+ });
+
+ skinViewer.width = 300;
+ skinViewer.height = 400;
+ skinViewer.nameTag = username;
+ skinViewer.loadPanorama("images/panorama.jpeg");
+ skinViewer.fov = 120;
+ skinViewer.zoom = 0.65;
+ skinViewer.autoRotate = true;
+
+ function set_cape_type(type) {
+ skinViewer.loadCape(`https://launcher.foxarmy.org/cloaks/${username}.png`, { backEquipment: type });
+ }
}
-
-
-
-// onload = () => {
-// alert(1);
-// // document.getElementById("cape").addEventListener("click", () => { set_cape_type("cape") }, false);
-// // document.getElementById("elytra").addEventListener("click", () => { set_cape_type("elytra") }, false );
-// document.getElementById("cape").addEventListener("click", a, false);
-// document.getElementById("elytra").addEventListener("click", a, false );
-
-
-// }
-
-
-
-// function set_cape_type_elytra() {
-// alert(2)
-// skinViewer.loadCape(`https://launcher.foxarmy.org/cloaks/${username}.png`, { backEquipment: "elytra" });
-// }
-
-// skinViewer.animation = new skinview3d.WalkingAnimation();
-// skinViewer.animation.speed = 3;
-// skinViewer.animation.paused = true;

View File

@ -1,7 +1,52 @@
const uploadSkin = async (event) => {
event.preventDefault();
const skinFile = document.getElementById("skinFile").files[0];
if (!skinFile) {
alert("Please, select a skin before uploading!");
return;
}
let formData = new FormData();
formData.append("file", skinFile);
await fetch(`/api/uploadSkin`, {
method: "POST",
body: formData
})
location.reload(true);
}
const uploadCape = async (event) => {
event.preventDefault();
const capeFile = document.getElementById("capeFile").files[0];
if (!capeFile) {
alert("Please, select a cape befora uploading!");
return;
}
let formData = new FormData();
formData.append("file", capeFile);
await fetch(`/api/uploadCape`, {
method: "POST",
body: formData
})
location.reload(true);
}
window.onload = async function() { window.onload = async function() {
document.getElementById("skinForm").addEventListener("submit", uploadSkin)
if (document.getElementById("cape")) { if (document.getElementById("cape")) {
document.getElementById("cape").addEventListener("click", () => { set_cape_type("cape") }, false); document.getElementById("cape").addEventListener("click", () => { set_cape_type("cape") }, false);
document.getElementById("cape").checked = true; document.getElementById("cape").checked = true;
document.getElementById("capeForm").addEventListener("submit", uploadCape);
} }
if (document.getElementById("elytra")) { if (document.getElementById("elytra")) {
document.getElementById("elytra").addEventListener("click", () => { set_cape_type("elytra") }, false ); document.getElementById("elytra").addEventListener("click", () => { set_cape_type("elytra") }, false );
@ -27,4 +72,6 @@ window.onload = async function() {
function set_cape_type(type) { function set_cape_type(type) {
skinViewer.loadCape(`https://launcher.foxarmy.org/cloaks/${username}.png`, { backEquipment: type }); skinViewer.loadCape(`https://launcher.foxarmy.org/cloaks/${username}.png`, { backEquipment: type });
} }
} }

View File

@ -20,14 +20,13 @@ html
input(type="radio" id="elytra" name="cape_type" value="elytra" checked="unchecked") input(type="radio" id="elytra" name="cape_type" value="elytra" checked="unchecked")
label(for="elytra") Элитры label(for="elytra") Элитры
p Скин: p Скин:
form(method="post" enctype="multipart/form-data" action="/api/uploadskin" target="hiddenFrame" onsubmit="window.location.reload()") form(target="hiddenFrame" id="skinForm")
input(type="file" name="file") input(type="file" name="file" id="skinFile")
input(type="submit" value="Загрузить") input(type="submit" value="Загрузить")
if can_have_cloak if can_have_cloak
p Плащ: p Плащ:
form(method="post" enctype="multipart/form-data" action="/api/uploadCape" target="hiddenFrame" onsubmit="window.location.reload()") form(target="hiddenFrame" id="capeForm")
input(type="file", name="file") input(type="file" name="file" id="capeFile")
input(type="submit", value="Загрузить") input(type="submit" value="Загрузить")
button(onclick="window.location.href='/api/logout'" value="Выйти" id="exitButton") Выйти button(onclick="window.location.href='/api/logout'" value="Выйти" id="exitButton") Выйти
//- a(href="/api/logout") Выйти