Update Reefscape

.dockerignore

@@ -0,0 +1,12 @@
+node_modules
+tests
+.git
+.github
+.next
+.swc
+.vscode
+coverage
+certs
+.env
+.env.test
+tsconfig.tsbuildinfo

.env.production

@@ -0,0 +1,5 @@
+# Only put NEXT_PUBLIC variables here! 
+# We have to include these at build time, so this file is used to inject them into the build process.
+NEXT_PUBLIC_API_URL=/api/
+NEXT_PUBLIC_SLACK_CLIENT_ID=10831824934.7404945710466
+NEXT_PUBLIC_GOOGLE_ANALYTICS_ID=G-1BFJYBDC76

.env.test

@@ -1,3 +1,7 @@
 NEXT_PUBLIC_API_URL=http://localhost:3000/api
 
-DEVELOPER_EMAILS=["[email protected]"]
+DEVELOPER_EMAILS=["[email protected]"]
+
+TOA_URL=https://example.com
+TOA_APP_ID=123
+TOA_KEY=456

.github/workflows/cd.yml

@@ -1,30 +1,34 @@
 name: CD
 
-on: [workflow_call, workflow_dispatch]
+on:
+  workflow_call:
+    secrets:
+      AWS_ACCESS_KEY_ID:
+        required: true
+      AWS_SECRET_ACCESS_KEY:
+        required: true
+  workflow_dispatch:
 
 permissions:
   packages: write
 
 jobs:
-  build_and_push:
+  push:
     runs-on: ubuntu-latest
-    environment: Test 
+    environment: Production
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Build and export
-        uses: docker/build-push-action@v6
-        env:
-          DOCKER_BUILD_SUMMARY: false
+      - name: Download artifact
+        uses: actions/download-artifact@v4
         with:
-          tags: ghcr.io/decatur-robotics/gearbox:latest
-          outputs: type=docker,dest=/tmp/gearbox.tar
-          context: . # Needed for Docker to find files made during the workflow
-
+          name: gearbox
+          path: /tmp
+
       - name: Load image
         run: |
           docker load --input /tmp/gearbox.tar
@@ -34,4 +38,13 @@
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u decatur-robotics --password-stdin
 
       - name: Push to GHCR
-        run: docker push ghcr.io/decatur-robotics/gearbox:latest
+        run: docker push ghcr.io/decatur-robotics/gearbox:latest
+
+      - name: Install AWS CLI
+        uses: unfor19/install-aws-cli-action@v1
+
+      - name: Configure AWS
+        run: aws configure set aws_access_key_id ${{ secrets.AWS_ACCESS_KEY_ID }} && aws configure set aws_secret_access_key ${{ secrets.AWS_SECRET_ACCESS_KEY }} && aws configure set region us-east-1
+
+      - name: Deploy to ECS
+        run: aws ecs update-service --cluster gearbox --service gearbox --force-new-deployment

.github/workflows/ci.yml

@@ -17,6 +17,12 @@ jobs:
         with:
           tags: ghcr.io/decatur-robotics/gearbox:latest
           outputs: type=docker,dest=/tmp/gearbox.tar
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: gearbox
+          path: /tmp/gearbox.tar
 
   unit_test:
     runs-on: ubuntu-latest

.github/workflows/onpush.yml

@@ -15,3 +15,6 @@ jobs:
     needs:
       - ci
     uses: ./.github/workflows/cd.yml
+    secrets:
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

Dockerfile

@@ -7,13 +7,13 @@ LABEL org.opencontainers.image.licenses=CC-BY-NC-SA-4.0
 WORKDIR /app
 
 COPY package*.json ./
-RUN npm i
+RUN npm ci
 
 COPY . .
 
 RUN npm run build
 
-EXPOSE 443
+EXPOSE 80
 
 # ENTRYPOINT [ "bash" ] # Uncomment to operate the terminal in the container
 CMD ["/usr/local/bin/npm", "run", "start"]

README.md

@@ -61,10 +61,18 @@ Features full feature parity with SJ2, whilst remaining simpler, faster and cool
 1. Run `npm run build`
 1. Run `npm run start`
 
