);
+ });
+
+ return (
+
+ {inputs}
+
+ );
+ });
+
+ pages.push(
+
+
+ {submitting ? (
+
+ ,
+ );
+
+ return (
+
+ {pages[page]}
+
+
+
+
+ #{[props.report.robotNumber]}
+
+
+
{
+ setPage(page - 1);
+ }}
+ >
+
+
+ {syncing ? (
+
+ {" "}
+
+ ) : (
+ <>
+ )}
+
+
{
+ setPage(page + 1);
+ }}
+ >
+ Next
+
+
+
+
+
+
-
-
-
{props.title}
-
-
- {props.children}
-
-
-
- );
-}
\ No newline at end of file
+ return (
+
+
+
+
{props.title}
+
+
+ {props.children}
+
+
+
+ );
+}
diff --git a/components/forms/ImageUpload.tsx b/components/forms/ImageUpload.tsx
index ac3fb921..5bd66a98 100644
--- a/components/forms/ImageUpload.tsx
+++ b/components/forms/ImageUpload.tsx
@@ -4,92 +4,96 @@ import React, { useState } from "react";
import { FaFileUpload, FaImage } from "react-icons/fa";
const DefaultCompressionOptions = {
- maxSizeMB: 0.5,
- maxWidthOrHeight: 1920,
- useWebWorker: true,
+ maxSizeMB: 0.5,
+ maxWidthOrHeight: 1920,
+ useWebWorker: true,
};
export default function ImageUpload(props: {
- report: Pitreport;
- callback: (key: string, value: string | number | boolean) => void;
+ report: Pitreport;
+ callback: (key: string, value: string | number | boolean) => void;
}) {
- const [imageUrl, setImageUrl] = useState(
- props.report.data?.image !== "/robot.jpg" ? props.report.data?.image : ""
- );
- const [uploadProgress, setUploadProgress] = useState(-1);
+ const [imageUrl, setImageUrl] = useState(
+ props.report.data?.image !== "/robot.jpg" ? props.report.data?.image : "",
+ );
+ const [uploadProgress, setUploadProgress] = useState(-1);
- const onUpload = async (event: any) => {
- setUploadProgress(50);
- const data = event.target.files[0];
- console.log(`originalFile size ${data.size / 1024 / 1024} MB`);
+ const onUpload = async (event: any) => {
+ setUploadProgress(50);
+ const data = event.target.files[0];
+ console.log(`originalFile size ${data.size / 1024 / 1024} MB`);
- const compressionOptions = {
- ...DefaultCompressionOptions,
- fileType: (data.name as string).split(".").at(-1),
- };
+ const compressionOptions = {
+ ...DefaultCompressionOptions,
+ fileType: (data.name as string).split(".").at(-1),
+ };
- const compressedFile = await imageCompression(data, compressionOptions);
- console.log(`compressedFile size ${compressedFile.size / 1024 / 1024} MB`);
+ const compressedFile = await imageCompression(data, compressionOptions);
+ console.log(`compressedFile size ${compressedFile.size / 1024 / 1024} MB`);
- const formData = new FormData();
- formData.append("files", compressedFile);
+ const formData = new FormData();
+ formData.append("files", compressedFile);
- const res = await fetch("/api/img/upload", {
- method: "POST",
- headers: {
- "gearbox-auth": "gearboxiscool",
- },
- body: formData,
- });
+ const res = await fetch("/api/img/upload", {
+ method: "POST",
+ headers: {
+ "gearbox-auth": "gearboxiscool",
+ },
+ body: formData,
+ });
- if (res.status === 200) {
- const data = await res.json();
- const url = `/api/img/get?filename=${data.filename}`;
+ if (res.status === 200) {
+ const data = await res.json();
+ const url = `/api/img/get?filename=${data.filename}`;
- setTimeout(() => {
- setImageUrl(url);
- props.callback("image", url);
- setUploadProgress(100);
- }, 1000);
- } else {
- setUploadProgress(-1);
- }
- };
+ setTimeout(() => {
+ setImageUrl(url);
+ props.callback("image", url);
+ setUploadProgress(100);
+ }, 1000);
+ } else {
+ setUploadProgress(-1);
+ }
+ };
- return (
-
- {!imageUrl ? (
-
-
- ) : (
-
- )}
- {uploadProgress > 0 ? (
-
- ) : (
- <>
- )}
-
-
-
-
- Only .png and .jpg accepted
-
-
-
+ {!imageUrl ? (
+
+
+ ) : (
+
+ )}
+ {uploadProgress > 0 ? (
+
+ ) : (
+ <>
+ )}
+
+
+
+
+ Only .png and .jpg accepted
+
+
+
-
{props.title}
-
{
- props.callback(props.dataKey as string, keys[e.target.valueAsNumber]);
- }}
- type="range"
- min={0}
- max={keys.length - 1}
- value={num}
- className="range range-primary"
- step="1"
- />
-
- {
- keys.map((key, i) => {
- return (
-
- {key}
-
- );
- })
- }
-
-
+
{props.title}
+
{
+ props.callback(props.dataKey as string, keys[e.target.valueAsNumber]);
+ }}
+ type="range"
+ min={0}
+ max={keys.length - 1}
+ value={num}
+ className="range range-primary"
+ step="1"
+ />
+
+ {keys.map((key, i) => {
+ return {key} ;
+ })}
+
+
-
- );
+ return (
+
+
+ );
}
diff --git a/components/stats/Heatmap.tsx b/components/stats/Heatmap.tsx
index f2e71a05..6fb59085 100644
--- a/components/stats/Heatmap.tsx
+++ b/components/stats/Heatmap.tsx
@@ -4,87 +4,95 @@ import { useEffect } from "react";
import { FieldPos, Report } from "@/lib/Types";
const Sketch = dynamic(() => import("react-p5").then((mod) => mod.default), {
- ssr: false,
+ ssr: false,
});
interface Position {
- x: number;
- y: number;
+ x: number;
+ y: number;
}
export interface Dot {
- x?: number;
- y?: number
- color: {
- r: number;
- g: number;
- b: number;
- a: number;
- };
- size: number;
- label: string;
+ x?: number;
+ y?: number;
+ color: {
+ r: number;
+ g: number;
+ b: number;
+ a: number;
+ };
+ size: number;
+ label: string;
}
var bg: p5Types.Image;
const resolution = 25;
var positions: Position[] = [];
-export default function Heatmap(props: { selectedReports: Report[], fieldImagePrefix: string, dots: Dot[] }) {
- const setup = (p5: p5Types, canvasParentRef: Element) => {
- bg = p5.loadImage(`/fields/${props.fieldImagePrefix}Blue.PNG`);
- p5.createCanvas(350, 300).parent(canvasParentRef);
- p5.rectMode(p5.CENTER);
- p5.stroke(1);
- };
+export default function Heatmap(props: {
+ selectedReports: Report[];
+ fieldImagePrefix: string;
+ dots: Dot[];
+}) {
+ const setup = (p5: p5Types, canvasParentRef: Element) => {
+ bg = p5.loadImage(`/fields/${props.fieldImagePrefix}Blue.PNG`);
+ p5.createCanvas(350, 300).parent(canvasParentRef);
+ p5.rectMode(p5.CENTER);
+ p5.stroke(1);
+ };
- const inSquare = (x: number, y: number, w: number) => {
- let counter = 0;
- positions.forEach((pos) => {
- if (Math.abs(pos.x - x) <= w) {
- if (Math.abs(pos.y - y) <= w) {
- counter++;
- }
- }
- });
- return counter;
- };
+ const inSquare = (x: number, y: number, w: number) => {
+ let counter = 0;
+ positions.forEach((pos) => {
+ if (Math.abs(pos.x - x) <= w) {
+ if (Math.abs(pos.y - y) <= w) {
+ counter++;
+ }
+ }
+ });
+ return counter;
+ };
- useEffect(() => {
- if (props.selectedReports) {
- positions = [];
- props.selectedReports.forEach((report) => {
- if (report.data.AutoStart)
- positions.push({
- x: report.data.AutoStart.x,
- y: report.data.AutoStart.y,
- });
- }
- );
- }
- });
+ useEffect(() => {
+ if (props.selectedReports) {
+ positions = [];
+ props.selectedReports.forEach((report) => {
+ if (report.data.AutoStart)
+ positions.push({
+ x: report.data.AutoStart.x,
+ y: report.data.AutoStart.y,
+ });
+ });
+ }
+ });
- const draw = (p5: p5Types) => {
- p5.background(bg);
+ const draw = (p5: p5Types) => {
+ p5.background(bg);
- for (var x = 0; x < p5.width + resolution; x += resolution) {
- for (var y = 0; y < p5.height + resolution; y += resolution) {
- var v = inSquare(x, y, resolution) / (positions.length / 2);
- p5.fill(
- p5.lerpColor(p5.color(124, 252, 0, 150), p5.color(255, 0, 0, 200), v),
- );
- p5.rect(x, y, resolution, resolution);
- }
- }
-
- props.dots.forEach((dot) => {
- if (dot && dot.x && dot.y) {
- p5.fill(dot.color.r, dot.color.g, dot.color.b, dot.color.a);
- p5.ellipse(dot.x, dot.y, dot.size, dot.size);
- }
- });
+ for (var x = 0; x < p5.width + resolution; x += resolution) {
+ for (var y = 0; y < p5.height + resolution; y += resolution) {
+ var v = inSquare(x, y, resolution) / (positions.length / 2);
+ p5.fill(
+ p5.lerpColor(p5.color(124, 252, 0, 150), p5.color(255, 0, 0, 200), v),
+ );
+ p5.rect(x, y, resolution, resolution);
+ }
+ }
- p5.fill(0, 0, 0, 0); // Reset fill so it doesn't affect the background
- };
+ props.dots.forEach((dot) => {
+ if (dot && dot.x && dot.y) {
+ p5.fill(dot.color.r, dot.color.g, dot.color.b, dot.color.a);
+ p5.ellipse(dot.x, dot.y, dot.size, dot.size);
+ }
+ });
- return
-
- {props.rank !== undefined ? `${props.rank + 1}. ` : ""}Team #{teamNumber}
-
- {
- props.rank !== undefined && props.lastRank && props.picklist ? (
-
- { props.rank > 0 && changeTeamRank(-1)}> }
- { props.rank < props.lastRank && changeTeamRank(1)}> }
-
)
- : ""
- }
-
void}
+ >
+
+ {props.rank !== undefined ? `${props.rank + 1}. ` : ""}
+ Team {" "}
+ #{teamNumber}
+
+ {props.rank !== undefined && props.lastRank && props.picklist ? (
+
+ {props.rank > 0 && (
+ changeTeamRank(-1)}
+ >
+
+ )}
+ {props.rank < props.lastRank && (
+ changeTeamRank(1)}
+ >
+
+ )}
+
+ ) : (
+ ""
+ )}
+
) {
- picklist.name = e.target.value;
- picklist.update(picklist);
- }
-
- return (
-
-
{picklist.name}
- {picklist.teams.map((team, index) => (
- Drop Here! }
-
- );
+function PicklistCard(props: { picklist: Picklist; picklists: Picklist[] }) {
+ const picklist = props.picklist;
+
+ const [{ isOver }, dropRef] = useDrop({
+ accept: "team",
+ drop: (item: CardData) => {
+ if (item.picklistIndex === picklist.index) return;
+
+ removeTeamFromPicklist(item, props.picklists);
+
+ if (!Includes(picklist.teams, item)) {
+ item.picklistIndex = picklist.index;
+ picklist.teams.push(item);
+ picklist.update(picklist);
+ }
+ },
+ collect: (monitor) => ({
+ isOver: monitor.isOver(),
+ }),
+ });
+
+ function changeName(e: ChangeEvent) {
+ picklist.name = e.target.value;
+ picklist.update(picklist);
+ }
+
+ return (
+ void}
+ >
+
+ {picklist.name}
+
+ {picklist.teams.map((team, index) => (
+ Drop Here! }
+
+ );
}
-export function TeamList(props: { teams: CardData[], picklists: Picklist[], expectedTeamCount: number }) {
- const [{ isOver}, dropRef] = useDrop({
- accept: "team",
- drop: (item: CardData) => {
- removeTeamFromPicklist(item, props.picklists);
- },
- collect: (monitor) => ({
- isOver: monitor.isOver(),
- }),
- });
-
- return (
-
- {
- props.teams.sort((a, b) => a.number - b.number).map((team) => (
-
- ))
- }
- { props.teams.length !== props.expectedTeamCount &&
-
- }
-
void}
+ className="w-full h-fit flex flex-row bg-base-300 space-x-2 p-2 overflow-x-scroll"
+ >
+ {props.teams
+ .sort((a, b) => a.number - b.number)
+ .map((team) => (
+
+ ))}
+ {props.teams.length !== props.expectedTeamCount && (
+
+ )}
+
([]);
-
- enum LoadState {
- NotLoaded,
- Loading,
- Loaded
- }
-
- const [loadingPicklists, setLoadingPicklists] = useState(LoadState.NotLoaded);
-
- const teams = props.teams.map((team) => ({ number: team }));
-
- function savePicklists(picklists: Picklist[]) {
- const picklistDict = picklists.reduce((acc, picklist) => {
- acc.picklists[picklist.name] = picklist.teams.map((team) => team.number);
- return acc;
- }, {
- _id: props.picklist._id,
- picklists: {}
- });
-
- updateCompInLocalStorage(props.compId, (comp) => comp.picklists = picklistDict);
-
- api.updatePicklist(picklistDict);
- }
-
- function updatePicklist(picklist: Picklist) {
- setPicklists((old) => {
- const newPicklists = old.map((p) => {
- if (p.index === picklist.index) {
- return picklist;
- } else {
- return p;
- }
- });
-
- savePicklists(newPicklists);
- return newPicklists;
- });
- }
-
- function loadDbPicklist(picklistDict: DbPicklist) {
- setPicklists(Object.entries(picklistDict.picklists).map((picklist, index) => {
- const newPicklist: Picklist = {
- index,
- name: picklist[0],
- teams: picklist[1].map((team: number) => ({ number: team })),
- update: updatePicklist
- };
-
- for (const team of newPicklist.teams) {
- team.picklistIndex = newPicklist.index;
- }
-
- return newPicklist;
- }));
- }
-
- useEffect(() => {
- if (loadingPicklists !== LoadState.NotLoaded) return;
-
- console.log(props);
- setLoadingPicklists(LoadState.Loading);
- api.getPicklist(props.picklist?._id).then((picklist) => {
- if (picklist) {
- loadDbPicklist(picklist);
- }
- });
- loadDbPicklist(props.picklist);
-
- setLoadingPicklists(LoadState.Loaded);
- });
-
- const addPicklist = () => {
- const newPicklist: Picklist = {
- index: picklists.length,
- name: `Picklist ${picklists.length + 1}`,
- teams: [],
- update: updatePicklist
- };
-
- const newPicklists = [...picklists, newPicklist];
- savePicklists(newPicklists);
- setPicklists(newPicklists);
- };
-
- return (
-
-
-
-
- {
- loadingPicklists === LoadState.Loading
- ?
- : picklists.length === 0
- ? (
-
-
- Create A Picklist
-
-
- )
- : picklists.map((picklist) => (
-
- )
- )
- }
-
-
- { loadingPicklists !== LoadState.Loading &&
-
-
- }
-
([]);
+
+ enum LoadState {
+ NotLoaded,
+ Loading,
+ Loaded,
+ }
+
+ const [loadingPicklists, setLoadingPicklists] = useState(LoadState.NotLoaded);
+
+ const teams = props.teams.map((team) => ({ number: team }));
+
+ const savePicklists = useCallback(
+ (picklists: Picklist[]) => {
+ const picklistDict = picklists.reduce(
+ (acc, picklist) => {
+ acc.picklists[picklist.name] = picklist.teams.map(
+ (team) => team.number,
+ );
+ return acc;
+ },
+ {
+ _id: props.picklist._id,
+ picklists: {},
+ },
+ );
+
+ api.updatePicklist(picklistDict);
+ },
+ [props.picklist._id],
+ );
+
+ const updatePicklist = useCallback(
+ (picklist: Picklist) => {
+ setPicklists((old) => {
+ const newPicklists = old.map((p) => {
+ if (p.index === picklist.index) {
+ return picklist;
+ } else {
+ return p;
+ }
+ });
+
+ savePicklists(newPicklists);
+ return newPicklists;
+ });
+ },
+ [setPicklists, savePicklists],
+ );
+
+ const loadDbPicklist = useCallback(
+ (picklistDict: DbPicklist) => {
+ setPicklists(
+ Object.entries(picklistDict.picklists).map((picklist, index) => {
+ const newPicklist: Picklist = {
+ index,
+ name: picklist[0],
+ teams: picklist[1].map((team: number) => ({ number: team })),
+ update: updatePicklist,
+ };
+
+ for (const team of newPicklist.teams) {
+ team.picklistIndex = newPicklist.index;
+ }
+
+ return newPicklist;
+ }),
+ );
+ },
+ [updatePicklist],
+ );
+
+ useEffect(() => {
+ if (loadingPicklists !== LoadState.NotLoaded) return;
+
+ setLoadingPicklists(LoadState.Loading);
+ api.getPicklist(props.picklist?._id).then((picklist) => {
+ if (picklist) {
+ loadDbPicklist(picklist);
+ }
+ });
+ loadDbPicklist(props.picklist);
+
+ setLoadingPicklists(LoadState.Loaded);
+ }, [
+ loadingPicklists,
+ LoadState.NotLoaded,
+ LoadState.Loading,
+ LoadState.Loaded,
+ props.picklist,
+ loadDbPicklist,
+ ]);
+
+ const addPicklist = () => {
+ const newPicklist: Picklist = {
+ index: picklists.length,
+ name: `Picklist ${picklists.length + 1}`,
+ teams: [],
+ update: updatePicklist,
+ };
+
+ const newPicklists = [...picklists, newPicklist];
+ savePicklists(newPicklists);
+ setPicklists(newPicklists);
+ };
+
+ return (
+
+
+
+
+ {loadingPicklists === LoadState.Loading ? (
+
+ ) : picklists.length === 0 ? (
+
+
+ Create A Picklist
+
+
+ ) : (
+ picklists.map((picklist) => (
+
+ ))
+ )}
+
+
+ {loadingPicklists !== LoadState.Loading && (
+
+
+ )}
+
-
{props.name} Alliance
-
- {props.alliance.map((team, index) =>
- props.update(index, parseInt(e.target.value))}>
- Empty
- {props.teams.map((t) => {t} )}
-
- )}
-
-
+
+ {props.name} Alliance
+
+
+ {props.alliance.map((team, index) => (
+ props.update(index, parseInt(e.target.value))}
+ >
+ Empty
+ {props.teams.map((t) => (
+
+ {t}
+
+ ))}
+
+ ))}
+
+
>({});
+export default function PredictionScreen(props: {
+ reports: Report[];
+ teams: number[];
+ game: Game;
+}) {
+ const [reportsByTeam, setReportsByTeam] = useState>(
+ {},
+ );
- // Array(length) constructor doesn't actually fill the array with undefined, so we have to do it manually
- const [blueAlliance, setBlueAlliance] = useState<(number | undefined)[]>(Array(props.game.allianceSize).fill(undefined));
- const [redAlliance, setRedAlliance] = useState<(number | undefined)[]>(Array(props.game.allianceSize).fill(undefined));
+ // Array(length) constructor doesn't actually fill the array with undefined, so we have to do it manually
+ const [blueAlliance, setBlueAlliance] = useState<(number | undefined)[]>(
+ Array(props.game.allianceSize).fill(undefined),
+ );
+ const [redAlliance, setRedAlliance] = useState<(number | undefined)[]>(
+ Array(props.game.allianceSize).fill(undefined),
+ );
- useEffect(() => {
- const reportsByTeam = props.reports.reduce((acc, report) => {
- if (!acc[report.robotNumber]) {
- acc[report.robotNumber] = [];
- }
+ useEffect(() => {
+ const reportsByTeam = props.reports.reduce(
+ (acc, report) => {
+ if (!acc[report.robotNumber]) {
+ acc[report.robotNumber] = [];
+ }
- acc[report.robotNumber].push(report);
- return acc;
- }, {} as Record);
+ acc[report.robotNumber].push(report);
+ return acc;
+ },
+ {} as Record,
+ );
- setReportsByTeam(reportsByTeam);
- }, [props.reports]);
+ setReportsByTeam(reportsByTeam);
+ }, [props.reports]);
- function updateAlliance(setAlliance: (alliance: (number | undefined)[]) => void, alliance: (number | undefined)[],
- index: number, team: number) {
- alliance[index] = team;
- setAlliance([...alliance]); // We have to create a new array for the update to work
- }
+ function updateAlliance(
+ setAlliance: (alliance: (number | undefined)[]) => void,
+ alliance: (number | undefined)[],
+ index: number,
+ team: number,
+ ) {
+ alliance[index] = team;
+ setAlliance([...alliance]); // We have to create a new array for the update to work
+ }
- const blueAllianceFilled = blueAlliance.filter((team) => team !== undefined);
- const redAllianceFilled = redAlliance.filter((team) => team !== undefined);
+ const blueAllianceFilled = blueAlliance.filter((team) => team !== undefined);
+ const redAllianceFilled = redAlliance.filter((team) => team !== undefined);
- const avgPointsBlueAllianceIndividual = blueAllianceFilled.map((team) => props.game.getAvgPoints(reportsByTeam[team!]));
- const avgPointsRedAllianceIndividual = redAllianceFilled.map((team) => props.game.getAvgPoints(reportsByTeam[team!]));
+ const avgPointsBlueAllianceIndividual = blueAllianceFilled.map((team) =>
+ props.game.getAvgPoints(reportsByTeam[team!]),
+ );
+ const avgPointsRedAllianceIndividual = redAllianceFilled.map((team) =>
+ props.game.getAvgPoints(reportsByTeam[team!]),
+ );
- const totalPointsBlueAlliance = avgPointsBlueAllianceIndividual.reduce((acc, points) => acc + points, 0);
- const totalPointsRedAlliance = avgPointsRedAllianceIndividual.reduce((acc, points) => acc + points, 0);
+ const totalPointsBlueAlliance = avgPointsBlueAllianceIndividual.reduce(
+ (acc, points) => acc + points,
+ 0,
+ );
+ const totalPointsRedAlliance = avgPointsRedAllianceIndividual.reduce(
+ (acc, points) => acc + points,
+ 0,
+ );
- const datasets = [];
- for (let i = 0; i < Math.max(avgPointsBlueAllianceIndividual.length, avgPointsRedAllianceIndividual.length); i++) {
- const blue = avgPointsBlueAllianceIndividual[i] || undefined;
- const red = avgPointsRedAllianceIndividual[i] || undefined;
+ const datasets = [];
+ for (
+ let i = 0;
+ i <
+ Math.max(
+ avgPointsBlueAllianceIndividual.length,
+ avgPointsRedAllianceIndividual.length,
+ );
+ i++
+ ) {
+ const blue = avgPointsBlueAllianceIndividual[i] || undefined;
+ const red = avgPointsRedAllianceIndividual[i] || undefined;
- datasets.push({
- data: [blue, red],
- label: `Team ${blueAllianceFilled[i] || "Empty"} vs Team ${redAllianceFilled[i] || "Empty"}`,
- backgroundColor: [`rgba(0, ${i * 255 / 2}, 235, 1)`, `rgba(235, ${i * 255 / 2}, 0, 1)`],
- });
- }
+ datasets.push({
+ data: [blue, red],
+ label: `Team ${blueAllianceFilled[i] || "Empty"} vs Team ${redAllianceFilled[i] || "Empty"}`,
+ backgroundColor: [
+ `rgba(0, ${(i * 255) / 2}, 235, 1)`,
+ `rgba(235, ${(i * 255) / 2}, 0, 1)`,
+ ],
+ });
+ }
- const pointDiff = totalPointsBlueAlliance - totalPointsRedAlliance;
- let winner = "Tie";
- let color = "";
- if (pointDiff > 0) {
- winner = "Blue Alliance";
- color = "blue-500";
- } else if (pointDiff < 0) {
- winner = "Red Alliance";
- color = "red-500";
- }
+ const pointDiff = totalPointsBlueAlliance - totalPointsRedAlliance;
+ let winner = "Tie";
+ let color = "";
+ if (pointDiff > 0) {
+ winner = "Blue Alliance";
+ color = "blue-500";
+ } else if (pointDiff < 0) {
+ winner = "Red Alliance";
+ color = "red-500";
+ }
- return (
-
-
-
updateAlliance(setBlueAlliance, blueAlliance, index, team)} name="Blue" color="blue-500" />
- updateAlliance(setRedAlliance, redAlliance, index, team)} name="Red" color="red-500" />
-
-
- {pointDiff != 0 ? `${winner} wins by ${Math.abs(pointDiff)} points` : winner} ({totalPointsBlueAlliance} - {totalPointsRedAlliance})
-
- {/* If we don't have bar graph in a div, it will vertically expand into infinity. Don't question it. - Renato */ }
-
-
-
+
+
+ updateAlliance(setBlueAlliance, blueAlliance, index, team)
+ }
+ name="Blue"
+ color="blue-500"
+ />
+
+ updateAlliance(setRedAlliance, redAlliance, index, team)
+ }
+ name="Red"
+ color="red-500"
+ />
+
+
+ {pointDiff != 0
+ ? `${winner} wins by ${Math.abs(pointDiff)} points`
+ : winner}{" "}
+ ({totalPointsBlueAlliance} - {totalPointsRedAlliance})
+
+ {/* If we don't have bar graph in a div, it will vertically expand into infinity. Don't question it. - Renato */}
+
+
+
(null);
- const [currentTeam, setCurrentTeam] = useState(0);
+ const [datapoints, setDataPoints] = useState(null);
+ const [currentTeam, setCurrentTeam] = useState(0);
- function dataToNumber(key: string, data: any): number {
- if (key === "Defense") {
- let n = 0;
- switch (data) {
- case Defense.None:
- return 0;
- case Defense.Partial:
- return 0.5;
- case Defense.Full:
- return 1;
- }
- }
- return data;
- }
-
- const data = {
- labels: datapoints?.map((point) => point.x) ?? [],
- datasets: [
- {
- label: key,
- data: props.selectedReports?.map((report) => dataToNumber(key, report.data[key])),
- backgroundColor: "rgba(255, 99, 132, 0.5)",
- },
- ],
- };
+ function dataToNumber(key: string, data: any): number {
+ if (key === "Defense") {
+ let n = 0;
+ switch (data) {
+ case Defense.None:
+ return 0;
+ case Defense.Partial:
+ return 0.5;
+ case Defense.Full:
+ return 1;
+ }
+ }
+ return data;
+ }
- useEffect(() => {
- if (!props.selectedReports || (datapoints && currentTeam === props.team && false)) return;
+ const data = {
+ labels: datapoints?.map((point) => point.x) ?? [],
+ datasets: [
+ {
+ label: key,
+ data: props.selectedReports?.map((report) =>
+ dataToNumber(key, report.data[key]),
+ ),
+ backgroundColor: "rgba(255, 99, 132, 0.5)",
+ },
+ ],
+ };
- setDataPoints([]);
- setCurrentTeam(props.team);
- for (const report of props.selectedReports) {
- api.findMatchById(report.match).then((match) => {
- if (!match) return;
+ useEffect(() => {
+ if (
+ !props.selectedReports ||
+ (datapoints && currentTeam === props.team && false)
+ )
+ return;
- setDataPoints((prev) => [...prev ?? [], {
- x: match.number,
- y: dataToNumber(key, report.data[key]),
- }].sort((a, b) => a.x - b.x));
- });
- }
- }, [key]);
+ setDataPoints([]);
+ setCurrentTeam(props.team);
+ for (const report of props.selectedReports) {
+ api.findMatchById(report.match).then((match) => {
+ if (!match) return;
- if (!props.selectedReports) {
- return <>;
- }
+ setDataPoints((prev) =>
+ [
+ ...(prev ?? []),
+ {
+ x: match.number,
+ y: dataToNumber(key, report.data[key]),
+ },
+ ].sort((a, b) => a.x - b.x),
+ );
+ });
+ }
+ }, [key, currentTeam, datapoints, props.selectedReports, props.team]);
- return (
-
-
Graph
- {
- console.log(e.target.value);
- setKey(e.target.value);
- }}
- >
-
- Select Variable
-
- {keys.map((key) => (
-
- {key}
-
- ))}
-
- point.x) ?? []
- }} />
-
- );
+ if (!props.selectedReports) {
+ return <>;
+ }
+
+ return (
+
+
Graph
+ {
+ console.log(e.target.value);
+ setKey(e.target.value);
+ }}
+ >
+
+ Select Variable
+
+ {keys.map((key) => (
+
+ {key}
+
+ ))}
+
+ point.x) ?? [],
+ }}
+ />
+
+ );
}
diff --git a/components/stats/StatsPage.tsx b/components/stats/StatsPage.tsx
deleted file mode 100644
index 62c8a821..00000000
--- a/components/stats/StatsPage.tsx
+++ /dev/null
@@ -1,150 +0,0 @@
-import ClientApi from "@/lib/api/ClientApi";
-import { NotLinkedToTba } from "@/lib/client/ClientUtils";
-import { defaultGameId } from "@/lib/client/GameId";
-import { Competition, Pitreport, SubjectiveReport, Report, DbPicklist } from "@/lib/Types";
-import { useState, useEffect } from "react";
-import Container from "@/components/Container";
-import PicklistScreen from "./Picklist";
-import TeamPage from "./TeamPage";
-import PredictionScreen from "./PredictionScreen";
-import { games } from "@/lib/games";
-
-const api = new ClientApi();
-
-export type StatsPageProps = {
- reports: Report[];
- pitReports: Pitreport[];
- subjectiveReports: SubjectiveReport[];
- competition: Competition;
- picklists: DbPicklist;
-};
-
-export default function Stats(props: StatsPageProps) {
- const [update, setUpdate] = useState(Date.now());
- const [updating, setUpdating] = useState(false);
- const [reports, setReports] = useState(props.reports);
- const [pitReports, setPitReports] = useState(props.pitReports);
- const [subjectiveReports, setSubjectiveReports] = useState(props.subjectiveReports);
- const [page, setPage] = useState(0);
- const [usePublicData, setUsePublicData] = useState(true);
-
- useEffect(() => {
- const i = setInterval(() => {
- resync();
- }, 15000);
- return () => {
- clearInterval(i);
- };
- });
-
- const resync = async () => {
- console.log("Resyncing...");
- setUpdating(true);
-
- const promises = [
- api
- .competitionReports(props.competition._id!, true, usePublicData)
- .then((data) => setReports(data)),
- pitReports.length === 0 && props.competition._id &&
- api.getPitReports(props.competition._id).then((data) => {
- setPitReports(data);
- }),
- api.getSubjectiveReportsForComp(props.competition._id!).then(setSubjectiveReports),
- ].flat();
-
- await Promise.all(promises);
-
- setUpdate(Date.now());
- setUpdating(false);
- };
-
- useEffect(() => {
- resync();
- }, [usePublicData]);
-
- const teams: Set = new Set();
- reports.forEach((r) => teams.add(r.robotNumber));
- pitReports.forEach((r) => teams.add(r.teamNumber));
- subjectiveReports.forEach((r) => Object.keys(r.robotComments).forEach((c) => teams.add(+c))); //+str converts to number
-
- console.log("Reports", reports);
- console.log("PitReports", pitReports);
- console.log("SubjectiveReports", subjectiveReports);
- console.log("Teams", teams);
-
- return (
-
-
- {props.competition?.tbaId !== NotLinkedToTba &&
-
setUsePublicData(!usePublicData)}>
- { usePublicData
- ? Using public data
- : Not using public data
}
- (Click to toggle)
-
- }
- {/*
- Use public data?
-
-
setUsePublicData(e.target.checked)} /> */}
-
- );
-}
\ No newline at end of file
diff --git a/components/stats/Summary.tsx b/components/stats/Summary.tsx
index a7929a49..6d3a8eff 100644
--- a/components/stats/Summary.tsx
+++ b/components/stats/Summary.tsx
@@ -2,51 +2,68 @@ import { Report } from "@/lib/Types";
import { NumericalAverage, MostCommonValue } from "@/lib/client/StatsMath";
import { Dot } from "./Heatmap";
-export default function Summary(props: { selectedReports: Report[], dots: Dot[] }) {
- if (!props.selectedReports) {
- return (
-
-
- {
- props.dots.map((dot, index) => (
-
{dot.label}
- ))
- }
-
);
- }
+export default function Summary(props: {
+ selectedReports: Report[];
+ dots: Dot[];
+}) {
+ if (!props.selectedReports) {
+ return (
+
+
+ {props.dots.map((dot, index) => (
+
+ {dot.label}
+
+ ))}
+
+ );
+ }
- const avgX = NumericalAverage((r) => r.AutoStart?.x ?? 0, props.selectedReports);
- const avgA = NumericalAverage((r) => r.AutoStart?.y ?? 0, props.selectedReports);
- const matches = props.selectedReports.length;
- const startingSide = avgX < 350 / 2 ? "left" : "right";
- const startingAngle = avgA < 180 ? "low" : "high";
+ const avgX = NumericalAverage(
+ (r) => r.AutoStart?.x ?? 0,
+ props.selectedReports,
+ );
+ const avgA = NumericalAverage(
+ (r) => r.AutoStart?.y ?? 0,
+ props.selectedReports,
+ );
+ const matches = props.selectedReports.length;
+ const startingSide = avgX < 350 / 2 ? "left" : "right";
+ const startingAngle = avgA < 180 ? "low" : "high";
- return (
-
- Insights
- Analysis suggests that this robot favors starting{" "}
- {startingSide} on the field, at{" "}
- {startingAngle} angles of attack.
- {matches < 5 ? (
-
- {" "}
- {matches} matches.
-
- ) : (
- <>
- This robot has competed in {matches} matches and is very well characterized.
-
- )}
-
- {
- props.dots.map((dot, index) => (
-
{dot.label}
- ))
- }
-
- );
+ return (
+
+ Insights
+ Analysis suggests that this robot favors starting{" "}
+ {startingSide} on the field, at{" "}
+ {startingAngle} angles of attack.
+ {matches < 5 ? (
+
+ {" "}
+ {matches} matches.
+
+ ) : (
+ <>
+ This robot has competed in {matches} matches and is very well
+ characterized.
+
+ )}
+
+ {props.dots.map((dot, index) => (
+
+ {dot.label}
+
+ ))}
+
+ );
}
diff --git a/components/stats/TeamPage.tsx b/components/stats/TeamPage.tsx
index 3e83c3cb..df6114de 100644
--- a/components/stats/TeamPage.tsx
+++ b/components/stats/TeamPage.tsx
@@ -1,11 +1,15 @@
-import { Game, PitReportData, Pitreport, QuantData, Report, SubjectiveReport } from "@/lib/Types";
+import {
+ Game,
+ PitReportData,
+ Pitreport,
+ QuantData,
+ Report,
+ SubjectiveReport,
+} from "@/lib/Types";
import { useEffect, useState } from "react";
import { Badge } from "@/lib/Layout";
-import {
- StandardDeviation,
- Round,
-} from "@/lib/client/StatsMath";
+import { StandardDeviation, Round } from "@/lib/client/StatsMath";
import Heatmap from "@/components/stats/Heatmap";
import TeamStats from "@/components/stats/TeamStats";
@@ -17,217 +21,259 @@ import { GameId } from "@/lib/client/GameId";
import { FrcDrivetrain } from "@/lib/Enums";
function TeamCard(props: {
- number: number;
- rank: number;
- reports: Report[];
- pitReport: Pitreport | undefined;
- onClick: () => void;
- selected: boolean;
- compAvgPoints: number;
- compPointsStDev: number;
- getBadges: (pitData: Pitreport | undefined, quantitativeData: Report[], card: boolean) => Badge[];
- getAvgPoints: (reports: Report[]) => number;
+ number: number;
+ rank: number;
+ reports: Report[];
+ pitReport: Pitreport | undefined;
+ onClick: () => void;
+ selected: boolean;
+ compAvgPoints: number;
+ compPointsStDev: number;
+ getBadges: (
+ pitData: Pitreport | undefined,
+ quantitativeData: Report[],
+ card: boolean,
+ ) => Badge[];
+ getAvgPoints: (reports: Report[]) => number;
}) {
- const pitReport = props.pitReport;
- const data = pitReport?.data as PitReportData;
-
- const avgPoints = props.getAvgPoints(props.reports);
-
- const badges = props.getBadges(pitReport, props.reports, true);
-
- const pointsDiffFromAvg = Round(avgPoints - props.compAvgPoints);
- const pointsDiffFromAvgFormatted = pointsDiffFromAvg > 0 ? `+${pointsDiffFromAvg}` : pointsDiffFromAvg;
-
- let textColor = "info";
- if (pointsDiffFromAvg > props.compPointsStDev) {
- textColor = "primary";
- }
- else if (pointsDiffFromAvg > props.compPointsStDev / 2) {
- textColor = "accent";
- } else if (pointsDiffFromAvg < -props.compPointsStDev) {
- textColor = "warning";
- }
-
- let badgeColor = "neutral";
- if (props.rank === 1) {
- badgeColor = "primary";
- }
- else if (props.rank === 2) {
- badgeColor = "secondary";
- }
- else if (props.rank === 3) {
- badgeColor = "accent";
- }
-
- let rankSuffix = "th";
- if (props.rank === 1) {
- rankSuffix = "st";
- }
- else if (props.rank === 2) {
- rankSuffix = "nd";
- }
- else if (props.rank === 3) {
- rankSuffix = "rd";
- }
-
- let drivetrainColor = "outline";
- if (pitReport?.submitted) {
- drivetrainColor = data?.drivetrain === FrcDrivetrain.Swerve ? "accent" : "warning";
- }
-
- return (
-
-
-
- #{props.number}
- {props.rank}{rankSuffix}
-
-
Avg Points: {avgPoints}{" "}
- ({pointsDiffFromAvgFormatted})
-
-
- {badges.map((badge, index) => (
-
{badge.text}
- ))}
-
-
-
+
+
+
+ #{props.number}
+
+
+ {props.rank}
+ {rankSuffix}
+
+
+
+ Avg Points: {avgPoints}{" "}
+
+ ({pointsDiffFromAvgFormatted})
+
+
+
+ {badges.map((badge, index) => (
+
+ {badge.text}
+
+ ))}
+
+
+
();
- const selectedReports = teamReports[selectedTeam ? selectedTeam : 0];
-
- const game = games[props.gameId];
-
- const associateTeams = () => {
- const newTeamReports: typeof teamReports = {};
- reports.forEach((report) => {
- if (!(report.robotNumber in newTeamReports)) {
- newTeamReports[report.robotNumber] = [report];
- } else {
- newTeamReports[report.robotNumber].push(report);
- }
- });
- setTeamReports(newTeamReports);
-
- const newPitReports: typeof pitReports = {};
- props.pitReports.forEach((pitReport) => {
- newPitReports[pitReport.teamNumber] = pitReport;
- });
- setPitReports(newPitReports);
-
- const subjectiveReports: typeof teamSubjectiveReports = {};
- props.subjectiveReports.forEach((subjectiveReport) => {
- for (const teamNumber of Object.keys(subjectiveReport.robotComments)) {
- if (!Object.keys(subjectiveReports).includes(teamNumber)) {
- subjectiveReports[Number(teamNumber)] = [subjectiveReport];
- } else {
- subjectiveReports[Number(teamNumber)].push(subjectiveReport);
- }
- }
- });
- setTeamSubjectiveReports(subjectiveReports);
- };
-
- useEffect(() => {
- const subjectiveReports: typeof teamSubjectiveReports = {};
- props.subjectiveReports.forEach((subjectiveReport) => {
- for (const teamNumber of Object.keys(subjectiveReport.robotComments)) {
- if (!Object.keys(subjectiveReports).includes(teamNumber)) {
- subjectiveReports[Number(teamNumber)] = [subjectiveReport];
- } else {
- subjectiveReports[Number(teamNumber)].push(subjectiveReport);
- }
- }
- });
- setTeamSubjectiveReports(subjectiveReports);
- }, [props.subjectiveReports]);
-
- const pointTotals = reports.map((report) => game.getAvgPoints([report]));
- const avgPoints = game.getAvgPoints(reports);
- const stDev = StandardDeviation(pointTotals);
-
- useEffect(() => {
- console.log("Associating teams...");
- associateTeams();
- }, [reports, props.pitReports, props.subjectiveReports]);
-
- // Associate pit reports
- props.pitReports.forEach((pitReport) => {
- pitReports[pitReport.teamNumber] = pitReport;
- });
-
- const teamRanking = Object.keys(teamReports).sort((a, b) => {
- const a1 = game.getAvgPoints(teamReports[Number(a)]);
- const b1 = game.getAvgPoints(teamReports[Number(b)]);
- return b1 - a1;
- });
-
- // Find teams not in team ranking
- const missingTeams = teamNumbers.filter((team) => !teamRanking.includes(team));
-
- return (
-
-
- {teamRanking.concat(missingTeams).map((number, index) => (
- setSelectedTeam(Number(number))}
- compAvgPoints={avgPoints}
- compPointsStDev={stDev}
- getBadges={game.getBadges}
- getAvgPoints={game.getAvgPoints}
- />
- ))}
-
-
-
-
-
-
();
+ const selectedReports = teamReports[selectedTeam ? selectedTeam : 0];
+
+ const game = games[props.gameId];
+
+ useEffect(() => {
+ const subjectiveReports: typeof teamSubjectiveReports = {};
+ props.subjectiveReports.forEach((subjectiveReport) => {
+ for (const teamNumber of Object.keys(subjectiveReport.robotComments)) {
+ if (!Object.keys(subjectiveReports).includes(teamNumber)) {
+ subjectiveReports[Number(teamNumber)] = [subjectiveReport];
+ } else {
+ subjectiveReports[Number(teamNumber)].push(subjectiveReport);
+ }
+ }
+ });
+ setTeamSubjectiveReports(subjectiveReports);
+ }, [props.subjectiveReports]);
+
+ const pointTotals = reports.map((report) => game.getAvgPoints([report]));
+ const avgPoints = game.getAvgPoints(reports);
+ const stDev = StandardDeviation(pointTotals);
+
+ useEffect(() => {
+ console.log("Associating teams...");
+ const newTeamReports: typeof teamReports = {};
+ reports.forEach((report) => {
+ if (!(report.robotNumber in newTeamReports)) {
+ newTeamReports[report.robotNumber] = [report];
+ } else {
+ newTeamReports[report.robotNumber].push(report);
+ }
+ });
+ setTeamReports(newTeamReports);
+
+ const newPitReports: typeof pitReports = {};
+ props.pitReports.forEach((pitReport) => {
+ newPitReports[pitReport.teamNumber] = pitReport;
+ });
+ setPitReports(newPitReports);
+
+ const subjectiveReports: typeof teamSubjectiveReports = {};
+ props.subjectiveReports.forEach((subjectiveReport) => {
+ for (const teamNumber of Object.keys(subjectiveReport.robotComments)) {
+ if (!Object.keys(subjectiveReports).includes(teamNumber)) {
+ subjectiveReports[Number(teamNumber)] = [subjectiveReport];
+ } else {
+ subjectiveReports[Number(teamNumber)].push(subjectiveReport);
+ }
+ }
+ });
+ setTeamSubjectiveReports(subjectiveReports);
+ }, [reports, props.pitReports, props.subjectiveReports]);
+
+ // Associate pit reports
+ props.pitReports.forEach((pitReport) => {
+ pitReports[pitReport.teamNumber] = pitReport;
+ });
+
+ const teamRanking = Object.keys(teamReports).sort((a, b) => {
+ const a1 = game.getAvgPoints(teamReports[Number(a)]);
+ const b1 = game.getAvgPoints(teamReports[Number(b)]);
+ return b1 - a1;
+ });
+
+ // Find teams not in team ranking
+ const missingTeams = teamNumbers.filter(
+ (team) => !teamRanking.includes(team),
+ );
+
+ return (
+
+
+ {teamRanking.concat(missingTeams).map((number, index) => (
+ setSelectedTeam(Number(number))}
+ compAvgPoints={avgPoints}
+ compPointsStDev={stDev}
+ getBadges={game.getBadges}
+ getAvgPoints={game.getAvgPoints}
+ />
+ ))}
+
+
+
+
+
+
| undefined, quantitativeData: Report[], card: boolean) => Badge[];
- layout: StatsLayout;
+ selectedTeam: number | undefined;
+ selectedReports: Report[];
+ pitReport: Pitreport | null;
+ subjectiveReports: SubjectiveReport[];
+ getBadges: (
+ pitData: Pitreport | undefined,
+ quantitativeData: Report[],
+ card: boolean,
+ ) => Badge[];
+ layout: StatsLayout;
}) {
- const [comments, setComments] = useState<{matchNum: number, content: { order: number, jsx: ReactNode}[] }[] | null>(null);
-
- useEffect(() => {
- if(!props.selectedTeam) return;
- setComments(null);
-
- const newComments: typeof comments = [];
-
- function addComment(match: number, order: number, jsx: ReactNode) {
- if (!newComments!.some((comment) => comment.matchNum === match)) newComments!.push({ matchNum: match, content: [{
- order,
- jsx
- }] });
- else newComments!.find((comment) => comment.matchNum === match)!.content.push({ order, jsx });
- }
-
- if (pitReport)
- addComment(0, 0, pitReport.data?.comments.length ?? 0 > 0 ? `Pit Report: ${pitReport.data?.comments}` : "No pit report comments.");
-
- if (!props.subjectiveReports) addComment(0, 0.1, Subjective: {report.robotComments[props.selectedTeam ?? 0]}
- );
- }
-
- if (report.wholeMatchComment) {
- addComment(
- report.matchNumber ?? 0, 1,
- Whole Match: {report.wholeMatchComment}
- );
- }
- }
- }
-
- const commentList = props.selectedReports?.filter((report) => report.data?.comments.length > 0) ?? [];
- if (commentList.length === 0) return setComments(newComments);
-
- const promises = commentList.map((report) => api.findMatchById(report.match).then((match) => match && addComment(
- match.number, 0, `Quantitative: ${report.data?.comments}`
- )));
-
- Promise.all(promises).then(() => setComments(newComments));
- }, [props.selectedTeam, props.selectedReports, props.subjectiveReports, props.pitReport]);
-
- if (!props.selectedTeam) {
- return (
-
-
- Select A Team
-
-
- );
- }
-
- const pitReport = props.pitReport;
- const badges = props.getBadges(pitReport ?? undefined, props.selectedReports, false);
-
- function getSections(header: string, stats: (Stat | StatPair)[]) {
- const statElements = stats.map((stat, index) => {
- if ((stat as Stat).key) {
- // Single stat
- const singleStat = stat as Stat;
-
- return
- {singleStat.label}: {NumericalAverage(singleStat.key as string, props.selectedReports)}
-
- }
-
- // Stat pair
- const pair = stat as StatPair;
- if (pair.stats.length !== 2) {
- console.error("Invalid stat pair. Wrong # of stats provided.", pair);
- return <>;
- }
-
- const first = pair.stats[0].get?.(pitReport ?? undefined, props.selectedReports)
- ?? NumericalAverage(pair.stats[0].key as string, props.selectedReports);
- const second = pair.stats[1].get?.(pitReport ?? undefined, props.selectedReports)
- ?? NumericalAverage(pair.stats[1].key as string, props.selectedReports);
-
- return
-
-
- {pair.stats[0].label}: {first}
-
-
- {pair.stats[1].label}: {second}
-
-
-
-
- {pair.label}: {ComparativePercent(pair.stats[0].key as string, pair.stats[1].key as string, props.selectedReports)}
-
-
-
- {icon} {header}
-
-
- {statElements}
-
-
-
- Team #{props.selectedTeam}
-
-
-
- { badges.map((badge, index) => (
-
{badge.text}
- ))
- }
-
-
-
-
- {sections}
-
-
-
-
-
-
-
- { comments
- ? comments.map((match) => match.matchNum > 0
- ? (
- Match {match.matchNum}
-
- {match.content.sort((a, b) => a.order - b.order).map((content, index) => (
- {content.jsx}
- ))}
-
- )
- : match.content.sort((a, b) => a.order - b.order).map((content, index) => (
- {content.jsx}
- ))
- )
- :
-
-
+ Subjective: {report.robotComments[props.selectedTeam ?? 0]}
+ ,
+ );
+ }
+
+ if (report.wholeMatchComment) {
+ addComment(
+ report.matchNumber ?? 0,
+ 1,
+
+ Whole Match: {report.wholeMatchComment}
+ ,
+ );
+ }
+ }
+ }
+
+ const commentList =
+ props.selectedReports?.filter(
+ (report) => report.data?.comments.length > 0,
+ ) ?? [];
+ if (commentList.length === 0) return setComments(newComments);
+
+ const promises = commentList.map((report) =>
+ api
+ .findMatchById(report.match)
+ .then(
+ (match) =>
+ match &&
+ addComment(
+ match.number,
+ 0,
+ `Quantitative: ${report.data?.comments}`,
+ ),
+ ),
+ );
+
+ Promise.all(promises).then(() => setComments(newComments));
+ }, [
+ props.selectedTeam,
+ props.selectedReports,
+ props.subjectiveReports,
+ props.pitReport,
+ pitReport,
+ ]);
+
+ if (!props.selectedTeam) {
+ return (
+
+
+ Select A Team
+
+
+ );
+ }
+
+ function getSections(
+ header: string,
+ stats: (
+ | Stat
+ | StatPair
+ )[],
+ ) {
+ const statElements = stats.map((stat, index) => {
+ if ((stat as Stat).key) {
+ // Single stat
+ const singleStat = stat as Stat;
+
+ return (
+
+ {singleStat.label}:{" "}
+ {NumericalAverage(singleStat.key as string, props.selectedReports)}
+
+ );
+ }
+
+ // Stat pair
+ const pair = stat as StatPair;
+ if (pair.stats.length !== 2) {
+ console.error("Invalid stat pair. Wrong # of stats provided.", pair);
+ return <>;
+ }
+
+ const first =
+ pair.stats[0].get?.(pitReport ?? undefined, props.selectedReports) ??
+ NumericalAverage(pair.stats[0].key as string, props.selectedReports);
+ const second =
+ pair.stats[1].get?.(pitReport ?? undefined, props.selectedReports) ??
+ NumericalAverage(pair.stats[1].key as string, props.selectedReports);
+
+ return (
+
+
+
+ {pair.stats[0].label}: {first}
+
+
+ {pair.stats[1].label}: {second}
+
+
+
+
+ {pair.label}:{" "}
+ {ComparativePercent(
+ pair.stats[0].key as string,
+ pair.stats[1].key as string,
+ props.selectedReports,
+ )}
+
+
+
+ {icon} {header}
+
+
{statElements}
+
+
+ Team #{props.selectedTeam}
+
+
+
+ {badges.map((badge, index) => (
+
+ {badge.text}
+
+ ))}
+
+
+
+
+ {sections}
+
+
+
+
+
+
+
+ {comments ? (
+ comments.map((match) =>
+ match.matchNum > 0 ? (
+
+ Match {match.matchNum}
+
+ {match.content
+ .sort((a, b) => a.order - b.order)
+ .map((content, index) => (
+ {content.jsx}
+ ))}
+
+
+ ) : (
+ match.content
+ .sort((a, b) => a.order - b.order)
+ .map((content, index) => {content.jsx} )
+ ),
+ )
+ ) : (
+
+
+
) => {
+ if (!req.url) return;
- try {
- const server = createServer(httpsOptions, async (req: IncomingMessage, res: ServerResponse) => {
- if (!req.url)
- return;
+ const parsedUrl = parse(req.url, true);
+ const { pathname } = parsedUrl;
- const parsedUrl = parse(req.url, true);
- const { pathname } = parsedUrl;
+ if (
+ pathname &&
+ (pathname === "/sw.js" ||
+ /^\/(workbox|worker|fallback)-\w+\.js$/.test(pathname))
+ ) {
+ console.log("Service worker request received: " + parsedUrl.pathname);
+ const filePath = join(__dirname, "public", pathname);
+ const file = fs.readFileSync(filePath, "utf8");
- if (pathname && (pathname === '/sw.js' || /^\/(workbox|worker|fallback)-\w+\.js$/.test(pathname))) {
- console.log("Service worker request received: " + parsedUrl.pathname);
- const filePath = join(__dirname, 'public', pathname);
- const file = fs.readFileSync(filePath, 'utf8');
+ res.writeHead(200, { "Content-Type": "application/javascript" });
+ res.write(file, (err) =>
+ console.log(
+ err
+ ? "Service worker write error: " + err
+ : "Service worker written",
+ ),
+ );
+ } else if (pathname && pathname.startsWith("/slack")) {
+ console.log("Slack event received: " + parsedUrl.pathname);
- res.writeHead(200, { 'Content-Type': 'application/javascript' });
- res.write(file, (err) => console.log(err ? "Service worker write error: " + err : "Service worker written"));
- } else if (pathname && pathname.startsWith("/slack")) {
- console.log("Slack event received: " + parsedUrl.pathname);
-
- // Pipe request to slack app
- const newReq = request(
- Object.assign(
- {},
- parse("http://localhost:" + process.env.SLACK_PORT + req.url),
- {
- method: req.method,
- path: req.url,
- }
- ),
- (newRes) => {
- res.writeHead(newRes.statusCode || 200, newRes.headers);
- newRes.pipe(res);
- }
- );
+ // Pipe request to slack app
+ const newReq = request(
+ Object.assign(
+ {},
+ parse("http://localhost:" + process.env.SLACK_PORT + req.url),
+ {
+ method: req.method,
+ path: req.url,
+ },
+ ),
+ (newRes) => {
+ res.writeHead(newRes.statusCode || 200, newRes.headers);
+ newRes.pipe(res);
+ },
+ );
- req.pipe(newReq);
- } else {
- handle(req, res, parsedUrl);
- }
- }).listen(port, () => {
- console.log(
- process.env.NODE_ENV +
- " HTTPS Server Running At: https://localhost:" +
- port,
- );
- }).on("error", (err: Error) => {
- console.log(err);
- throw err;
- });
+ req.pipe(newReq);
+ } else {
+ handle(req, res, parsedUrl);
+ }
+ },
+ )
+ .listen(port, () => {
+ console.log(
+ process.env.NODE_ENV +
+ " HTTPS Server Running At: https://localhost:" +
+ port,
+ );
+ })
+ .on("error", (err: Error) => {
+ console.log(err);
+ throw err;
+ });
- console.log("Server created. Listening: " + server.listening);
- } catch (err) {
- console.log(err);
- throw err;
- }
-});
\ No newline at end of file
+ console.log("Server created. Listening: " + server.listening);
+ } catch (err) {
+ console.log(err);
+ throw err;
+ }
+});
diff --git a/jest.config.ts b/jest.config.ts
index 7be5578c..e16b603b 100644
--- a/jest.config.ts
+++ b/jest.config.ts
@@ -3,206 +3,206 @@
* https://jestjs.io/docs/configuration
*/
-import type { Config } from 'jest';
+import type { Config } from "jest";
const config: Config = {
- preset: 'ts-jest',
+ preset: "ts-jest",
- // Map @import paths to the correct directories
- moduleNameMapper: {
- "@/lib/(.*)$": ["/lib/$1"],
- "@/pages/(.*)$": ["/pages/$1"],
- "@/components/(.*)$": ["/components/$1"],
- },
+ // Map @import paths to the correct directories
+ moduleNameMapper: {
+ "@/lib/(.*)$": ["/lib/$1"],
+ "@/pages/(.*)$": ["/pages/$1"],
+ "@/components/(.*)$": ["/components/$1"],
+ },
- // All imported modules in your tests should be mocked automatically
- // automock: false,
+ // All imported modules in your tests should be mocked automatically
+ // automock: false,
- // Stop running tests after `n` failures
- // bail: 0,
+ // Stop running tests after `n` failures
+ // bail: 0,
- // The directory where Jest should store its cached dependency information
- // cacheDirectory: "C:\\Users\\rddel\\AppData\\Local\\Temp\\jest",
+ // The directory where Jest should store its cached dependency information
+ // cacheDirectory: "C:\\Users\\rddel\\AppData\\Local\\Temp\\jest",
- // Automatically clear mock calls, instances, contexts and results before every test
- clearMocks: true,
+ // Automatically clear mock calls, instances, contexts and results before every test
+ clearMocks: true,
- // Indicates whether the coverage information should be collected while executing the test
- collectCoverage: true,
+ // Indicates whether the coverage information should be collected while executing the test
+ collectCoverage: true,
- // An array of glob patterns indicating a set of files for which coverage information should be collected
- // collectCoverageFrom: undefined,
+ // An array of glob patterns indicating a set of files for which coverage information should be collected
+ // collectCoverageFrom: undefined,
- // The directory where Jest should output its coverage files
- coverageDirectory: "coverage",
+ // The directory where Jest should output its coverage files
+ coverageDirectory: "coverage",
- // An array of regexp pattern strings used to skip coverage collection
- // coveragePathIgnorePatterns: [
- // "\\\\node_modules\\\\"
- // ],
+ // An array of regexp pattern strings used to skip coverage collection
+ // coveragePathIgnorePatterns: [
+ // "\\\\node_modules\\\\"
+ // ],
- // Indicates which provider should be used to instrument code for coverage
- coverageProvider: "v8",
+ // Indicates which provider should be used to instrument code for coverage
+ coverageProvider: "v8",
- // A list of reporter names that Jest uses when writing coverage reports
- // coverageReporters: [
- // "json",
- // "text",
- // "lcov",
- // "clover"
- // ],
+ // A list of reporter names that Jest uses when writing coverage reports
+ // coverageReporters: [
+ // "json",
+ // "text",
+ // "lcov",
+ // "clover"
+ // ],
- // An object that configures minimum threshold enforcement for coverage results
- // coverageThreshold: undefined,
+ // An object that configures minimum threshold enforcement for coverage results
+ // coverageThreshold: undefined,
- // A path to a custom dependency extractor
- // dependencyExtractor: undefined,
+ // A path to a custom dependency extractor
+ // dependencyExtractor: undefined,
- // Make calling deprecated APIs throw helpful error messages
- // errorOnDeprecated: false,
+ // Make calling deprecated APIs throw helpful error messages
+ // errorOnDeprecated: false,
- // The default configuration for fake timers
- // fakeTimers: {
- // "enableGlobally": false
- // },
+ // The default configuration for fake timers
+ // fakeTimers: {
+ // "enableGlobally": false
+ // },
- // Force coverage collection from ignored files using an array of glob patterns
- // forceCoverageMatch: [],
+ // Force coverage collection from ignored files using an array of glob patterns
+ // forceCoverageMatch: [],
- // A path to a module which exports an async function that is triggered once before all test suites
- // globalSetup: undefined,
+ // A path to a module which exports an async function that is triggered once before all test suites
+ // globalSetup: undefined,
- // A path to a module which exports an async function that is triggered once after all test suites
- // globalTeardown: undefined,
+ // A path to a module which exports an async function that is triggered once after all test suites
+ // globalTeardown: undefined,
- // A set of global variables that need to be available in all test environments
- // globals: {},
+ // A set of global variables that need to be available in all test environments
+ // globals: {},
- // The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
- // maxWorkers: "50%",
+ // The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
+ // maxWorkers: "50%",
- // An array of directory names to be searched recursively up from the requiring module's location
- // moduleDirectories: [
- // "node_modules"
- // ],
+ // An array of directory names to be searched recursively up from the requiring module's location
+ // moduleDirectories: [
+ // "node_modules"
+ // ],
- // An array of file extensions your modules use
- // moduleFileExtensions: [
- // "js",
- // "mjs",
- // "cjs",
- // "jsx",
- // "ts",
- // "tsx",
- // "json",
- // "node"
- // ],
+ // An array of file extensions your modules use
+ // moduleFileExtensions: [
+ // "js",
+ // "mjs",
+ // "cjs",
+ // "jsx",
+ // "ts",
+ // "tsx",
+ // "json",
+ // "node"
+ // ],
- // A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
- // moduleNameMapper: {},
+ // A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
+ // moduleNameMapper: {},
- // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
- // modulePathIgnorePatterns: [],
+ // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
+ // modulePathIgnorePatterns: [],
- // Activates notifications for test results
- // notify: false,
+ // Activates notifications for test results
+ // notify: false,
- // An enum that specifies notification mode. Requires { notify: true }
- // notifyMode: "failure-change",
+ // An enum that specifies notification mode. Requires { notify: true }
+ // notifyMode: "failure-change",
- // A preset that is used as a base for Jest's configuration
- // preset: undefined,
+ // A preset that is used as a base for Jest's configuration
+ // preset: undefined,
- // Run tests from one or more projects
- // projects: undefined,
+ // Run tests from one or more projects
+ // projects: undefined,
- // Use this configuration option to add custom reporters to Jest
- // reporters: undefined,
+ // Use this configuration option to add custom reporters to Jest
+ // reporters: undefined,
- // Automatically reset mock state before every test
- // resetMocks: false,
+ // Automatically reset mock state before every test
+ // resetMocks: false,
- // Reset the module registry before running each individual test
- // resetModules: false,
+ // Reset the module registry before running each individual test
+ // resetModules: false,
- // A path to a custom resolver
- // resolver: undefined,
+ // A path to a custom resolver
+ // resolver: undefined,
- // Automatically restore mock state and implementation before every test
- // restoreMocks: false,
+ // Automatically restore mock state and implementation before every test
+ // restoreMocks: false,
- // The root directory that Jest should scan for tests and modules within
- // rootDir: undefined,
+ // The root directory that Jest should scan for tests and modules within
+ // rootDir: undefined,
- // A list of paths to directories that Jest should use to search for files in
- // roots: [
- // ""
- // ],
+ // A list of paths to directories that Jest should use to search for files in
+ // roots: [
+ // ""
+ // ],
- // Allows you to use a custom runner instead of Jest's default test runner
- // runner: "jest-runner",
+ // Allows you to use a custom runner instead of Jest's default test runner
+ // runner: "jest-runner",
- // The paths to modules that run some code to configure or set up the testing environment before each test
- setupFiles: ["/lib/testutils/setup.ts"],
+ // The paths to modules that run some code to configure or set up the testing environment before each test
+ setupFiles: ["/lib/testutils/setup.ts"],
- // A list of paths to modules that run some code to configure or set up the testing framework before each test
- // setupFilesAfterEnv: [],
+ // A list of paths to modules that run some code to configure or set up the testing framework before each test
+ // setupFilesAfterEnv: [],
- // The number of seconds after which a test is considered as slow and reported as such in the results.
- // slowTestThreshold: 5,
+ // The number of seconds after which a test is considered as slow and reported as such in the results.
+ // slowTestThreshold: 5,
- // A list of paths to snapshot serializer modules Jest should use for snapshot testing
- // snapshotSerializers: [],
+ // A list of paths to snapshot serializer modules Jest should use for snapshot testing
+ // snapshotSerializers: [],
- // The test environment that will be used for testing
- // testEnvironment: "jest-environment-node",
+ // The test environment that will be used for testing
+ // testEnvironment: "jest-environment-node",
- // Options that will be passed to the testEnvironment
- // testEnvironmentOptions: {},
+ // Options that will be passed to the testEnvironment
+ // testEnvironmentOptions: {},
- // Adds a location field to test results
- // testLocationInResults: false,
+ // Adds a location field to test results
+ // testLocationInResults: false,
- // The glob patterns Jest uses to detect test files
- // testMatch: [
- // "**/__tests__/**/*.[jt]s?(x)",
- // "**/?(*.)+(spec|test).[tj]s?(x)"
- // ],
+ // The glob patterns Jest uses to detect test files
+ // testMatch: [
+ // "**/__tests__/**/*.[jt]s?(x)",
+ // "**/?(*.)+(spec|test).[tj]s?(x)"
+ // ],
- // An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
- // testPathIgnorePatterns: [
- // "\\\\node_modules\\\\"
- // ],
+ // An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
+ // testPathIgnorePatterns: [
+ // "\\\\node_modules\\\\"
+ // ],
- // The regexp pattern or array of patterns that Jest uses to detect test files
- // testRegex: [],
+ // The regexp pattern or array of patterns that Jest uses to detect test files
+ // testRegex: [],
- // This option allows the use of a custom results processor
- // testResultsProcessor: undefined,
+ // This option allows the use of a custom results processor
+ // testResultsProcessor: undefined,
- // This option allows use of a custom test runner
- // testRunner: "jest-circus/runner",
+ // This option allows use of a custom test runner
+ // testRunner: "jest-circus/runner",
- // A map from regular expressions to paths to transformers
- // transform: undefined,
+ // A map from regular expressions to paths to transformers
+ // transform: undefined,
- // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
- // transformIgnorePatterns: [
- // "\\\\node_modules\\\\",
- // "\\.pnp\\.[^\\\\]+$"
- // ],
+ // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
+ // transformIgnorePatterns: [
+ // "\\\\node_modules\\\\",
+ // "\\.pnp\\.[^\\\\]+$"
+ // ],
- // An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
- // unmockedModulePathPatterns: undefined,
+ // An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
+ // unmockedModulePathPatterns: undefined,
- // Indicates whether each individual test should be reported during the run
- // verbose: undefined,
+ // Indicates whether each individual test should be reported during the run
+ // verbose: undefined,
- // An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
- // watchPathIgnorePatterns: [],
+ // An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
+ // watchPathIgnorePatterns: [],
- // Whether to use watchman for file crawling
- // watchman: true,
+ // Whether to use watchman for file crawling
+ // watchman: true,
};
export default config;
diff --git a/lib/Auth.ts b/lib/Auth.ts
index 8d740168..d80805df 100644
--- a/lib/Auth.ts
+++ b/lib/Auth.ts
@@ -7,36 +7,41 @@ import { getDatabase, clientPromise } from "./MongoDB";
import { ObjectId } from "bson";
import { User } from "./Types";
import { GenerateSlug } from "./Utils";
-import { Analytics } from '@/lib/client/Analytics';
+import { Analytics } from "@/lib/client/Analytics";
import Email from "next-auth/providers/email";
import ResendUtils from "./ResendUtils";
import CollectionId from "./client/CollectionId";
+import { AdapterUser } from "next-auth/adapters";
var db = getDatabase();
const adapter = MongoDBAdapter(clientPromise, { databaseName: process.env.DB });
export const AuthenticationOptions: AuthOptions = {
- secret: process.env.NEXTAUTH_SECRET,
- providers: [
- Google({
- clientId: process.env.GOOGLE_ID,
- clientSecret: process.env.GOOGLE_SECRET,
- profile: async (profile) => {
- const user = new User(
- profile.name,
- profile.email,
- profile.picture,
- false,
- await GenerateSlug(await getDatabase(), CollectionId.Users, profile.name),
- [],
- []
- );
- user.id = profile.sub;
- return user;
- },
- }),
- /*
+ secret: process.env.NEXTAUTH_SECRET,
+ providers: [
+ Google({
+ clientId: process.env.GOOGLE_ID,
+ clientSecret: process.env.GOOGLE_SECRET,
+ profile: async (profile) => {
+ const user = new User(
+ profile.name,
+ profile.email,
+ profile.picture,
+ false,
+ await GenerateSlug(
+ await getDatabase(),
+ CollectionId.Users,
+ profile.name,
+ ),
+ [],
+ [],
+ );
+ user.id = profile.sub;
+ return user;
+ },
+ }),
+ /*
GitHubProvider({
clientId: process.env.GITHUB_ID as string,
clientSecret: process.env.GITHUB_SECRET as string,
@@ -47,98 +52,112 @@ export const AuthenticationOptions: AuthOptions = {
},
}),
*/
- SlackProvider({
- clientId: process.env.NEXT_PUBLIC_SLACK_CLIENT_ID as string,
- clientSecret: process.env.SLACK_CLIENT_SECRET as string,
- profile: async (profile) => {
- const user = new User(
- profile.name,
- profile.email,
- profile.picture,
- false,
- await GenerateSlug(await getDatabase(), CollectionId.Users, profile.name),
- [],
- [],
- profile.sub,
- 10,
- 1
- );
- user.id = profile.sub;
- return user;
- }
- }),
- Email({
- server: {
- host: process.env.SMTP_HOST,
- port: process.env.SMTP_PORT,
- auth: {
- user: process.env.SMTP_USER,
- pass: process.env.SMTP_PASSWORD,
- },
- },
- from: process.env.SMTP_FROM
- })
- ],
- callbacks: {
- async session({ session, user }) {
- session.user = await (await db).findObjectById(
- CollectionId.Users,
- new ObjectId(user.id)
- );
+ SlackProvider({
+ clientId: process.env.NEXT_PUBLIC_SLACK_CLIENT_ID as string,
+ clientSecret: process.env.SLACK_CLIENT_SECRET as string,
+ profile: async (profile) => {
+ const user = new User(
+ profile.name,
+ profile.email,
+ profile.picture,
+ false,
+ await GenerateSlug(
+ await getDatabase(),
+ CollectionId.Users,
+ profile.name,
+ ),
+ [],
+ [],
+ profile.sub,
+ 10,
+ 1,
+ );
+ user.id = profile.sub;
+ return user;
+ },
+ }),
+ Email({
+ server: {
+ host: process.env.SMTP_HOST,
+ port: process.env.SMTP_PORT,
+ auth: {
+ user: process.env.SMTP_USER,
+ pass: process.env.SMTP_PASSWORD,
+ },
+ },
+ from: process.env.SMTP_FROM,
+ }),
+ ],
+ callbacks: {
+ async session({ session, user }) {
+ session.user = await (
+ await db
+ ).findObjectById(CollectionId.Users, new ObjectId(user.id));
+
+ return session;
+ },
- return session;
- },
+ async redirect({ baseUrl }) {
+ return baseUrl + "/onboarding";
+ },
- async redirect({ baseUrl }) {
- return baseUrl + "/onboarding";
- },
+ async signIn({ user }) {
+ Analytics.signIn(user.name ?? "Unknown User");
+ new ResendUtils().createContact(user);
- async signIn({ user }) {
- Analytics.signIn(user.name ?? "Unknown User");
- new ResendUtils().createContact(user);
+ let typedUser = user as Partial;
+ if (!typedUser.slug) {
+ console.log("User is incomplete, filling in missing fields");
- let typedUser = user as Partial;
- if (!typedUser.slug) {
- console.log("User is incomplete, filling in missing fields");
+ const name =
+ typedUser.name ?? typedUser.email?.split("@")[0] ?? "Unknown User";
- const name = typedUser.name ?? typedUser.email?.split("@")[0] ?? "Unknown User";
-
- // User is incomplete, fill in the missing fields
- typedUser = {
- _id: typedUser._id ?? new ObjectId(typedUser.id),
- name,
- image: typedUser.image ?? "https://4026.org/user.jpg",
- slug: await GenerateSlug(await getDatabase(), CollectionId.Users, name),
- teams: typedUser.teams ?? [],
- owner: typedUser.owner ?? [],
- slackId: typedUser.slackId ?? "",
- onboardingComplete: typedUser.onboardingComplete ?? false,
- admin: typedUser.admin ?? false,
- xp: typedUser.xp ?? 0,
- level: typedUser.level ?? 0,
- ...typedUser,
- } as User;
+ // User is incomplete, fill in the missing fields
+ typedUser = {
+ _id: typedUser._id ?? new ObjectId(typedUser.id),
+ name,
+ image: typedUser.image ?? "https://4026.org/user.jpg",
+ slug: await GenerateSlug(
+ await getDatabase(),
+ CollectionId.Users,
+ name,
+ ),
+ teams: typedUser.teams ?? [],
+ owner: typedUser.owner ?? [],
+ slackId: typedUser.slackId ?? "",
+ onboardingComplete: typedUser.onboardingComplete ?? false,
+ admin: typedUser.admin ?? false,
+ xp: typedUser.xp ?? 0,
+ level: typedUser.level ?? 0,
+ ...typedUser,
+ } as User;
- await (await db).updateObjectById(CollectionId.Users, new ObjectId(typedUser._id?.toString()), typedUser);
- }
+ await (
+ await db
+ ).updateObjectById(
+ CollectionId.Users,
+ new ObjectId(typedUser._id?.toString()),
+ typedUser,
+ );
+ }
- return true;
- }
- },
- debug: false,
- adapter: {
- ...adapter,
- createUser: async (user) => {
- const createdUser = await adapter.createUser!(user);
+ return true;
+ },
+ },
+ debug: false,
+ adapter: {
+ ...adapter,
+ createUser: async (user: Omit) => {
+ const createdUser = await adapter.createUser!(user);
- Analytics.newSignUp(user.name ?? "Unknown User");
+ Analytics.newSignUp(user.name ?? "Unknown User");
- return createdUser;
- }
- },
- pages: {
- //signIn: "/signin",
- },
+ return createdUser;
+ },
+ },
+ pages: {
+ //signIn: "/signin",
+ },
};
export default NextAuth(AuthenticationOptions);
diff --git a/lib/CompetitionHandling.ts b/lib/CompetitionHandling.ts
index 2d098499..5009c3f1 100644
--- a/lib/CompetitionHandling.ts
+++ b/lib/CompetitionHandling.ts
@@ -1,142 +1,171 @@
import {
- Competition,
- Match,
- Team,
- Report,
- AllianceColor,
- League,
+ Competition,
+ Match,
+ Team,
+ Report,
+ AllianceColor,
+ League,
} from "./Types";
import { ObjectId } from "bson";
import { rotateArray } from "./client/ClientUtils";
import { games } from "./games";
import { GameId } from "./client/GameId";
import CollectionId from "./client/CollectionId";
-import DbInterface from './client/dbinterfaces/DbInterface';
+import DbInterface from "./client/dbinterfaces/DbInterface";
type ScheduleMatch = {
- subjectiveScouter?: string;
- assignedScouters: string[];
-}
+ subjectiveScouter?: string;
+ assignedScouters: string[];
+};
/**
* @tested_by tests/lib/CompetitionHandling.test.ts
*/
-export function generateSchedule(scouters: string[], subjectiveScouters: string[], matchCount: number, robotsPerMatch: number) {
- const schedule = [];
- for (let i = 0; i < matchCount; i++) {
- const subjectiveScouter = subjectiveScouters.length > 0 ? subjectiveScouters[0] : undefined;
- const assignedScouters = (subjectiveScouter ? scouters.filter((s) => s !== subjectiveScouter) : scouters).slice(0, robotsPerMatch);
-
- const match = {
- subjectiveScouter,
- assignedScouters
- };
- schedule.push(match);
- rotateArray(scouters);
- rotateArray(subjectiveScouters);
- }
-
- return schedule;
+export function generateSchedule(
+ scouters: string[],
+ subjectiveScouters: string[],
+ matchCount: number,
+ robotsPerMatch: number,
+) {
+ const schedule = [];
+ for (let i = 0; i < matchCount; i++) {
+ const subjectiveScouter =
+ subjectiveScouters.length > 0 ? subjectiveScouters[0] : undefined;
+ const assignedScouters = (
+ subjectiveScouter
+ ? scouters.filter((s) => s !== subjectiveScouter)
+ : scouters
+ ).slice(0, robotsPerMatch);
+
+ const match = {
+ subjectiveScouter,
+ assignedScouters,
+ };
+ schedule.push(match);
+ rotateArray(scouters);
+ rotateArray(subjectiveScouters);
+ }
+
+ return schedule;
}
export async function AssignScoutersToCompetitionMatches(
- db: DbInterface,
- teamId: string,
- competitionId: string,
+ db: DbInterface,
+ teamId: string,
+ competitionId: string,
) {
- const comp = await db.findObjectById(
- CollectionId.Competitions,
- new ObjectId(competitionId),
- );
-
- const team = await db.findObject(
- CollectionId.Teams,
- new ObjectId(teamId),
- );
-
- if (!comp || !team) {
- throw new Error("Competition or team not found");
- }
-
- team.scouters = team.scouters.filter((s) => team.users.includes(s));
- team.subjectiveScouters = team.subjectiveScouters.filter((s) => team.users.includes(s));
-
- const schedule = generateSchedule(team.scouters, team.subjectiveScouters, comp.matches.length, games[comp.gameId].league == League.FRC ? 6 : 4);
-
- const promises: Promise[] = [];
- for (let i = 0; i < comp.matches.length; i++) {
- // Filter out the subjective scouter that will be assigned to this match
- promises.push(generateReportsForMatch(db, comp.matches[i], comp.gameId, schedule[i]));
- }
-
- await Promise.all(promises);
- return "Success";
+ const comp = await db.findObjectById(
+ CollectionId.Competitions,
+ new ObjectId(competitionId),
+ );
+
+ const team = await db.findObject(
+ CollectionId.Teams,
+ new ObjectId(teamId),
+ );
+
+ if (!comp || !team) {
+ throw new Error("Competition or team not found");
+ }
+
+ team.scouters = team.scouters.filter((s) => team.users.includes(s));
+ team.subjectiveScouters = team.subjectiveScouters.filter((s) =>
+ team.users.includes(s),
+ );
+
+ const schedule = generateSchedule(
+ team.scouters,
+ team.subjectiveScouters,
+ comp.matches.length,
+ games[comp.gameId].league == League.FRC ? 6 : 4,
+ );
+
+ const promises: Promise[] = [];
+ for (let i = 0; i < comp.matches.length; i++) {
+ // Filter out the subjective scouter that will be assigned to this match
+ promises.push(
+ generateReportsForMatch(db, comp.matches[i], comp.gameId, schedule[i]),
+ );
+ }
+
+ await Promise.all(promises);
+ return "Success";
}
-export async function generateReportsForMatch(db: DbInterface, match: string | Match, gameId: GameId, schedule?: ScheduleMatch) {
- if (typeof match === "string") {
- const foundMatch = await db.findObjectById(
- CollectionId.Matches,
- new ObjectId(match),
- );
-
- if (!foundMatch) {
- throw new Error("Match not found");
- }
-
- match = foundMatch;
- }
-
- match.subjectiveScouter = schedule?.subjectiveScouter;
-
- const existingReportPromises = match.reports.map((r) =>
- db.findObjectById(CollectionId.Reports, new ObjectId(r)));
- const existingReports = await Promise.all(existingReportPromises);
-
- const bots = match.blueAlliance.concat(match.redAlliance);
- const reports = [];
- for (let i = 0; i < bots.length; i++) {
- const teamNumber = bots[i];
- const scouter = i < (schedule?.assignedScouters.length ?? 0) ? schedule?.assignedScouters[i] : undefined;
- const color = match.blueAlliance.includes(teamNumber)
- ? AllianceColor.Blue
- : AllianceColor.Red;
-
- const oldReport = existingReports.find((r) => r?.robotNumber === teamNumber);
-
- if (!oldReport) {
- // Create a new report
-
- const newReport = new Report(
- scouter,
- games[gameId].createQuantitativeFormData(),
- teamNumber,
- color,
- String(match._id),
- 0
- );
-
- reports.push(
- String((await db.addObject(CollectionId.Reports, newReport))._id),
- );
- }
- else {
- // Update existing report
- oldReport.user = scouter;
-
- await db.updateObjectById(
- CollectionId.Reports,
- new ObjectId(oldReport._id),
- oldReport,
- );
- reports.push(oldReport._id);
- }
- }
-
- match.reports = reports.filter((r) => r !== undefined) as string[];
- await db.updateObjectById(
- CollectionId.Matches,
- new ObjectId(match._id),
- match,
- );
-}
\ No newline at end of file
+export async function generateReportsForMatch(
+ db: DbInterface,
+ match: string | Match,
+ gameId: GameId,
+ schedule?: ScheduleMatch,
+) {
+ if (typeof match === "string") {
+ const foundMatch = await db.findObjectById(
+ CollectionId.Matches,
+ new ObjectId(match),
+ );
+
+ if (!foundMatch) {
+ throw new Error("Match not found");
+ }
+
+ match = foundMatch;
+ }
+
+ match.subjectiveScouter = schedule?.subjectiveScouter;
+
+ const existingReportPromises = match.reports.map((r) =>
+ db.findObjectById(CollectionId.Reports, new ObjectId(r)),
+ );
+ const existingReports = await Promise.all(existingReportPromises);
+
+ const bots = match.blueAlliance.concat(match.redAlliance);
+ const reports = [];
+ for (let i = 0; i < bots.length; i++) {
+ const teamNumber = bots[i];
+ const scouter =
+ i < (schedule?.assignedScouters.length ?? 0)
+ ? schedule?.assignedScouters[i]
+ : undefined;
+ const color = match.blueAlliance.includes(teamNumber)
+ ? AllianceColor.Blue
+ : AllianceColor.Red;
+
+ const oldReport = existingReports.find(
+ (r) => r?.robotNumber === teamNumber,
+ );
+
+ if (!oldReport) {
+ // Create a new report
+
+ const newReport = new Report(
+ scouter,
+ games[gameId].createQuantitativeFormData(),
+ teamNumber,
+ color,
+ String(match._id),
+ 0,
+ );
+
+ reports.push(
+ String((await db.addObject(CollectionId.Reports, newReport))._id),
+ );
+ } else {
+ // Update existing report
+ oldReport.user = scouter;
+
+ await db.updateObjectById(
+ CollectionId.Reports,
+ new ObjectId(oldReport._id),
+ oldReport,
+ );
+ reports.push(oldReport._id);
+ }
+ }
+
+ match.reports = reports.filter((r) => r !== undefined) as string[];
+ await db.updateObjectById(
+ CollectionId.Matches,
+ new ObjectId(match._id),
+ match,
+ );
+}
diff --git a/lib/Enums.ts b/lib/Enums.ts
index c322ff13..8dc4ba49 100644
--- a/lib/Enums.ts
+++ b/lib/Enums.ts
@@ -1,83 +1,83 @@
export enum Defense {
- None = "None",
- Partial = "Partial",
- Full = "Full",
+ None = "None",
+ Partial = "Partial",
+ Full = "Full",
}
export enum FTCEndgame {
- None = "None",
- Parked = "Parked",
- TouchingTheLowerBar = "Touching the Lower Bar",
- LowClimb = "Low Climb",
- HighClimb = "High Climb",
+ None = "None",
+ Parked = "Parked",
+ TouchingTheLowerBar = "Touching the Lower Bar",
+ LowClimb = "Low Climb",
+ HighClimb = "High Climb",
}
export enum IntakeTypes {
- None = "None",
- Human = "Human",
- Ground = "Ground",
- Both = "Both",
+ None = "None",
+ Human = "Human",
+ Ground = "Ground",
+ Both = "Both",
}
export enum FrcDrivetrain {
- Tank = "Tank",
- Swerve = "Swerve",
- Mecanum = "Mecanum",
+ Tank = "Tank",
+ Swerve = "Swerve",
+ Mecanum = "Mecanum",
}
export enum FtcDrivetrain {
- Tank = FrcDrivetrain.Tank, // Reference the other enum to allow interoperability
- Mecanum = FrcDrivetrain.Mecanum,
+ Tank = FrcDrivetrain.Tank, // Reference the other enum to allow interoperability
+ Mecanum = FrcDrivetrain.Mecanum,
}
export enum Motors {
- CIMs = "CIM",
- Krakens = "Krakens",
- Falcons = "Falcons",
- Talons = "Talons",
- Neos = "Neos",
+ CIMs = "CIM",
+ Krakens = "Krakens",
+ Falcons = "Falcons",
+ Talons = "Talons",
+ Neos = "Neos",
}
export enum SwerveLevel {
- None = "None",
- L1 = "L1",
- L2 = "L2",
- L3 = "L3",
+ None = "None",
+ L1 = "L1",
+ L2 = "L2",
+ L3 = "L3",
}
export namespace CenterStageEnums {
- export enum CenterStageParkingLocation {
- Corner = "Corner",
- Center = "Center",
- FarSide = "Far Side",
- NotApplicable = "N/A",
- }
+ export enum CenterStageParkingLocation {
+ Corner = "Corner",
+ Center = "Center",
+ FarSide = "Far Side",
+ NotApplicable = "N/A",
+ }
- export enum AutoAdjustable {
- NoNeed = "No Need",
- Yes = "Yes",
- No = "No",
- }
+ export enum AutoAdjustable {
+ NoNeed = "No Need",
+ Yes = "Yes",
+ No = "No",
+ }
- export enum AutoSidePreference {
- Backstage = "Backstage",
- Audience = "Audience",
- NoPreference = "No Preference",
- }
+ export enum AutoSidePreference {
+ Backstage = "Backstage",
+ Audience = "Audience",
+ NoPreference = "No Preference",
+ }
}
export namespace IntoTheDeepEnums {
- export enum StartedWith {
- Nothing = "Nothing",
- Sample = "Sample",
- Specimen = "Specimen",
- }
+ export enum StartedWith {
+ Nothing = "Nothing",
+ Sample = "Sample",
+ Specimen = "Specimen",
+ }
- export enum EndgameLevelClimbed {
- None = "None",
- Parked = "Parked",
- TouchedLowRung = "Touched Low Rung",
- LowLevelClimb = "Low Level Climb",
- HighLevelClimb = "High Level Climb",
- }
-}
\ No newline at end of file
+ export enum EndgameLevelClimbed {
+ None = "None",
+ Parked = "Parked",
+ TouchedLowRung = "Touched Low Rung",
+ LowLevelClimb = "Low Level Climb",
+ HighLevelClimb = "High Level Climb",
+ }
+}
diff --git a/lib/Layout.ts b/lib/Layout.ts
index a61452fa..5da62fa8 100644
--- a/lib/Layout.ts
+++ b/lib/Layout.ts
@@ -1,139 +1,221 @@
import { Dot } from "@/components/stats/Heatmap";
import { camelCaseToTitleCase } from "./client/ClientUtils";
-import { IntakeTypes, Defense, FrcDrivetrain, Motors, SwerveLevel, CenterStageEnums, IntoTheDeepEnums, FtcDrivetrain } from "./Enums";
+import {
+ IntakeTypes,
+ Defense,
+ FrcDrivetrain,
+ Motors,
+ SwerveLevel,
+ CenterStageEnums,
+ IntoTheDeepEnums,
+ FtcDrivetrain,
+} from "./Enums";
import { PitReportData, QuantData, Pitreport, Report, League } from "./Types";
export type StringKeyedObject = { [key: string]: any };
-export type ElementType = "string" | "number" | "boolean" | "image" | "startingPos" | Object;
-
-export type FormElementProps = keyof TData | {
- key: keyof TData;
- label?: string;
- type?: ElementType;
-}
+export type ElementType =
+ | "string"
+ | "number"
+ | "boolean"
+ | "image"
+ | "startingPos"
+ | Object;
+
+export type FormElementProps =
+ | keyof TData
+ | {
+ key: keyof TData;
+ label?: string;
+ type?: ElementType;
+ };
export class FormElement {
- key: keyof TData;
- label: string;
- type?: ElementType
-
- constructor(league: League, key: keyof TData, dataExample: TData, label?: string, type?: ElementType) {
- this.key = key;
- this.label = label ?? camelCaseToTitleCase(key as string);
- this.type = type ?? keyToType(league, key as string, dataExample);
- }
-
- /**
- * @tested_by tests/lib/Layout.test.ts
- */
- static fromProps(league: League, props: FormElementProps, dataExample: TData): FormElement {
- if (typeof props === "string")
- return new FormElement(league, props, dataExample);
- if (typeof props !== "object")
- throw new Error("Invalid FormElementProps: " + props.toString());
- return new FormElement(league, props.key, dataExample, props.label, props.type);
- }
+ key: keyof TData;
+ label: string;
+ type?: ElementType;
+
+ constructor(
+ league: League,
+ key: keyof TData,
+ dataExample: TData,
+ label?: string,
+ type?: ElementType,
+ ) {
+ this.key = key;
+ this.label = label ?? camelCaseToTitleCase(key as string);
+ this.type = type ?? keyToType(league, key as string, dataExample);
+ }
+
+ /**
+ * @tested_by tests/lib/Layout.test.ts
+ */
+ static fromProps(
+ league: League,
+ props: FormElementProps,
+ dataExample: TData,
+ ): FormElement {
+ if (typeof props === "string")
+ return new FormElement(league, props, dataExample);
+ if (typeof props !== "object")
+ throw new Error("Invalid FormElementProps: " + props.toString());
+ return new FormElement(
+ league,
+ props.key,
+ dataExample,
+ props.label,
+ props.type,
+ );
+ }
}
-export type BlockElementProps = FormElementProps[][];
-
-export class BlockElement extends Array>> {
- constructor(league: League, elements: BlockElementProps, dataExample: TData) {
- const genElements = elements.map(c => c.map(e => FormElement.fromProps(league, e, dataExample)));
- super(...genElements);
- }
-
- static isBlock(element: FormElement | BlockElement): element is BlockElement {
- return Array.isArray(element);
- }
+export type BlockElementProps =
+ FormElementProps[][];
+
+export class BlockElement extends Array<
+ Array>
+> {
+ constructor(
+ league: League,
+ elements: BlockElementProps,
+ dataExample: TData,
+ ) {
+ const genElements = elements.map((c) =>
+ c.map((e) => FormElement.fromProps(league, e, dataExample)),
+ );
+ super(...genElements);
+ }
+
+ static isBlock(
+ element: FormElement | BlockElement,
+ ): element is BlockElement {
+ return Array.isArray(element);
+ }
}
-export type FormLayoutProps =
- { [header: string]: (FormElementProps | BlockElementProps)[] };
+export type FormLayoutProps = {
+ [header: string]: (FormElementProps | BlockElementProps)[];
+};
export class FormLayout {
- [header: string]: (FormElement | BlockElement)[];
-
- static fromProps(league: League, props: FormLayoutProps, dataExample: TData): FormLayout {
- const layout = new FormLayout();
- for (const header in props) {
- layout[header] = props[header].map(e => {
- if (!Array.isArray(e))
- return FormElement.fromProps(league, e, dataExample);
- return new BlockElement(league, e, dataExample);
- });
- }
-
- return layout;
- }
+ [header: string]: (FormElement | BlockElement)[];
+
+ static fromProps(
+ league: League,
+ props: FormLayoutProps,
+ dataExample: TData,
+ ): FormLayout {
+ const layout = new FormLayout();
+ for (const header in props) {
+ layout[header] = props[header].map((e) => {
+ if (!Array.isArray(e))
+ return FormElement.fromProps(league, e, dataExample);
+ return new BlockElement(league, e, dataExample);
+ });
+ }
+
+ return layout;
+ }
}
export type Badge = {
- text: string;
- color: "primary" | "secondary" | "accent" | "success" | "warning" | "info";
-}
-
-export type Stat = {
- label: string;
- key?: keyof TPitData | keyof TQuantData | undefined;
- get?: (pitData: Pitreport | undefined, quantitativeReports: Report[] | undefined) => number;
-}
-
-export type StatPair = {
- stats: [Stat, Stat];
- label: string;
-}
-
-export type StatsLayout = {
- sections: { [header: string]: (Stat | StatPair)[] };
- getGraphDots: (quantitativeReports: Report[], pitReport?: Pitreport) => Dot[];
-}
-
-export type PitStatsLayout = {
- [key: string]: Stat | Stat[];
-
- overallSlideStats: Stat[];
- individualSlideStats: Stat[];
- robotCapabilities: Stat[];
- graphStat: Stat;
-}
+ text: string;
+ color: "primary" | "secondary" | "accent" | "success" | "warning" | "info";
+};
+
+export type Stat<
+ TPitData extends PitReportData,
+ TQuantData extends QuantData,
+> = {
+ label: string;
+ key?: keyof TPitData | keyof TQuantData | undefined;
+ get?: (
+ pitData: Pitreport | undefined,
+ quantitativeReports: Report[] | undefined,
+ ) => number;
+};
+
+export type StatPair<
+ TPitData extends PitReportData,
+ TQuantData extends QuantData,
+> = {
+ stats: [Stat, Stat];
+ label: string;
+};
+
+export type StatsLayout<
+ TPitData extends PitReportData,
+ TQuantData extends QuantData,
+> = {
+ sections: {
+ [header: string]: (
+ | Stat
+ | StatPair
+ )[];
+ };
+ getGraphDots: (
+ quantitativeReports: Report[],
+ pitReport?: Pitreport,
+ ) => Dot[];
+};
+
+export type PitStatsLayout<
+ TPitData extends PitReportData,
+ TQuantData extends QuantData,
+> = {
+ [key: string]: Stat | Stat[];
+
+ overallSlideStats: Stat[];
+ individualSlideStats: Stat[];
+ robotCapabilities: Stat[];
+ graphStat: Stat;
+};
/**
* @tested_by tests/lib/Layout.test.ts
*/
-export function keyToType(league: League, key: string, exampleData: StringKeyedObject): ElementType {
- if (key === "image")
- return "image";
-
- const type = typeof exampleData[key];
-
- if (type === "object" && "x" in exampleData[key] && "y" in exampleData[key] && "angle" in exampleData[key])
- return "startingPos";
-
- if (type !== "string")
- return type as ElementType;
-
- const enums = [
- IntakeTypes, Defense, league === League.FRC ? FrcDrivetrain : FtcDrivetrain, Motors, SwerveLevel,
- CenterStageEnums.CenterStageParkingLocation, CenterStageEnums.AutoAdjustable, CenterStageEnums.AutoSidePreference,
- IntoTheDeepEnums.StartedWith, IntoTheDeepEnums.EndgameLevelClimbed
- ];
-
- if (key === "Defense")
- return Defense;
- if (key === "swerveLevel")
- return SwerveLevel;
-
- if (key === "StartedWith")
- return IntoTheDeepEnums.StartedWith;
- if (key === "EndgameLevelClimbed")
- return IntoTheDeepEnums.EndgameLevelClimbed;
-
- for (const e of enums) {
- if (Object.values(e).includes(exampleData[key]))
- return e;
- }
-
- return "string";
-}
\ No newline at end of file
+export function keyToType(
+ league: League,
+ key: string,
+ exampleData: StringKeyedObject,
+): ElementType {
+ if (key === "image") return "image";
+
+ const type = typeof exampleData[key];
+
+ if (
+ type === "object" &&
+ "x" in exampleData[key] &&
+ "y" in exampleData[key] &&
+ "angle" in exampleData[key]
+ )
+ return "startingPos";
+
+ if (type !== "string") return type as ElementType;
+
+ const enums = [
+ IntakeTypes,
+ Defense,
+ league === League.FRC ? FrcDrivetrain : FtcDrivetrain,
+ Motors,
+ SwerveLevel,
+ CenterStageEnums.CenterStageParkingLocation,
+ CenterStageEnums.AutoAdjustable,
+ CenterStageEnums.AutoSidePreference,
+ IntoTheDeepEnums.StartedWith,
+ IntoTheDeepEnums.EndgameLevelClimbed,
+ ];
+
+ if (key === "Defense") return Defense;
+ if (key === "swerveLevel") return SwerveLevel;
+
+ if (key === "StartedWith") return IntoTheDeepEnums.StartedWith;
+ if (key === "EndgameLevelClimbed")
+ return IntoTheDeepEnums.EndgameLevelClimbed;
+
+ for (const e of enums) {
+ if (Object.values(e).includes(exampleData[key])) return e;
+ }
+
+ return "string";
+}
diff --git a/lib/MongoDB.ts b/lib/MongoDB.ts
index 601b84a6..054b1021 100644
--- a/lib/MongoDB.ts
+++ b/lib/MongoDB.ts
@@ -1,18 +1,16 @@
-import {
- Db,
- MongoClient,
- MongoClientOptions,
-} from "mongodb";
-import { ObjectId } from "bson";
-import CollectionId from "./client/CollectionId";
-import DbInterface from "./client/dbinterfaces/DbInterface";
+import { Db, MongoClient, MongoClientOptions } from "mongodb";
+import { ObjectId, Document } from "bson";
+import CollectionId, { CollectionIdToType } from "./client/CollectionId";
+import DbInterface, {
+ WithStringOrObjectIdId,
+} from "./client/dbinterfaces/DbInterface";
if (!process.env.MONGODB_URI) {
- // Necessary to allow connections from files running outside of Next
- require("dotenv").config();
+ // Necessary to allow connections from files running outside of Next
+ require("dotenv").config();
- if (!process.env.MONGODB_URI)
- console.error('Invalid/Missing environment variable: "MONGODB_URI"');
+ if (!process.env.MONGODB_URI)
+ console.error('Invalid/Missing environment variable: "MONGODB_URI"');
}
const uri = process.env.MONGODB_URI ?? "mongodb://localhost:27017";
@@ -22,104 +20,117 @@ let client;
let clientPromise: Promise;
if (!global.clientPromise) {
- client = new MongoClient(uri, options);
- global.clientPromise = client.connect();
+ client = new MongoClient(uri, options);
+ global.clientPromise = client.connect();
}
clientPromise = global.clientPromise;
export { clientPromise };
export async function getDatabase(): Promise {
- if (!global.interface) {
- await clientPromise;
- const dbInterface = new MongoDBInterface(clientPromise);
- await dbInterface.init();
- global.interface = dbInterface;
+ if (!global.interface) {
+ await clientPromise;
+ const dbInterface = new MongoDBInterface(clientPromise);
+ await dbInterface.init();
+ global.interface = dbInterface;
- return dbInterface;
- }
+ return dbInterface;
+ }
- return global.interface;
+ return global.interface;
}
export class MongoDBInterface implements DbInterface {
- promise: Promise | undefined;
- client: MongoClient | undefined;
- db: Db | undefined;
-
- constructor(promise: Promise) {
- this.promise = promise;
- }
-
- async init() {
- this.client = await this.promise;
- this.db = this.client?.db(process.env.DB);
- //@ts-ignore
-
- const CollectionId = await this.db?.listCollections().toArray() as CollectionId;
- if (CollectionId?.length === 0) {
- try {
- Object.values(CollectionId).forEach(
- async (collectionName) =>
- await this.db?.createCollection(collectionName)
- );
- } catch (e) {
- console.log("Failed to create CollectionId... (probably exist already)");
- }
- }
- }
-
- async addObject(collection: CollectionId, object: any): Promise {
- const ack = await this?.db?.collection(collection).insertOne(object);
- object._id = ack?.insertedId;
- return object as Type;
- }
-
- async deleteObjectById(collection: CollectionId, id: ObjectId) {
- var query = { _id: id };
- await this?.db?.collection(collection).deleteOne(query);
- }
-
- async updateObjectById(
- collection: CollectionId,
- id: ObjectId,
- newValues: Partial | { [key: string]: any }
- ) {
- var query = { _id: id };
- var updated = { $set: newValues };
- this?.db
- ?.collection(collection)
- .updateOne(query, updated);
- }
-
- async findObjectById(
- collection: CollectionId,
- id: ObjectId
- ): Promise {
- return (await this?.db?.collection(collection).findOne({ _id: id })) as Type;
- }
-
- async findObject(
- collection: CollectionId,
- query: object
- ): Promise {
- return (await this?.db?.collection(collection).findOne(query)) as Type;
- }
-
- async findObjects(
- collection: CollectionId,
- query: object
- ): Promise {
- return (await this?.db
- ?.collection(collection)
- .find(query)
- .toArray()) as Type[];
- }
-
- async countObjects(
- collection: CollectionId,
- query: object
- ): Promise {
- return await this?.db?.collection(collection).countDocuments(query);
- }
+ promise: Promise | undefined;
+ client: MongoClient | undefined;
+ db: Db | undefined;
+
+ constructor(promise: Promise) {
+ this.promise = promise;
+ }
+
+ async init() {
+ this.client = await this.promise;
+ this.db = this.client?.db(process.env.DB);
+ //@ts-ignore
+
+ const CollectionId = (await this.db
+ ?.listCollections()
+ .toArray()) as CollectionId;
+ if (CollectionId?.length === 0) {
+ try {
+ Object.values(CollectionId).forEach(
+ async (collectionName) =>
+ await this.db?.createCollection(collectionName),
+ );
+ } catch (e) {
+ console.log(
+ "Failed to create CollectionId... (probably exist already)",
+ );
+ }
+ }
+ }
+
+ async addObject<
+ TId extends CollectionId,
+ TObj extends CollectionIdToType,
+ >(collection: TId, object: WithStringOrObjectIdId): Promise {
+ if (object._id && typeof object._id === "string")
+ object._id = new ObjectId(object._id);
+
+ const ack = await this?.db
+ ?.collection(collection)
+ .insertOne(object as Document & { _id?: ObjectId });
+ object._id = ack?.insertedId;
+ return object as TObj;
+ }
+
+ async deleteObjectById(collection: CollectionId, id: ObjectId) {
+ var query = { _id: id };
+ await this?.db?.collection(collection).deleteOne(query);
+ }
+
+ updateObjectById<
+ TId extends CollectionId,
+ TObj extends CollectionIdToType,
+ >(collection: TId, id: ObjectId, newValues: Partial): Promise {
+ var query = { _id: id };
+ var updated = { $set: newValues };
+ this?.db?.collection(collection).updateOne(query, updated);
+
+ return Promise.resolve();
+ }
+
+ async findObjectById(
+ collection: CollectionId,
+ id: ObjectId,
+ ): Promise {
+ return (await this?.db
+ ?.collection(collection)
+ .findOne({ _id: id })) as Type;
+ }
+
+ async findObject(
+ collection: CollectionId,
+ query: object,
+ ): Promise {
+ return (await this?.db?.collection(collection).findOne(query)) as Type;
+ }
+
+ async findObjects(
+ collection: CollectionId,
+ query: object,
+ ): Promise {
+ return (await this?.db
+ ?.collection(collection)
+ .find(query)
+ .toArray()) as Type[];
+ }
+
+ async countObjects(
+ collection: CollectionId,
+ query: object,
+ ): Promise {
+ return await this?.db?.collection(collection).countDocuments(query);
+ }
}
diff --git a/lib/ResendUtils.ts b/lib/ResendUtils.ts
index 420b97ed..bac16f7b 100644
--- a/lib/ResendUtils.ts
+++ b/lib/ResendUtils.ts
@@ -1,64 +1,68 @@
import { User as NextAuthUser } from "next-auth";
-import { Resend } from 'resend';
-import { getDatabase } from './MongoDB';
+import { Resend } from "resend";
+import { getDatabase } from "./MongoDB";
import { User } from "./Types";
import CollectionId from "./client/CollectionId";
const resend = new Resend(process.env.SMTP_PASSWORD);
export interface ResendInterface {
- createContact: (rawUser: NextAuthUser) => Promise;
- emailDevelopers: (subject: string, message: string) => void;
+ createContact: (rawUser: NextAuthUser) => Promise;
+ emailDevelopers: (subject: string, message: string) => void;
}
export class ResendUtils implements ResendInterface {
- async createContact(rawUser: NextAuthUser) {
- const user = rawUser as User;
+ async createContact(rawUser: NextAuthUser) {
+ const user = rawUser as User;
- if (user.resendContactId)
- return;
+ if (user.resendContactId) return;
- if (!user.email || !user.name) {
- console.error("User is missing email or name", user);
- return;
- }
+ if (!user.email || !user.name) {
+ console.error("User is missing email or name", user);
+ return;
+ }
- console.log("Creating contact for", user.email);
+ console.log("Creating contact for", user.email);
- const nameParts = user.name?.split(" ");
+ const nameParts = user.name?.split(" ");
- const res = await resend.contacts.create({
- email: user.email,
- firstName: nameParts[0],
- lastName: nameParts.length > 1 ? nameParts[1] : "",
- unsubscribed: false,
- audienceId: process.env.RESEND_AUDIENCE_ID,
- });
+ const res = await resend.contacts.create({
+ email: user.email,
+ firstName: nameParts[0],
+ lastName: nameParts.length > 1 ? nameParts[1] : "",
+ unsubscribed: false,
+ audienceId: process.env.RESEND_AUDIENCE_ID,
+ });
- if (!res.data?.id) {
- console.error("Failed to create contact for", user.email);
- console.error(res);
- return;
- }
+ if (!res.data?.id) {
+ console.error("Failed to create contact for", user.email);
+ console.error(res);
+ return;
+ }
- const db = await getDatabase();
- // Going around our own interface is a red flag, but it's 11 PM and I'm tired -Renato
- db.db?.collection(CollectionId.Users).updateOne({ email: user.email}, { $set: { resendContactId: res.data.id } });
- }
+ const db = await getDatabase();
+ // Going around our own interface is a red flag, but it's 11 PM and I'm tired -Renato
+ db.db
+ ?.collection(CollectionId.Users)
+ .updateOne(
+ { email: user.email },
+ { $set: { resendContactId: res.data.id } },
+ );
+ }
- async emailDevelopers(subject: string, message: string) {
- if (!process.env.DEVELOPER_EMAILS) {
- console.error("No developer emails found");
- return;
- }
+ async emailDevelopers(subject: string, message: string) {
+ if (!process.env.DEVELOPER_EMAILS) {
+ console.error("No developer emails found");
+ return;
+ }
- resend.emails.send({
- from: "Gearbox Server ",
- to: JSON.parse(process.env.DEVELOPER_EMAILS), // Environment variables are always strings, so we need to parse it
- subject,
- text: message,
- })
- }
+ resend.emails.send({
+ from: "Gearbox Server ",
+ to: JSON.parse(process.env.DEVELOPER_EMAILS), // Environment variables are always strings, so we need to parse it
+ subject,
+ text: message,
+ });
+ }
}
-export default ResendUtils;
\ No newline at end of file
+export default ResendUtils;
diff --git a/lib/Slack.ts b/lib/Slack.ts
deleted file mode 100644
index 511ecadd..00000000
--- a/lib/Slack.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { SlashCommand, AckFn, RespondArguments, RespondFn, App, Installation } from "@slack/bolt";
-import SlackCommands from "./SlackCommands";
-import { getDatabase } from "./MongoDB";
-import CollectionId from "./client/CollectionId";
-
-const slackApp = new App({
- // token: process.env.SLACK_BOT_TOKEN,
- signingSecret: process.env.SLACK_SIGNING_SECRET,
- socketMode: true,
- port: +process.env.SLACK_PORT,
- redirectUri: "https://localhost/slack/oauth_redirect",
- installerOptions: {
- redirectUriPath: "/slack/oauth_redirect",
- },
- appToken: process.env.SLACK_APP_TOKEN,
- clientId: process.env.NEXT_PUBLIC_SLACK_CLIENT_ID,
- clientSecret: process.env.SLACK_CLIENT_SECRET,
- stateSecret: process.env.SLACK_STATE_SECRET,
- scopes: ["chat:write", "commands"],
- installationStore: {
- storeInstallation: async (installation) => {
- console.log("Storing installation", installation.team?.name);
-
- const db = await getDatabase();
-
- db.addObject(CollectionId.SlackInstallations, installation);
- },
- fetchInstallation: async (InstallQuery) => {
- const db = await getDatabase();
-
- console.log("Fetching installation: " + InstallQuery.teamId);
- const installation = await db.findObject(CollectionId.SlackInstallations, {
- userId: InstallQuery.userId,
- team: {
- id: InstallQuery.teamId,
- }
- });
-
- console.log("Found installation", installation.team?.name);
-
- if (!installation) {
- throw new Error("No installation found");
- }
-
- return installation;
- },
- },
-});
-
-slackApp.command(/\/.*/, async (props: { command: SlashCommand, ack: AckFn, respond: RespondFn }) => {
- const { command, ack, respond } = props;
-
- const commandName = command.command.replace("/", "");
- const handler = SlackCommands[commandName];
-
- if (handler) {
- handler(command, ack, respond);
- }
- else {
- await ack();
- await respond(`Command not found: ` + commandName);
- }
-});
-
-export async function startSlackApp() {
- await slackApp.start(process.env.SLACK_PORT);
- console.log("Slack bot is listening at: http://localhost:" + process.env.SLACK_PORT);
-
- return slackApp;
-}
\ No newline at end of file
diff --git a/lib/SlackClient.ts b/lib/SlackClient.ts
new file mode 100644
index 00000000..5befdf63
--- /dev/null
+++ b/lib/SlackClient.ts
@@ -0,0 +1,12 @@
+export interface SlackInterface {
+ sendMsg(webhookUrl: string, msg: string): Promise;
+}
+
+export default class SlackClient implements SlackInterface {
+ sendMsg(webhookUrl: string, msg: string) {
+ return fetch(webhookUrl, {
+ method: "POST",
+ body: JSON.stringify({ text: msg }),
+ });
+ }
+}
diff --git a/lib/SlackCommands.ts b/lib/SlackCommands.ts
deleted file mode 100644
index 3b388d1c..00000000
--- a/lib/SlackCommands.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { AckFn, RespondArguments, RespondFn, SlashCommand } from "@slack/bolt";
-import { ObjectId } from "bson";
-import { getDatabase } from "./MongoDB";
-import { Team, User } from "./Types";
-import CollectionId from "./client/CollectionId";
-
-type SlackCommandDict = {
- [command: string]:
- (command: SlashCommand, acknowledge: AckFn, respond: RespondFn) => Promise
-};
-
-const SlackCommands: SlackCommandDict = {
- "link-notifications": async (command, acknowledge, respond) => {
- await acknowledge();
-
- if (!command.text || isNaN(+command.text)) {
- await respond("Please provide a team number.");
- return;
- }
-
- const teamNumber = +command.text;
- const userId = command.user_id;
-
- const db = await getDatabase();
-
- const userPromise = db.findObject(CollectionId.Users, { slackId: userId });
- const teamPromise = db.findObject(CollectionId.Teams, { number: teamNumber });
-
- const user = await userPromise;
- const team = await teamPromise;
-
- console.log(user, team);
-
- if (!user) {
- await respond("You are not registered in Gearbox. Please register first at https://4026.org.");
- return;
- }
-
- if (!team) {
- await respond(`Team ${teamNumber} does not exist.`);
- return;
- }
-
- if (!team.owners.includes(user._id!.toString())) {
- await respond(`You are not an owner of team ${teamNumber}.`);
- return;
- }
-
- await db.updateObjectById(CollectionId.Teams, new ObjectId(team._id!), {
- slackChannel: command.channel_id
- });
-
- db.client?.close();
- await respond(`Linked channel for team ${teamNumber}. Make sure to run /invite @Gearbox to the channel to receive notifications.`);
- }
-}
-
-export default SlackCommands;
\ No newline at end of file
diff --git a/lib/Socket.ts b/lib/Socket.ts
index 7663958b..849c09ad 100644
--- a/lib/Socket.ts
+++ b/lib/Socket.ts
@@ -7,48 +7,48 @@ import ClientApi from "@/lib/api/ClientApi";
const api = new ClientApi();
export interface SocketServer extends HTTPServer {
- io?: Server | undefined;
+ io?: Server | undefined;
}
export interface SocketIO extends Socket {
- server: SocketServer;
+ server: SocketServer;
}
export interface NextResponseWithSocketIO extends NextResponse {
- socket: SocketIO;
+ socket: SocketIO;
}
const SocketHandler = (req: NextRequest, res: NextResponseWithSocketIO) => {
- if (!res.socket.server.io) {
- console.log("Socket is initializing");
- const io = new Server(res.socket.server, {
- path: "/api/socketio",
- addTrailingSlash: false,
- });
- res.socket.server.io = io;
-
- io.on("connect", (socket) => {
- socket.on("form-update", (data) => {
- socket.broadcast.emit("form-update", data);
- });
-
- socket.on("form-submit", (_id) => {
- socket.broadcast.emit("form-submit", _id);
- });
-
- socket.on("update-checkin", (reportId) => {
- console.log("Checkin");
- socket.broadcast.emit("update-checkin", reportId);
- });
-
- socket.on("update-checkout", (reportId) => {
- socket.broadcast.emit("update-checkout", reportId);
- console.log("Checkout");
- });
- });
- }
- //@ts-ignore
- res.end();
+ if (!res.socket.server.io) {
+ console.log("Socket is initializing");
+ const io = new Server(res.socket.server, {
+ path: "/api/socketio",
+ addTrailingSlash: false,
+ });
+ res.socket.server.io = io;
+
+ io.on("connect", (socket) => {
+ socket.on("form-update", (data) => {
+ socket.broadcast.emit("form-update", data);
+ });
+
+ socket.on("form-submit", (_id) => {
+ socket.broadcast.emit("form-submit", _id);
+ });
+
+ socket.on("update-checkin", (reportId) => {
+ console.log("Checkin");
+ socket.broadcast.emit("update-checkin", reportId);
+ });
+
+ socket.on("update-checkout", (reportId) => {
+ socket.broadcast.emit("update-checkout", reportId);
+ console.log("Checkout");
+ });
+ });
+ }
+ //@ts-ignore
+ res.end();
};
export default SocketHandler;
diff --git a/lib/Statbotics.ts b/lib/Statbotics.ts
index 1e57605d..9263965d 100644
--- a/lib/Statbotics.ts
+++ b/lib/Statbotics.ts
@@ -1,64 +1,67 @@
-
-
export namespace Statbotics {
- const BaseURL = "https://api.statbotics.io/v3"
- export interface TeamEvent {
- team: number,
- year: number,
- event: string,
- time: number,
- offseason : boolean,
- team_name : string ,
- event_name : string ,
- country : string,
- state : string ,
- district : string ,
- //type : district ,
- week : number,
- //status : Completed,
- epa : {
- total_points : {
- mean : number,
- },
- breakdown : {
- total_points : {
- mean : number,
- },
- auto_points : {
- mean : number,
- },
- teleop_points : {
- mean : number,
- },
- endgame_points : {
- mean : number,
- },
- total_notes : {
- mean : number,
- },
- }
- },
- record : {
- qual : {
- wins : number,
- losses : number,
- ties : number,
- winrate : number,
- rank : number
- }
- },
- district_points : number,
- }
+ const BaseURL = "https://api.statbotics.io/v3";
+ export interface TeamEvent {
+ team: number;
+ year: number;
+ event: string;
+ time: number;
+ offseason: boolean;
+ team_name: string;
+ event_name: string;
+ country: string;
+ state: string;
+ district: string;
+ //type : district ,
+ week: number;
+ //status : Completed,
+ epa: {
+ total_points: {
+ mean: number;
+ };
+ breakdown: {
+ total_points: {
+ mean: number;
+ };
+ auto_points: {
+ mean: number;
+ };
+ teleop_points: {
+ mean: number;
+ };
+ endgame_points: {
+ mean: number;
+ };
+ total_notes: {
+ mean: number;
+ };
+ };
+ };
+ record: {
+ qual: {
+ wins: number;
+ losses: number;
+ ties: number;
+ winrate: number;
+ rank: number;
+ };
+ };
+ district_points: number;
+ }
- async function statboticsRequest(subUrl: string): Promise {
- var res = await fetch(BaseURL + subUrl, {
- method: "GET",
- });
- return res.json();
- }
+ async function statboticsRequest(subUrl: string): Promise {
+ var res = await fetch(BaseURL + subUrl, {
+ method: "GET",
+ });
+ return res.json();
+ }
- export async function getTeamEvent(eventKey: string, teamNumber: number|string) {
- const teamEvent = await statboticsRequest(`/team_event/${teamNumber}/${eventKey}`)
- return teamEvent;
- }
+ export async function getTeamEvent(
+ eventKey: string,
+ teamNumber: number | string,
+ ) {
+ const teamEvent = await statboticsRequest(
+ `/team_event/${teamNumber}/${eventKey}`,
+ );
+ return teamEvent;
+ }
}
diff --git a/lib/TestUtils.ts b/lib/TestUtils.ts
deleted file mode 100644
index 8da145b3..00000000
--- a/lib/TestUtils.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import { NextApiResponse } from "next";
-import ApiLib from "./api/ApiLib";
-import InMemoryDbInterface from "./client/dbinterfaces/InMemoryDbInterface";
-import ApiDependencies from "./api/ApiDependencies";
-import DbInterface from "./client/dbinterfaces/DbInterface";
-import { User } from "./Types";
-import { ResendInterface } from "./ResendUtils";
-import { ObjectId } from "bson";
-import CollectionId from "./client/CollectionId";
-
-export class TestRes extends ApiLib.ApiResponse {
- status = jest.fn((code) => this);
- send = jest.fn((obj) => this);
- error = jest.fn((code, message) => {
- this.status(code);
- this.send({ error: message });
- return this;
- });
-
- constructor(res?: NextApiResponse) {
- super(res ?? {} as NextApiResponse);
- }
-}
-
-export class TestResend implements ResendInterface {
- createContact = jest.fn();
- emailDevelopers = jest.fn();
-}
-
-function getTestUser() {
- return {
- _id: new ObjectId(),
- email: "",
- name: "",
- image: "",
- teams: [],
- owner: []
- } as any as User;
-}
-
-export async function getTestApiUtils() {
- const db = new InMemoryDbInterface();
- db.init();
-
- const user = getTestUser();
- await db.addObject(CollectionId.Users, user);
-
- return {
- res: new TestRes(),
- db,
- resend: new TestResend(),
- user
- }
-}
-
-export async function getTestApiParams, TAuthData = undefined>(
- res: TestRes,
- deps: Partial | Partial<{ db: DbInterface, user: Partial, resend: ResendInterface }>,
- args: TArgs,
- authData: TAuthData = undefined as any
-): Promise<[any, TestRes, ApiDependencies, TAuthData, any]> {
- let user = (deps as any).user ?? (deps as any).userPromise;
- const db = await deps.db ?? new InMemoryDbInterface();
-
- if (!user) {
- user = getTestUser();
- (deps as any).user = user;
-
- await db.addObject(CollectionId.Users, user);
- }
-
- return [
- {} as any,
- res,
- {
- db: Promise.resolve(db),
- slackClient: undefined,
- userPromise: Promise.resolve(user),
- tba: undefined,
- resend: deps.resend ?? new TestResend(),
- ...deps
- } as ApiDependencies,
- authData,
- args
- ]
-}
\ No newline at end of file
diff --git a/lib/TheBlueAlliance.ts b/lib/TheBlueAlliance.ts
index 80fd1464..aadb7527 100644
--- a/lib/TheBlueAlliance.ts
+++ b/lib/TheBlueAlliance.ts
@@ -1,336 +1,343 @@
import stringSimilarity from "string-similarity-js";
import { getDatabase, MongoDBInterface } from "./MongoDB";
import {
- Competition,
- Match,
- Team,
- CompetitonNameIdPair,
- MatchType,
- Alliance,
- Pitreport,
+ Competition,
+ Match,
+ Team,
+ CompetitonNameIdPair,
+ MatchType,
+ Alliance,
+ Pitreport,
} from "./Types";
import { NotLinkedToTba } from "./client/ClientUtils";
import { GameId, defaultGameId } from "./client/GameId";
import { games } from "./games";
export namespace TheBlueAlliance {
- export interface SimpleTeam {
- key: string;
- team_number: number;
- nickname: string;
- name: string;
- city: string;
- state_prov: string;
- country: string;
- }
-
- export interface SimpleDistrict {
- abbreviation: string;
- display_name: string;
- key: string;
- year: number;
- }
-
- export interface SimpleCompetition {
- key: string;
- name: string;
- event_code: string;
- event_type: number;
- district: SimpleDistrict;
- city: string;
- state_prov: string;
- country: string;
- start_date: string; //"2023-04-26"
- end_date: string;
- year: number;
- }
-
- export enum CompetitionLevel {
- QM = "qm",
- EF = "ef",
- QF = "qf",
- SF = "sf",
- F = "f",
- }
-
- export interface Alliances {
- red: TbaAlliance;
- blue: TbaAlliance;
- }
-
- export interface TbaAlliance {
- score: number;
- team_keys: string[];
- surrogate_team_keys: string[];
- dq_team_keys: string[];
- }
-
- export enum WinningAlliance {
- Red = "red",
- Blue = "blue",
- }
-
- export interface SimpleRank {
- matches_played: number;
- qual_average: number;
- record: {
- losses: number;
- wins: number;
- ties: number;
- };
- rank: number;
- dq: number;
- team_key: string;
- }
-
- export interface OprRanking {
- oprs: {
- [key: string]: number;
- };
- }
-
- export interface SimpleMatch {
- key: string;
- comp_level: CompetitionLevel; // qm
- set_number: number;
- match_number: number;
- alliances: Alliances;
- winning_alliance: WinningAlliance;
- event_key: string;
- time: number;
- predicted_time: number;
- actual_time: number;
- }
-
- export interface District {
- key: string;
- display_name: string;
- year: number;
- abbreviation: string;
- }
-
- export enum Prefixes {
- FTC = "ftc",
- FRC = "frc",
- }
-
- export type TeamArray = { [team_number: string]: number }[];
-
- export function ConvertDate(tbaDate: string): number {
- return Date.parse(tbaDate);
- }
-
- export function competitionLevelToMatchType(
- matchType: CompetitionLevel
- ): MatchType {
- if (matchType === CompetitionLevel.QM) {
- return MatchType.Qualifying;
- }
- if (matchType === CompetitionLevel.EF) {
- return MatchType.Qualifying;
- }
- if (matchType === CompetitionLevel.QF) {
- return MatchType.Quarterfinals;
- }
- if (matchType === CompetitionLevel.SF) {
- return MatchType.Semifinals;
- } else {
- return MatchType.Finals;
- }
- }
-
- export function tbaIdsToTeamNumbers(tbaIds: string[]): Alliance {
- //@ts-ignore
- return tbaIds.map((id) => parseInt(id.match(/\d+/g)[0]));
- }
-
- class Request {
- baseUrl: string;
- apiKey: string;
-
- constructor(baseUrl = process.env.TBA_URL, apiKey = process.env.TBA_KEY) {
- this.baseUrl = baseUrl;
- this.apiKey = apiKey;
- }
-
- async request(suburl: string): Promise {
- var res = await fetch(this.baseUrl + suburl, {
- method: "GET",
- headers: {
- "X-TBA-Auth-Key": this.apiKey,
- },
- });
-
- return res.json();
- }
-
- async getTeam(tbaId: string): Promise {
- return this.request(`/team/${tbaId}/simple`);
- }
-
- async getCompetition(tbaId: string): Promise {
- return this.request(`/event/${tbaId}/simple`);
- }
-
- async getCompetitionMatches(tbaId: string): Promise {
- return this.request(`/event/${tbaId}/matches`);
- }
-
- async getCompetitonRanking(
- tbaId: string
- ): Promise<{ rankings: SimpleRank[] }> {
- return this.request(`/event/${tbaId}/rankings`);
- }
-
- async getCompetitonOPRS(tbaId: string): Promise {
- return this.request(`/event/${tbaId}/oprs`);
- }
-
- async getMatch(tbaId: string): Promise {
- return this.request(`/match/${tbaId}/simple`);
- }
-
- async getDistricts(year: number): Promise {
- return this.request(`/districts/${year}`);
- }
-
- async getDistrictEvents(tbaId: string): Promise {
- return this.request(`/district/${tbaId}/events/simple`);
- }
-
- async getEvents(year: number): Promise {
- return this.request(`/events/${year}/simple`);
- }
-
- async getCompetitionTeams(tbaId: string): Promise {
- return this.request(`/event/${tbaId}/teams`);
- }
- }
-
- export class Interface {
- req: Request;
- db: Promise;
-
- competitionPairings: CompetitonNameIdPair[] = [];
-
- constructor() {
- this.req = new Request();
- this.db = getDatabase();
-
- this.loadCompetitionPairings();
- }
-
- async getTeamAutofillData(teamNumber: number): Promise {
- let team = await this.req.getTeam(Prefixes.FRC + teamNumber.toString());
- if (!team) {
- team = await this.req.getTeam(Prefixes.FTC + teamNumber.toString());
- }
-
- return new Team(team.nickname, undefined, team.key, team.team_number);
- }
-
- async getCompetitionAutofillData(tbaId: string): Promise {
- var competitonData = await this.req.getCompetition(tbaId);
-
- let competition = new Competition(
- competitonData.name,
- undefined,
- competitonData.key,
- ConvertDate(competitonData.start_date),
- ConvertDate(competitonData.end_date)
- );
-
- // maybe give automatic matches later, once scouting is more stabilized
- return competition;
- }
-
- async getMatchAutofillData(tbaId: string): Promise {
- let data = await this.req.getMatch(tbaId);
- return new Match(
- data.match_number,
- undefined,
- data.key,
- data.time,
- competitionLevelToMatchType(data.comp_level),
- tbaIdsToTeamNumbers(data.alliances.blue.team_keys),
- tbaIdsToTeamNumbers(data.alliances.red.team_keys)
- );
- }
-
- async getCompetitionMatches(tbaId: string): Promise {
- if (tbaId === NotLinkedToTba)
- return [];
-
- let matches = (await this.req.getCompetitionMatches(tbaId)).map(
- (data) =>
- new Match(
- data.match_number,
- undefined,
- data.key,
- data.time,
- competitionLevelToMatchType(data.comp_level),
- tbaIdsToTeamNumbers(data.alliances.blue.team_keys),
- tbaIdsToTeamNumbers(data.alliances.red.team_keys)
- )
- ) ?? [];
- return matches;
- }
-
- async getCompetitionPitreports(tbaId: string, gameId: GameId): Promise {
- if (tbaId === NotLinkedToTba)
- return [];
-
- const competitionTeams = await this.req.getCompetitionTeams(tbaId);
- return competitionTeams.map(
- ({ team_number }) => new Pitreport(team_number, games[gameId ?? defaultGameId].createPitReportData())
- );
- }
-
- async getMatchAndReportsAutofillData() {
- throw new Error();
- }
-
- async searchCompetitionByName(name: string, trim: number = 5) {
- var results: { value: number; pair: CompetitonNameIdPair }[] = [];
- this.competitionPairings.forEach((pair) => {
- results.push({ value: stringSimilarity(name, pair.name), pair });
- });
-
- results.sort((a, b) => {
- if (a.value < b.value) {
- return 1;
- } else if (a.value > b.value) {
- return -1;
- }
-
- return 0;
- });
-
- results = results.slice(0, trim);
- return results;
- }
-
- async loadCompetitionPairings() {
- if (global?.compIdPairs) {
- this.competitionPairings = global.compIdPairs;
- } else {
- console.log("Loading Pairings For Competition Searches...");
- const year = new Date().getFullYear();
- const pairings = await this.allCompetitionsToPairings(year);
- console.log(`Loaded ${pairings.length} Pairings!`);
- this.competitionPairings = pairings;
- global.compIdPairs = pairings;
- }
- }
-
- async allCompetitionsToPairings(year: number) {
- var allCompetitions = await this.req.getEvents(year);
- var pairings: CompetitonNameIdPair[] = [];
- allCompetitions.forEach((comp) => {
- pairings.push({ name: comp.name, tbaId: comp.key });
- });
-
- return pairings;
- }
- }
+ export interface SimpleTeam {
+ key: string;
+ team_number: number;
+ nickname: string;
+ name: string;
+ city: string;
+ state_prov: string;
+ country: string;
+ }
+
+ export interface SimpleDistrict {
+ abbreviation: string;
+ display_name: string;
+ key: string;
+ year: number;
+ }
+
+ export interface SimpleCompetition {
+ key: string;
+ name: string;
+ event_code: string;
+ event_type: number;
+ district: SimpleDistrict;
+ city: string;
+ state_prov: string;
+ country: string;
+ start_date: string; //"2023-04-26"
+ end_date: string;
+ year: number;
+ }
+
+ export enum CompetitionLevel {
+ QM = "qm",
+ EF = "ef",
+ QF = "qf",
+ SF = "sf",
+ F = "f",
+ }
+
+ export interface Alliances {
+ red: TbaAlliance;
+ blue: TbaAlliance;
+ }
+
+ export interface TbaAlliance {
+ score: number;
+ team_keys: string[];
+ surrogate_team_keys: string[];
+ dq_team_keys: string[];
+ }
+
+ export enum WinningAlliance {
+ Red = "red",
+ Blue = "blue",
+ }
+
+ export interface SimpleRank {
+ matches_played: number;
+ qual_average: number;
+ record: {
+ losses: number;
+ wins: number;
+ ties: number;
+ };
+ rank: number;
+ dq: number;
+ team_key: string;
+ }
+
+ export interface OprRanking {
+ oprs: {
+ [key: string]: number;
+ };
+ }
+
+ export interface SimpleMatch {
+ key: string;
+ comp_level: CompetitionLevel; // qm
+ set_number: number;
+ match_number: number;
+ alliances: Alliances;
+ winning_alliance: WinningAlliance;
+ event_key: string;
+ time: number;
+ predicted_time: number;
+ actual_time: number;
+ }
+
+ export interface District {
+ key: string;
+ display_name: string;
+ year: number;
+ abbreviation: string;
+ }
+
+ export enum Prefixes {
+ FTC = "ftc",
+ FRC = "frc",
+ }
+
+ export type TeamArray = { [team_number: string]: number }[];
+
+ export function ConvertDate(tbaDate: string): number {
+ return Date.parse(tbaDate);
+ }
+
+ export function competitionLevelToMatchType(
+ matchType: CompetitionLevel,
+ ): MatchType {
+ if (matchType === CompetitionLevel.QM) {
+ return MatchType.Qualifying;
+ }
+ if (matchType === CompetitionLevel.EF) {
+ return MatchType.Qualifying;
+ }
+ if (matchType === CompetitionLevel.QF) {
+ return MatchType.Quarterfinals;
+ }
+ if (matchType === CompetitionLevel.SF) {
+ return MatchType.Semifinals;
+ } else {
+ return MatchType.Finals;
+ }
+ }
+
+ export function tbaIdsToTeamNumbers(tbaIds: string[]): Alliance {
+ //@ts-ignore
+ return tbaIds.map((id) => parseInt(id.match(/\d+/g)[0]));
+ }
+
+ class Request {
+ baseUrl: string;
+ apiKey: string;
+
+ constructor(baseUrl = process.env.TBA_URL, apiKey = process.env.TBA_KEY) {
+ this.baseUrl = baseUrl;
+ this.apiKey = apiKey;
+ }
+
+ async request(suburl: string): Promise {
+ var res = await fetch(this.baseUrl + suburl, {
+ method: "GET",
+ headers: {
+ "X-TBA-Auth-Key": this.apiKey,
+ },
+ });
+
+ return res.json();
+ }
+
+ async getTeam(tbaId: string): Promise {
+ return this.request(`/team/${tbaId}/simple`);
+ }
+
+ async getCompetition(tbaId: string): Promise {
+ return this.request(`/event/${tbaId}/simple`);
+ }
+
+ async getCompetitionMatches(tbaId: string): Promise {
+ return this.request(`/event/${tbaId}/matches`);
+ }
+
+ async getCompetitonRanking(
+ tbaId: string,
+ ): Promise<{ rankings: SimpleRank[] }> {
+ return this.request(`/event/${tbaId}/rankings`);
+ }
+
+ async getCompetitonOPRS(tbaId: string): Promise {
+ return this.request(`/event/${tbaId}/oprs`);
+ }
+
+ async getMatch(tbaId: string): Promise {
+ return this.request(`/match/${tbaId}/simple`);
+ }
+
+ async getDistricts(year: number): Promise {
+ return this.request(`/districts/${year}`);
+ }
+
+ async getDistrictEvents(tbaId: string): Promise {
+ return this.request(`/district/${tbaId}/events/simple`);
+ }
+
+ async getEvents(year: number): Promise {
+ return this.request(`/events/${year}/simple`);
+ }
+
+ async getCompetitionTeams(tbaId: string): Promise {
+ return this.request(`/event/${tbaId}/teams`);
+ }
+ }
+
+ export class Interface {
+ req: Request;
+ db: Promise;
+
+ competitionPairings: CompetitonNameIdPair[] = [];
+
+ constructor() {
+ this.req = new Request();
+ this.db = getDatabase();
+
+ this.loadCompetitionPairings();
+ }
+
+ async getTeamAutofillData(teamNumber: number): Promise {
+ let team = await this.req.getTeam(Prefixes.FRC + teamNumber.toString());
+ if (!team) {
+ team = await this.req.getTeam(Prefixes.FTC + teamNumber.toString());
+ }
+
+ return new Team(team.nickname, undefined, team.key, team.team_number);
+ }
+
+ async getCompetitionAutofillData(tbaId: string): Promise {
+ var competitonData = await this.req.getCompetition(tbaId);
+
+ let competition = new Competition(
+ competitonData.name,
+ undefined,
+ competitonData.key,
+ ConvertDate(competitonData.start_date),
+ ConvertDate(competitonData.end_date),
+ );
+
+ // maybe give automatic matches later, once scouting is more stabilized
+ return competition;
+ }
+
+ async getMatchAutofillData(tbaId: string): Promise {
+ let data = await this.req.getMatch(tbaId);
+ return new Match(
+ data.match_number,
+ undefined,
+ data.key,
+ data.time,
+ competitionLevelToMatchType(data.comp_level),
+ tbaIdsToTeamNumbers(data.alliances.blue.team_keys),
+ tbaIdsToTeamNumbers(data.alliances.red.team_keys),
+ );
+ }
+
+ async getCompetitionQualifyingMatches(tbaId: string): Promise {
+ if (tbaId === NotLinkedToTba) return [];
+
+ let matches =
+ (await this.req.getCompetitionMatches(tbaId))
+ .filter((match) => match.comp_level === CompetitionLevel.QM)
+ .map((data, index) => {
+ return new Match(
+ index + 1,
+ undefined,
+ data.key,
+ data.time,
+ competitionLevelToMatchType(data.comp_level),
+ tbaIdsToTeamNumbers(data.alliances.blue.team_keys),
+ tbaIdsToTeamNumbers(data.alliances.red.team_keys),
+ );
+ }) ?? [];
+ return matches;
+ }
+
+ async getCompetitionPitreports(
+ tbaId: string,
+ gameId: GameId,
+ ): Promise {
+ if (tbaId === NotLinkedToTba) return [];
+
+ const competitionTeams = await this.req.getCompetitionTeams(tbaId);
+ return competitionTeams.map(
+ ({ team_number }) =>
+ new Pitreport(
+ team_number,
+ games[gameId ?? defaultGameId].createPitReportData(),
+ ),
+ );
+ }
+
+ async getMatchAndReportsAutofillData() {
+ throw new Error();
+ }
+
+ async searchCompetitionByName(name: string, trim: number = 5) {
+ var results: { value: number; pair: CompetitonNameIdPair }[] = [];
+ this.competitionPairings.forEach((pair) => {
+ results.push({ value: stringSimilarity(name, pair.name), pair });
+ });
+
+ results.sort((a, b) => {
+ if (a.value < b.value) {
+ return 1;
+ } else if (a.value > b.value) {
+ return -1;
+ }
+
+ return 0;
+ });
+
+ results = results.slice(0, trim);
+ return results;
+ }
+
+ async loadCompetitionPairings() {
+ if (global?.compIdPairs) {
+ this.competitionPairings = global.compIdPairs;
+ } else {
+ console.log("Loading Pairings For Competition Searches...");
+ const year = new Date().getFullYear();
+ const pairings = await this.allCompetitionsToPairings(year);
+ console.log(`Loaded ${pairings.length} Pairings!`);
+ this.competitionPairings = pairings;
+ global.compIdPairs = pairings;
+ }
+ }
+
+ async allCompetitionsToPairings(year: number) {
+ var allCompetitions = await this.req.getEvents(year);
+ var pairings: CompetitonNameIdPair[] = [];
+ allCompetitions.forEach((comp) => {
+ pairings.push({ name: comp.name, tbaId: comp.key });
+ });
+
+ return pairings;
+ }
+ }
}
diff --git a/lib/TheOrangeAlliance.ts b/lib/TheOrangeAlliance.ts
index ad954236..fd35d487 100644
--- a/lib/TheOrangeAlliance.ts
+++ b/lib/TheOrangeAlliance.ts
@@ -1,46 +1,50 @@
import { League, Team } from "./Types";
async function request(suburl: string): Promise {
- var res = await fetch(process.env.TOA_URL + suburl, {
- method: "GET",
- headers: {
- "X-Application-Origin": process.env.TOA_APP_ID,
- "X-TOA-Key": process.env.TOA_KEY,
- },
- });
+ var res = await fetch(process.env.TOA_URL + suburl, {
+ method: "GET",
+ headers: {
+ "X-Application-Origin": process.env.TOA_APP_ID,
+ "X-TOA-Key": process.env.TOA_KEY,
+ },
+ });
- return res.json();
+ return res.json();
}
export namespace TheOrangeAlliance {
- export type SimpleTeam = {
- /** Appears to be the same as team_number */
- team_key: string;
- region_key: string;
- league_key: string;
- team_number: number;
- team_name_short: string;
- team_name_long: string;
- robot_name: string;
- last_active: string;
- city: string;
- state_prov: string;
- zip_code: number;
- country: string;
- rookie_year: number;
- website: string;
- }
+ export type SimpleTeam = {
+ /** Appears to be the same as team_number */
+ team_key: string;
+ region_key: string;
+ league_key: string;
+ team_number: number;
+ team_name_short: string;
+ team_name_long: string;
+ robot_name: string;
+ last_active: string;
+ city: string;
+ state_prov: string;
+ zip_code: number;
+ country: string;
+ rookie_year: number;
+ website: string;
+ };
- export async function getTeam(teamNumber: number): Promise {
- const teams = await request(`/team/${teamNumber}`) as SimpleTeam[];
+ export async function getTeam(teamNumber: number): Promise {
+ const teams = (await request(`/team/${teamNumber}`)) as SimpleTeam[];
- if (teams.length === 0)
- return undefined;
+ if (teams.length === 0) return undefined;
- const team = teams[0];
- if (!team?.team_number || !team?.team_name_short)
- return undefined;
-
- return new Team(team.team_name_short, team.team_name_long, team.robot_name, team.team_number, League.FTC);
- }
-}
\ No newline at end of file
+ const team = teams[0];
+ if (!team?.team_number || !team?.team_name_short) return undefined;
+
+ return new Team(
+ team.team_name_short,
+ team.team_name_long,
+ team.robot_name,
+ team.team_number,
+ League.FTC,
+ );
+ }
+}
diff --git a/lib/Types.ts b/lib/Types.ts
index f2ab2eff..e4d6f620 100644
--- a/lib/Types.ts
+++ b/lib/Types.ts
@@ -1,13 +1,19 @@
// A collection of all the standard types Gearbox uses
import {
- Account as NextAuthAccount,
- Session as NextAuthSession,
- User as NextAuthUser,
+ Account as NextAuthAccount,
+ Session as NextAuthSession,
+ User as NextAuthUser,
} from "next-auth";
import { TheBlueAlliance } from "./TheBlueAlliance";
import { GameId, defaultGameId } from "./client/GameId";
import { Defense, FrcDrivetrain, Motors, SwerveLevel } from "./Enums";
-import { FormLayoutProps, FormLayout, Badge, PitStatsLayout, StatsLayout } from './Layout';
+import {
+ FormLayoutProps,
+ FormLayout,
+ Badge,
+ PitStatsLayout,
+ StatsLayout,
+} from "./Layout";
import { ObjectId } from "bson";
/**
@@ -16,549 +22,568 @@ import { ObjectId } from "bson";
* Derived orginally from NextAuth's Account struct
*/
export interface Account extends NextAuthAccount {
- /**
- * ID for the Mongo database
- */
- _id: string;
+ /**
+ * ID for the Mongo database
+ */
+ _id: string;
}
export interface Session extends NextAuthSession {
- _id: string;
+ _id: string;
}
export class User implements NextAuthUser {
- id: string = "";
- _id: string | undefined;
- name: string | undefined;
- email: string | undefined;
- image: string;
- admin: boolean;
- slug: string | undefined;
- teams: string[];
- owner: string[];
- slackId: string = "";
- xp: number = 10;
- level: number = 1;
- onboardingComplete: boolean = false;
- resendContactId: string | undefined = undefined;
-
- constructor(
- name: string | undefined,
- email: string | undefined,
- image: string = process.env.DEFAULT_IMAGE,
- admin: boolean = false,
- slug: string | undefined,
- teams: string[] = [],
- owner: string[] = [],
- slackId: string = "",
- xp: number = 10,
- level: number = 1
- ) {
- this.name = name;
- this.email = email;
- this.image = image;
- this.admin = admin;
- this.slug = slug;
- this.teams = teams;
- this.owner = owner;
- this.slackId = slackId;
- this.xp = xp;
- }
+ id: string = "";
+ _id: string | undefined;
+ name: string | undefined;
+ email: string | undefined;
+ image: string;
+ admin: boolean;
+ slug: string | undefined;
+ teams: string[];
+ owner: string[];
+ slackId: string = "";
+ xp: number = 10;
+ level: number = 1;
+ onboardingComplete: boolean = false;
+ resendContactId: string | undefined = undefined;
+
+ constructor(
+ name: string | undefined,
+ email: string | undefined,
+ image: string = process.env.DEFAULT_IMAGE,
+ admin: boolean = false,
+ slug: string | undefined,
+ teams: string[] = [],
+ owner: string[] = [],
+ slackId: string = "",
+ xp: number = 10,
+ level: number = 1,
+ ) {
+ this.name = name;
+ this.email = email;
+ this.image = image;
+ this.admin = admin;
+ this.slug = slug;
+ this.teams = teams;
+ this.owner = owner;
+ this.slackId = slackId;
+ this.xp = xp;
+ }
}
export class FieldPos {
- x: number = 0;
- y: number = 0;
- angle: number = 0;
+ x: number = 0;
+ y: number = 0;
+ angle: number = 0;
- static Zero = new FieldPos();
+ static Zero = new FieldPos();
}
export class Team {
- _id: ObjectId;
- name: string;
- slug: string | undefined;
- tbaId: string | undefined;
- number: number;
- league: League = League.FRC;
-
- owners: string[];
- users: string[];
- scouters: string[];
- subjectiveScouters: string[];
- requests: string[];
-
- seasons: string[];
-
- slackChannel: string | undefined;
-
- constructor(
- name: string,
- slug: string | undefined,
- tbaId: string | undefined,
- number: number,
- league: League = League.FRC,
- owners: string[] = [],
- users: string[] = [],
- scouters: string[] = [],
- subjectiveScouters: string[] = [],
- requests: string[] = [],
- seasons: string[] = [],
- slackChannel: string | undefined = undefined
- ) {
- this._id = new ObjectId();
- this.name = name;
- this.slug = slug;
- this.tbaId = tbaId;
- this.number = number;
- this.league = league;
- this.owners = owners;
- this.users = users;
- this.scouters = scouters;
- this.subjectiveScouters = subjectiveScouters;
- this.seasons = seasons;
- this.requests = requests;
- this.slackChannel = slackChannel;
- }
+ _id: ObjectId;
+ name: string;
+ slug: string | undefined;
+ tbaId: string | undefined;
+ number: number;
+ league: League = League.FRC;
+
+ owners: string[];
+ users: string[];
+ scouters: string[];
+ subjectiveScouters: string[];
+ requests: string[];
+
+ seasons: string[];
+
+ /**
+ * ID of the WebhookHolder object
+ * @see WebhookHolder
+ */
+ slackWebhook: string | undefined;
+
+ constructor(
+ name: string,
+ slug: string | undefined,
+ tbaId: string | undefined,
+ number: number,
+ league: League = League.FRC,
+ owners: string[] = [],
+ users: string[] = [],
+ scouters: string[] = [],
+ subjectiveScouters: string[] = [],
+ requests: string[] = [],
+ seasons: string[] = [],
+ ) {
+ this._id = new ObjectId();
+ this.name = name;
+ this.slug = slug;
+ this.tbaId = tbaId;
+ this.number = number;
+ this.league = league;
+ this.owners = owners;
+ this.users = users;
+ this.scouters = scouters;
+ this.subjectiveScouters = subjectiveScouters;
+ this.seasons = seasons;
+ this.requests = requests;
+ }
}
export abstract class QuantData {
- [key: string]: any;
+ [key: string]: any;
- Presented: boolean = true;
+ Presented: boolean = true;
- AutoStart: FieldPos = FieldPos.Zero;
+ AutoStart: FieldPos = FieldPos.Zero;
- Defense: Defense = Defense.None;
+ Defense: Defense = Defense.None;
- drivetrain: FrcDrivetrain = FrcDrivetrain.Tank;
+ drivetrain: FrcDrivetrain = FrcDrivetrain.Tank;
- comments: string = "";
+ comments: string = "";
}
export enum League {
- FTC = "FTC", FRC = "FRC"
+ FTC = "FTC",
+ FRC = "FRC",
}
-export class Game 
- 
- )}
- {uploadProgress > 0 ? (
-
- ) : (
- <>
- )}
-
-