fivemoons/planka-zh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prepare for collection board type, refactoring, update dependencies

Browse Source
This commit is contained in:
Maksim Eltyshev
2020-08-04 01:32:46 +05:00
parent 2d92ade8dc
commit c6ee7d54bb
190 changed files with 2144 additions and 1817 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/containers/BoardContainer.js → client/src/containers/BoardKanbanContainer.js
View File

@@ -21,13 +21,13 @@ import {
removeUserFromFilterInCurrentBoard,
updateLabel,
} from '../actions/entry';
import Board from '../components/Board';
import BoardKanban from '../components/BoardKanban';
const mapStateToProps = (state) => {
const { cardId } = pathSelector(state);
const allProjectMemberships = membershipsForCurrentProjectSelector(state);
const listIds = listIdsForCurrentBoardSelector(state);
const allLabels = labelsForCurrentBoardSelector(state);
const listIds = listIdsForCurrentBoardSelector(state);
const filterUsers = filterUsersForCurrentBoardSelector(state);
const filterLabels = filterLabelsForCurrentBoardSelector(state);
@@ -45,8 +45,8 @@ const mapDispatchToProps = (dispatch) =>
bindActionCreators(
{
onListCreate: createListInCurrentBoard,
onCardMove: moveCard,
onListMove: moveList,
onCardMove: moveCard,
onUserToFilterAdd: addUserToFilterInCurrentBoard,
onUserFromFilterRemove: removeUserFromFilterInCurrentBoard,
onLabelToFilterAdd: addLabelToFilterInCurrentBoard,
@@ -58,4 +58,4 @@ const mapDispatchToProps = (dispatch) =>
dispatch,
);
export default connect(mapStateToProps, mapDispatchToProps)(Board);
export default connect(mapStateToProps, mapDispatchToProps)(BoardKanban);

3
client/src/containers/BoardWrapperContainer.js
View File

@@ -4,9 +4,10 @@ import { currentBoardSelector } from '../selectors';
import BoardWrapper from '../components/BoardWrapper';
const mapStateToProps = (state) => {
const { isFetching } = currentBoardSelector(state);
const { type, isFetching } = currentBoardSelector(state);
return {
type,
isFetching,
};
};

4
client/src/containers/CardContainer.js
View File

@@ -41,7 +41,7 @@ const makeMapStateToProps = () => {
const allProjectMemberships = membershipsForCurrentProjectSelector(state);
const allLabels = labelsForCurrentBoardSelector(state);
const { name, dueDate, timer, coverUrl, listId, boardId, isPersisted } = cardByIdSelector(
const { name, dueDate, timer, coverUrl, boardId, listId, isPersisted } = cardByIdSelector(
state,
id,
);
@@ -58,8 +58,8 @@ const makeMapStateToProps = () => {
dueDate,
timer,
coverUrl,
listId,
boardId,
listId,
projectId,
isPersisted,
notificationsTotal,

2
client/src/containers/CardModalContainer.js
View File

@@ -58,8 +58,8 @@ const mapStateToProps = (state) => {
isSubscribed,
isActionsFetching,
isAllActionsFetched,
listId,
boardId,
listId,
} = currentCardSelector(state);
const users = usersForCurrentCardSelector(state);

4
client/src/containers/AddProjectModalContainer.js → client/src/containers/ProjectAddModalContainer.js
View File

@@ -2,7 +2,7 @@ import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import { closeModal, createProject } from '../actions/entry';
import AddProjectModal from '../components/AddProjectModal';
import ProjectAddModal from '../components/ProjectAddModal';
const mapStateToProps = ({ projectCreateForm: { data: defaultData, isSubmitting } }) => ({
defaultData,
@@ -18,4 +18,4 @@ const mapDispatchToProps = (dispatch) =>
dispatch,
);
export default connect(mapStateToProps, mapDispatchToProps)(AddProjectModal);
export default connect(mapStateToProps, mapDispatchToProps)(ProjectAddModal);

4
client/src/containers/ProjectsContainer.js
View File

@@ -2,7 +2,7 @@ import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import { currentUserSelector, projectsForCurrentUserSelector } from '../selectors';
import { openAddProjectModal } from '../actions/entry';
import { openProjectAddModal } from '../actions/entry';
import Projects from '../components/Projects';
const mapStateToProps = (state) => {
@@ -18,7 +18,7 @@ const mapStateToProps = (state) => {
const mapDispatchToProps = (dispatch) =>
bindActionCreators(
{
onAdd: openAddProjectModal,
onAdd: openProjectAddModal,
},
dispatch,
);

4
client/src/containers/AddUserPopupContainer.js → client/src/containers/UserAddPopupContainer.js
View File

@@ -2,7 +2,7 @@ import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import { clearUserCreateError, createUser } from '../actions/entry';
import AddUserPopup from '../components/AddUserPopup';
import UserAddPopup from '../components/UserAddPopup';
const mapStateToProps = ({ userCreateForm: { data: defaultData, isSubmitting, error } }) => ({
defaultData,
@@ -19,4 +19,4 @@ const mapDispatchToProps = (dispatch) =>
dispatch,
);
export default connect(mapStateToProps, mapDispatchToProps)(AddUserPopup);
export default connect(mapStateToProps, mapDispatchToProps)(UserAddPopup);