aboutsummaryrefslogtreecommitdiffstats
path: root/src/views
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/views/pages/about.ejs6
-rw-r--r--src/views/pages/index.ejs35
-rw-r--r--src/views/partials/nav.ejs2
3 files changed, 26 insertions, 17 deletions
diff --git a/src/views/pages/about.ejs b/src/views/pages/about.ejs
index 2feede5..26e5687 100644
--- a/src/views/pages/about.ejs
+++ b/src/views/pages/about.ejs
@@ -15,9 +15,8 @@
<h1>Remotely Accessible Inverted Pendulum</h1>
</div>
- <div id="main">
- <div id="about">
- <h3 id="subtitle">
+ <div class="about">
+ <h3>
Created by <br />
Abrar Nair Islam, Brendan Lake, Cory Ohnsted, Matt Strapp, Kiflu Woldegiorgis (2022) <br />
Sam Hansen, Rezkath Awal, Donovan Peterson, Joseph Jewett (2021) <br />
@@ -35,7 +34,6 @@
<p>
A vertical pendulum that is balanced via the base moving. <br /> Controlled movements are determined by measuring the position and speed of the pendulum and base.
</p>
- </div>
</div>
</body>
diff --git a/src/views/pages/index.ejs b/src/views/pages/index.ejs
index 8b5f044..81624f6 100644
--- a/src/views/pages/index.ejs
+++ b/src/views/pages/index.ejs
@@ -2,25 +2,36 @@
<html lang="en">
<head>
- <!-- HTML headers information -->
+ <!-- HTML headers -->
<%- include('../partials/head.ejs') %>
+ <title>Upload your code here!</title>
<script type="module" src="public/js/form.js" defer></script>
</head>
<body>
<!-- Get the navbar -->
<%- include('../partials/nav.ejs') %>
- <br />
- <h2>Please upload a Python file (.py file extension) to run on the Inverted Pendulum.</h2>
- <br /> <br />
- <form id="upload" enctype="multipart/form-data">
- <input type="hidden" name="_csrf" value="<%= csrfToken %>">
- <input type="file" name="file" accept=".py" />
- <br /> <br />
- <br /> <br />
- <label id="Start">Start pendulum: </label>
- <input type="submit" id="actuate_but" value="Actuate!" />
- </form>
+ <div id="nojs">
+ <h1>Please enable JavaScript to use the inverted pendulum.</h1>
+ </div>
+ <div id="block" hidden="true">
+ <br />
+ <h1>Please upload a Python file (.py file extension) to run on the Inverted Pendulum.</h1>
+ <h3>A heavily documented example can be <a href="public/example.py">found here</a>.</h3>
+ <h2>
+ <span class="error" id="upload-err"></span>
+ <span class="error" id="actuate-err"></span>
+ </h2>
+
+ <form id="upload" enctype="multipart/form-data">
+ <input type="hidden" name="_csrf" value="<%= csrfToken %>">
+ <input type="file" name="file" accept=".py" />
+ <br /> <br />
+ <label id="Start">Start pendulum: </label>
+ <input type="submit" id="actuate_but" value="Actuate!" />
+ </form>
+ </span>
+
</body>
</html> \ No newline at end of file
diff --git a/src/views/partials/nav.ejs b/src/views/partials/nav.ejs
index 1ee6c00..b36e72e 100644
--- a/src/views/partials/nav.ejs
+++ b/src/views/partials/nav.ejs
@@ -2,6 +2,6 @@
<ul class="navbar">
<li><a href="/">Home</a></li>
<li><a href="/about">About the Inverted Pendulum</a></li>
- <li><a href="https://github.com/RosstheRoss/4951w-pendulum">GitHub Repo</a></li>
+ <li><a href="https://github.com/RosstheRoss/4951w-pendulum" style="right: 0px">GitHub Repo</a></li>
</ul>
</nav> \ No newline at end of file