alex_orid/Praxis_Bot
2
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

master updates #41

Manually merged
alex_orid merged 177 commits from master into github-master 2021-05-13 21:11:10 +00:00
Conversation 0 Commits 177 Files Changed 103 +53 -17
4 changed files with 53 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e735cb94c8 - Show all commits

8
standalone_eventLog.py
View File

@ -76,7 +76,13 @@ def get_events():
def reRunEvent_handler(eventName, eventTime, eventType, eventSender, eventData):
return flask.make_response("{\"message\":\"%s\"}" % 'rerunning event....', 200, {"Content-Type": "application/json"})
def attempt_Event_Rerun():
returnString = ""
try:
return flask.make_response("{\"message\":\"%s\"}" % returnString, 200, {"Content-Type": "application/json"})
except:
returnString = "Something Went Wrong!"
return flask.make_response("{\"message\":\"%s\"}" % returnString, 200, {"Content-Type": "application/json"})
@api.route('/')
def bot_StatusIcon():

51
user_client/v1/index.html
View File

@ -40,7 +40,7 @@
<i class="material-icons">arrow_upward</i>
</div></a>
<div class="lineSeperator blue"></div>
<a href="#Chyron"><div class="s12 card waves-effect waves-light btn-large colsInSideBar" style="background-color: #42A5F5;">
<a href="#Chyron"><div class="s12 card waves-effect waves-light btn-large colsInSideBar hide" style="background-color: #42A5F5;">
<p>Chyron</p>
</div></a>
<a href="#Commands"><div class="s12 card waves-effect waves-light btn-large colsInSideBar" style="background-color: #42A5F5;">
@ -52,7 +52,7 @@
<a href="#Timers"><div class="s12 card colsInSideBar waves-effect waves-light btn-large hide" style="background-color: #42A5F5;">
<p>Timers</p>
</div></a>
<a href="#TextSources"><div class="s12 card colsInSideBar waves-effect waves-light btn-large" style="background-color: #42A5F5;">
<a href="#TextSources"><div class="s12 card colsInSideBar waves-effect waves-light btn-large hide" style="background-color: #42A5F5;">
<p>Text Sources</p>
</div></a>
<a href="#EventHistory"><div class="lineSeperator blue"></div>
@ -67,7 +67,7 @@
<div id="main_area" class="col s12 m9 right card">
<div id="Chyron" style="padding-top: 20px;"><div class="rowsInMain center card">
<div id="Chyron" style="padding-top: 20px;"><div class="rowsInMain center card hide">
<a class="btn-floating btn-large waves-effect waves-light blue right" style="margin-right: 10px;">
<i class="material-icons">refresh</i>
</a>
@ -75,7 +75,7 @@
<i class="material-icons">add</i>
</a>
<h3>Chyron:</h3></div>
<div class="rowsInMain row card" style="margin-right: 20px;margin-left: 20px;margin-top: 30px;margin-bottom: 30px;">
<div class="rowsInMain row card hide" style="margin-right: 20px;margin-left: 20px;margin-top: 30px;margin-bottom: 30px;">
<div class="col s12 switch hide" style="top: -20px;position: relative;padding-left: 10px;"><label>Enabled:<input type="checkbox"><span class="lever"></span></label></div>
<div class="col s4"><p>Section Name:</p>
<div class="input-field inline" style="width: 80%;">
@ -136,12 +136,12 @@
<div id="TextSources" style="padding-top: 20px;"></div><div class="rowsInMain center card">
<div id="TextSources" style="padding-top: 20px;"></div><div class="rowsInMain center card hide">
<a class="btn-floating btn-large waves-effect waves-light blue right" style="margin-right: 10px;">
<i class="material-icons">refresh</i>
</a>
<h3>Text Sources:</h3></div>
<div class="rowsInMain row card" style="margin-right: 20px;margin-left: 20px;margin-top: 30px;margin-bottom: 30px;">
<div class="rowsInMain row card hide" style="margin-right: 20px;margin-left: 20px;margin-top: 30px;margin-bottom: 30px;">
<div class="col s4"><p>File Name:</p>
<div class="input-field inline" style="width: 80%;">
<input id="filename_inline" type="text" class="validate">
@ -234,22 +234,47 @@
</div>
<div id="Settings"style="padding-top: 20px;">
<div class="" >
<div class="card" >
<div class=""style="padding-top: 20px;">
<div class="row bodyarea container" style="background-color: rgb(221, 221, 221);">
<div class="rowsInMain center card">
<a class="btn-floating btn-large waves-effect waves-light blue right" style="margin-right: 10px;">
<a class="btn-floating btn-large waves-effect waves-light blue right" style="position: absolute; right: 5px;">
<i class="material-icons">refresh</i>
</a>
<h3>Settings</h3>
<h1>Settings</h1>
</div>
<div class="container">
<div class="col s12">
<div class="card" style="margin-top: 30px;margin-bottom: 30px; min-height: 3em;">
<div class="">
<div class="col s12">
<div class="card center" style="margin-top: 15px;margin-bottom: 15px; min-height: 3em; padding-top: 5px;padding-bottom: 5px;">
<h3>Config</h3>
</div>
</div>
</div>
<div class="container">
<div class="col s12">
<div class="card center" style="margin-top: 15px;margin-bottom: 15px; min-height: 3em; padding-top: 15px;padding-bottom: 15px;">
<p>test</p>
</div>
</div>
</div>
<div class="">
<div class="col s12">
<div class="card center" style="margin-top: 15px;margin-bottom: 15px; min-height: 3em; padding-top: 5px;padding-bottom: 5px;">
<h3>Credentials</h3>
</div>
</div>
</div>
<div class="container">
<div class="col s12">
<div class="card center" style="margin-top: 15px;margin-bottom: 15px; min-height: 3em; padding-top: 15px;padding-bottom: 15px;">
<p>test</p>
</div>
</div>
</div>
</div>
</div>
</div>

5
user_client/v1/style.css
View File

@ -38,6 +38,11 @@ p {
min-height: 100%;
}
.main_area{
background-color: rgb(221, 221, 221);
min-height: 100%;
}
.lineSeperator{
margin-top: 15px;
margin-bottom: 15px;

6
user_client/v1/webclient.js
View File

@ -213,9 +213,9 @@ async function updateEventList() {
let template = ""+
"<div class=\"rowsInMain row card\">"+
"<div class=\"col s12\" style=\"position:absolute;top:0;color:grey;\">Time: "+ eventTime +"</div>"+
"<div class=\"col s3\"><p>Event: "+ eventName +"</p></div>"+
"<div class=\"col s3\"><p>User: "+ eventSender +"</p></div>"+
"<div class=\"col s3\"><p>Message: "+ eventData +"</p></div>"+
"<div class=\"col s12 m3\"><p>Event: <br>"+ eventName +"</p><br></div>"+
"<div class=\"col s12 m3\"><p>User: <br>"+ eventSender +"</p><br></div>"+
"<div class=\"col s12 m3\"><p>Message: <br>"+ eventData +"</p><br></div>"+
'<a onclick="'+ reRunEvent_Params +'" class="btn waves-effect waves-light green right col s1" style="position: absolute; right: 0; top: 0; width: 3em;">'+
"<i class=\"material-icons\">refresh</i>"+
"</a></div>"