moved skins&capes url to config
This commit is contained in:
parent
a805cb77fc
commit
f393496a1b
|
@ -52,16 +52,19 @@ window.onload = async function() {
|
||||||
document.getElementById("elytra").checked = false;
|
document.getElementById("elytra").checked = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
const username = await (await (fetch("/api/getUsername"))).text();
|
const username = await (await (fetch('/api/getUsername'))).text();
|
||||||
|
const skinsUrl = (await (await fetch('/api/skinsUrl')).text()).replace('%username%', username);
|
||||||
|
const capesUrl = (await (await fetch('/api/capesUrl')).text()).replace('%username%', username);
|
||||||
|
|
||||||
let skinViewer = new skinview3d.SkinViewer({
|
let skinViewer = new skinview3d.SkinViewer({
|
||||||
canvas: document.getElementById("skin_container"),
|
canvas: document.getElementById("skin_container"),
|
||||||
width: 300,
|
width: 300,
|
||||||
height: 400,
|
height: 400,
|
||||||
skin: `https://launcher.foxarmy.org/skins/${username}.png`,
|
skin: skinsUrl,
|
||||||
cape: `https://launcher.foxarmy.org/cloaks/${username}.png`
|
cape: capesUrl
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
skinViewer.nameTag = username;
|
skinViewer.nameTag = username;
|
||||||
skinViewer.loadPanorama("images/panorama.jpeg");
|
skinViewer.loadPanorama("images/panorama.jpeg");
|
||||||
skinViewer.fov = 120;
|
skinViewer.fov = 120;
|
||||||
|
@ -69,7 +72,7 @@ window.onload = async function() {
|
||||||
skinViewer.autoRotate = true;
|
skinViewer.autoRotate = true;
|
||||||
|
|
||||||
function set_cape_type(type) {
|
function set_cape_type(type) {
|
||||||
skinViewer.loadCape(`https://launcher.foxarmy.org/cloaks/${username}.png`, { backEquipment: type });
|
skinViewer.loadCape(capesUrl, { backEquipment: type });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,14 @@ class ApiController {
|
||||||
async getWebsocketConnection(req, res) {
|
async getWebsocketConnection(req, res) {
|
||||||
return res.status(200).send(config.ws_connection_string);
|
return res.status(200).send(config.ws_connection_string);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async getSkinsUrl(req, res) {
|
||||||
|
return res.status(200).send(config.skins_url);
|
||||||
|
}
|
||||||
|
|
||||||
|
async getCapesUrl(req, res) {
|
||||||
|
return res.status(200).send(config.capes_url);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default new ApiController();
|
export default new ApiController();
|
|
@ -14,10 +14,14 @@ ApiRouter.post('/register', requiredParameters.requireUsername, requiredParamete
|
||||||
ApiRouter.post('/login', requiredParameters.requireUsername, requiredParameters.requirePassword, existance.userExist, UserController.login);
|
ApiRouter.post('/login', requiredParameters.requireUsername, requiredParameters.requirePassword, existance.userExist, UserController.login);
|
||||||
ApiRouter.get('/logout', auth.authenticate, UserController.logout);
|
ApiRouter.get('/logout', auth.authenticate, UserController.logout);
|
||||||
ApiRouter.post('/changepassword', auth.authenticate, existance.userExist, UserController.changePassword);
|
ApiRouter.post('/changepassword', auth.authenticate, existance.userExist, UserController.changePassword);
|
||||||
|
|
||||||
ApiRouter.post('/uploadSkin', existance.userExist, auth.authenticate, utils.upload.single('file'), requiredParameters.requireFile, UserController.uploadSkin);
|
ApiRouter.post('/uploadSkin', existance.userExist, auth.authenticate, utils.upload.single('file'), requiredParameters.requireFile, UserController.uploadSkin);
|
||||||
ApiRouter.post('/uploadCape', existance.userExist, auth.authenticate, auth.canHaveCloak, utils.upload.single('file'), requiredParameters.requireFile, UserController.uploadCape);
|
ApiRouter.post('/uploadCape', existance.userExist, auth.authenticate, auth.canHaveCloak, utils.upload.single('file'), requiredParameters.requireFile, UserController.uploadCape);
|
||||||
|
|
||||||
ApiRouter.get('/getUsername', existance.userExist, auth.authenticate, UserController.getUsername);
|
ApiRouter.get('/getUsername', existance.userExist, auth.authenticate, UserController.getUsername);
|
||||||
ApiRouter.get('/getChatMessages/:offset/:limit', auth.authenticate, ApiController.getChatMessages);
|
ApiRouter.get('/getChatMessages/:offset/:limit', auth.authenticate, ApiController.getChatMessages);
|
||||||
ApiRouter.get('/webSocketConnection', auth.authenticate, ApiController.getWebsocketConnection)
|
ApiRouter.get('/webSocketConnection', auth.authenticate, ApiController.getWebsocketConnection)
|
||||||
|
|
||||||
|
ApiRouter.get('/skinsUrl', auth.authenticate, ApiController.getSkinsUrl);
|
||||||
|
ApiRouter.get('/capesUrl', auth.authenticate, ApiController.getCapesUrl)
|
||||||
export default ApiRouter;
|
export default ApiRouter;
|
Loading…
Reference in New Issue