diff --git a/components/stats/SmallGraph.tsx b/components/stats/SmallGraph.tsx
index ca66df4f..cdb0a348 100644
--- a/components/stats/SmallGraph.tsx
+++ b/components/stats/SmallGraph.tsx
@@ -87,15 +87,6 @@ export default function SmallGraph(props: {
return 1;
}
} else if (key === "LevelClimbed") {
- ///switch (data) {
- //case ReefscapeEnums.EndgameClimbStatus.None:
- //return 0;
- //case ReefscapeEnums.EndgameClimbStatus.Park:
- //return 0.33;
- //case ReefscapeEnums.EndgameClimbStatus.High:
- //return 0.66;
- //case ReefscapeEnums.EndgameClimbStatus.Low:
- //return 1;
switch (data) {
case RebuiltEnums.LevelClimbed.No:
return 0;
@@ -106,6 +97,29 @@ export default function SmallGraph(props: {
case RebuiltEnums.LevelClimbed.Third:
return 1;
}
+ } else if (key === "TotalFuelPoints") {
+ switch (data) {
+ default:
+ return (
+ data["AutoFuelPointsOne"] +
+ data["FuelPointsOne"] +
+ (data["AutoFuelPointsFive"] + data["FuelPointsFive"]) * 5 +
+ (data["AutoFuelPointsTen"] + data["FuelPointsTen"]) * 10
+ );
+ }
+ } else if (key === "DriverSkill") {
+ switch (data) {
+ case RebuiltEnums.DriverSkill.One:
+ return 1;
+ case RebuiltEnums.DriverSkill.Two:
+ return 2;
+ case RebuiltEnums.DriverSkill.Three:
+ return 3;
+ case RebuiltEnums.DriverSkill.Four:
+ return 4;
+ case RebuiltEnums.DriverSkill.Five:
+ return 5;
+ }
}
return data;
}
diff --git a/lib/Auth.ts b/lib/Auth.ts
index 813f972d..665bbb57 100644
--- a/lib/Auth.ts
+++ b/lib/Auth.ts
@@ -54,7 +54,7 @@ export const AuthenticationOptions: AuthOptions = {
},
}),
SlackProvider({
- clientId: process.env.NEXT_PUBLIC_SLACK_CLIENT_ID as string,
+ clientId: process.env.SLACK_CLIENT_ID as string,
clientSecret: process.env.SLACK_CLIENT_SECRET as string,
allowDangerousEmailAccountLinking: true,
profile: async (profile) => {
diff --git a/lib/Enums.ts b/lib/Enums.ts
index 0014013b..ee263c5e 100644
--- a/lib/Enums.ts
+++ b/lib/Enums.ts
@@ -4,13 +4,13 @@ export enum Defense {
Full = "Full",
}
-export enum FTCEndgame {
+/*export enum FTCEndgame {
None = "None",
Parked = "Parked",
TouchingTheLowerBar = "Touching the Lower Bar",
LowClimb = "Low Climb",
HighClimb = "High Climb",
-}
+}*/
export enum IntakeTypes {
None = "None",
@@ -34,7 +34,6 @@ export enum Motors {
CIMs = "CIM",
Krakens = "Krakens",
Falcons = "Falcons",
- Talons = "Talons",
Neos = "Neos",
}
@@ -136,6 +135,13 @@ export namespace RebuiltEnums {
Second = "Second",
Third = "Third",
}
+ export enum DriverSkill {
+ One = "1",
+ Two = "2",
+ Three = "3",
+ Four = "4",
+ Five = "5",
+ }
}
export namespace DecodeEnums {
diff --git a/lib/Layout.ts b/lib/Layout.ts
index ccd8d0f9..5f66b2a2 100644
--- a/lib/Layout.ts
+++ b/lib/Layout.ts
@@ -224,30 +224,39 @@ export function keyToType(
RebuiltEnums.DriveOverBump,
RebuiltEnums.DriveUnderTrench,
RebuiltEnums.LevelClimbed,
+ RebuiltEnums.DriverSkill,
DecodeEnums.AutoStatus,
DecodeEnums.EndgameParkStatus,
];
- if (key === "Defense") return Defense;
- if (key === "swerveLevel") return SwerveLevel;
-
- if (key === "StartedWith") return IntoTheDeepEnums.StartedWith;
- if (key === "EndgameLevelClimbed")
- return IntoTheDeepEnums.EndgameLevelClimbed;
-
- if (key == "AutoCapabilities") return ReefscapeEnums.AutoCapabilities;
- if (key == "Climbing") return ReefscapeEnums.Climbing;
- if (key == "DriveThroughDeepCage") return ReefscapeEnums.DriveThroughDeepCage;
- if (key == "EndgameClimbStatus") return ReefscapeEnums.EndgameClimbStatus;
-
- //if (key == "AutoAbilities") return RebuiltEnums.AutoAbilities;
- if (key == "ClimbingCapabilities") return RebuiltEnums.ClimbingCapabilities;
- if (key == "DriveOverBump") return RebuiltEnums.DriveOverBump;
- if (key == "DiveUnderTrench") return RebuiltEnums.DriveUnderTrench;
- if (key == "LevelClimbed") return RebuiltEnums.LevelClimbed;
+ // Resolve by field name first. Values such as "None" occur in several enums.
+ const enumByKey: Record