Merge pull request #345 from Decatur-Robotics/main

Updating CS IA

Author: renatodellosso

.github/workflows/cd.yml

@@ -2,13 +2,6 @@ name: CD
 
 on:
   workflow_call:
-    secrets:
-      SSL_KEY:
-        required: true
-      SSL_CERT:
-        required: true
-      ENV_FILE:
-        required: true
   workflow_dispatch: # Allows manual triggering of the workflow
 
 permissions:
@@ -27,15 +20,6 @@ jobs:
 
       - name: Create certs directory
         run: mkdir certs
-
-      - name: Write SSL key
-        run: echo "${{ secrets.SSL_KEY }}" > certs/ssl.key
-
-      - name: Write SSL cert
-        run: echo "${{ secrets.SSL_CERT }}" > certs/ssl.cert
-
-      - name: Write ENV file
-        run: echo "${{ secrets.ENV_FILE }}" > .env
 
       - name: Build and export
         uses: docker/build-push-action@v6

.github/workflows/onpush.yml

@@ -13,8 +13,4 @@ jobs:
   cd:
     needs:
       - ci
-    uses: ./.github/workflows/cd.yml
-    secrets:
-      SSL_KEY: ${{ secrets.SSL_KEY }}
-      SSL_CERT: ${{ secrets.SSL_CERT }}
-      ENV_FILE: ${{ secrets.ENV_FILE }}
+    uses: ./.github/workflows/cd.yml

README.md

@@ -53,7 +53,7 @@ Features full feature parity with SJ2, whilst remaining simpler, faster and cool
 1. Run `npm run test`
 
 ## Contributing
-You've made it past set up and are ready to contibure to the future scouting - here's how.
+You've made it past set up and are ready to contibure to the future of scouting - here's how.
 
 We recommend you start with issues labelled `good first issue` to get a feel for the codebase. Fork the repo (unless you're part of Decatur Robotics, in which case make a new branch) and then make a pull request to the main branch. We'll review it and, if it looks good, merge it.
 

components/competition/CompetitionIndex.tsx

@@ -46,6 +46,7 @@ import CompHeaderCard from "./CompHeaderCard";
 import InsightsAndSettingsCard from "./InsightsAndSettingsCard";
 import MatchScheduleCard from "./MatchScheduleCard";
 import PitScoutingCard from "./PitScoutingCard";
+import toast from "react-hot-toast";
 
 const api = new ClientApi();
 
@@ -386,7 +387,7 @@ export default function CompetitionIndex(props: {
     }
 
     if ((res.result as string).toLowerCase() !== "success") {
-      alert(res.result);
+      toast.error(res.result);
     }
 
     setAssigningMatches(false);
@@ -395,11 +396,11 @@ export default function CompetitionIndex(props: {
   const reloadCompetition = async () => {
     const num = Math.floor(Math.random() * 1000000);
     if(prompt(`Are you sure you want to reload the competition? This will overwrite ALL your data. We CANNOT recover your data. If you are sure, type '${num}'`) !== String(num)) {
-      alert("Cancelled");
+      toast("Cancelled");
       return;
     }
 
-    alert("Reloading competition...");
+    toast("Reloading competition...");
 
     setUpdatingComp("Checking for Updates...");
     const res = await api.reloadCompetition(comp?._id!);

components/stats/Picklist.tsx

@@ -69,7 +69,7 @@ function TeamCard(props: { cardData: CardData, draggable: boolean, picklist?: Pi
   return (
     <div
       className={`w-${props.width ?? "[150px]"} h-${props.height ?? "[100px]"} bg-base-100 rounded-lg p-1 flex items-center justify-center border-2 border-base-100 hover:border-primary`}
-      ref={dragRef}
+      ref={dragRef as unknown as () => void}
     >
       <h1>
         {props.rank !== undefined ? `${props.rank + 1}. ` : ""}<span className="max-sm:hidden">Team</span> <span className="text-accent">#{teamNumber}</span>
@@ -115,7 +115,7 @@ function  PicklistCard(props: { picklist: Picklist, picklists: Picklist[] }) {
   return (
     <div
       className="bg-base-200 min-h-[30rem] h-fit rounded-lg w-1/3 sm:w-1/6 min-h-32 flex flex-col items-center space-y-2 p-2 sm:p-4"
-      ref={dropRef}
+      ref={dropRef as unknown as () => void}
     >
       <input defaultValue={picklist.name} className="w-[95%] input input-sm max-sm:hidden" onChange={changeName} />
       <h1 className="w-[95%] input input-sm input-disabled sm:hidden">{picklist.name}</h1>
@@ -148,7 +148,7 @@ export function TeamList(props: { teams: CardData[], picklists: Picklist[], expe
   });
 
   return (
-    <div ref={dropRef} className="w-full h-fit flex flex-row bg-base-300 space-x-2 p-2 overflow-x-scroll">
+    <div ref={dropRef as unknown as () => 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) => (
           <TeamCard

index.ts

@@ -24,7 +24,7 @@ const httpsOptions = {
 
 console.log("HTTPS options set");
 
-startSlackApp();
+// startSlackApp();
 
 console.log("App preparing...");
 app.prepare().then(() => {

lib/Auth.ts

@@ -11,6 +11,7 @@ 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();
 
@@ -137,7 +138,7 @@ export const AuthenticationOptions: AuthOptions = {
   debug: false,
   adapter: {
     ...adapter,
-    createUser: async (user) => {
+    createUser: async (user: Omit<AdapterUser, "id">) => {
       const createdUser = await adapter.createUser!(user);
 
       Analytics.newSignUp(user.name ?? "Unknown User");

lib/api/AccessLevels.ts

@@ -68,8 +68,6 @@ namespace AccessLevels {
       return { authorized: false, authData: undefined };
     }
 
-    console.log(team.owners, user._id?.toString());
-
     return { authorized: team.owners.includes(user._id?.toString()!), authData: { team, comp } };
   }
 
@@ -241,8 +239,6 @@ namespace AccessLevels {
   }
 
   export async function IfOnTeamThatOwnsPicklist(req: NextApiRequest, res: ApiLib.ApiResponse<any>, { userPromise, db }: UserAndDb, picklistId: string) {
-    console.log("IfOnTeamThatOwnsPicklist", picklistId);
-
     const user = await userPromise;
     if (!user) {
       return { authorized: false, authData: undefined };
@@ -258,7 +254,6 @@ namespace AccessLevels {
       return { authorized: false, authData: undefined };
     }
 
-    console.log(team.users, user._id?.toString());
     return { authorized: team.users.includes(user._id?.toString()!), authData: { team, picklist } };
   }
 }

lib/api/ApiLib.ts

@@ -1,5 +1,6 @@
 import { NextApiRequest, NextApiResponse } from "next";
 import { OmitCallSignature } from "@/lib/Types";
+import toast from "react-hot-toast";
 
 /**
  * @tested_by tests/lib/api/ApiLib.test.ts
@@ -108,7 +109,7 @@ namespace ApiLib {
 
     if (res?.error) {
       if (res.error === "Unauthorized") {
-        alert(`Unauthorized API request: ${subUrl}. If this is an error, please contact the developers.`);
+        toast.error(`Unauthorized API request: ${subUrl}. If this is an error, please contact the developers.`);
       }
       throw new Error(`${subUrl}: ${res.error}`);
     }