From 69afb6b0df1a44a30f9916062897d6f67ea0d117 Mon Sep 17 00:00:00 2001 From: leca Date: Fri, 31 Jan 2025 17:28:52 +0300 Subject: [PATCH] fixed caching --- patch | 79 --------------------------------------------- public/js/skin3d.js | 47 +++++++++++++++++++++++++++ views/index.pug | 11 +++---- 3 files changed, 52 insertions(+), 85 deletions(-) delete mode 100644 patch diff --git a/patch b/patch deleted file mode 100644 index f29885f..0000000 --- a/patch +++ /dev/null @@ -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; diff --git a/public/js/skin3d.js b/public/js/skin3d.js index 3eae225..5fd3218 100644 --- a/public/js/skin3d.js +++ b/public/js/skin3d.js @@ -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() { + document.getElementById("skinForm").addEventListener("submit", uploadSkin) + if (document.getElementById("cape")) { document.getElementById("cape").addEventListener("click", () => { set_cape_type("cape") }, false); document.getElementById("cape").checked = true; + + document.getElementById("capeForm").addEventListener("submit", uploadCape); } if (document.getElementById("elytra")) { document.getElementById("elytra").addEventListener("click", () => { set_cape_type("elytra") }, false ); @@ -27,4 +72,6 @@ window.onload = async function() { function set_cape_type(type) { skinViewer.loadCape(`https://launcher.foxarmy.org/cloaks/${username}.png`, { backEquipment: type }); } + + } \ No newline at end of file diff --git a/views/index.pug b/views/index.pug index 59c500d..e56c1f5 100644 --- a/views/index.pug +++ b/views/index.pug @@ -20,14 +20,13 @@ html input(type="radio" id="elytra" name="cape_type" value="elytra" checked="unchecked") label(for="elytra") Элитры p Скин: - form(method="post" enctype="multipart/form-data" action="/api/uploadskin" target="hiddenFrame" onsubmit="window.location.reload()") - input(type="file" name="file") + form(target="hiddenFrame" id="skinForm") + input(type="file" name="file" id="skinFile") input(type="submit" value="Загрузить") if can_have_cloak p Плащ: - form(method="post" enctype="multipart/form-data" action="/api/uploadCape" target="hiddenFrame" onsubmit="window.location.reload()") - input(type="file", name="file") - input(type="submit", value="Загрузить") + form(target="hiddenFrame" id="capeForm") + input(type="file" name="file" id="capeFile") + input(type="submit" value="Загрузить") button(onclick="window.location.href='/api/logout'" value="Выйти" id="exitButton") Выйти - //- a(href="/api/logout") Выйти \ No newline at end of file