merge with master

This commit is contained in:
simplonco
2023-01-03 19:54:53 +01:00
10 changed files with 109 additions and 56 deletions

View File

@@ -17368,10 +17368,10 @@ var app = (function () {
// export const soundPongArr: HTMLAudioElement[] = [];
const soundPongArr = [
new Audio("http://transcendance:8080/sound/pong/" + 1 + ".ogg"),
new Audio("http://transcendance:8080/sound/pong/" + 2 + ".ogg")
new Audio("http://" + 'transcendance' + ":" + '8080' + "/sound/pong/" + 1 + ".ogg"),
new Audio("http://" + 'transcendance' + ":" + '8080' + "/sound/pong/" + 2 + ".ogg")
];
const soundRoblox = new Audio("http://transcendance:8080/sound/roblox-oof.ogg");
const soundRoblox = new Audio("http://" + 'transcendance' + ":" + '8080' + "/sound/roblox-oof.ogg");
function initAudio(sound) {
let muteFlag;
if (sound === "on") {
@@ -17380,11 +17380,6 @@ var app = (function () {
else {
muteFlag = true;
}
/* for (let i = 0; i <= 32; i++) {
soundPongArr.push(new Audio("http://transcendance:8080/sound/pong/"+i+".ogg"));
soundPongArr[i].volume = c.soundPongVolume;
soundPongArr[i].muted = muteFlag;
} */
soundPongArr.forEach((value) => {
value.volume = soundRobloxVolume;
value.muted = muteFlag;
@@ -17466,7 +17461,7 @@ var app = (function () {
}
class ClientInfoSpectator {
}
const wsUrl = "ws://transcendance:8080/pong";
const wsUrl = "ws://" + 'transcendance' + ":" + '8080' + "/pong";
let socket; /* TODO: A way to still use "const" not "let" ? */
const clientInfo = new ClientInfo();
const clientInfoSpectator = new ClientInfoSpectator(); // WIP, could refactor this
@@ -21304,7 +21299,7 @@ var app = (function () {
component: ProfilePage,
conditions: [
async(detail) => {
const user = await fetch('http://transcendance:8080/api/v2/user')
const user = await fetch('http://' + 'transcendance' + ":" + '8080' + '/api/v2/user')
.then((resp) => resp.json());
console.log('in /profile what is in user');
@@ -21321,7 +21316,7 @@ var app = (function () {
component: ProfilePage,
conditions: [
async(detail) => {
const user = await fetch('http://transcendance:8080/api/v2/user')
const user = await fetch('http://' + 'transcendance' + ":" + '8080' + '/api/v2/user')
.then((resp) => resp.json());
console.log('in /profile/* what is in user');

File diff suppressed because one or more lines are too long