kdrakontidis/throttle_motor_mapping
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

General refactor

Browse Source
This commit is contained in:
admin
2025-06-09 08:53:29 +02:00
parent e9296b44be
commit 9081853a6f
15 changed files with 43 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/routes/private_routes.js
+5
View File
@@ -15,6 +15,7 @@ function errorPageRenderer(res, emoji, message) {
res.render("error", {
page_title: app_conf.name,
program: app_conf.program,
app_url: app_conf.app_url,
css_path: path.join(app_conf.paths.css.web, "stylesheet.css"),
js_path: path.join(app_conf.paths.js.web, "error.js"),
error_emoji: emoji,
@@ -124,6 +125,7 @@ router.get("/add", async (req, res) => {
res.render("add", {
page_title: app_conf.name,
program: app_conf.program,
app_url: app_conf.app_url,
css_path: path.join(app_conf.paths.css.web, "stylesheet.css"),
js_path: path.join(app_conf.paths.js.web, "add.js"),
chartjs: app_conf.paths.chartjs.web + "/chart.umd.js",
@@ -143,6 +145,7 @@ router.get("/edit", async (req, res) => {
res.render("edit", {
page_title: app_conf.name,
program: app_conf.program,
app_url: app_conf.app_url,
css_path: path.join(app_conf.paths.css.web, "stylesheet.css"),
js_path: path.join(app_conf.paths.js.web, "edit.js"),
chartjs: app_conf.paths.chartjs.web + "/chart.umd.js",
@@ -203,6 +206,7 @@ router.get("/", async (req, res) => {
res.render("index", {
page_title: app_conf.name,
program: app_conf.program,
app_url: app_conf.app_url,
css_path: path.join(app_conf.paths.css.web, "stylesheet.css"),
js_path: path.join(app_conf.paths.js.web, "index.js"),
map_name_msg: (selected_map_name != "" ? "Using: " + selected_map_name : ""),
@@ -222,6 +226,7 @@ router.get("/about", (req, res) => {
res.render("about", {
page_title: app_conf.name,
program: app_conf.program,
app_url: app_conf.app_url,
css_path: path.join(app_conf.paths.css.web, "stylesheet.css"),
version: app_conf.version
});
app/routes/public_routes.js
+1 -9
View File
@@ -12,15 +12,7 @@ router.use(app_conf.paths.chartjs.web, express.static(path.join(path.dirname(req
* Main endpoint - might implement authentication step here...
*/
router.get("/", (req, res) => {
res.render("auth", {
page_title: app_conf.name,
program: app_conf.program,
css_path: path.join(app_conf.paths.css.web, "stylesheet.css"),
protocol: app_conf.protocol,
host: app_conf.host,
port: app_conf.port
});
res.redirect(`${app_conf.protocol}://${app_conf.host}:${app_conf.port}${app_conf.app_url}`);
});
module.exports = router;
app/views/about.ejs
+1 -1
View File
@@ -30,7 +30,7 @@
style="font-size: 150%;">GitHub</a>
</center>
<br>
<a href="/app"><span>&#129152; </span>Return</a>
<a href="<%= app_url %>"><span>&#129152; </span>Return</a>
</div>
</body>
app/views/add.ejs
+3 -3
View File
@@ -16,7 +16,7 @@
<script src="<%= js_path %>" defer></script>
<script src="<%= chartjs %>"></script>
<script defer>
var steps = '<%= steps %>', max_rpm = '<%= max_rpm %>', max_throttle = '<%= max_throttle %>';
var steps = '<%= steps %>', max_rpm = '<%= max_rpm %>', max_throttle = '<%= max_throttle %>', app_url = '<%= app_url %>';
</script>
</head>
@@ -55,12 +55,12 @@
<table id="motor_table" style="text-align: center;"></table>
</div>
<div style="display: flex; flex-direction: row; justify-content: space-between;">
<a href="/app"><span>&#129152; </span>Return</a>
<a href="<%= app_url %>"><span>&#129152; </span>Return</a>
<label id="commit" style="cursor: pointer;"><span>&#9989; </span>Commit</label>
</div>
</div>
<div class="about_div">
<center><a href="/app/about">About</label></center>
<center><a href="<%= app_url %>/about">About</label></center>
</div>
</body>
app/views/auth.ejs
-33
View File
@@ -1,33 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<title>
<%= page_title %>
</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link
href="https://fonts.googleapis.com/css2?family=Ubuntu:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&display=swap"
rel="stylesheet">
<link rel="stylesheet" href="<%= css_path %>">
</head>
<body>
<div class="control_div">
<label
style='font-family: "Ubuntu", sans-serif; font-weight: 500; font-style: normal; font-size: 200%;'>Centaurus
Racing Team</label>
</div>
<div class="main_div"
style="display: flex; flex-direction: column; justify-content: space-between; font-size: 150%; margin-top: 15px; margin-bottom: 15px;">
<div style="display: flex; flex-direction: row; justify-content: space-evenly;">
<label><%= page_title %> <%= program %></label>
<a href="<%= protocol %>://<%= host %>:<%= port %>/app">Enter</a>
</div>
</div>
</body>
</html>
app/views/edit.ejs
+3 -3
View File
@@ -16,7 +16,7 @@
<script type="module" src="<%= js_path %>" defer></script>
<script src="<%= chartjs %>"></script>
<script defer>
var map = '<%- map %>', map_meta = '<%- map_meta %>', steps = '<%= steps %>', max_rpm = '<%= max_rpm %>', max_throttle = '<%= max_throttle %>';
var map = '<%- map %>', map_meta = '<%- map_meta %>', steps = '<%= steps %>', max_rpm = '<%= max_rpm %>', max_throttle = '<%= max_throttle %>', app_url = '<%= app_url %>';
</script>
</head>
@@ -60,12 +60,12 @@
<table id="motor_table" style="text-align: center;"></table>
</div>
<div style="display: flex; flex-direction: row; justify-content: space-between;">
<a href="/app"><span>&#129152; </span>Return</a>
<a href="<%= app_url %>"><span>&#129152; </span>Return</a>
<label id="commit" style="cursor: pointer;"><span>&#9989; </span>Commit</label>
</div>
</div>
<div class="about_div">
<center><a href="/app/about">About</label></center>
<center><a href="<%= app_url %>/about">About</label></center>
</div>
</body>
app/views/error.ejs
+4 -1
View File
@@ -14,6 +14,9 @@
rel="stylesheet">
<link rel="stylesheet" href="<%= css_path %>">
<script src="<%= js_path %>" defer></script>
<script defer>
var app_url = '<%= app_url %>';
</script>
</head>
<body>
@@ -38,7 +41,7 @@
<%= error_message %>
</label>
<br>
<a href="/app"><span>&#129152; </span>Return</a>
<a href="<%= app_url %>"><span>&#129152; </span>Return</a>
</div>
</body>
app/views/index.ejs
+4 -1
View File
@@ -14,6 +14,9 @@
rel="stylesheet">
<link rel="stylesheet" href="<%= css_path %>">
<script src="<%= js_path %>" defer></script>
<script defer>
var app_url = '<%= app_url %>';
</script>
</head>
<body>
@@ -47,7 +50,7 @@
</table>
</div>
<div class="about_div">
<center><a href="/app/about">About</label></center>
<center><a href="<%= app_url %>/about">About</label></center>
</div>
</body>