Skip to content

Commit 9e856ba

Browse files
daithihearndaithihearn
authored
Merge pull request #78 from daithihearn/prettier2
Updating prettier config
2 parents d509ace + d3bd65e commit 9e856ba

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+4305
-4185
lines changed

‎.github/workflows/build-docker-image.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
name: Build Docker image
22

33
on:
4-
workflow_dispatch:
5-
pull_request:
6-
branches: ["main"]
4+
workflow_dispatch:
5+
pull_request:
6+
branches: ["main"]
77

88
jobs:
9-
build:
10-
name: Build Docker image
11-
runs-on: self-hosted
9+
build:
10+
name: Build Docker image
11+
runs-on: self-hosted
1212

13-
steps:
14-
- uses: actions/checkout@v3
15-
- name: Build the Docker image
16-
run: docker build . --file Dockerfile
13+
steps:
14+
- uses: actions/checkout@v3
15+
- name: Build the Docker image
16+
run: docker build . --file Dockerfile

‎.github/workflows/publish-to-dockerhub.yml‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
11
name: Publish to Dockerhub
22

33
on:
4-
release:
5-
types: [published]
4+
release:
5+
types: [published]
66

77
jobs:
8-
publish:
9-
name: Build and Publish docker image to dockerhub
10-
permissions:
11-
contents: write
12-
pull-requests: write
13-
packages: read
14-
runs-on: self-hosted
8+
publish:
9+
name: Build and Publish docker image to dockerhub
10+
permissions:
11+
contents: write
12+
pull-requests: write
13+
packages: read
14+
runs-on: self-hosted
1515

16-
steps:
17-
- uses: actions/checkout@v3
18-
- name: Update version in package.json
19-
run: yarn version --no-git-tag-version --new-version ${{ github.ref_name }}
20-
- name: Update manifest.json version
21-
uses: jossef/action-set-json-field@v2
22-
with:
23-
file: public/manifest.json
24-
field: version
25-
value: ${{ github.ref_name }}
26-
- name: Set up QEMU
27-
uses: docker/setup-qemu-action@v2
28-
- name: Set up Docker Buildx
29-
uses: docker/setup-buildx-action@v2
30-
- name: Publish to Dockerhub
31-
uses: elgohr/Publish-Docker-Github-Action@v5
32-
with:
33-
name: daithihearn/cards-110-frontend
34-
username: ${{ secrets.DOCKER_USERNAME }}
35-
password: ${{ secrets.DOCKER_PASSWORD }}
36-
platforms: linux/amd64,linux/arm64/v8
37-
tags: "latest, ${{ github.ref_name }}"
16+
steps:
17+
- uses: actions/checkout@v3
18+
- name: Update version in package.json
19+
run: yarn version --no-git-tag-version --new-version ${{ github.ref_name }}
20+
- name: Update manifest.json version
21+
uses: jossef/action-set-json-field@v2
22+
with:
23+
file: public/manifest.json
24+
field: version
25+
value: ${{ github.ref_name }}
26+
- name: Set up QEMU
27+
uses: docker/setup-qemu-action@v2
28+
- name: Set up Docker Buildx
29+
uses: docker/setup-buildx-action@v2
30+
- name: Publish to Dockerhub
31+
uses: elgohr/Publish-Docker-Github-Action@v5
32+
with:
33+
name: daithihearn/cards-110-frontend
34+
username: ${{ secrets.DOCKER_USERNAME }}
35+
password: ${{ secrets.DOCKER_PASSWORD }}
36+
platforms: linux/amd64,linux/arm64/v8
37+
tags: "latest, ${{ github.ref_name }}"
3838

39-
- name: Create PR with version changes
40-
uses: peter-evans/create-pull-request@v4
41-
with:
42-
token: ${{ secrets.PAT_PR }}
43-
commit-message: Update latest version (${{ github.ref_name }})
44-
title: Update latest version (${{ github.ref_name }})
45-
body: |
46-
Update latest version (${{ github.ref_name }})
47-
branch: update-version-${{ github.ref_name }}
48-
base: main
49-
add-paths: |
50-
package.json
51-
public/manifest.json
52-
labels: |
53-
update
54-
assignees: |
55-
${{ github.actor }}
39+
- name: Create PR with version changes
40+
uses: peter-evans/create-pull-request@v4
41+
with:
42+
token: ${{ secrets.PAT_PR }}
43+
commit-message: Update latest version (${{ github.ref_name }})
44+
title: Update latest version (${{ github.ref_name }})
45+
body: |
46+
Update latest version (${{ github.ref_name }})
47+
branch: update-version-${{ github.ref_name }}
48+
base: main
49+
add-paths: |
50+
package.json
51+
public/manifest.json
52+
labels: |
53+
update
54+
assignees: |
55+
${{ github.actor }}

