aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDat Nguyen <nguy2854@umn.edu>2019-11-29 21:59:28 -0600
committerDat Nguyen <nguy2854@umn.edu>2019-11-29 21:59:28 -0600
commit374ca77b2a7a093537515607d5f10226fef06e29 (patch)
tree2614e695354d0139e294132c8febe116880f492a
parentImprove logging: add timestamps for each log. Add a new function to add other... (diff)
downloadee4511w-374ca77b2a7a093537515607d5f10226fef06e29.tar
ee4511w-374ca77b2a7a093537515607d5f10226fef06e29.tar.gz
ee4511w-374ca77b2a7a093537515607d5f10226fef06e29.tar.bz2
ee4511w-374ca77b2a7a093537515607d5f10226fef06e29.tar.lz
ee4511w-374ca77b2a7a093537515607d5f10226fef06e29.tar.xz
ee4511w-374ca77b2a7a093537515607d5f10226fef06e29.tar.zst
ee4511w-374ca77b2a7a093537515607d5f10226fef06e29.zip
some aesthetics
-rw-r--r--Web/PI/Uploads/test.py17
-rw-r--r--Web/Server/Results/results.csv2
-rw-r--r--Web/Server/Server.py2
-rw-r--r--Web/Server/static/Server.css24
-rw-r--r--Web/Server/templates/base.html23
-rw-r--r--Web/Server/templates/index.html69
-rw-r--r--Web/Server/templates/results.html11
7 files changed, 90 insertions, 58 deletions
diff --git a/Web/PI/Uploads/test.py b/Web/PI/Uploads/test.py
deleted file mode 100644
index 5091e89..0000000
--- a/Web/PI/Uploads/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", "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)
diff --git a/Web/Server/Results/results.csv b/Web/Server/Results/results.csv
new file mode 100644
index 0000000..a16431a
--- /dev/null
+++ b/Web/Server/Results/results.csv
@@ -0,0 +1,2 @@
+THIS IS RESULTS TEXT
+Current Time = 21:17:28 \ No newline at end of file
diff --git a/Web/Server/Server.py b/Web/Server/Server.py
index a936b96..3a4f351 100644
--- a/Web/Server/Server.py
+++ b/Web/Server/Server.py
@@ -59,7 +59,7 @@ def upload_file():
results.write(results_content)
results.close()
- return render_template('index.html', results = 'True')
+ return render_template('results.html')
else:
flash('Allowed file types are .py')
return redirect(request.url)
diff --git a/Web/Server/static/Server.css b/Web/Server/static/Server.css
index e69de29..6f366ec 100644
--- a/Web/Server/static/Server.css
+++ b/Web/Server/static/Server.css
@@ -0,0 +1,24 @@
+.container{
+ color: white;
+ background-color: maroon;
+ border-style: solid;
+ border: 1px solid black;
+ text-align: center;
+ margin:5px;
+}
+
+#title{
+ font-size: xx-large;
+}
+
+#subtitle{
+ font-size: large;
+}
+
+#choose_file{
+
+}
+
+#submit{
+
+} \ No newline at end of file
diff --git a/Web/Server/templates/base.html b/Web/Server/templates/base.html
new file mode 100644
index 0000000..a141c0a
--- /dev/null
+++ b/Web/Server/templates/base.html
@@ -0,0 +1,23 @@
+<html>
+ <head>
+ <link rel="stylesheet" href="/static/Server.css">
+ <script type="text/javascript" src="/static/Server.js"></script>
+ </head>
+ <body>
+ <title>ANDI'S PIE</title>
+ <nav class = "container">
+ <h1 id="title">Remotely Accessible Inverted Pendulum</h1>
+ <h2 id="subtitle">
+ By Alin Butoi, Paul D’Amico, Dat Nguyen, Ross Olson, Rachel Schow <br>
+ Advisor: Professor Andrew Lamperski <br>
+ Sponsored by the University of Minnesota - Twin Cities <br>
+ </h2>
+ </nav>
+
+ <div class = "container">
+ {% block content %}
+ default content
+ {% endblock %}
+ </div>
+ </body>
+</html> \ No newline at end of file
diff --git a/Web/Server/templates/index.html b/Web/Server/templates/index.html
index 70a282b..1350fdd 100644
--- a/Web/Server/templates/index.html
+++ b/Web/Server/templates/index.html
@@ -1,43 +1,32 @@
-<html>
- <head>
- <link rel="stylesheet" href="/static/Server.css">
- <script type="text/javascript" src="/static/Server.js"></script>
- </head>
- <body>
- <title>ANDI'S PIE</title>
- <div id="upload">
- <h2>Select a file to upload</h2>
- <p>
- {% with messages = get_flashed_messages() %}
- {% if messages %}
- <ul class=flashes>
- {% for message in messages %}
- <li>{{ message }}</li>
- {% endfor %}
- </ul>
- {% endif %}
- {% endwith %}
- </p>
-
- <form method="post" action="/upload" enctype="multipart/form-data">
- <dl>
- <p>
- <input type="file" name="file" autocomplete="off" required>
- </p>
- </dl>
+{% extends "base.html" %}
+
+{% block content %}
+ <div id="upload">
+ <h2>Select a file to upload</h2>
+ <p>
+ {% with messages = get_flashed_messages() %}
+ {% if messages %}
+ <ul class=flashes>
+ {% for message in messages %}
+ <li>{{ message }}</li>
+ {% endfor %}
+ </ul>
+ {% endif %}
+ {% endwith %}
+ </p>
+
+ <form method="post" action="/upload" enctype="multipart/form-data">
+ <dl>
<p>
- <input type="submit" value="Submit" onclick="showLoad()">
+ <input id="choose_file" type="file" name="file" autocomplete="off" required>
</p>
- </form>
- </div>
-
- <div id="message"></div>
-
- {% if results %}
- <form method="get" action="/results">
- <button type="submit">Download!</button>
- </form>
- {% endif %}
+ </dl>
+ <p>
+ <input id="submit" type="submit" value="Submit" onclick="showLoad()">
+ </p>
+ </form>
+ </div>
+
+ <div id="message"></div>
- </body>
-</html> \ No newline at end of file
+{% endblock %}
diff --git a/Web/Server/templates/results.html b/Web/Server/templates/results.html
new file mode 100644
index 0000000..5714f96
--- /dev/null
+++ b/Web/Server/templates/results.html
@@ -0,0 +1,11 @@
+{% extends "base.html" %}
+
+{% block content %}
+ <form method="get" action="/results">
+ <button type="submit">Download Results File</button>
+ </form>
+
+ <form method="get" action="/">
+ <button type="submit">Return to upload another file</button>
+ </form>
+{% endblock %} \ No newline at end of file