Pre ccc (#9)

* start CCC code * fix api path in main form client * use 0 instead of B for mobile tel input * more consistent routes * forgor to minify files 💀 * handle empty results * another theme 🤯 * swap gruvbox colors * change link colors * fix my button mess * reduce unused css * accent color broken... * please i beg you css * version num
JayAgra · Oct 20, 2023 · eb021c6 · eb021c6
1 parent e2e89ed
commit eb021c6
Show file tree

Hide file tree

Showing 81 changed files with 1,332 additions and 1,280 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "scouting-app",
-  "version": "2023.1.8.2",
+  "version": "2023.1.8.3",
   "main": "serve.js",
   "dependencies": {
     "cookie-parser": "^1.4.6",

diff --git a/routes/2023.js b/routes/2023.js
@@ -289,6 +289,7 @@ function weightScores(submissionID, db) {
 }
 
 function createHTMLTable(data) {
+    if (data.length === 0) return "";
     var html = ``;
     var avg = {
         "auto_charge": 0,
@@ -391,6 +392,7 @@ function createHTMLTable(data) {
 }
 
 function createHTMLTableWithTeamNum(data) {
+    if (data.length === 0) return "";
     var html = ``;
     var avg = {
         "auto_charge": 0,

diff --git a/routes/api/events/teams.js b/routes/api/events/teams.js
@@ -12,7 +12,7 @@ function invalidJSON(str) {
 
 
 async function teams(req, res, frcapi, season) {
-    if (req.params.event !== "WOOD") {
+    if (req.params.event !== "CCCC") {
         var dbody = new EventEmitter();
         var options = {
             method: "GET",
@@ -58,7 +58,7 @@ async function teams(req, res, frcapi, season) {
             }
         });
     } else {
-        res.status(200).send("8,100,115,199,253,581,670,766,840,841,846,852,1072,1700,1868,2473,2489,2643,2813,3045,3256,4186,4765,4904,4990,5026,5027,5419,5430,6036,6059,6418,6962,7245,7777,8033,8048,8404,9114,9143,9400,9900");
+        res.status(200).send("8,253,649,701,766,841,846,852,1072,1425,1458,1671,1678,1967,2073,2135,2288,2551,2643,3189,3257,3482,3598,3859,4135,4159,4255,4643,4698,5027,5274,5458,5817,5924,59240,5940,59400,6059,6918,7137,7419,74190,7528,8016,80160,8768,9400,9634");
     }
 }
 

diff --git a/routes/api/teams/eventAll.js b/routes/api/teams/eventAll.js
@@ -0,0 +1,13 @@
+async function teamsByEventAll(req, res, db, season) {
+    const stmt = `SELECT * FROM main WHERE team=? AND event=? AND season=?`;
+    const values = [req.params.team, req.params.event, season];
+    db.all(stmt, values, (err, dbQueryResult) => {
+        if (err) {
+            res.status(500).send("" + 0x1f41);
+        } else {
+            res.status(200).json(dbQueryResult);
+        }
+    });
+}
+
+module.exports = { teamsByEventAll };
diff --git a/routes/api/teams/eventWeight.js b/routes/api/teams/eventWeight.js
@@ -0,0 +1,13 @@
+async function teamsByEvent(req, res, db, season) {
+    const stmt = `SELECT weight FROM main WHERE team=? AND event=? AND season=?`;
+    const values = [req.params.team, req.params.event, season];
+    db.all(stmt, values, (err, dbQueryResult) => {
+        if (err) {
+            res.status(500).send("" + 0x1f41);
+        } else {
+            res.status(200).json(dbQueryResult);
+        }
+    });
+}
+
+module.exports = { teamsByEvent };
diff --git a/routes/api/teams/seasonAll.js b/routes/api/teams/seasonAll.js
@@ -0,0 +1,13 @@
+async function teamsBySeasonAll(req, res, db, season) {
+    const stmt = `SELECT * FROM main WHERE team=? AND season=?`;
+    const values = [req.params.team, season];
+    db.all(stmt, values, (err, dbQueryResult) => {
+        if (err) {
+            res.status(500).send("" + 0x1f41);
+        } else {
+            res.status(200).json(dbQueryResult);
+        }
+    });
+}
+
+module.exports = { teamsBySeasonAll };
diff --git a/routes/api/teams/seasonWeight.js b/routes/api/teams/seasonWeight.js
@@ -0,0 +1,13 @@
+async function teamsBySeason(req, res, db, season) {
+    const stmt = `SELECT weight FROM main WHERE team=? AND season=?`;
+    const values = [req.params.team, season];
+    db.all(stmt, values, (err, dbQueryResult) => {
+        if (err) {
+            res.status(500).send("" + 0x1f41);
+        } else {
+            res.status(200).json(dbQueryResult);
+        }
+    });
+}
+
+module.exports = { teamsBySeason };
diff --git a/scouting.sh b/scouting.sh
@@ -23,7 +23,7 @@ if [ "$1" ]; then
         else
             echo "Please add domain (w/o protocol)"
         fi
-    elif [ "$1" = "renewssl" ];then 
+    elif [ "$1" = "renewssl" ]; then 
         ## assumes pm2
         certbot renew --deploy-hook='pm2 restart all'
     else

diff --git a/serve.js b/serve.js
@@ -75,7 +75,6 @@ app.engine("html", ejs.renderFile);
 app.use("/js", express.static("src/js"));
 app.use("/css", express.static("src/css"));
 app.use("/images", express.static("images"));
-app.use("/public", express.static("src/public"));
 // all cards by Lydia Honerkamp (https://github.com/1yd1a)
 app.use("/assets", express.static("src/assets", 
     {
@@ -546,6 +545,10 @@ app.get("/api/pit/:season/:event/:team", apiCheckAuth, async (req, res) => {
     require("./routes/api/pit.js").pit(req, res, db);
 });
 
+app.get("/api/teams/current/:event", apiCheckAuth, async (req, res) => {
+    require("./routes/api/teams.js").teams(req, res, db, req.params.season);
+});
+
 app.get("/api/teams/:season/:event", apiCheckAuth, async (req, res) => {
     require("./routes/api/teams.js").teams(req, res, db, season);
 });
@@ -611,24 +614,31 @@ app.get("/api/casino/plinko/startGame", apiCheckAuth, checkGamble, async (req, r
 app.get("/api/casino/plinko/endGame/:token/:pts", apiCheckAuth, checkGamble, async (req, res) => {
     require("./routes/api/casino/plinko/endGame.js").endGame(req, res, db, casinoToken);
 });
-// end plinko
 
-app.get("/api/events/:event/teams", apiCheckAuth, async (req, res) => {
+// team, weight pair from db
+app.get("/api/events/:season/:event/teams", apiCheckAuth, async (req, res) => {
+    require("./routes/api/events/teams.js").teams(req, res, frcapi, req.params.season);
+});
+
+app.get("/api/events/current/:event/teams", apiCheckAuth, async (req, res) => {
     require("./routes/api/events/teams.js").teams(req, res, frcapi, season);
 });
 
+// frc api teams data
 app.get("/api/events/:event/allTeamData", apiCheckAuth, async (req, res) => {
     forwardFRCAPIdata(`/v3.0/${season}/teams?eventCode=${req.params.event}`, req, res);
 });
 
-app.get("/api/events/current/allData", apiCheckAuth, async (req, res) => {
-    forwardFRCAPIdata(`/v3.0/${season}/teams?eventCode=${currentComp}`, req, res);
+// pit scouted team list
+app.get("/api/events/current/:event/pitscoutedteams", apiCheckAuth, async (req, res) => {
+    require("./routes/api/events/pitscoutedteams.js").pitscoutedteams(req, res, db, season);
 });
 
-app.get("/api/events/:event/pitscoutedteams", apiCheckAuth, async (req, res) => {
-    require("./routes/api/events/pitscoutedteams.js").pitscoutedteams(req, res, db, season);
+app.get("/api/events/:season/:event/pitscoutedteams", apiCheckAuth, async (req, res) => {
+    require("./routes/api/events/pitscoutedteams.js").pitscoutedteams(req, res, db, req.params.season);
 });
 
+// notes api
 app.get("/api/notes/:event/:team/getNotes", apiCheckAuth, async (req, res) => {
     require("./routes/api/notes/getNotes.js").getNotes(req, res, db, season);
 });
@@ -641,10 +651,45 @@ app.post("/api/notes/:event/:team/updateNotes", apiCheckAuth, async (req, res) =
     require("./routes/api/notes/updateNotes.js").updateNotes(req, res, db, season);
 });
 
+// frc api's data on a team
 app.get("/api/teams/teamdata/:team", apiCheckAuth, async (req, res) => {
     forwardFRCAPIdata(`/v3.0/${season}/teams?teamNumber=${req.params.team}`, req, res);
 });
 
+// get weight for teams
+app.get("/api/teams/event/current/:event/:team/weight", apiCheckAuth, async (req, res) => {
+    require("./routes/api/teams/eventWeight.js").teamsByEvent(req, res, db, season);
+});
+
+app.get("/api/teams/event/:season/:event/:team/weight", apiCheckAuth, async (req, res) => {
+    require("./routes/api/teams/eventWeight.js").teamsByEvent(req, res, db, req.params.season);
+});
+
+app.get("/api/teams/season/current/:team/weight", apiCheckAuth, async (req, res) => {
+    require("./routes/api/teams/seasonWeight.js").teamsBySeason(req, res, db, season);
+});
+
+app.get("/api/teams/season/:season/:team/weight", apiCheckAuth, async (req, res) => {
+    require("./routes/api/teams/seasonWeight.js").teamsBySeason(req, res, db, req.params.season);
+});
+
+// get all data for teams
+app.get("/api/teams/event/current/:event/:team/all", apiCheckAuth, async (req, res) => {
+    require("./routes/api/teams/eventAll.js").teamsByEventAll(req, res, db, season);
+});
+
+app.get("/api/teams/event/:season/:event/:team/all", apiCheckAuth, async (req, res) => {
+    require("./routes/api/teams/eventAll.js").teamsByEventAll(req, res, db, req.params.season);
+});
+
+app.get("/api/teams/season/current/:team/all", apiCheckAuth, async (req, res) => {
+    require("./routes/api/teams/seasonAll.js").teamsBySeasonAll(req, res, db, season);
+});
+
+app.get("/api/teams/season/:season/:team/all", apiCheckAuth, async (req, res) => {
+    require("./routes/api/teams/seasonAll.js").teamsBySeasonAll(req, res, db, req.params.season);
+});
+
 // auth functions
 app.get("/", passport.authenticate("discord"));