Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@meltyshev
meltyshev committed Feb 8, 2022
1 parent 95ea1e9 commit 0c92623
Show file tree
Hide file tree
Showing 20 changed files with 18,577 additions and 27,233 deletions.
38,677 changes: 15,660 additions & 23,017 deletions client/package-lock.json
View file

Large diffs are not rendered by default.

67 changes: 38 additions & 29 deletions client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,15 @@
"browser": true,
"jest": true
},
"parser": "babel-eslint",
"parser": "@babel/eslint-parser",
"parserOptions": {
"babelOptions": {
"presets": [
"airbnb"
]
},
"requireConfigFile": false
},
"plugins": [
"prettier"
],
Expand Down Expand Up @@ -56,54 +64,55 @@
},
"dependencies": {
"classnames": "^2.2.6",
"connected-react-router": "^6.8.0",
"date-fns": "^2.23.0",
"connected-react-router": "^6.9.2",
"date-fns": "^2.28.0",
"dequal": "^2.0.2",
"history": "^4.10.1",
"i18next": "^20.3.5",
"i18next-browser-languagedetector": "^6.1.2",
"initials": "^3.1.1",
"i18next": "^21.6.11",
"i18next-browser-languagedetector": "^6.1.3",
"initials": "^3.1.2",
"lodash": "^4.17.20",
"node-sass": "^6.0.1",
"prop-types": "^15.7.2",
"node-sass": "^7.0.1",
"prop-types": "^15.8.1",
"react": "^17.0.1",
"react-beautiful-dnd": "^13.0.0",
"react-datepicker": "^4.1.1",
"react-datepicker": "^4.6.0",
"react-dom": "^17.0.1",
"react-dropzone": "^11.3.4",
"react-i18next": "^11.11.4",
"react-dropzone": "^12.0.1",
"react-i18next": "^11.15.4",
"react-input-mask": "^2.0.4",
"react-markdown": "^6.0.3",
"react-redux": "^7.2.4",
"react-markdown": "^8.0.0",
"react-redux": "^7.2.6",
"react-router-dom": "^5.2.0",
"react-scripts": "4.0.3",
"react-scripts": "5.0.0",
"react-textarea-autosize": "^8.3.3",
"redux": "^4.1.0",
"redux": "^4.1.2",
"redux-logger": "^3.0.6",
"redux-orm": "^0.16.2",
"redux-saga": "^1.1.3",
"remark-gfm": "^1.0.0",
"reselect": "^4.0.0",
"remark-gfm": "^3.0.1",
"reselect": "^4.1.5",
"sails.io.js": "^1.2.1",
"semantic-ui-react": "^2.0.3",
"semantic-ui-react": "^2.1.1",
"socket.io-client": "^2.3.1",
"validator": "^13.6.0",
"validator": "^13.7.0",
"whatwg-fetch": "^3.5.0"
},
"devDependencies": {
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.3",
"chai": "^4.3.0",
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.6",
"babel-preset-airbnb": "^5.0.0",
"chai": "^4.3.6",
"enzyme": "^3.11.0",
"eslint": "^7.32.0",
"eslint-config-airbnb": "^18.2.1",
"eslint": "^8.8.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-import": "^2.23.4",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-react": "^7.24.0",
"eslint-plugin-react-hooks": "^4.2.0",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.28.0",
"eslint-plugin-react-hooks": "^4.3.0",
"jest-enzyme": "^7.1.2",
"prettier": "2.3.2",
"prettier": "2.5.1",
"react-test-renderer": "^17.0.1"
}
}
26 changes: 14 additions & 12 deletions client/src/components/Background/Background.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,20 @@ import { ProjectBackgroundTypes } from '../../constants/Enums';
import styles from './Background.module.scss';
import globalStyles from '../../styles.module.scss';

const Background = ({ type, name, imageUrl }) => (
<div
className={classNames(
styles.wrapper,
type === ProjectBackgroundTypes.GRADIENT &&
globalStyles[`background${upperFirst(camelCase(name))}`],
)}
style={{
background: type === 'image' && `url("${imageUrl}") center / cover`,
}}
/>
);
function Background({ type, name, imageUrl }) {
return (
<div
className={classNames(
styles.wrapper,
type === ProjectBackgroundTypes.GRADIENT &&
globalStyles[`background${upperFirst(camelCase(name))}`],
)}
style={{
background: type === 'image' && `url("${imageUrl}") center / cover`,
}}
/>
);
}

