Merge branch 'main' into flask-only
This commit is contained in:
commit
da16c9bd27
3 changed files with 5 additions and 2 deletions
|
|
@ -83,7 +83,7 @@ async function getFromServer(bodyInfo, source="", secure=false, password=adminPa
|
|||
if (e.toString().includes("TypeError: Failed to fetch")){
|
||||
alertText("Error: Can't Connect to Server (is the ip set?)")
|
||||
} else {
|
||||
alertText("Error: " + e);
|
||||
alertText(e);
|
||||
}
|
||||
const response=null;
|
||||
return response;
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ changes visibility with JS-->
|
|||
</div>
|
||||
<div class="item">
|
||||
<h2>Clear the playlist</h2>
|
||||
<p class="italic" title="With PartyMode enabled, the second song will be added back randomly">Wipe the playlist, except the currently playing song*</p>
|
||||
<p class="italic" >Wipe the playlist, except the currently playing song. With PartyMode enabled, a second song will be added back randomly</p>
|
||||
<button id="clear-button">Clear Playlist</button>
|
||||
</div>
|
||||
<p class="versionNumber">PartyJukebox is under an <a href="https://github.com/kristy-fournier/PartyJukebox/blob/main/LICENSE.md" target="_blank">AGPLV3</a> liscense. You can access the source code <a href=https://github.com/kristy-fournier/PartyJukebox target="_blank">here</a>.</p>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,12 @@
|
|||
import eventlet
|
||||
eventlet.monkey_patch()
|
||||
from flask import Flask
|
||||
from flask import request,render_template
|
||||
from flask_cors import CORS
|
||||
from flask_socketio import SocketIO
|
||||
import sqlite3 as sql
|
||||
import vlc,threading,time,random,argparse,dotenv,os,hashlib,string
|
||||
|
||||
# Argparse Stuff
|
||||
parser=argparse.ArgumentParser(description="Options for the Webby Bits")
|
||||
# parser.add_argument('-p','--port',help="Port to host on, not the same as the web (client) port",default='19054')
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue