diff --git a/src/app.js b/src/app.js
index 587be139..f297e563 100644
--- a/src/app.js
+++ b/src/app.js
@@ -18,6 +18,7 @@ if (fs.existsSync("config/config.json")) {
app.use("/analysis", require("./analysis/analysis.js"));
app.use("/admin", require("./admin/admin.js"));
app.use("/setup", require("./setup/setup.js"));
+ app.use("/checklist", require("./checklist/checklist.js"));
} else {
console.log(chalk.cyan.bold.underline("config.json not detected! First time setup flow enabled on server."))
app.use("/",require("./setup/setup.js"));
diff --git a/src/checklist/checklist.js b/src/checklist/checklist.js
new file mode 100644
index 00000000..9571dda1
--- /dev/null
+++ b/src/checklist/checklist.js
@@ -0,0 +1,13 @@
+express = require("express");
+
+let router = express.Router();
+
+router.use(express.static(__dirname + "/public"));
+
+router.get("/", (req,res) => {
+ res.render(__dirname + "/views/index.ejs");
+})
+
+router.use("/api", require("./routes/api.js"));
+
+module.exports = router;
\ No newline at end of file
diff --git a/src/checklist/public/css/global.css b/src/checklist/public/css/global.css
new file mode 100644
index 00000000..6ab477d6
--- /dev/null
+++ b/src/checklist/public/css/global.css
@@ -0,0 +1,28 @@
+:root {
+ --bg: #EFEFEF;
+ --text: #232323;
+ --bg-alt: #FEFEFE;
+ --accent: #30a2ff;
+ --accent-alt: #ff6030;
+ --error: #ff5166;
+ --light-gray: #bebebe;
+ --gray: #757575;
+ --green: #4caf50;
+ --placeholder: #a3a3a3;
+ --border-radius: 16px;
+ --font: Cairo, sans-serif
+}
+html {
+ overflow: hidden;
+ height: 100%;
+ position: fixed;
+}
+
+body {
+ height: 100%;
+ position: relative;
+}
+
+* {
+ font-family: var(--font, sans-serif)
+}
\ No newline at end of file
diff --git a/src/checklist/public/css/internal.css b/src/checklist/public/css/internal.css
new file mode 100644
index 00000000..bd38a33b
--- /dev/null
+++ b/src/checklist/public/css/internal.css
@@ -0,0 +1,59 @@
+/*****************************************************************
+ !!!WARNING!!!
+ EVERYTHING HERE IS VERY IMPORTANT
+DO NOT REMOVE OR MODIFY ANYTHING UNLESS YOU KNOW WHAT YOU'RE DOING
+*****************************************************************/
+* {
+ box-sizing: border-box;
+}
+
+body {
+ margin: 0;
+}
+
+html {
+ height: 100%;
+ width: 100%;
+}
+
+#spinner {
+ height: 300px;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ z-index: -1;
+}
+
+.main-svg {
+ border-radius: var(--border-radius);
+}
+
+/* width */
+::-webkit-scrollbar {
+ width: 10px;
+}
+
+/* Track */
+::-webkit-scrollbar-track {
+ background: transparent;
+}
+
+/* Handle */
+::-webkit-scrollbar-thumb {
+ background: var(--gray);
+ filter: saturate(0.8);
+ transition: 0.2s background;
+ border-radius: 999px;
+ width: 4px;
+ border: 3px solid rgba(0,0,0,0);
+ background-clip: padding-box;
+}
+
+/* Handle on hover */
+::-webkit-scrollbar-thumb:hover {
+ background: var(--text);
+ width: 4px;
+ border: 3px solid rgba(0,0,0,0);
+ background-clip: padding-box;
+}
\ No newline at end of file
diff --git a/src/checklist/public/css/style.css b/src/checklist/public/css/style.css
new file mode 100644
index 00000000..81b56b8a
--- /dev/null
+++ b/src/checklist/public/css/style.css
@@ -0,0 +1,142 @@
+body {
+ background-color: var(--bg);
+ }
+
+ #app {
+ height: 100vh;
+ width: 100%;
+ display: grid;
+ grid-template-columns: 275px auto;
+ grid-template-rows: 75px 30px auto;
+ transition: 0.3s visibility, opacity;
+ opacity: 0;
+ visibility: hidden;
+ background-color: var(--bg);
+ overflow: hidden;
+ }
+
+ #app.visible {
+ visibility: unset;
+ opacity: 1;
+ transition: visibility 0s 0s, opacity 0.3s 0s;
+ }
+
+ /* styling for page header */
+ #header {
+ background: var(--text);
+ height: 100px;
+ width: 100px;
+ border-bottom: 0.25vh solid white;
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: center;
+ padding: 0 20px;
+ box-shadow: 0 0 12px -2px #ff6030;
+ grid-area: 1 / 2 / 2 / 4;
+ }
+ /* styling for logo */
+ #logo {
+ height: 95px;
+ width: 100%;
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ justify-content: center;
+ grid-area: 1 / 1 / 3 / 2;
+ gap: 25px;
+
+ background-color: var(--accent-alt);
+ }
+
+ #logo-img {
+ height: 50px;;
+ }
+
+ #logo-text {
+ color: white;
+ font-size: 2.5rem;
+ }
+ /* styling for buttons */
+ .team-container {
+ border-radius: 16px;
+ border: 2px solid var(--accent-alt);
+ background-color: var(--bg);
+ padding: 16px;
+ border-top-width: 2px;
+ display: flex;
+ flex-direction: column;
+ gap: 10px;
+ cursor: pointer;
+ transition: 0.3s border, 0.3s background-color;
+ width: 75%;
+ justify-items: center;
+
+ }
+ /* team number */
+ .team-container > .team-number {
+ text-align: center;
+ text-justify: center;
+ width: 100%;
+ color: var(--accent-alt);
+ font-weight: 600;
+ font-size: 2.0rem;
+ line-height: 2.0rem;
+ transition: 0.3s color;
+ }
+ /* team name */
+ .team-container > .team-name {
+ text-align: center;
+ text-justify: center;
+ width: 100%;
+ font-size: 1.8rem;
+ line-height: 1.6rem;
+ color: var(--text);
+ transition: 0.3s color;
+ }
+ /* styling for buttons when selected */
+ .team-container.selected {
+ background-color: var(--accent-alt);
+ border-top-width: 2px;
+ }
+
+ .team-container.selected > .team-number, .team-container.selected > .team-name {
+ color: var(--bg);
+ }
+ /* styling for pick list */
+ #pick-list {
+ height: 100%;
+ width: 100%;
+ overflow-y: auto;
+ overflow-x: hidden;
+ gap: 20px;
+ display: flex;
+ flex-direction: column;
+ padding-top: 20px;
+ align-items: center;
+ }
+
+
+ @media screen and (max-width: 1100px) {
+ html {
+ font-size: 75%;
+ }
+
+ #app {
+ grid-template-columns: 200px auto;
+ grid-template-rows: 40px 20px auto;
+ }
+
+ #dashboard > div.visible {
+ height: calc(100vh - 40px);
+ }
+
+ #main-list {
+ padding: 25px 0;
+ }
+
+ #side-list {
+ padding: 25px 0;
+ }
+ }
+
\ No newline at end of file
diff --git a/src/checklist/public/icons/android-chrome-192x192.png b/src/checklist/public/icons/android-chrome-192x192.png
new file mode 100644
index 00000000..9cce4775
Binary files /dev/null and b/src/checklist/public/icons/android-chrome-192x192.png differ
diff --git a/src/checklist/public/icons/android-chrome-512x512.png b/src/checklist/public/icons/android-chrome-512x512.png
new file mode 100644
index 00000000..27f826c1
Binary files /dev/null and b/src/checklist/public/icons/android-chrome-512x512.png differ
diff --git a/src/checklist/public/icons/apple-touch-icon.png b/src/checklist/public/icons/apple-touch-icon.png
new file mode 100644
index 00000000..dfa8a225
Binary files /dev/null and b/src/checklist/public/icons/apple-touch-icon.png differ
diff --git a/src/checklist/public/icons/browserconfig.xml b/src/checklist/public/icons/browserconfig.xml
new file mode 100644
index 00000000..0cfc3dc1
--- /dev/null
+++ b/src/checklist/public/icons/browserconfig.xml
@@ -0,0 +1,9 @@
+
+
+
+
+ #fefefe
+
+
+
diff --git a/src/checklist/public/icons/favicon-16x16.png b/src/checklist/public/icons/favicon-16x16.png
new file mode 100644
index 00000000..a6155191
Binary files /dev/null and b/src/checklist/public/icons/favicon-16x16.png differ
diff --git a/src/checklist/public/icons/favicon-32x32.png b/src/checklist/public/icons/favicon-32x32.png
new file mode 100644
index 00000000..774418b4
Binary files /dev/null and b/src/checklist/public/icons/favicon-32x32.png differ
diff --git a/src/checklist/public/icons/favicon.ico b/src/checklist/public/icons/favicon.ico
new file mode 100644
index 00000000..e426fc53
Binary files /dev/null and b/src/checklist/public/icons/favicon.ico differ
diff --git a/src/checklist/public/icons/mstile-150x150.png b/src/checklist/public/icons/mstile-150x150.png
new file mode 100644
index 00000000..cc7b02ac
Binary files /dev/null and b/src/checklist/public/icons/mstile-150x150.png differ
diff --git a/src/checklist/public/icons/safari-pinned-tab.svg b/src/checklist/public/icons/safari-pinned-tab.svg
new file mode 100644
index 00000000..c421bfae
--- /dev/null
+++ b/src/checklist/public/icons/safari-pinned-tab.svg
@@ -0,0 +1,591 @@
+
+
+
diff --git a/src/checklist/public/icons/site.webmanifest b/src/checklist/public/icons/site.webmanifest
new file mode 100644
index 00000000..b9319c60
--- /dev/null
+++ b/src/checklist/public/icons/site.webmanifest
@@ -0,0 +1,19 @@
+{
+ "name": "",
+ "short_name": "",
+ "icons": [
+ {
+ "src": "android-chrome-192x192.png",
+ "sizes": "192x192",
+ "type": "image/png"
+ },
+ {
+ "src": "android-chrome-512x512.png",
+ "sizes": "512x512",
+ "type": "image/png"
+ }
+ ],
+ "theme_color": "#fefefe",
+ "background_color": "#fefefe",
+ "display": "standalone"
+}
diff --git a/src/checklist/public/img/spinner.svg b/src/checklist/public/img/spinner.svg
new file mode 100644
index 00000000..c0e7e57e
--- /dev/null
+++ b/src/checklist/public/img/spinner.svg
@@ -0,0 +1,6 @@
+
+
\ No newline at end of file
diff --git a/src/checklist/public/js/elements.js b/src/checklist/public/js/elements.js
new file mode 100644
index 00000000..e8fca351
--- /dev/null
+++ b/src/checklist/public/js/elements.js
@@ -0,0 +1,2 @@
+const header = document.getElementById("header")
+const pickList = document.getElementById("pick-list")
diff --git a/src/checklist/public/js/script.js b/src/checklist/public/js/script.js
new file mode 100644
index 00000000..7f8c3041
--- /dev/null
+++ b/src/checklist/public/js/script.js
@@ -0,0 +1,56 @@
+
+//get teams from the team list
+async function fetchTeams() {
+ const teams = await fetch(`/analysis/api/teams`).then(res => res.json())
+ return teams.reduce((acc, t) => {
+ acc[t.team_number] = t.nickname
+ return acc
+ }, {})
+}
+async function loadTeamsPickList(dataset) {
+ //get blue alliance teams
+ const allTeams = await fetchTeams();
+ //add to pick list
+ for (const [teamNumber, team] of Object.entries(dataset.teams)) {
+ const PickListTeamContainer = constructTeam(teamNumber, team, allTeams)
+ pickList.appendChild(PickListTeamContainer)
+ }
+
+}
+
+//makes buttons toggleable
+function displayTeam(teamContainer) {
+ teamContainer.classList.toggle("selected")
+ showFade(teamView)
+}
+
+// create team containers
+function constructTeam(teamNumber, team, allTeams) {
+
+ const teamContainer = createDOMElement("button", "team-container")
+ const teamNumDisplay = createDOMElement("div", "team-number")
+ teamNumDisplay.innerText = teamNumber
+ teamContainer.setAttribute("num", teamNumber)
+ teamContainer.appendChild(teamNumDisplay)
+ if (allTeams) {
+ const teamNameDisplay = createDOMElement("div", "team-name")
+ teamNameDisplay.innerText = allTeams[teamNumber]
+ teamContainer.appendChild(teamNameDisplay)
+ }
+ // listens for button clicked
+ teamContainer.addEventListener("click", async () => {
+ displayTeam(teamContainer)
+ })
+
+ return teamContainer
+}
+
+// grabs data set
+async function fetchDataset() {
+ return await fetch("/analysis/api/dataset").then(res => res.json())
+}
+
+(async ()=>{
+ var data = await fetchDataset();
+ loadTeamsPickList(data);
+})();
diff --git a/src/checklist/public/js/ui-elements.js b/src/checklist/public/js/ui-elements.js
new file mode 100644
index 00000000..231ac169
--- /dev/null
+++ b/src/checklist/public/js/ui-elements.js
@@ -0,0 +1,162 @@
+class Modal {
+ blind; // dimmed background element (closes modal on click)
+ close; // close button element
+ element; // main modal container element
+ modalExit; // function to close and destroy the modal
+ dismissButton; // optional dismiss button element
+ cancel; // cancel function passed in
+
+ constructor(size, closable=true) {
+ this.blind = document.createElement("div")
+ this.blind.classList = "modal-blind"
+ this.element = document.createElement("div")
+ this.element.classList = `modal ${size}`
+
+ this.modalExit = () => {
+ hideFade(this.blind)
+ hideFade(this.element)
+ setTimeout(() => {
+ document.body.removeChild(this.blind)
+ document.body.removeChild(this.element)
+ }, 300)
+ }
+
+ if (closable) {
+ this.close = document.createElement("i")
+ this.close.classList = "fa fa-times modal-close"
+
+ this.blind.addEventListener("click", this.modalExit)
+ this.close.addEventListener("click", this.modalExit)
+ this.element.appendChild(this.close)
+ }
+ document.body.appendChild(this.blind)
+ document.body.appendChild(this.element)
+ this.blind.offsetHeight
+ this.element.offsetHeight
+ showFade(this.blind)
+ showFade(this.element)
+ return this
+ }
+
+ assignCancel(cancelFunction) {
+ this.blind.addEventListener("click", cancelFunction)
+ this.close.addEventListener("click", cancelFunction)
+ this.dismissButton ? this.dismissButton.addEventListener("click", cancelFunction) : null
+ this.cancel = cancelFunction
+ }
+
+ header(text) {
+ const headerElement = document.createElement("div")
+ headerElement.innerHTML = text
+ headerElement.classList.add("header")
+ this.element.appendChild(headerElement)
+ return this
+ }
+
+ text(text) {
+ const textElement = document.createElement("div")
+ textElement.innerHTML = text
+ textElement.classList.add("text")
+ this.element.appendChild(textElement)
+ return this
+ }
+
+ image(src) {
+ const imgElement = document.createElement("img")
+ imgElement.src = src
+ this.element.appendChild(imgElement)
+ return this
+ }
+
+ center(horizontal = true, vertical = false) {
+ if (vertical) {
+ this.element.classList.add("main-center")
+ }
+
+ if (horizontal) {
+ this.element.classList.add("alt-center")
+ }
+
+ return this
+ }
+
+ dismiss(buttonText = "Dismiss") {
+ const buttonElement = document.createElement("button")
+ buttonElement.innerText = buttonText
+ buttonElement.addEventListener("click", this.modalExit)
+ this.cancel ? buttonElement.addEventListener("click", this.cancel) : null
+ this.element.appendChild(buttonElement)
+
+ return this
+ }
+
+ action(buttonText, func) {
+ const buttonElement = document.createElement("button")
+ buttonElement.innerText = buttonText
+ buttonElement.addEventListener("click", func);
+ this.element.appendChild(buttonElement);
+
+ return this
+ }
+}
+
+function showFade(element) {
+ element.classList.add("visible")
+}
+
+function hideFade(element) {
+ element.classList.remove("visible")
+}
+
+class Popup {
+ static types = {
+ "error": {
+ "prefix": "Error: ",
+ "color": "var(--error)"
+ },
+
+ "notice": {
+ "prefix": "",
+ "color": "var(--accent)"
+ },
+
+ "success": {
+ "prefix": "",
+ "color": "var(--green)"
+ },
+ }
+ popupElement;
+
+ constructor(type, text, duration = 5000) {
+ this.popupElement = document.createElement("p")
+ this.popupElement.classList = "popup"
+ this.popupElement.style.backgroundColor = Popup.types[type].color
+ this.popupElement.innerText = Popup.types[type].prefix + text
+ document.body.appendChild(this.popupElement)
+ this.popupElement.offsetHeight
+ this.popupElement.style.top = "55px"
+ setTimeout(() => {
+ this.popupElement.style.top = "0"
+ setTimeout(() => {
+ document.body.removeChild(this.popupElement)
+ }, 600)
+ }, duration)
+ }
+ setText(text) {
+ this.popupElement.innerText = text;
+ return this;
+ }
+ setType(type) {
+ this.popupElement.style.backgroundColor = Popup.types[type].color;
+ return this;
+ }
+}
+
+function createDOMElement(tag, classes, id) {
+ const element = document.createElement(tag)
+ element.classList = classes
+ if (id) {
+ element.id = id
+ }
+ return element
+}
\ No newline at end of file
diff --git a/src/checklist/routes/api.js b/src/checklist/routes/api.js
new file mode 100644
index 00000000..a58b0ac5
--- /dev/null
+++ b/src/checklist/routes/api.js
@@ -0,0 +1,28 @@
+const { Router } = require("express");
+let router = Router();
+const config = require("../../../config/config.json");
+const { TeamMatchPerformance } = require("../../lib/db");
+
+
+router.get("/auth", (req, res) => {
+ if (config.secrets.ACCESS_CODE === "") {
+ res.json({status: 2})
+ } else if (config.secrets.ACCESS_CODE == req.headers.authorization) {
+ res.json({status: 1})
+ } else {
+ res.json({status: 0})
+ }
+})
+
+
+router.get("/data", async (req,res) => {
+ res.json(await TeamMatchPerformance.find());
+})
+
+router.get("/matches", async (req,res) => {
+ res.json({
+ "allMatches": await ScoutingSync.getMatches(),
+ "currentMatch": ScoutingSync.match
+ })
+})
+module.exports = router;
\ No newline at end of file
diff --git a/src/checklist/views/index.ejs b/src/checklist/views/index.ejs
new file mode 100644
index 00000000..be0d472c
--- /dev/null
+++ b/src/checklist/views/index.ejs
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+ SPOT - Pick List
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+ SPOT - Checklist
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/scouting/public/css/match-scouting.css b/src/scouting/public/css/match-scouting.css
index 26112831..efc12ead 100644
--- a/src/scouting/public/css/match-scouting.css
+++ b/src/scouting/public/css/match-scouting.css
@@ -14,7 +14,7 @@
width: 99%;
height: 93.5%;
display: grid;
- grid-gap: .75vw;
+ grid-gap: 3vw;
border-radius: var(--border-radius, 16px);
padding: .5vmin
}
@@ -44,6 +44,15 @@
background-color: #2D2D2D
}
+.button-padding {
+ padding: 5vw;
+}
+
+.silver {
+ border: 3px solid #2d2d2d;
+ background-color: #919191
+}
+
.green {
background-color: #4caf50
}
@@ -53,15 +62,23 @@
}
.red {
- background-color: #ff4436
+ background-color: #ff4436;
}
.navy {
- background-color: #3f51b5
+ background-color: #3f51b5;
}
.pink {
- background-color: #f06292
+ background-color: #f06292;
+}
+
+.yellow{
+ background-color:#d8c24f;
+}
+
+.border{
+ border: 4px solid #37cde1;
}
.highlight {
diff --git a/src/scouting/public/js/match-scouting.js b/src/scouting/public/js/match-scouting.js
index 847e984c..bbc76b9a 100644
--- a/src/scouting/public/js/match-scouting.js
+++ b/src/scouting/public/js/match-scouting.js
@@ -124,7 +124,7 @@ let devEnd
button.timerInterval = setInterval(() => {
if (time <= transitions[0]) { //move to the next transition if it is time
displayText = matchScoutingConfig.timing.timeTransitions[transitions[0]].displayText;
- showLayer(matchScoutingConfig.timing.timeTransitions[transitions[0]].layer);
+ // showLayer(matchScoutingConfig.timing.timeTransitions[transitions[0]].layer);
transitions.shift()
}
if (time <= 0) {
diff --git a/src/scouting/scouting-sync.js b/src/scouting/scouting-sync.js
index 42d06413..0ed4da47 100644
--- a/src/scouting/scouting-sync.js
+++ b/src/scouting/scouting-sync.js
@@ -9,7 +9,7 @@ const {TeamMatchPerformance} = require("../lib/db.js");
const axios = require("axios");
const config = require("../../config/config.json");
const chalk = require("chalk");
-
+const DEMO = true;
module.exports = (server) => {
if (!ScoutingSync.initialized) {
if (!server) {
@@ -145,18 +145,24 @@ class ScoutingSync {
x.state.status == ScoutingSync.SCOUTER_STATUS.WAITING &&
x.state.connected);
- //if anyone is scouting the match, tell all waiting scouters to start
- if (ScoutingSync.scouters.filter(x=>
- x.state.matchNumber == ScoutingSync.match.number &&
- x.state.status == ScoutingSync.SCOUTER_STATUS.SCOUTING
- ).length > 0) {
- for (let scouter of currentMatchWaitingScouters) {
- scouter.socket.emit("enterMatch");
- }
- } else if (currentMatchWaitingScouters.length >= 6) { //if there are 6 scouters waiting, enter match.
- for (let scouter of currentMatchWaitingScouters) {
- scouter.socket.emit("enterMatch");
- }
+ if(!DEMO){
+ //if anyone is scouting the match, tell all waiting scouters to start
+ if (ScoutingSync.scouters.filter(x=>
+ x.state.matchNumber == ScoutingSync.match.number &&
+ x.state.status == ScoutingSync.SCOUTER_STATUS.SCOUTING
+ ).length > 0) {
+ for (let scouter of currentMatchWaitingScouters) {
+ scouter.socket.emit("enterMatch");
+ }
+ } else if (currentMatchWaitingScouters.length >= 6) { //if there are 6 scouters waiting, enter match.
+ for (let scouter of currentMatchWaitingScouters) {
+ scouter.socket.emit("enterMatch");
+ }
+ }
+ } else {
+ for (let scouter of currentMatchWaitingScouters) { //for demo, everyone should enter immediately
+ scouter.socket.emit("enterMatch");
+ }
}
}
@@ -205,8 +211,12 @@ class Scouter {
})
this.socket.on("syncData", async (clientTeamMatchPerformanceIds, requestTeamMatchPerformances) => {
+ if(!DEMO){
const serverTeamMatchPerformanceIds = (await TeamMatchPerformance.find()).map(teamMatchPerformance => teamMatchPerformance.matchId)
requestTeamMatchPerformances(clientTeamMatchPerformanceIds.filter(clientTeamMatchPerformanceId => !serverTeamMatchPerformanceIds.includes(clientTeamMatchPerformanceId)))
+ } else {
+ requestTeamMatchPerformances([]) //dont request any tmps for the demo
+ }
})
// comment out the clearData command
// this.socket.on("clearData", async () => {