Background.propTypes = {
type: PropTypes.string.isRequired,
Expand Down
4 changes: 1 addition & 3 deletions client/src/components/Card/Tasks.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@ const Tasks = React.memo(({ items }) => {
<span
className={classNames(styles.count, isOpened ? styles.countOpened : styles.countClosed)}
>
{completedItems.length}
{'/'}
{items.length}
{completedItems.length}/{items.length}
</span>
</div>
{isOpened && (
Expand Down
34 changes: 18 additions & 16 deletions client/src/components/Core.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,24 @@ import UserSettingsModalContainer from '../containers/UserSettingsModalContainer
import ProjectAddModalContainer from '../containers/ProjectAddModalContainer';
import Background from './Background';

const Core = ({ currentModal, currentProject }) => (
<>
{currentProject && currentProject.background && (
<Background
type={currentProject.background.type}
name={currentProject.background.name}
imageUrl={currentProject.backgroundImage && currentProject.backgroundImage.url}
/>
)}
<FixedContainer />
<StaticContainer />
{currentModal === ModalTypes.USERS && <UsersModalContainer />}
{currentModal === ModalTypes.USER_SETTINGS && <UserSettingsModalContainer />}
{currentModal === ModalTypes.PROJECT_ADD && <ProjectAddModalContainer />}
</>
);
function Core({ currentModal, currentProject }) {
return (
<>
{currentProject && currentProject.background && (
<Background
type={currentProject.background.type}
name={currentProject.background.name}
imageUrl={currentProject.backgroundImage && currentProject.backgroundImage.url}
/>
)}
<FixedContainer />
<StaticContainer />
{currentModal === ModalTypes.USERS && <UsersModalContainer />}
{currentModal === ModalTypes.USER_SETTINGS && <UserSettingsModalContainer />}
{currentModal === ModalTypes.PROJECT_ADD && <ProjectAddModalContainer />}
</>
);
}

Core.propTypes = {
currentModal: PropTypes.oneOf(Object.values(ModalTypes)),
Expand Down
16 changes: 9 additions & 7 deletions client/src/components/Fixed/Fixed.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ import BoardActionsContainer from '../../containers/BoardActionsContainer';

import styles from './Fixed.module.scss';

const Fixed = ({ projectId, board }) => (
<div className={styles.wrapper}>
<HeaderContainer />
{projectId && <ProjectContainer />}
{board && !board.isFetching && <BoardActionsContainer />}
</div>
);
function Fixed({ projectId, board }) {
return (
<div className={styles.wrapper}>
<HeaderContainer />
{projectId && <ProjectContainer />}
{board && !board.isFetching && <BoardActionsContainer />}
</div>
);
}

Fixed.propTypes = {
projectId: PropTypes.string,
Expand Down
4 changes: 2 additions & 2 deletions client/src/components/NotFound.jsx
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { useTranslation } from 'react-i18next';

const NotFound = () => {
function NotFound() {
const [t] = useTranslation();

return (
Expand All @@ -11,6 +11,6 @@ const NotFound = () => {
})}
</h1>
);
};
}

export default NotFound;
30 changes: 16 additions & 14 deletions client/src/components/Root.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,22 @@ import '../lib/custom-ui/styles.css';

import '../styles.module.scss';

const Root = ({ store, history }) => (
<Provider store={store}>
<ConnectedRouter history={history}>
<Switch>
<Route exact path={Paths.LOGIN} component={LoginContainer} />
<Route exact path={Paths.ROOT} component={CoreWrapperContainer} />
<Route exact path={Paths.PROJECTS} component={CoreWrapperContainer} />
<Route exact path={Paths.BOARDS} component={CoreWrapperContainer} />
<Route exact path={Paths.CARDS} component={CoreWrapperContainer} />
<Route path="*" component={NotFound} />
</Switch>
</ConnectedRouter>
</Provider>
);
function Root({ store, history }) {
return (
<Provider store={store}>
<ConnectedRouter history={history}>
<Switch>
<Route exact path={Paths.LOGIN} component={LoginContainer} />
<Route exact path={Paths.ROOT} component={CoreWrapperContainer} />
<Route exact path={Paths.PROJECTS} component={CoreWrapperContainer} />
<Route exact path={Paths.BOARDS} component={CoreWrapperContainer} />
<Route exact path={Paths.CARDS} component={CoreWrapperContainer} />
<Route path="*" component={NotFound} />
</Switch>
</ConnectedRouter>
</Provider>
);
}

Root.propTypes = {
/* eslint-disable react/forbid-prop-types */
Expand Down
4 changes: 2 additions & 2 deletions client/src/components/Static/Static.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import BoardWrapperContainer from '../../containers/BoardWrapperContainer';

import styles from './Static.module.scss';

const Static = ({ cardId, boardId, projectId }) => {
function Static({ cardId, boardId, projectId }) {
const [t] = useTranslation();

if (projectId === undefined) {
Expand Down Expand Up @@ -85,7 +85,7 @@ const Static = ({ cardId, boardId, projectId }) => {
<BoardWrapperContainer />
</div>
);
};
}

Static.propTypes = {
cardId: PropTypes.string,
Expand Down
Loading

0 comments on commit 0c92623

Please sign in to comment.