phixxy/sparkytron3000
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

webui progress/added alerts

Browse source
This commit is contained in:
phixxy 2024-06-18 22:59:30 -07:00
parent d94163e246
commit 5cd502b19c
4 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
flask_templates/index.html
View file

@ -1,4 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
<style> <style>
body { body {
background-color: #333; background-color: #333;
@ -56,6 +58,16 @@
<br> <br>
{% endfor %} {% endfor %}
<button type="submit">Submit</button> <button type="submit">Submit</button>
{% with messages = get_flashed_messages() %}
{% if messages %}
{% for message in messages %}
<div class="alert alert-success">
{{ message }}
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
</div>
{% endfor %}
{% endif %}
{% endwith %}
</form> </form>
</body> </body>
</html> </html>

6
sparkytron_webui.py
View file

@ -2,6 +2,7 @@ import asyncio
import discord import discord
import os import os
import subprocess import subprocess
import sys
from dotenv import load_dotenv from dotenv import load_dotenv
from src.bot import bot from src.bot import bot
from src.webui import flask_app from src.webui import flask_app
@ -12,11 +13,14 @@ def run_flask_app(process):
if not flask_port: if not flask_port:
flask_port = '5000' flask_port = '5000'
flask_app.bot_process = process flask_app.bot_process = process
flask_app.secret_key = "woaoaoahaowhawoiahoahhhhhh"
flask_app.run(debug=True, use_reloader=False ,host='0.0.0.0', port=flask_port) flask_app.run(debug=True, use_reloader=False ,host='0.0.0.0', port=flask_port)
def main(): def main():
load_dotenv() load_dotenv()
process = subprocess.Popen(["python", "sparkytron3000.py"]) process = subprocess.Popen([sys.executable, "sparkytron3000.py"])
run_flask_app(process) run_flask_app(process)

2
src/bot.py
View file

@ -26,7 +26,7 @@ async def on_ready():
await utils.delete_all_files("tmp/") await utils.delete_all_files("tmp/")
await load_cogs(bot, 'cogs/') await load_cogs(bot, 'cogs/')
logger.info('We have logged in as {0.user}'.format(bot)) logger.info('We have logged in as {0.user}'.format(bot))
print("Visit http://localhost:5000 to change config!") print("If using the webui, visit http://localhost:5000 to change config!")
except: except:
logger.warning(f"Error in on_ready") logger.warning(f"Error in on_ready")

8
src/webui.py
View file

@ -1,8 +1,9 @@
import logging import logging
import os import os
import subprocess import subprocess
import sys
from flask import Flask, render_template, request from flask import Flask, render_template, request, flash
logger = logging.getLogger("bot") logger = logging.getLogger("bot")
flask_app = Flask(__name__, template_folder='../flask_templates') flask_app = Flask(__name__, template_folder='../flask_templates')
@ -39,7 +40,8 @@ async def index():
file.write(f"{key}='{value}'\n") file.write(f"{key}='{value}'\n")
print(form_dict) print(form_dict)
flask_app.bot_process.terminate() flask_app.bot_process.terminate()
flask_app.bot_process = subprocess.Popen(["python", "sparkytron3000.py"]) flask_app.bot_process = subprocess.Popen([sys.executable, "sparkytron3000.py"])
return 'Your input has been saved! The bot must be restarted for the changes to take effect.' message = "Variables Updated!"
flash(message)
return render_template('index.html', key_value_pairs = key_value_pairs) return render_template('index.html', key_value_pairs = key_value_pairs)