Basic Kinda Half Working
This commit is contained in:
parent
4f3e5dcef7
commit
2ff76a0178
@ -1,4 +1,4 @@
|
|||||||
FROM python:3.10.0a7-alpine3.13
|
FROM python:3.7.10-alpine3.12
|
||||||
|
|
||||||
WORKDIR /Praxis
|
WORKDIR /Praxis
|
||||||
|
|
||||||
|
|||||||
12
deleteME.py
Normal file
12
deleteME.py
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
class testing():
|
||||||
|
def __init__(self) -> None:
|
||||||
|
self.test = "dsadas"
|
||||||
|
self.g434test = "dsadasdgas"
|
||||||
|
|
||||||
|
thing = testing()
|
||||||
|
dicthing = {0:thing, 1:thing, 2:thing, 3:thing, 4:thing, 5:thing}
|
||||||
|
listthing = [thing, thing, thing, thing, thing, thing]
|
||||||
|
|
||||||
|
|
||||||
|
for t in listthing:
|
||||||
|
print(t.test)
|
||||||
@ -53,20 +53,21 @@ def get_events():
|
|||||||
newDic = {}
|
newDic = {}
|
||||||
counter = 0
|
counter = 0
|
||||||
for event in logging_module.Event_Log_List:
|
for event in logging_module.Event_Log_List:
|
||||||
|
#praxis_logger_obj.log("get event history debug thing: "+ str(event))
|
||||||
#recentLog = self.Event_Log_List[-x]
|
#recentLog = self.Event_Log_List[-x]
|
||||||
newDic['eventName'] = str(event['eventName'])
|
newDic['eventName'] = str(event.eventName)
|
||||||
newDic['eventTime'] = str(event['eventName'])
|
newDic['eventTime'] = str(event.eventTime)
|
||||||
newDic['eventType'] = str(event['eventType'])
|
newDic['eventType'] = str(event.eventType)
|
||||||
newDic['eventSender'] = str(event['eventSender'])
|
newDic['eventSender'] = str(event.eventSender)
|
||||||
newDic['eventData'] = str(event['eventData'])
|
newDic['eventData'] = str(event.eventData)
|
||||||
masterDic[str(counter)] = newDic
|
masterDic[str(counter)] = newDic
|
||||||
counter = counter + 1
|
counter = counter + 1
|
||||||
newDic = {}
|
newDic = {}
|
||||||
except:
|
except:
|
||||||
masterDic = {}
|
masterDic = {}
|
||||||
#returnedData = [""]
|
#returnedData = [""]
|
||||||
praxis_logger_obj.log("\nGotten Events" + masterDic)
|
#praxis_logger_obj.log("\nGotten Events" + str(masterDic))
|
||||||
print("\nGotten Events" + masterDic)
|
#print("\nGotten Events" + masterDic)
|
||||||
payload = json.dumps(masterDic)
|
payload = json.dumps(masterDic)
|
||||||
payload = base64.b64encode(str.encode(payload))
|
payload = base64.b64encode(str.encode(payload))
|
||||||
|
|
||||||
@ -119,10 +120,6 @@ def get_event_log():
|
|||||||
def add_header(response):
|
def add_header(response):
|
||||||
response.headers.add('Access-Control-Allow-Origin', '*')
|
response.headers.add('Access-Control-Allow-Origin', '*')
|
||||||
return response
|
return response
|
||||||
if 'request_name' not in request.args:
|
|
||||||
return flask.make_response('{\"text\":"Argument \'request_name\' not in request"}', 400)
|
|
||||||
if 'request_type' not in request.args:
|
|
||||||
return flask.make_response('{\"text\":"Argument \'request_type\' not in request"}', 400)
|
|
||||||
if 'request_data' not in request.args:
|
if 'request_data' not in request.args:
|
||||||
requestData = 50
|
requestData = 50
|
||||||
return get_events()
|
return get_events()
|
||||||
|
|||||||
@ -105,7 +105,7 @@ updateCommandList();
|
|||||||
|
|
||||||
async function updateRewardList() {
|
async function updateRewardList() {
|
||||||
$("#RewardRowWrapper").empty();
|
$("#RewardRowWrapper").empty();
|
||||||
console.log("about to tdo the things");
|
console.log("about to update the rewards list");
|
||||||
let returnedRewards = await GetList_OBJ("Rewards");
|
let returnedRewards = await GetList_OBJ("Rewards");
|
||||||
for (var x in returnedRewards){
|
for (var x in returnedRewards){
|
||||||
//console.log(x)
|
//console.log(x)
|
||||||
@ -171,7 +171,9 @@ GetEventList = async () => {
|
|||||||
'request_type': "list",
|
'request_type': "list",
|
||||||
'request_data': "50"
|
'request_data': "50"
|
||||||
}
|
}
|
||||||
let params = "?request_name="+encodeURIComponent(ListRequestOBJ.request_name)+"&"+"request_type="+encodeURIComponent(ListRequestOBJ.request_type);
|
let params = "?request_name="+encodeURIComponent(ListRequestOBJ.request_name)
|
||||||
|
+"&"+"request_type="+encodeURIComponent(ListRequestOBJ.request_type)
|
||||||
|
+"&"+"request_data="+encodeURIComponent(ListRequestOBJ.request_data);
|
||||||
let targetURL = "http://127.0.0.1:42055/api/v1/user_client/get"+params;
|
let targetURL = "http://127.0.0.1:42055/api/v1/user_client/get"+params;
|
||||||
//console.log(targetURL)
|
//console.log(targetURL)
|
||||||
let a = await fetch_GetList(targetURL);
|
let a = await fetch_GetList(targetURL);
|
||||||
@ -204,6 +206,22 @@ async function updateEventList() {
|
|||||||
$("#EventHistoryWrapper").empty();
|
$("#EventHistoryWrapper").empty();
|
||||||
let returnedEvents = await GetEventList_OBJ();
|
let returnedEvents = await GetEventList_OBJ();
|
||||||
|
|
||||||
|
|
||||||
|
// let template = ""+
|
||||||
|
// "<div class=\"rowsInMain row card\">"+
|
||||||
|
// "<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>"+
|
||||||
|
// "<a onclick=\"reRunEvent()\" 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>"
|
||||||
|
// $("#EventHistoryWrapper").append(template);
|
||||||
|
// $("#EventHistoryWrapper").append(template);
|
||||||
|
// $("#EventHistoryWrapper").append(template);
|
||||||
|
// $("#EventHistoryWrapper").append(template);
|
||||||
|
// $("#EventHistoryWrapper").append(template);
|
||||||
|
// $("#EventHistoryWrapper").append(template);
|
||||||
|
|
||||||
console.log(returnedEvents)
|
console.log(returnedEvents)
|
||||||
try {
|
try {
|
||||||
for (var x in returnedEvents){
|
for (var x in returnedEvents){
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user