Skip to content

Commit

Permalink
Merge branch 'main' into non-next-dependent-api-lib
Browse files Browse the repository at this point in the history
  • Loading branch information
renatodellosso authored Dec 24, 2024
2 parents 1ab8ca7 + ab7e19b commit fed9ee4
Show file tree
Hide file tree
Showing 5 changed files with 101 additions and 40 deletions.
16 changes: 16 additions & 0 deletions .github/workflows/auto_approve_dependabot_prs.yml
Original file line number Diff line number Diff line change
@@ -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}}
37 changes: 37 additions & 0 deletions .github/workflows/increment_version.yml
Original file line number Diff line number Diff line change
@@ -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 }}
16 changes: 16 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -36,33 +45,40 @@ 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`

#### Tests

1. Run `npm run test`

## 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).
61 changes: 26 additions & 35 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"name": "sj3",
"version": "0.1.1",
"version": "1.1.1",
"private": true,
"repository": "https://github.com/Decatur-Robotics/Gearbox",
"license": "CC BY-NC-SA 4.0",
"scripts": {
"dev": "cross-env NODE_ENV=development npx tsx index.ts",
"build": "next build",
Expand Down Expand Up @@ -30,7 +31,7 @@
"cloc": "^2.11.0",
"dependencies": "^0.0.1",
"dotenv": "^16.4.7",
"eslint": "9.16.0",
"eslint": "9.17.0",
"eslint-config-next": "15.0.3",
"formidable": "^3.5.2",
"jose": "^5.9.6",
Expand All @@ -42,7 +43,7 @@
"next-pwa": "^5.6.0",
"next-seo": "^6.6.0",
"nodemailer": "^6.9.16",
"omit-call-signature": "^1.0.6",
"omit-call-signature": "^1.0.15",
"react": "18.3.1",
"react-beautiful-dnd": "^13.1.1",
"react-bootstrap": "^2.10.5",
Expand Down Expand Up @@ -72,13 +73,13 @@
"@jest/globals": "^29.7.0",
"@types/formidable": "^3.4.5",
"@types/jest": "^29.5.14",
"@types/node": "^20.11.16",
"@types/node": "^22.10.2",
"@types/react": "^18.3.8",
"autoprefixer": "^10.4.20",
"cross-env": "^7.0.3",
"daisyui": "^4.12.22",
"jest": "^29.7.0",
"postcss": "^8.4.47",
"postcss": "^8.4.49",
"prettier": "3.3.3",
"tailwindcss": "^3.3.2",
"ts-jest": "^29.2.5"
Expand Down

0 comments on commit fed9ee4

Please sign in to comment.