Skip to content
This repository has been archived by the owner on Jun 12, 2022. It is now read-only.

Upgrade prettier and fix prettier and lint issues #25

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/requirements/base.txt
@@ -1,7 +1,7 @@
Django>=3.0.7
djangorestframework==3.11.0
django-filter==2.3.0
django-extensions==3.0.0
django-extensions==3.0.3
django-allauth==0.42.0
django-model-utils==4.0.0
django-admin-sortable==2.2.3
Expand Down
6 changes: 3 additions & 3 deletions frontend/package.json
Expand Up @@ -37,10 +37,10 @@
"axios-mock-adapter": "1.18.1",
"babel-jest": "24.9.0",
"cypress": "4.3.0",
"date-fns": "^2.13.0",
"date-fns": "^2.15.0",
"eslint": "6.8.0",
"eslint-config-prettier": "6.10.0",
"eslint-plugin-flowtype": "3.x",
"eslint-plugin-flowtype": "3.13.0",
"eslint-plugin-prettier": "3.1.3",
"eslint-plugin-react": "7.19.0",
"jest-junit": "10.0.0",
Expand Down Expand Up @@ -75,7 +75,7 @@
"test": "craco test",
"test:ci": "craco test --ci --coverage --reporters=default --reporters=jest-junit --coverageDirectory=jest-coverage",
"test:coverage": "yarn test --coverage --watchAll=false --coverageDirectory=jest-coverage",
"lint": "eslint '*/**/*.{js,ts,tsx}'",
"lint": "eslint \"**/*.{js,ts,tsx}\"",
"lint:ci": "yarn lint --max-warnings=1",
"lint:fix": "yarn lint --quiet --fix",
"cypress:open": "cypress open"
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/features/board/BoardBar.tsx
Expand Up @@ -16,7 +16,7 @@ import { Button } from "@material-ui/core";
import { PRIMARY } from "utils/colors";
import { addColumn } from "features/column/ColumnSlice";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faColumns, faCog } from "@fortawesome/free-solid-svg-icons";
import { faPlus, faPen } from "@fortawesome/free-solid-svg-icons";
import { setDialogOpen } from "features/label/LabelSlice";
import LabelDialog from "features/label/LabelDialog";
import { useParams } from "react-router-dom";
Expand Down Expand Up @@ -127,7 +127,7 @@ const BoardBar = () => {
margin-right: 0.5rem;
`}
onClick={handleEditLabels}
startIcon={<FontAwesomeIcon icon={faCog} />}
startIcon={<FontAwesomeIcon icon={faPen} />}
data-testid="open-labels-dialog"
>
Edit labels
Expand All @@ -138,7 +138,7 @@ const BoardBar = () => {
${buttonStyles}
`}
onClick={handleAddColumn}
startIcon={<FontAwesomeIcon icon={faColumns} />}
startIcon={<FontAwesomeIcon icon={faPlus} />}
data-testid="add-col"
>
Add List
Expand Down
22 changes: 12 additions & 10 deletions frontend/src/features/board/BoardList.tsx
Expand Up @@ -137,16 +137,18 @@ const BoardList = () => {
</Title>
<Cards>
<Grid container spacing={2}>
{boards.map(board => (
<Card
key={board.id}
cardCss={boardCardStyles}
to={`/b/${board.id}`}
isOwner={board.owner === userId}
>
{board.name}
</Card>
))}
{boards.map(board => {
return (
<Card
key={board.id}
cardCss={boardCardStyles}
to={`/b/${board.id}`}
isOwner={board.owner === userId}
>
{board.name}
</Card>
);
})}
<Grid item xs={6} sm={4} key="new-board">
<NewBoardDialog />
</Grid>
Expand Down