From 5cbc879c60b3bafe29e8f07f82e2f34b55d81a48 Mon Sep 17 00:00:00 2001 From: Matt Strapp Date: Tue, 15 Feb 2022 09:26:36 -0600 Subject: Use newer web interface --- .gitmodules | 6 +-- Uploads/ee4951W_pendulum_web | 1 - Web | 1 + Web/PI/PI.py | 48 ---------------------- Web/PI/Results/PLACEHOLDER.txt | 0 Web/PI/Uploads/PLACEHOLDER | 0 Web/PI/test2.py | 7 ---- Web/Server/Results/PLACEHOLDER | 0 Web/Server/Results/results.csv | 2 - Web/Server/Server.py | 83 --------------------------------------- Web/Server/static/Server.css | 64 ------------------------------ Web/Server/static/Server.js | 19 --------- Web/Server/templates/base.html | 48 ---------------------- Web/Server/templates/index.html | 26 ------------ Web/Server/templates/results.html | 13 ------ Web/requirements.txt | 18 --------- Web/test.py | 17 -------- 17 files changed, 4 insertions(+), 349 deletions(-) delete mode 160000 Uploads/ee4951W_pendulum_web create mode 160000 Web delete mode 100644 Web/PI/PI.py delete mode 100644 Web/PI/Results/PLACEHOLDER.txt delete mode 100644 Web/PI/Uploads/PLACEHOLDER delete mode 100644 Web/PI/test2.py delete mode 100644 Web/Server/Results/PLACEHOLDER delete mode 100644 Web/Server/Results/results.csv delete mode 100644 Web/Server/Server.py delete mode 100644 Web/Server/static/Server.css delete mode 100644 Web/Server/static/Server.js delete mode 100644 Web/Server/templates/base.html delete mode 100644 Web/Server/templates/index.html delete mode 100644 Web/Server/templates/results.html delete mode 100644 Web/requirements.txt delete mode 100644 Web/test.py diff --git a/.gitmodules b/.gitmodules index 7acc11c..dd3be4d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "Uploads/ee4951W_pendulum_web"] - path = Uploads/ee4951W_pendulum_web - url = https://github.com/RosstheRoss/ee4951W_pendulum_web.git +[submodule "4951w-pendulum"] + path = Web + url = git@github.com:RosstheRoss/4951w-pendulum.git diff --git a/Uploads/ee4951W_pendulum_web b/Uploads/ee4951W_pendulum_web deleted file mode 160000 index e5abe2e..0000000 --- a/Uploads/ee4951W_pendulum_web +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e5abe2e724bf73bb7bd07539297e03c19ca0c38a diff --git a/Web b/Web new file mode 160000 index 0000000..fb66bbc --- /dev/null +++ b/Web @@ -0,0 +1 @@ +Subproject commit fb66bbca33e6d7c1eacc38599c3eb7d35d9e0b1b diff --git a/Web/PI/PI.py b/Web/PI/PI.py deleted file mode 100644 index a6a597b..0000000 --- a/Web/PI/PI.py +++ /dev/null @@ -1,48 +0,0 @@ -#handle a POST request -from flask import Flask, render_template, request, url_for, jsonify -import subprocess -import os -app = Flask(__name__) - -UPLOAD_DESTINATION = "Uploads/" - -RESULTS_DESTINATION = "Results/" - -@app.route('/') -def home(): - return "ANDI'S PIE" - -@app.route('/tests/endpoint', methods=['POST']) -def my_test_endpoint(): - # Receive post - input_json = request.get_json(force=True) - - # Put file content into a file caled upload.py - filename=input_json['filename'].encode("ascii") - file_content=input_json['file_content'].encode("ascii") - upload = open(UPLOAD_DESTINATION + filename, "w") - upload.write(file_content) - upload.close() - - # Run python script - subprocess.call(["python", UPLOAD_DESTINATION + filename]) - - # Get results file - results_filename = filename.split(".")[0] - results_filename = results_filename + "_results.csv" - with open(RESULTS_DESTINATION + results_filename, 'r') as results: - results_content = results.read() - results.close() - - # Remove test file and results file now that were done with them - os.remove(UPLOAD_DESTINATION + filename) - os.remove(RESULTS_DESTINATION + results_filename) - - # Return results file content - dictToReturn = {'results_filename':results_filename, 'results_content':results_content} - return jsonify(dictToReturn) - -if __name__ == '__main__': - app.run(host="localhost", port=8000) - # UNCOMMENT IF RUNNING PI.PI ON PI - #app.run(host="192.168.1.10", port=8000) diff --git a/Web/PI/Results/PLACEHOLDER.txt b/Web/PI/Results/PLACEHOLDER.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Web/PI/Uploads/PLACEHOLDER b/Web/PI/Uploads/PLACEHOLDER deleted file mode 100644 index e69de29..0000000 diff --git a/Web/PI/test2.py b/Web/PI/test2.py deleted file mode 100644 index a5eb806..0000000 --- a/Web/PI/test2.py +++ /dev/null @@ -1,7 +0,0 @@ -import subprocess -import os - -subprocess.call(["python", "Uploads/upload.py"]) -print("end of script") - -os.remove("Uploads/upload.py") \ No newline at end of file diff --git a/Web/Server/Results/PLACEHOLDER b/Web/Server/Results/PLACEHOLDER deleted file mode 100644 index e69de29..0000000 diff --git a/Web/Server/Results/results.csv b/Web/Server/Results/results.csv deleted file mode 100644 index 82b0137..0000000 --- a/Web/Server/Results/results.csv +++ /dev/null @@ -1,2 +0,0 @@ -THIS IS RESULTS TEXT -Current Time = 10:55:30 \ No newline at end of file diff --git a/Web/Server/Server.py b/Web/Server/Server.py deleted file mode 100644 index 6070406..0000000 --- a/Web/Server/Server.py +++ /dev/null @@ -1,83 +0,0 @@ -import os -try: #python3 - from urllib.request import urlopen -except: #python2 - from urllib2 import urlopen -from flask import Flask, flash, request, redirect, render_template, Response -from werkzeug.utils import secure_filename -import requests -import json - -app = Flask(__name__) -app.secret_key = "ski u mah" -app.config['MAX_CONTENT_LENGTH'] = 16 * 1024 * 1024 - -ALLOWED_EXTENSIONS = set(['py']) - -PI_URL = 'http://localhost:8000' - -# UNCOMMENT IF RUNNING PI.PY ON PI -#PI_URL = 'http://192.168.1.10:8000' - -RESULTS_DESTINATION = "Results/results.csv" - -def allowed_file(filename): - return '.' in filename and filename.rsplit('.', 1)[1].lower() in ALLOWED_EXTENSIONS - -@app.route('/') -def home(): - return render_template('index.html') - -@app.route('/upload', methods=['POST']) -def upload_file(): - if request.method == 'POST': - # Check if the post request has the file part - if 'file' not in request.files: - print("hi") - return render_template('index.html', error = 'No file part') - - # Grab the file - file = request.files['file'] - if file.filename == '': - print("hi") - return render_template('index.html', error = 'No file selected for uploading') - - # Send the file content as a post to the PI - if file and allowed_file(file.filename): - - dictToSend = {'filename':file.filename, 'file_content':file.read()} - file.close() - print('Running test') - response = requests.post(PI_URL + '/tests/endpoint', json=dictToSend) - - results_filename = json.loads(response.text)[u'results_filename'] - results_content = json.loads(response.text)[u'results_content'] - flash('Results file:' + results_filename) - flash('Response from server:' + results_content) - - results = open(RESULTS_DESTINATION, "w") - results.write(results_content) - results.close() - - return render_template('results.html') - else: - print("hi") - return render_template('index.html', error = 'Allowed file types are .py') - return render_template('index.html', error = 'No file selected') - -@app.route('/results', methods=['GET']) -def download(): - # Grab content from results file - with open(RESULTS_DESTINATION, 'r') as results: - results_content = results.read() - results.close() - - # Put content as a download file - return Response( - results_content, - mimetype="text/csv", - headers={"Content-disposition": - "attachment; filename=results.csv"}) - -if __name__ == "__main__": - app.run(host="localhost", port=5000) \ No newline at end of file diff --git a/Web/Server/static/Server.css b/Web/Server/static/Server.css deleted file mode 100644 index 10d8b23..0000000 --- a/Web/Server/static/Server.css +++ /dev/null @@ -1,64 +0,0 @@ -.container{ - color: white; - background-color: maroon; - border-style: solid; - border: 1px solid #d5d6d2; - text-align: center; - margin:5px; -} - -.button { - background-color: gold; - border: solid; - border-color:#d5d6d2; - color: black; - padding: 15px 32px; - text-align: center; - text-decoration: none; - display: inline-block; - font-size: 16px; -} - -.button:hover{ - background-color: white; - cursor: pointer; -} - -a{ - color:white; - text-decoration:none; -} -a:hover{ - text-decoration:underline -} - -#main{ - color: black; - background-color: #d5d6d2; - border-style: solid; - border: 1px solid #d5d6d2; - text-align: center; - margin:5px; -} - -#about{ - display: none; -} - -#title{ - font-size: xx-large; -} - -#subtitle{ - font-size: large; -} - -#choose_file{ - border: none; - text-decoration: none; - display: inline-block; -} - -#submit{ - -} \ No newline at end of file diff --git a/Web/Server/static/Server.js b/Web/Server/static/Server.js deleted file mode 100644 index 6c2be18..0000000 --- a/Web/Server/static/Server.js +++ /dev/null @@ -1,19 +0,0 @@ -function showLoad(){ - var paragraph = document.getElementById("running"); - var text = document.createTextNode("Running Test, Please wait for Results"); - paragraph.appendChild(text); - - var div = document.getElementById("upload"); - if (div.style.display !== 'none') { - div.style.display = 'none'; - } -} - -function toggleAbout(){ - var x = document.getElementById("about"); - if (x.style.display === "none") { - x.style.display = "block"; - } else { - x.style.display = "none"; - } -} \ No newline at end of file diff --git a/Web/Server/templates/base.html b/Web/Server/templates/base.html deleted file mode 100644 index a1bc09b..0000000 --- a/Web/Server/templates/base.html +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - ANDI'S PIE - - -
- {% block content %} - default content - {% endblock %} -
- - \ No newline at end of file diff --git a/Web/Server/templates/index.html b/Web/Server/templates/index.html deleted file mode 100644 index 6f7e738..0000000 --- a/Web/Server/templates/index.html +++ /dev/null @@ -1,26 +0,0 @@ -{% extends "base.html" %} - -{% block content %} -
-