+##### Deployment
+
+See the [Gearbox-Terraform](https://github.com/Decatur-Robotics/Gearbox-Terraform) repo.
+
 #### Tests
 
 1. Run `npm run test`
 
+#### Scripts
+
+There's a few scripts in the /scripts folder that can be run with `npx tsx scripts/<script_name>.ts`.
+
 ## Contributing
 
 You've made it past set up and are ready to contibure to the future of scouting - here's how.

components/Footer.tsx

@@ -151,8 +151,9 @@ export default function Footer() {
 			</nav>
 			<nav className="max-sm:pl-8">
 				<h6 className="footer-title">Debug</h6>
+				<div>Version {process.env.NEXT_PUBLIC_GEARBOX_VERSION}</div>
 				<div>
-					Version{" "}
+					Build Time:{" "}
 					{(() => {
 						const timestamp = new Date(+process.env.NEXT_PUBLIC_BUILD_TIME);
 						return timestamp.toDateString() + " " + timestamp.toTimeString();

enviroment.d.ts → environment.d.ts

@@ -45,6 +45,7 @@ declare global {
 			NEXT_PUBLIC_FORCE_OFFLINE_MODE: string;
 
 			NEXT_PUBLIC_BUILD_TIME: string;
+			NEXT_PUBLIC_GEARBOX_VERSION: string;
 
 			DEVELOPER_EMAILS: string;
 

index.ts

@@ -1,47 +1,67 @@
 import { join } from "path";
-import { createServer } from "https";
+import { createServer as createServerHttps } from "https";
 import { parse } from "url";
 import next from "next";
 import fs, { existsSync, readFileSync } from "fs";
-import { IncomingMessage, ServerResponse, request } from "http";
+import {
+	IncomingMessage,
+	ServerResponse,
+	request,
+	createServer as createServerHttp,
+} from "http";
 
 console.log("Starting server...");
 
 const dev = process.env.NODE_ENV !== "production";
-const port = 443;
-const app = next({ dev, port });
-const handle = app.getRequestHandler();
 
 console.log("Constants set");
 
-const httpsOptions =
-	existsSync("./certs/key.pem") && existsSync("./certs/cert.pem")
-		? {
-				key: readFileSync("./certs/key.pem"),
-				cert: readFileSync("./certs/cert.pem"),
-			}
-		: {};
+const useHttps =
+	existsSync("./certs/key.pem") && existsSync("./certs/cert.pem");
+
+const httpsOptions = useHttps
+	? {
+			key: readFileSync("./certs/key.pem"),
+			cert: readFileSync("./certs/cert.pem"),
+		}
+	: {};
 
-console.log("HTTPS options set");
+const port = useHttps ? 443 : 80;
+console.log(`Using port ${port}`);
+
+const app = next({ dev, port });
+const handle = app.getRequestHandler();
 
 console.log("App preparing...");
 app.prepare().then(() => {
 	console.log("App prepared. Creating server...");
 
+	async function handleRaw(
+		req: IncomingMessage,
+		res: ServerResponse<IncomingMessage>,
+	) {
+		const start = Date.now();
+		console.log(`IN: ${req.method} ${req.url}`);
+		if (!req.url) return;
+
+		const parsedUrl = parse(req.url, true);
+		handle(req, res, parsedUrl).then(() =>
+			console.log(
+				`OUT: ${req.method} ${req.url} ${res.statusCode} in ${Date.now() - start}ms`,
+			),
+		);
+	}
+
 	try {
-		const server = createServer(
-			httpsOptions,
-			async (req: IncomingMessage, res: ServerResponse<IncomingMessage>) => {
-				if (!req.url) return;
-
-				const parsedUrl = parse(req.url, true);
-				handle(req, res, parsedUrl);
-			},
+		const server = (
+			useHttps
+				? createServerHttps(httpsOptions, handleRaw)
+				: createServerHttp(handleRaw)
 		)
 			.listen(port, () => {
 				console.log(
 					process.env.NODE_ENV +
-						" HTTPS Server Running At: https://localhost:" +
+						` Server Running At: ${useHttps ? "https" : "http"}://localhost:` +
 						port,
 				);
 			})

lib/Auth.ts

@@ -6,12 +6,13 @@ import { MongoDBAdapter } from "@next-auth/mongodb-adapter";
 import { getDatabase, clientPromise } from "./MongoDB";
 import { ObjectId } from "bson";
 import { User } from "./Types";
-import { GenerateSlug } from "./Utils";
+import { GenerateSlug, repairUser } from "./Utils";
 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";
+import { wait } from "./client/ClientUtils";
 
 var db = getDatabase();
 
@@ -101,49 +102,40 @@ export const AuthenticationOptions: AuthOptions = {
 			return baseUrl + "/onboarding";
 		},
 
+		/**
+		 * For email sign in, runs when the "Sign In" button is clicked (before email is sent).
+		 */
 		async signIn({ user }) {
 			Analytics.signIn(user.name ?? "Unknown User");
 
 			let typedUser = user as Partial<User>;
-			if (!typedUser.slug) {
-				console.log(
-					"User is incomplete, filling in missing fields. User:",
-					typedUser,
-				);
+			if (!typedUser.slug || typedUser._id?.toString() != typedUser.id) {
+				const repairUserOnceItIsInDb = async () => {
+					console.log(
+						"User is incomplete, waiting for it to be in the database.",
+					);
+					let foundUser: User | undefined = undefined;
+					while (!foundUser) {
+						foundUser = await (
+							await db
+						).findObject(CollectionId.Users, { email: typedUser.email });
 
-				const name =
-					typedUser.name ?? typedUser.email?.split("@")[0] ?? "Unknown User";
+						if (!foundUser) await wait(50);
+					}
 
-				const id = typedUser._id ?? new ObjectId();
+					console.log(
+						"User is incomplete, filling in missing fields. User:",
+						typedUser,
+					);
 
-				// User is incomplete, fill in the missing fields
-				typedUser = {
-					_id: id,
-					id: id.toString(),
-					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,
-				);
+					typedUser._id = foundUser._id;
+
+					typedUser = await repairUser(await db, typedUser);
+
+					console.log("User updated:", typedUser);
+				};
+
+				repairUserOnceItIsInDb();
 			}
 
 			new ResendUtils().createContact(typedUser as User);