From 2ff76a017894201e0f731278adea5548093bec8d Mon Sep 17 00:00:00 2001
From: Alex Orid <TheCuriousNerd@users.noreply.github.com>
Date: Wed, 12 May 2021 18:02:42 -0400
Subject: [PATCH] Basic Kinda Half Working

---
 Dockerfile_standalone_eventlog.Dockerfile |  2 +-
 deleteME.py                               | 12 ++++++++++++
 standalone_eventLog.py                    | 19 ++++++++-----------
 user_client/v1/webclient.js               | 22 ++++++++++++++++++++--
 4 files changed, 41 insertions(+), 14 deletions(-)
 create mode 100644 deleteME.py

diff --git a/Dockerfile_standalone_eventlog.Dockerfile b/Dockerfile_standalone_eventlog.Dockerfile
index 14ebf71..0a73192 100644
--- a/Dockerfile_standalone_eventlog.Dockerfile
+++ b/Dockerfile_standalone_eventlog.Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.10.0a7-alpine3.13
+FROM python:3.7.10-alpine3.12
 
 WORKDIR /Praxis
 
diff --git a/deleteME.py b/deleteME.py
new file mode 100644
index 0000000..16c337b
--- /dev/null
+++ b/deleteME.py
@@ -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)
\ No newline at end of file
diff --git a/standalone_eventLog.py b/standalone_eventLog.py
index 9c277aa..1190a23 100644
--- a/standalone_eventLog.py
+++ b/standalone_eventLog.py
@@ -53,20 +53,21 @@ def get_events():
         newDic = {}
         counter = 0
         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]
-            newDic['eventName'] = str(event['eventName'])
-            newDic['eventTime'] = str(event['eventName'])
-            newDic['eventType'] = str(event['eventType'])
-            newDic['eventSender'] = str(event['eventSender'])
-            newDic['eventData'] = str(event['eventData'])
+            newDic['eventName'] = str(event.eventName)
+            newDic['eventTime'] = str(event.eventTime)
+            newDic['eventType'] = str(event.eventType)
+            newDic['eventSender'] = str(event.eventSender)
+            newDic['eventData'] = str(event.eventData)
             masterDic[str(counter)] = newDic
             counter = counter + 1
             newDic = {}
     except:
         masterDic = {}
     #returnedData = [""]
-    praxis_logger_obj.log("\nGotten Events" + masterDic)
-    print("\nGotten Events" + masterDic)
+    #praxis_logger_obj.log("\nGotten Events" + str(masterDic))
+    #print("\nGotten Events" + masterDic)
     payload = json.dumps(masterDic)
     payload = base64.b64encode(str.encode(payload))
 
@@ -119,10 +120,6 @@ def get_event_log():
     def add_header(response):
         response.headers.add('Access-Control-Allow-Origin', '*')
         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:
         requestData = 50
     return get_events()
diff --git a/user_client/v1/webclient.js b/user_client/v1/webclient.js
index 8889386..62e6b7a 100644
--- a/user_client/v1/webclient.js
+++ b/user_client/v1/webclient.js
@@ -105,7 +105,7 @@ updateCommandList();
 
 async function updateRewardList() {
     $("#RewardRowWrapper").empty();
-    console.log("about to tdo the things");
+    console.log("about to update the rewards list");
     let returnedRewards = await GetList_OBJ("Rewards");
     for (var x in returnedRewards){
         //console.log(x)
@@ -171,7 +171,9 @@ GetEventList = async () => {
             'request_type': "list",
             '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;
         //console.log(targetURL)
         let a = await fetch_GetList(targetURL);
@@ -204,6 +206,22 @@ async function updateEventList() {
     $("#EventHistoryWrapper").empty();
     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)
     try {
         for (var x in returnedEvents){