Skip to content

Commit 2d099dc

Browse files
committed
Add & run format task
1 parent 242740b commit 2d099dc

20 files changed

+2087
-2099
lines changed

.github/workflows/firebase-hosting-merge-prod.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ env:
1111
VITE_FIREBASE_API_KEY: ${{ secrets.VITE_FIREBASE_API_KEY_PROD }}
1212
VITE_STADIA_KEY: ${{ secrets.VITE_STADIA_KEY }}
1313
VITE_ANALYTICS_URL: ${{ secrets.VITE_ANALYTICS_URL }}
14-
VITE_REPOSITORY_URL: "https://github.com/DSSD-Madison/Red-CORAL"
14+
VITE_REPOSITORY_URL: 'https://github.com/DSSD-Madison/Red-CORAL'
1515
'on':
1616
push:
1717
branches:
1818
- main
1919
jobs:
2020
build_and_deploy:
2121
runs-on: ubuntu-latest
22-
concurrency:
22+
concurrency:
2323
group: 'firebase-hosting-merge-prod'
2424
cancel-in-progress: true
2525
steps:

.github/workflows/firebase-hosting-merge-qa.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ env:
1111
VITE_FIREBASE_API_KEY: ${{ secrets.VITE_FIREBASE_API_KEY }}
1212
VITE_STADIA_KEY: ${{ secrets.VITE_STADIA_KEY }}
1313
VITE_ANALYTICS_URL: ${{ secrets.VITE_ANALYTICS_URL }}
14-
VITE_REPOSITORY_URL: "https://github.com/DSSD-Madison/Red-CORAL"
14+
VITE_REPOSITORY_URL: 'https://github.com/DSSD-Madison/Red-CORAL'
1515
'on':
1616
push:
1717
branches:
1818
- main
1919
jobs:
2020
build_and_deploy:
2121
runs-on: ubuntu-latest
22-
concurrency:
22+
concurrency:
2323
group: 'firebase-hosting-merge-qa'
2424
cancel-in-progress: true
2525
steps:

.github/workflows/firebase-hosting-pull-request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ env:
1111
VITE_FIREBASE_API_KEY: ${{ secrets.VITE_FIREBASE_API_KEY }}
1212
VITE_STADIA_KEY: ${{ secrets.VITE_STADIA_KEY }}
1313
VITE_ANALYTICS_URL: ${{ secrets.VITE_ANALYTICS_URL }}
14-
VITE_REPOSITORY_URL: "https://github.com/DSSD-Madison/Red-CORAL"
14+
VITE_REPOSITORY_URL: 'https://github.com/DSSD-Madison/Red-CORAL'
1515
'on': pull_request
1616
jobs:
1717
build_and_preview:
1818
if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}'
1919
runs-on: ubuntu-latest
20-
concurrency:
20+
concurrency:
2121
group: 'firebase-hosting-pull-request-${{ github.event.pull_request.number }}'
2222
cancel-in-progress: true
2323
steps:

.prettierrc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
"semi": false,
66
"bracketSpacing": true,
77
"jsxBracketSameLine": false,
8-
"plugins": [
9-
"prettier-plugin-tailwindcss"
10-
],
8+
"plugins": ["prettier-plugin-tailwindcss"],
119
"printWidth": 150,
1210
"proseWrap": "always"
13-
}
11+
}

.vscode/extensions.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
{
2-
"recommendations": ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode", "usernamehw.errorlens", "ms-vscode.vscode-typescript-next", "bradlc.vscode-tailwindcss"]
2+
"recommendations": [
3+
"dbaeumer.vscode-eslint",
4+
"esbenp.prettier-vscode",
5+
"usernamehw.errorlens",
6+
"ms-vscode.vscode-typescript-next",
7+
"bradlc.vscode-tailwindcss"
8+
]
39
}

README.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,23 @@
22

33
Interactive map of organized crime in South America.
44

5-
[Production Site](https://redcoralmap.web.app)
6-
[QA Site](https://red-coral-map.web.app/)
5+
[Production Site](https://redcoralmap.web.app) [QA Site](https://red-coral-map.web.app/)
76

87
## Details
98

10-
See the [Google Drive Folder](https://drive.google.com/drive/folders/1U2VPsuXm2Jfzjbf39y73rK3O6BKxV4Jy) for details. The Architecture document is most relevant.
9+
See the [Google Drive Folder](https://drive.google.com/drive/folders/1U2VPsuXm2Jfzjbf39y73rK3O6BKxV4Jy) for details. The Architecture document is most
10+
relevant.
1111

1212
## Contributing
1313

14-
Assign an issue to yourself, or work on one that has been assigned to you by cloning this repository, creating a new branch, pushing your changes, and creating a pull request into main. You'll get a preview link on the PR linked to the QA environment. Once you recieve an approval, feel free to merge into main! This will build deploy your code to production.
14+
Assign an issue to yourself, or work on one that has been assigned to you by cloning this repository, creating a new branch, pushing your changes, and
15+
creating a pull request into main. You'll get a preview link on the PR linked to the QA environment. Once you recieve an approval, feel free to merge
16+
into main! This will build deploy your code to production.
1517

1618
## Running Locally
1719

18-
First, make sure you have [Node.js](https://nodejs.org/) installed and you've made a .env file in the root of the project with contents from the Secrets doc (QA environment) in the Drive folder. Then it's as easy as running:
20+
First, make sure you have [Node.js](https://nodejs.org/) installed and you've made a .env file in the root of the project with contents from the
21+
Secrets doc (QA environment) in the Drive folder. Then it's as easy as running:
1922

2023
```bash
2124
pnpm i && pnpm dev

eslint.config.js

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,15 @@ import reactPlugin from 'eslint-plugin-react'
55
import reactHooks from 'eslint-plugin-react-hooks'
66
import prettierConfig from 'eslint-config-prettier'
77
import { fileURLToPath } from 'url'
8-
import globals from "globals";
8+
import globals from 'globals'
99
import path from 'path'
1010

1111
const __dirname = path.dirname(fileURLToPath(import.meta.url))
1212

1313
export default [
1414
// Global ignores
1515
{
16-
ignores: [
17-
'dist/**',
18-
'dist-ssr/**',
19-
'node_modules/**',
20-
'.vite/**',
21-
'backend/**',
22-
'*.local',
23-
],
16+
ignores: ['dist/**', 'dist-ssr/**', 'node_modules/**', '.vite/**', 'backend/**', '*.local'],
2417
},
2518

2619
// Base recommended config
@@ -43,7 +36,7 @@ export default [
4336
tsconfigRootDir: __dirname,
4437
},
4538
globals: {
46-
...globals.browser
39+
...globals.browser,
4740
},
4841
},
4942
plugins: {

firebase.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
{
22
"hosting": {
33
"public": "dist",
4-
"ignore": [
5-
"firebase.json",
6-
"**/.*",
7-
"**/node_modules/**"
8-
],
4+
"ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
95
"rewrites": [
106
{
117
"source": "**",

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"dev": "vite",
99
"build": "tsc && vite build",
1010
"lint": "eslint . --max-warnings 0",
11+
"format": "prettier --write .",
1112
"preview": "vite preview",
1213
"firebase": "firebase"
1314
},

0 commit comments

Comments
 (0)