aboutsummaryrefslogtreecommitdiffstats
path: root/src/views
diff options
context:
space:
mode:
authorMatt Strapp <matt@mattstrapp.net>2022-02-11 00:11:52 -0600
committerMatt Strapp <matt@mattstrapp.net>2022-02-11 00:11:52 -0600
commit0fbc317e926b5d80363979ee51a4e3c930014efd (patch)
treebfd8ce0fc829d80a46a2182b759057c25e4894fa /src/views
parentGet rid of express-session and use a cookie instead (diff)
downloadee4511w-web-0fbc317e926b5d80363979ee51a4e3c930014efd.tar
ee4511w-web-0fbc317e926b5d80363979ee51a4e3c930014efd.tar.gz
ee4511w-web-0fbc317e926b5d80363979ee51a4e3c930014efd.tar.bz2
ee4511w-web-0fbc317e926b5d80363979ee51a4e3c930014efd.tar.lz
ee4511w-web-0fbc317e926b5d80363979ee51a4e3c930014efd.tar.xz
ee4511w-web-0fbc317e926b5d80363979ee51a4e3c930014efd.tar.zst
ee4511w-web-0fbc317e926b5d80363979ee51a4e3c930014efd.zip
Do a bunch of random things (still no feature parity)
sadge Signed-off-by: Matt Strapp <matt@mattstrapp.net>
Diffstat (limited to 'src/views')
-rw-r--r--src/views/pages/about.ejs6
-rw-r--r--src/views/pages/index.ejs76
-rw-r--r--src/views/pages/login.ejs11
-rw-r--r--src/views/partials/head.ejs10
-rw-r--r--src/views/partials/nav.ejs14
5 files changed, 39 insertions, 78 deletions
diff --git a/src/views/pages/about.ejs b/src/views/pages/about.ejs
index 3b376d5..022354c 100644
--- a/src/views/pages/about.ejs
+++ b/src/views/pages/about.ejs
@@ -12,19 +12,19 @@
<title>About the Remotely Accessible Inverted Pendulum</title>
<div class="header">
<img src="public/img/site_logo.png" alt="Pendulum logo" width="160" height="130" />
- <h1 id="title1">Remotely Accessible Inverted Pendulum</h1>
+ <h1>Remotely Accessible Inverted Pendulum</h1>
</div>
<div id="main">
<div id="about">
- <h2 id="subtitle">
+ <h3 id="subtitle">
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 />
Alin Butoi, Paul D’Amico, Dat Nguyen, Ross Olson, Rachel Schow (2019) <br /> <br />
Advisor: Professor Andrew Lamperski <br />
Sponsored by the University of Minnesota -Twin Cities <br />
- </h2>
+ </h3>
<br />
<h1 id="Background">Background</h1>
<p>
diff --git a/src/views/pages/index.ejs b/src/views/pages/index.ejs
index 6087732..0e6fe15 100644
--- a/src/views/pages/index.ejs
+++ b/src/views/pages/index.ejs
@@ -4,73 +4,23 @@
<head>
<!-- HTML headers information -->
<%- include('../partials/head.ejs') %>
- <script type="text/javascript" src="/static/js/app.js"></script>
+ <script type="module" src="public/js/form.js" defer></script>
</head>
<body>
+ <!-- Get the navbar -->
<%- include('../partials/nav.ejs') %>
- <div class="header">
- <!-- Get the navbar -->
-
- <div class="row">
- <div class="col">
-
- <h1 id="title2">Homepage</h1>
- <hr>
-
-
- <h3 id="subtitle1">Please upload a Python file (.py file extension) onto the Inverted Pendulum</h3>
- <!--**************************Send form data to web server**************************-->
- <form method="POST" action="/index" enctype="multipart/form-data">
- <p><input type="file" name="file" accept=".py" /></p>
- <p><input type="submit" value="Upload File" onclick="update()"></p>
- </form>
-
- For file upload progress bar
- <div id="myProgress">
- <div id="myBar"></div>
- </div>
-
- <!--The following lines are for the warning flash() messages-->
- <% if (errors) { %>
- <% for (const message in errors) { %>
- <div class="alert alert-warning alert-dismissible fade show" role="alert">
- <span>
- <% message %>
- </span>
- <button type="button" class="close" data-dismiss="alert" aria-label="Close">
- <span aria-hidden="true">&times;</span>
- </button>
- </div>
- <% } %>
- <% } %>
-
- <!--The following lines are for the danger flash() messages-->
- <% if (errors) { %>
- <% for (const message in errors) { %>
- <div class="alert alert-danger alert-dismissible fade show" role="alert">
- <span>
- <% message %>
- </span>
- <button type="button" class="close" data-dismiss="alert" aria-label="Close">
- <span aria-hidden="true">&times;</span>
- </button>
- </div>
- <% } %>
- <% } %>
-
-
- <div class="mb-3">
- <div class="form-group">
- <label id="Start">Start pendulum: </label>
- <!-- <button class="btn btn-primary" id="onbutton">Actuate!</button> -->
- <button type="button" id=button1 onclick="window.location.href='{{ url_for( 'run_test_file') }}';">Actuate!</button>
- </div>
- </div>
- <hr>
- </div>
- </div>
- </div>
+ <br />
+ <h2>Please upload a Python file (.py file extension) onto 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>
</body>
</html> \ No newline at end of file
diff --git a/src/views/pages/login.ejs b/src/views/pages/login.ejs
index e69de29..7e77ee2 100644
--- a/src/views/pages/login.ejs
+++ b/src/views/pages/login.ejs
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+ <!-- HTML headers information -->
+ <%- include('../partials/head.ejs') %>
+</head>
+
+<body>
+ <%- include('../partials/nav.ejs') %>
+</body> \ No newline at end of file
diff --git a/src/views/partials/head.ejs b/src/views/partials/head.ejs
index 02786be..320f0e6 100644
--- a/src/views/partials/head.ejs
+++ b/src/views/partials/head.ejs
@@ -1,6 +1,6 @@
-<meta charset="utf-8" />
-<meta http-equiv="X-UA-Compatible" content="IE=edge" />
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta charset="utf-8" />
+ <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
-<link rel="stylesheet" href="public/css/style.css" type="text/css">
-<link rel="icon" href="public/img/site_logo.png" type="image/x-icon"> \ No newline at end of file
+ <link rel="stylesheet" href="public/css/style.css" type="text/css">
+ <link rel="icon" href="public/img/site_logo.png" type="image/x-icon"> \ No newline at end of file
diff --git a/src/views/partials/nav.ejs b/src/views/partials/nav.ejs
index ab2626b..1ee6c00 100644
--- a/src/views/partials/nav.ejs
+++ b/src/views/partials/nav.ejs
@@ -1,7 +1,7 @@
-<nav>
- <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>
- </ul>
-</nav> \ No newline at end of file
+ <nav>
+ <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>
+ </ul>
+ </nav> \ No newline at end of file