Upload a python file onto the inverted pendulum

-

- {% if error %} -

{{ error }}

- {% endif %} -

- -
-
-

- -

-
-

- -

-
-
- -
- -{% endblock %} diff --git a/Web/Server/templates/results.html b/Web/Server/templates/results.html deleted file mode 100644 index dd32d87..0000000 --- a/Web/Server/templates/results.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends "base.html" %} - -{% block content %} -
-
-
- -
- -
- -
-{% endblock %} \ No newline at end of file diff --git a/Web/requirements.txt b/Web/requirements.txt deleted file mode 100644 index f0cc7a5..0000000 --- a/Web/requirements.txt +++ /dev/null @@ -1,18 +0,0 @@ -certifi==2019.9.11 -chardet==3.0.4 -Click==7.0 -Flask==1.1.1 -Flask-Bootstrap==3.2.0.2 -Flask-WTF==0.14.2 -gunicorn==19.9.0 -idna==2.8 -itsdangerous==1.1.0 -Jinja2==2.10.3 -MarkupSafe==1.1.1 -Pillow==2.5.1 -requests==2.22.0 -simplejson==3.6.0 -urllib3==1.25.6 -virtualenv==16.7.7 -Werkzeug==0.16.0 -WTForms==2.2.1 diff --git a/Web/test.py b/Web/test.py deleted file mode 100644 index 8c15f58..0000000 --- a/Web/test.py +++ /dev/null @@ -1,17 +0,0 @@ -import time, os, sys -from datetime import datetime - -file_name = os.path.basename(sys.argv[0]) - -file_name = file_name.split(".")[0] - -now = datetime.now() -current_time = now.strftime("%H:%M:%S") -print("Current Time = " + current_time) - -f = open("Results/" + file_name + "_results.csv", "w+") -f.write("THIS IS RESULTS TEXT\n") -f.write("Current Time = " + current_time) -f.close() -print("Running test.py for ~ 5 seconds.") -time.sleep(5) -- cgit v1.2.3