‎.prettierrc.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1+
arrowParens: "avoid"
2+
bracketSameLine: true
3+
bracketSpacing: true
4+
singleQuote: false
5+
trailingComma: "all"
16
semi: false
7+
tabWidth: 4

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ All of the above can be configured in the `.env` file.
1212

1313
# Technical Stack
1414

15-
- NPM >=v14
16-
- Yarn
17-
- React
15+
- NPM >=v14
16+
- Yarn
17+
- React
1818

1919
# Building
2020

‎package.json‎

Lines changed: 84 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,86 @@
11
{
2-
"name": "frontend",
3-
"version": "3.2.4",
4-
"description": "React frontend for the Cards 110",
5-
"author": "Daithi Hearn",
6-
"license": "MIT",
7-
"private": true,
8-
"dependencies": {
9-
"@auth0/auth0-react": "^1.12.0",
10-
"@coreui/coreui": "^4.2.6",
11-
"@coreui/icons": "^2.1.0",
12-
"@coreui/react": "^4.5.1",
13-
"@emotion/react": "^11.10.5",
14-
"@emotion/styled": "^11.10.5",
15-
"@mui/icons-material": "^5.11.0",
16-
"@mui/material": "^5.11.4",
17-
"@popperjs/core": "^2.5.4",
18-
"@reduxjs/toolkit": "^1.9.1",
19-
"@types/jest": "^29.2.5",
20-
"@types/node": "^18.11.18",
21-
"@types/react": "^18.0.26",
22-
"@types/react-avatar-editor": "13",
23-
"@types/react-dom": "^18.0.10",
24-
"@types/react-router-dom": "^5.3.3",
25-
"axios": "0.27.2",
26-
"bootstrap": "^5.2.3",
27-
"chart.js": "^4.1.2",
28-
"core-js": "^3.27.1",
29-
"crypto-js": "4.1.1",
30-
"flag-icon-css": "^4.1.7",
31-
"font-awesome": "^4.7.0",
32-
"heic2any": "^0.0.3",
33-
"jwt-decode": "^3.1.2",
34-
"moment": "^2.29.1",
35-
"notistack": "^2.0.8",
36-
"react": "^18.2.0",
37-
"react-avatar-editor": "13",
38-
"react-beautiful-dnd": "^13.0.0",
39-
"react-block-ui": "^1.3.3",
40-
"react-chartjs-2": "5",
41-
"react-data-table-component": "7.5.3",
42-
"react-dom": "18.2.0",
43-
"react-redux": "^8.0.5",
44-
"react-router": "^6.6.2",
45-
"react-router-config": "^5.1.1",
46-
"react-router-dom": "^6.6.2",
47-
"react-simple-pull-to-refresh": "^1.3.3",
48-
"react-stomp-hooks": "2.1.0",
49-
"react-viewer": "^3.2.2",
50-
"reactstrap": "9.1.5",
51-
"semantic-ui-css": "^2.4.1",
52-
"simple-line-icons": "^2.5.5",
53-
"styled-components": "^5.2.3",
54-
"typescript": "^4.9.4",
55-
"uuid-random": "^1.3.2"
56-
},
57-
"devDependencies": {
58-
"@types/crypto-js": "^4.1.1",
59-
"@types/enzyme": "^3.10.12",
60-
"@types/enzyme-adapter-react-16": "^1.0.6",
61-
"@types/react-beautiful-dnd": "^13.1.3",
62-
"@types/react-loadable": "^5.5.6",
63-
"enzyme": "^3.11.0",
64-
"enzyme-adapter-react-16": "^1.15.7",
65-
"node-sass-chokidar": "^2.0.0",
66-
"npm-run-all": "^4.1.3",
67-
"prettier": "^2.8.1",
68-
"react-scripts": "^5.0.1"
69-
},
70-
"scripts": {
71-
"build-css": "node-sass-chokidar --include-path ./node_modules ./src/scss -o ./src/scss",
72-
"watch-css": "npm run build-css && node-sass-chokidar --include-path ./node_modules ./src/scss -o ./src/scss --watch --recursive",
73-
"start": "react-scripts start",
74-
"build": "react-scripts build",
75-
"test": "react-scripts test --env=jsdom",
76-
"eject": "react-scripts eject",
77-
"format": "yarn prettier --write src",
78-
"format:check": "yarn prettier --check src"
79-
},
80-
"browserslist": [
81-
">0.2%",
82-
"not dead",
83-
"not ie <= 11",
84-
"not op_mini all"
85-
]
2+
"name": "frontend",
3+
"version": "3.2.4",
4+
"description": "React frontend for the Cards 110",
5+
"author": "Daithi Hearn",
6+
"license": "MIT",
7+
"private": true,
8+
"dependencies": {
9+
"@auth0/auth0-react": "^1.12.0",
10+
"@coreui/coreui": "^4.2.6",
11+
"@coreui/icons": "^2.1.0",
12+
"@coreui/react": "^4.5.1",
13+
"@emotion/react": "^11.10.5",
14+
"@emotion/styled": "^11.10.5",
15+
"@mui/icons-material": "^5.11.0",
16+
"@mui/material": "^5.11.4",
17+
"@popperjs/core": "^2.5.4",
18+
"@reduxjs/toolkit": "^1.9.1",
19+
"@types/jest": "^29.2.5",
20+
"@types/node": "^18.11.18",
21+
"@types/react": "^18.0.26",
22+
"@types/react-avatar-editor": "13",
23+
"@types/react-dom": "^18.0.10",
24+
"@types/react-router-dom": "^5.3.3",
25+
"axios": "0.27.2",
26+
"bootstrap": "^5.2.3",
27+
"chart.js": "^4.1.2",
28+
"core-js": "^3.27.1",
29+
"crypto-js": "4.1.1",
30+
"flag-icon-css": "^4.1.7",
31+
"font-awesome": "^4.7.0",
32+
"heic2any": "^0.0.3",
33+
"jwt-decode": "^3.1.2",
34+
"moment": "^2.29.1",
35+
"notistack": "^2.0.8",
36+
"react": "^18.2.0",
37+
"react-avatar-editor": "13",
38+
"react-beautiful-dnd": "^13.0.0",
39+
"react-block-ui": "^1.3.3",
40+
"react-chartjs-2": "5",
41+
"react-data-table-component": "7.5.3",
42+
"react-dom": "18.2.0",
43+
"react-redux": "^8.0.5",
44+
"react-router": "^6.6.2",
45+
"react-router-config": "^5.1.1",
46+
"react-router-dom": "^6.6.2",
47+
"react-simple-pull-to-refresh": "^1.3.3",
48+
"react-stomp-hooks": "2.1.0",
49+
"react-viewer": "^3.2.2",
50+
"reactstrap": "9.1.5",
51+
"semantic-ui-css": "^2.4.1",
52+
"simple-line-icons": "^2.5.5",
53+
"styled-components": "^5.2.3",
54+
"typescript": "^4.9.4",
55+
"uuid-random": "^1.3.2"
56+
},
57+
"devDependencies": {
58+
"@types/crypto-js": "^4.1.1",
59+
"@types/enzyme": "^3.10.12",
60+
"@types/enzyme-adapter-react-16": "^1.0.6",
61+
"@types/react-beautiful-dnd": "^13.1.3",
62+
"@types/react-loadable": "^5.5.6",
63+
"enzyme": "^3.11.0",
64+
"enzyme-adapter-react-16": "^1.15.7",
65+
"node-sass-chokidar": "^2.0.0",
66+
"npm-run-all": "^4.1.3",
67+
"prettier": "^2.8.1",
68+
"react-scripts": "^5.0.1"
69+
},
70+
"scripts": {
71+
"build-css": "node-sass-chokidar --include-path ./node_modules ./src/scss -o ./src/scss",
72+
"watch-css": "npm run build-css && node-sass-chokidar --include-path ./node_modules ./src/scss -o ./src/scss --watch --recursive",
73+
"start": "react-scripts start",
74+
"build": "react-scripts build",
75+
"test": "react-scripts test --env=jsdom",
76+
"eject": "react-scripts eject",
77+
"format": "yarn prettier --write src",
78+
"format:check": "yarn prettier --check src"
79+
},
80+
"browserslist": [
81+
">0.2%",
82+
"not dead",
83+
"not ie <= 11",
84+
"not op_mini all"
85+
]
8686
}

0 commit comments

Comments
 (0)