Update this development branch here

.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/auto_approve_dependabot_prs.yml

@@ -0,0 +1,16 @@
+name: Dependabot auto-approve
+on: pull_request
+
+permissions:
+  pull-requests: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'Decatur-Robotics/Gearbox'
+    steps:
+      - name: Approve a PR
+        run: gh pr review --approve "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/cd.yml

@@ -1,33 +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: Create certs directory
-        run: mkdir certs
 
-      - 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
@@ -37,4 +38,13 @@ jobs:
         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/increment_version.yml

@@ -0,0 +1,37 @@
+name: Increment Version
+
+on:
+  workflow_call:
+  workflow_dispatch:
+  pull_request_target:
+    branches: [main]
+    types: [opened]
+
+jobs:
+  increment:
+    runs-on: ubuntu-latest
+    if: 
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref }} # We need to checkout the head branch, not the temporary merge branch
+          persist-credentials: false
+
+      - name: Setup Node.js environment
+        uses: actions/[email protected]
+
+      - name: Set name
+        run: git config user.name "Gearbox Bot"
+
+      - name: Set email
+        run: git config user.email "[email protected]"
+
+      - name: Increment patch number
+        run: npm version patch
+
+      - name: Push changes
+        uses: ad-m/[email protected]
+        with:
+          github_token: ${{ secrets.GIT_PUSH_TOKEN }}
+          branch: ${{ github.head_ref }}

.github/workflows/onpush.yml

@@ -11,7 +11,10 @@
   ci:
     uses: ./.github/workflows/ci.yml
 
-  # cd:
-  #   needs:
-  #     - ci
-  #   uses: ./.github/workflows/cd.yml
+  cd:
+    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 }}

.gitignore

@@ -37,9 +37,8 @@ yarn-error.log*
 *.tsbuildinfo
 next-env.d.ts
 
-/public/sw.js
-/public/sw.js.map
-/public/workbox-*
-/public/fallback-*
+/certs/*.*
 
-/certs/*.*
+# PWA
+public/sw.js
+public/swe-worker*

Dockerfile

@@ -7,12 +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
 
-CMD npm run start
+# ENTRYPOINT [ "bash" ] # Uncomment to operate the terminal in the container
+CMD ["/usr/local/bin/npm", "run", "start"]

README.md

@@ -1,10 +1,12 @@
 # Gearbox: Intuitive, Powerful Scouting at [4026.org](https://4026.org)
+
 The final incarnation of Scout Janssen.
 
 Rewritten fully in Typescript, written to be easy to maintain and modular.
 Features full feature parity with SJ2, whilst remaining simpler, faster and cooler.
 
 ## Features
+
 - Automatic match generation
 - Match assignment (both automatic and manual)
 - Pre-generated forms
@@ -17,9 +19,16 @@ Features full feature parity with SJ2, whilst remaining simpler, faster and cool
 - Public data sharing (optional)
 - Sub-5-minute setup
 
+## Status
+
+![CI Checks](https://github.com/Decatur-Robotics/Gearbox/actions/workflows/ci.yml/badge.svg)<br/>
+![Formatting](https://github.com/Decatur-Robotics/Gearbox/actions/workflows/format.yml/badge.svg)<br/>
+![Autoversioning](https://github.com/Decatur-Robotics/Gearbox/actions/workflows/increment_version.yml/badge.svg)
+
 ## Setup
 
 ### Prerequisites
+
 - Node.js
 - NPM
 - A MongoDB instance
@@ -36,33 +45,48 @@ Features full feature parity with SJ2, whilst remaining simpler, faster and cool
   - A Resend audience ID
 
 ### Installation
+
 1. Clone the repository
 1. Run `npm install`
 1. Add the secrets to a `.env` file
 
 ### Running
 
 #### Development
+
 1. Run `npm run dev`
 
 #### Production
+
 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.
 
 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.
 
 ## Contibutors
+
 <a href="https://github.com/Decatur-Robotics/Gearbox/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=Decatur-Robotics/Gearbox" />
 </a>
 
 Made with [contrib.rocks](https://contrib.rocks).
 
 ## Licensed under a CC BY-NC-SA 4.0 license
+
 Read the license [here](LICENSE.md).

components/Avatar.tsx

@@ -1,17 +1,17 @@
 import { useCurrentSession } from "@/lib/client/useCurrentSession";
-import { User } from "@/lib/Types";
 import { levelToClassName } from "@/lib/Xp";
 import { BsGearFill } from "react-icons/bs";
 
 export default function Avatar(props: {
-	user?: User | undefined;
-	scale?: string | undefined;
+	user?: { image: string | undefined; level: number; admin?: boolean };
+	scale?: string | undefined; // Use "scale-75" for 75% scale, etc.
 	imgHeightOverride?: string | undefined;
 	showLevel?: boolean | undefined;
 	borderThickness?: number | undefined;
 	onClick?: () => void | undefined;
 	className?: string | undefined;
 	online?: boolean;
+	gearSize?: number;
 }) {
 	const { session, status } = useCurrentSession();
 	const user = props.user ?? session?.user;
@@ -39,7 +39,7 @@ export default function Avatar(props: {
 			</div>
 			{admin ? (
 				<div className="absolute z-10 -bottom-2 -left-2 text-slate-300 animate-spin-slow">
-					<BsGearFill size={36}></BsGearFill>
+					<BsGearFill size={props.gearSize ?? 36}></BsGearFill>
 				</div>
 			) : (
 				<></>

components/Container.tsx

@@ -226,6 +226,7 @@ export default function Container(props: ContainerProps) {
 										imgHeightOverride="h-11"
 										showLevel={false}
 										borderThickness={2}
+										gearSize={24}
 									/>
 								</Link>
 							) : (
@@ -361,7 +362,8 @@ export default function Container(props: ContainerProps) {
 
 								<Link href={`/${selectedTeam?.slug}`}>
 									<button className="btn btn-ghost normal-case bg-base-100">
-										<BiHome className="text-2xl"></BiHome>Team Home
+										<BiHome className="text-2xl"></BiHome>
+										{selectedTeam?.alliance ? "Alliance Home" : "Team Home"}
 									</button>
 								</Link>