KristyF/PartyJukebox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Sockets allowing for live updates rather than complete rebuilds #7

Merged
kristy-fournier merged 20 commits from timerChanges into main 2026-02-11 09:39:36 -05:00
Conversation 1 Commits 20 Files changed 7 +7 -8
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit f556f17cce - Show all commits

11
Client/scripts.js
View file

@ -148,7 +148,7 @@ async function controlButton(buttonType) {
document.getElementById("songlist-mode").style.display = "none"; document.getElementById("songlist-mode").style.display = "none";
document.getElementById("settings-mode").style.display = "block"; document.getElementById("settings-mode").style.display = "block";
checkSettings() checkSettings()
} else if (buttonType = "pm") { //Partymode toggle (in settings) } else if (buttonType == "pm") { //Partymode toggle (in settings)
let response = await getFromServer({setting: "partymode-toggle"}, "settings") let response = await getFromServer({setting: "partymode-toggle"}, "settings")
if(response.ok) { if(response.ok) {
justChangedSetting = true; justChangedSetting = true;
@ -156,6 +156,8 @@ async function controlButton(buttonType) {
} else { } else {
// dont think anything is needed here // dont think anything is needed here
} }
} else {
alertText("Error: You pushed a button that does not exist");
} }
@ -617,8 +619,7 @@ document.getElementById("settings-mode").style.display = "none";
document.getElementById("volumerange").onchange = async function(e) { document.getElementById("volumerange").onchange = async function(e) {
// there is no reason for this not to be a defined function // there is no reason for this not to be a defined function
// FIX THIS // FIX THIS
console.log(e); let returnValue = await getFromServer({setting:"volume",level:e.target.value}, "settings")
let returnValue = await getFromServer({setting:"volume",level:this.value}, "settings")
if (returnValue["status"] == ERR_NO_ADMIN) { if (returnValue["status"] == ERR_NO_ADMIN) {
// alertText("Error: Admin restricted action"); // alertText("Error: Admin restricted action");
// there's an admin restrict alert built into getFromServer // there's an admin restrict alert built into getFromServer
@ -718,9 +719,9 @@ socket.on("skipSong",() => {
}) })
socket.on("settingsChange",(data) => { socket.on("settingsChange",(data) => {
console.log(data); // console.log(data);
if(justChangedSetting) { if(justChangedSetting) {
console.log("working"); // console.log("working");
justChangedSetting = false; justChangedSetting = false;
} else { } else {
// checkSettings(); // checkSettings();

4
Server/webbyBits.py
View file

@ -193,9 +193,7 @@ def settingsControl():
if(volumePassed == 0): if(volumePassed == 0):
# only emit a signal i the volume really changed # only emit a signal i the volume really changed
socketio.emit("settingsChange",{"settingToChange":"volume","newData":volumeLevel}) socketio.emit("settingsChange",{"settingToChange":"volume","newData":volumeLevel})
return {"error":"ok","data":{"volumePassed":volumePassed}},200 return {"error":"ok","data":{"volumePassed":volumePassed}},200
else:
return {"error":"VLC cannot take volume change requests at this time","data":None},500
else: else:
return {"error":"Invalid volume level","data":None},422 return {"error":"Invalid volume level","data":None},422
else: else: