Skip to content

Commit

Permalink
Merge pull request #239 from osu-tournament-rating/expandables
Browse files Browse the repository at this point in the history
big stuff
  • Loading branch information
hburn7 authored Jan 19, 2025
2 parents 246b27e + c0368b8 commit 1385421
Show file tree
Hide file tree
Showing 147 changed files with 6,594 additions and 1,683 deletions.
2 changes: 1 addition & 1 deletion .github/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ changelog:
- 'bug'
- title: Misc. Fixes 🚧
labels:
- '*'
- '*'
22 changes: 11 additions & 11 deletions .github/workflows/prod-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Checkout Code
uses: actions/checkout@v4
- name: Checkout Code
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 20
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 20

- name: Install
run: npm ci
- name: Install
run: npm ci

publish:
needs: build
Expand Down Expand Up @@ -53,8 +53,8 @@ jobs:
host: ${{ secrets.SSH_HOST }}
username: ${{ secrets.SSH_USER }}
key: ${{ secrets.SSH_KEY }}
source: ".env"
target: "~/otr-web/"
source: '.env'
target: '~/otr-web/'
- name: Deploy
uses: appleboy/ssh-action@master
with:
Expand All @@ -65,4 +65,4 @@ jobs:
docker pull stagecodes/otr-web-prod:latest
docker stop otr-web-prod || true
docker rm otr-web-prod || true
docker run -d -p 3000:3000 --restart always --name otr-web-prod --env-file ~/otr-web/.env stagecodes/otr-web-prod:latest
docker run -d -p 3000:3000 --restart always --name otr-web-prod --env-file ~/otr-web/.env stagecodes/otr-web-prod:latest
28 changes: 14 additions & 14 deletions .github/workflows/staging-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@ name: Web deploy

on:
push:
branches: [ master ]
branches: [master]

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Checkout Code
uses: actions/checkout@v4
with:
ref: master
- name: Checkout Code
uses: actions/checkout@v4
with:
ref: master

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 20
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 20

- name: Install
run: npm ci
- name: Install
run: npm ci

publish:
needs: build
Expand Down Expand Up @@ -58,8 +58,8 @@ jobs:
host: ${{ secrets.SSH_HOST }}
username: ${{ secrets.SSH_USER }}
key: ${{ secrets.SSH_KEY }}
source: ".env"
target: "~/otr-web/"
source: '.env'
target: '~/otr-web/'
- name: Deploy
uses: appleboy/ssh-action@master
with:
Expand All @@ -70,4 +70,4 @@ jobs:
docker pull stagecodes/otr-web-staging:latest
docker stop otr-web-staging || true
docker rm otr-web-staging || true
docker run -d -p 3000:3000 --restart always --name otr-web-staging --env-file ~/otr-web/.env stagecodes/otr-web-staging:latest
docker run -d -p 3000:3000 --restart always --name otr-web-staging --env-file ~/otr-web/.env stagecodes/otr-web-staging:latest
1 change: 1 addition & 0 deletions .husky/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

npx lint-staged
22 changes: 21 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
{
"singleQuote": true
"singleQuote": true,
"arrowParens": "always",
"bracketSameLine": false,
"bracketSpacing": true,
"embeddedLanguageFormatting": "auto",
"endOfLine": "lf",
"experimentalTernaries": false,
"htmlWhitespaceSensitivity": "css",
"insertPragma": false,
"jsxBracketSameLine": false,
"jsxSingleQuote": false,
"printWidth": 80,
"proseWrap": "preserve",
"quoteProps": "as-needed",
"requirePragma": false,
"semi": true,
"singleAttributePerLine": false,
"tabWidth": 2,
"trailingComma": "es5",
"useTabs": false,
"vueIndentScriptAndStyle": false
}
Loading

0 comments on commit 1385421

Please sign in to comment.