feat: Toggle actions details, little redesign

Closes #212

client/package.json

@@ -63,58 +63,60 @@
     }
   },
   "dependencies": {
-    "classnames": "^2.2.6",
+    "classnames": "^2.3.1",
-    "connected-react-router": "^6.9.2",
+    "connected-react-router": "^6.9.3",
-    "date-fns": "^2.28.0",
+    "date-fns": "^2.29.1",
-    "dequal": "^2.0.2",
+    "dequal": "^2.0.3",
     "history": "^4.10.1",
-    "i18next": "^21.6.16",
+    "i18next": "^21.8.14",
     "i18next-browser-languagedetector": "^6.1.4",
     "initials": "^3.1.2",
     "js-cookie": "^3.0.1",
-    "lodash": "^4.17.20",
+    "lodash": "^4.17.21",
     "node-sass": "^7.0.1",
+    "photoswipe": "^5.3.0",
     "prop-types": "^15.8.1",
     "react": "^17.0.2",
-    "react-beautiful-dnd": "^13.0.0",
+    "react-beautiful-dnd": "^13.1.0",
-    "react-datepicker": "^4.7.0",
+    "react-datepicker": "^4.8.0",
     "react-dom": "^17.0.2",
-    "react-dropzone": "^12.0.5",
+    "react-dropzone": "^14.2.2",
-    "react-i18next": "^11.16.6",
+    "react-i18next": "^11.18.1",
     "react-input-mask": "^2.0.4",
-    "react-markdown": "^8.0.2",
+    "react-markdown": "^8.0.3",
+    "react-photoswipe-gallery": "^2.2.1",
     "react-redux": "^7.2.8",
     "react-router-dom": "^5.3.1",
     "react-scripts": "5.0.1",
-    "react-textarea-autosize": "^8.3.3",
+    "react-textarea-autosize": "^8.3.4",
-    "redux": "^4.1.2",
+    "redux": "^4.2.0",
     "redux-logger": "^3.0.6",
     "redux-orm": "^0.16.2",
     "redux-saga": "^1.1.3",
     "remark-breaks": "^3.0.2",
     "remark-gfm": "^3.0.1",
-    "reselect": "^4.1.5",
+    "reselect": "^4.1.6",
     "sails.io.js": "^1.2.1",
-    "semantic-ui-react": "^2.1.2",
+    "semantic-ui-react": "^2.1.3",
     "socket.io-client": "^2.3.1",
     "validator": "^13.7.0",
-    "whatwg-fetch": "^3.5.0"
+    "whatwg-fetch": "^3.6.2"
   },
   "devDependencies": {
     "@wojtekmaj/enzyme-adapter-react-17": "^0.6.7",
     "babel-preset-airbnb": "^5.0.0",
     "chai": "^4.3.6",
     "enzyme": "^3.11.0",
-    "eslint": "^8.13.0",
+    "eslint": "^8.20.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jsx-a11y": "^6.5.1",
+    "eslint-plugin-jsx-a11y": "^6.6.1",
-    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-react": "^7.29.4",
+    "eslint-plugin-react": "^7.30.1",
-    "eslint-plugin-react-hooks": "^4.4.0",
+    "eslint-plugin-react-hooks": "^4.6.0",
     "jest-enzyme": "^7.1.2",
-    "prettier": "2.6.2",
+    "prettier": "2.7.1",
     "react-test-renderer": "^17.0.2"
   }
 }

client/src/actions/actions.js

@@ -1,6 +1,5 @@
 import ActionTypes from '../constants/ActionTypes';
 
-// eslint-disable-next-line import/prefer-default-export
 export const fetchActions = (cardId) => ({
   type: ActionTypes.ACTIONS_FETCH,
   payload: {
@@ -24,3 +23,28 @@ fetchActions.failure = (cardId, error) => ({
     error,
   },
 });
+
+export const toggleActionsDetails = (cardId, isVisible) => ({
+  type: ActionTypes.ACTIONS_DETAILS_TOGGLE,
+  payload: {
+    cardId,
+    isVisible,
+  },
+});
+
+toggleActionsDetails.success = (cardId, actions, users) => ({
+  type: ActionTypes.ACTIONS_DETAILS_TOGGLE__SUCCESS,
+  payload: {
+    cardId,
+    actions,
+    users,
+  },
+});
+
+toggleActionsDetails.failure = (cardId, error) => ({
+  type: ActionTypes.ACTIONS_DETAILS_TOGGLE__FAILURE,
+  payload: {
+    cardId,
+    error,
+  },
+});

client/src/actions/entry/actions.js

@@ -1,7 +1,13 @@
 import EntryActionTypes from '../../constants/EntryActionTypes';
 
-// eslint-disable-next-line import/prefer-default-export
 export const fetchActionsInCurrentCard = () => ({
   type: EntryActionTypes.ACTIONS_IN_CURRENT_CARD_FETCH,
   payload: {},
 });
+
+export const toggleActionsDetailsInCurrentCard = (isVisible) => ({
+  type: EntryActionTypes.ACTIONS_DETAILS_IN_CURRENT_CARD_TOGGLE,
+  payload: {
+    isVisible,
+  },
+});

client/src/actions/entry/task.js

@@ -29,6 +29,14 @@ export const handleTaskUpdate = (task) => ({
   },
 });
 
+export const moveTask = (id, index) => ({
+  type: EntryActionTypes.TASK_MOVE,
+  payload: {
+    id,
+    index,
+  },
+});
+
 export const deleteTask = (id) => ({
   type: EntryActionTypes.TASK_DELETE,
   payload: {

client/src/actions/entry/user.js

@@ -41,6 +41,13 @@ export const handleUserUpdate = (user) => ({
   },
 });
 
+export const updateCurrentUserLanguage = (language) => ({
+  type: EntryActionTypes.CURRENT_USER_LANGUAGE_UPDATE,
+  payload: {
+    language,
+  },
+});
+
 export const updateUserEmail = (id, data) => ({
   type: EntryActionTypes.USER_EMAIL_UPDATE,
   payload: {

client/src/components/BoardKanban/ListAdd.jsx

@@ -15,7 +15,7 @@ const DEFAULT_DATA = {
 const ListAdd = React.memo(({ onCreate, onClose }) => {
   const [t] = useTranslation();
   const [data, handleFieldChange, setData] = useForm(DEFAULT_DATA);
-  const [selectNameFieldState, selectNameField] = useToggle();
+  const [focusNameFieldState, focusNameField] = useToggle();
 
   const nameField = useRef(null);
 
@@ -44,16 +44,16 @@ const ListAdd = React.memo(({ onCreate, onClose }) => {
     onCreate(cleanData);
 
     setData(DEFAULT_DATA);
-    selectNameField();
+    focusNameField();
-  }, [onCreate, data, setData, selectNameField]);
+  }, [onCreate, data, setData, focusNameField]);
 
   useEffect(() => {
-    nameField.current.select();
+    nameField.current.focus();
   }, []);
 
   useDidUpdate(() => {
-    nameField.current.select();
+    nameField.current.focus();
-  }, [selectNameFieldState]);
+  }, [focusNameFieldState]);
 
   return (
     <Form className={styles.wrapper} onSubmit={handleSubmit}>

client/src/components/Boards/AddPopup.jsx

@@ -35,7 +35,7 @@ const AddStep = React.memo(({ onCreate, onClose }) => {
   }, [onCreate, onClose, data]);
 
   useEffect(() => {
-    nameField.current.select();
+    nameField.current.focus();
   }, []);
 
   return (

client/src/components/Card/Card.module.scss

@@ -77,6 +77,7 @@
 
   .cover {
     border-radius: 3px 3px 0 0;
+    margin-bottom: 2px;
     vertical-align: middle;
   }
 
@@ -114,6 +115,7 @@
   }
 
   .wrapper {
+    cursor: auto;
     display: block;
     margin-bottom: 8px;
   }

client/src/components/Card/NameEdit.jsx

@@ -79,7 +79,7 @@ const NameEdit = React.forwardRef(({ children, defaultValue, onUpdate }, ref) =>
 
   useEffect(() => {
     if (isOpened) {
-      field.current.ref.current.select();
+      field.current.ref.current.focus();
     }
   }, [isOpened]);
 

client/src/components/CardModal/Actions/Actions.jsx

@@ -1,7 +1,7 @@
 import React, { useCallback } from 'react';
 import PropTypes from 'prop-types';
 import { useTranslation } from 'react-i18next';
-import { Comment, Icon, Loader, Visibility } from 'semantic-ui-react';
+import { Button, Comment, Icon, Loader, Visibility } from 'semantic-ui-react';
 
 import { ActionTypes } from '../../../constants/Enums';
 import CommentAdd from './CommentAdd';
@@ -14,15 +14,22 @@ const Actions = React.memo(
     items,
     isFetching,
     isAllFetched,
+    isDetailsVisible,
+    isDetailsFetching,
     canEdit,
     canEditAllComments,
     onFetch,
+    onDetailsToggle,
     onCommentCreate,
     onCommentUpdate,
     onCommentDelete,
   }) => {
     const [t] = useTranslation();
 
+    const handleToggleDetailsClick = useCallback(() => {
+      onDetailsToggle(!isDetailsVisible);
+    }, [isDetailsVisible, onDetailsToggle]);
+
     const handleCommentUpdate = useCallback(
       (id, data) => {
         onCommentUpdate(id, data);
@@ -38,54 +45,51 @@ const Actions = React.memo(
     );
 
     return (
-      <>
+      <div className={styles.contentModule}>
-        {canEdit && (
+        <div className={styles.moduleWrapper}>
-          <div className={styles.contentModule}>
+          <Icon name="list ul" className={styles.moduleIcon} />
-            <div className={styles.moduleWrapper}>
+          <div className={styles.moduleHeader}>
-              <Icon name="comment outline" className={styles.moduleIcon} />
+            {t('common.actions')}
-              <div className={styles.moduleHeader}>{t('common.addComment')}</div>
+            <Button
-              <CommentAdd onCreate={onCommentCreate} />
+              content={isDetailsVisible ? t('action.hideDetails') : t('action.showDetails')}
-            </div>
+              className={styles.toggleButton}
+              onClick={handleToggleDetailsClick}
+            />
           </div>
-        )}
+          {canEdit && <CommentAdd onCreate={onCommentCreate} />}
-        <div className={styles.contentModule}>
+          <div className={styles.wrapper}>
-          <div className={styles.moduleWrapper}>
+            <Comment.Group>
-            <Icon name="list ul" className={styles.moduleIcon} />
+              {items.map((item) =>
-            <div className={styles.moduleHeader}>{t('common.actions')}</div>
+                item.type === ActionTypes.COMMENT_CARD ? (
-            <div className={styles.wrapper}>
+                  <Item.Comment
-              <Comment.Group>
+                    key={item.id}
-                {items.map((item) =>
+                    data={item.data}
-                  item.type === ActionTypes.COMMENT_CARD ? (
+                    createdAt={item.createdAt}
-                    <Item.Comment
+                    isPersisted={item.isPersisted}
-                      key={item.id}
+                    user={item.user}
-                      data={item.data}
+                    canEdit={(item.user.isCurrent && canEdit) || canEditAllComments}
-                      createdAt={item.createdAt}
+                    onUpdate={(data) => handleCommentUpdate(item.id, data)}
-                      isPersisted={item.isPersisted}
+                    onDelete={() => handleCommentDelete(item.id)}
-                      user={item.user}
+                  />
-                      canEdit={(item.user.isCurrent && canEdit) || canEditAllComments}
+                ) : (
-                      onUpdate={(data) => handleCommentUpdate(item.id, data)}
+                  <Item
-                      onDelete={() => handleCommentDelete(item.id)}
+                    key={item.id}
-                    />
+                    type={item.type}
-                  ) : (
+                    data={item.data}
-                    <Item
+                    createdAt={item.createdAt}
-                      key={item.id}
+                    user={item.user}
-                      type={item.type}
+                  />
-                      data={item.data}
+                ),
-                      createdAt={item.createdAt}
+              )}
-                      user={item.user}
+            </Comment.Group>
-                    />
-                  ),
-                )}
-              </Comment.Group>
-            </div>
-            {isFetching ? (
-              <Loader active inverted inline="centered" size="small" className={styles.loader} />
-            ) : (
-              !isAllFetched && <Visibility fireOnMount onOnScreen={onFetch} />
-            )}
           </div>
+          {isFetching || isDetailsFetching ? (
+            <Loader active inverted inline="centered" size="small" className={styles.loader} />
+          ) : (
+            !isAllFetched && <Visibility fireOnMount onOnScreen={onFetch} />
+          )}
         </div>
-      </>
+      </div>
     );
   },
 );
@@ -94,9 +98,12 @@ Actions.propTypes = {
   items: PropTypes.array.isRequired, // eslint-disable-line react/forbid-prop-types
   isFetching: PropTypes.bool.isRequired,
   isAllFetched: PropTypes.bool.isRequired,
+  isDetailsVisible: PropTypes.bool.isRequired,
+  isDetailsFetching: PropTypes.bool.isRequired,
   canEdit: PropTypes.bool.isRequired,
   canEditAllComments: PropTypes.bool.isRequired,
   onFetch: PropTypes.func.isRequired,
+  onDetailsToggle: PropTypes.func.isRequired,
   onCommentCreate: PropTypes.func.isRequired,
   onCommentUpdate: PropTypes.func.isRequired,
   onCommentDelete: PropTypes.func.isRequired,

client/src/components/CardModal/Actions/Actions.module.scss

@@ -8,12 +8,14 @@
   }
 
   .moduleHeader {
+    align-items: center;
     color: #17394d;
+    display: flex;
     font-size: 16px;
     font-weight: bold;
-    line-height: 20px;
+    height: 36px;
+    justify-content: space-between;
     margin: 0 0 4px;
-    padding: 8px 0;
   }
 
   .moduleIcon {
@@ -33,6 +35,24 @@
     position: relative;
   }
 
+  .toggleButton {
+    background: transparent;
+    box-shadow: none;
+    color: #6b808c;
+    float: right;
+    font-weight: normal;
+    margin-right: 0;
+    padding: 6px 11px;
+    text-align: left;
+    text-decoration: underline;
+    transition: none;
+
+    &:hover {
+      background: rgba(9, 30, 66, 0.08);
+      color: #092d42;
+    }
+  }
+
   .wrapper {
     margin-left: -40px;
     margin-top: 12px;

client/src/components/CardModal/Actions/CommentAdd.jsx

@@ -1,10 +1,11 @@
-import React, { useCallback, useRef } from 'react';
+import React, { useCallback, useRef, useState } from 'react';
 import PropTypes from 'prop-types';
 import { useTranslation } from 'react-i18next';
 import TextareaAutosize from 'react-textarea-autosize';
 import { Button, Form, TextArea } from 'semantic-ui-react';
+import { useDidUpdate, useToggle } from '../../../lib/hooks';
 
-import { useForm } from '../../../hooks';
+import { useClosableForm, useForm } from '../../../hooks';
 
 import styles from './CommentAdd.module.scss';
 
@@ -14,10 +15,16 @@ const DEFAULT_DATA = {
 
 const CommentAdd = React.memo(({ onCreate }) => {
   const [t] = useTranslation();
+  const [isOpened, setIsOpened] = useState(false);
   const [data, handleFieldChange, setData] = useForm(DEFAULT_DATA);
+  const [selectTextFieldState, selectTextField] = useToggle();
 
   const textField = useRef(null);
 
+  const close = useCallback(() => {
+    setIsOpened(false);
+  }, []);
+
   const submit = useCallback(() => {
     const cleanData = {
       ...data,
@@ -32,7 +39,12 @@ const CommentAdd = React.memo(({ onCreate }) => {
     onCreate(cleanData);
 
     setData(DEFAULT_DATA);
-  }, [onCreate, data, setData]);
+    selectTextField();
+  }, [onCreate, data, setData, selectTextField]);
+
+  const handleFieldFocus = useCallback(() => {
+    setIsOpened(true);
+  }, []);
 
   const handleFieldKeyDown = useCallback(
     (event) => {
@@ -43,10 +55,16 @@ const CommentAdd = React.memo(({ onCreate }) => {
     [submit],
   );
 
+  const [handleFieldBlur, handleControlMouseOver, handleControlMouseOut] = useClosableForm(close);
+
   const handleSubmit = useCallback(() => {
     submit();
   }, [submit]);
 
+  useDidUpdate(() => {
+    textField.current.ref.current.focus();
+  }, [selectTextFieldState]);
+
   return (
     <Form onSubmit={handleSubmit}>
       <TextArea
@@ -55,15 +73,24 @@ const CommentAdd = React.memo(({ onCreate }) => {
         name="text"
         value={data.text}
         placeholder={t('common.writeComment')}
-        minRows={3}
+        minRows={isOpened ? 3 : 1}
         spellCheck={false}
         className={styles.field}
+        onFocus={handleFieldFocus}
         onKeyDown={handleFieldKeyDown}
         onChange={handleFieldChange}
+        onBlur={handleFieldBlur}
       />
-      <div className={styles.controls}>
+      {isOpened && (
-        <Button positive content={t('action.addComment')} disabled={!data.text} />
+        <div className={styles.controls}>
-      </div>
+          <Button
+            positive
+            content={t('action.addComment')}
+            onMouseOver={handleControlMouseOver}
+            onMouseOut={handleControlMouseOut}
+          />
+        </div>
+      )}
     </Form>
   );
 });

client/src/components/CardModal/Actions/CommentEdit.jsx

@@ -76,7 +76,7 @@ const CommentEdit = React.forwardRef(({ children, defaultData, onUpdate }, ref)
 
   useEffect(() => {
     if (isOpened) {
-      textField.current.ref.current.select();
+      textField.current.ref.current.focus();
     }
   }, [isOpened]);
 

client/src/components/CardModal/AttachmentAddZone/TextFileAddModal.jsx

@@ -37,7 +37,7 @@ const TextFileAddModal = React.memo(({ content, onCreate, onClose }) => {
   }, [content, onCreate, onClose, data]);
 
   useEffect(() => {
-    nameField.current.select();
+    nameField.current.focus();
   }, []);
 
   return (

client/src/components/CardModal/Attachments/Attachments.jsx

@@ -1,6 +1,8 @@
 import React, { useCallback } from 'react';
 import PropTypes from 'prop-types';
+import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
+import { Gallery, Item as GalleryItem } from 'react-photoswipe-gallery';
 import { Button } from 'semantic-ui-react';
 import { useToggle } from '../../../lib/hooks';
 
@@ -8,81 +10,152 @@ import Item from './Item';
 
 import styles from './Attachments.module.scss';
 
-const Attachments = React.memo(({ items, onUpdate, onDelete, onCoverUpdate }) => {
+const INITIALLY_VISIBLE = 4;
-  const [t] = useTranslation();
-  const [isOpened, toggleOpened] = useToggle();
 
-  const handleToggleClick = useCallback(() => {
+const Attachments = React.memo(
-    toggleOpened();
+  ({ items, onUpdate, onDelete, onCoverUpdate, onGalleryOpen, onGalleryClose }) => {
-  }, [toggleOpened]);
+    const [t] = useTranslation();
+    const [isAllVisible, toggleAllVisible] = useToggle();
 
-  const handleCoverSelect = useCallback(
+    const handleCoverSelect = useCallback(
-    (id) => {
+      (id) => {
-      onCoverUpdate(id);
+        onCoverUpdate(id);
-    },
+      },
-    [onCoverUpdate],
+      [onCoverUpdate],
-  );
+    );
 
-  const handleCoverDeselect = useCallback(() => {
+    const handleCoverDeselect = useCallback(() => {
-    onCoverUpdate(null);
+      onCoverUpdate(null);
-  }, [onCoverUpdate]);
+    }, [onCoverUpdate]);
 
-  const handleUpdate = useCallback(
+    const handleUpdate = useCallback(
-    (id, data) => {
+      (id, data) => {
-      onUpdate(id, data);
+        onUpdate(id, data);
-    },
+      },
-    [onUpdate],
+      [onUpdate],
-  );
+    );
 
-  const handleDelete = useCallback(
+    const handleDelete = useCallback(
-    (id) => {
+      (id) => {
-      onDelete(id);
+        onDelete(id);
-    },
+      },
-    [onDelete],
+      [onDelete],
-  );
+    );
 
-  const visibleItems = isOpened ? items : items.slice(0, 4);
+    const handleBeforeGalleryOpen = useCallback(
+      (gallery) => {
+        onGalleryOpen();
 
-  return (
+        gallery.on('destroy', () => {
-    <>
+          onGalleryClose();
-      {visibleItems.map((item) => (
+        });
-        <Item
+      },
+      [onGalleryOpen, onGalleryClose],
+    );
+
+    const handleToggleAllVisibleClick = useCallback(() => {
+      toggleAllVisible();
+    }, [toggleAllVisible]);
+
+    const galleryItemsNode = items.map((item, index) => {
+      const isPdf = item.url && item.url.endsWith('.pdf');
+
+      let props;
+      if (item.image) {
+        props = item.image;
+      } else {
+        props = {
+          content: isPdf ? (
+            // eslint-disable-next-line jsx-a11y/alt-text
+            <object
+              data={item.url}
+              type="application/pdf"
+              className={classNames(styles.content, styles.contentPdf)}
+            />
+          ) : (
+            <span className={classNames(styles.content, styles.contentError)}>
+              {t('common.thereIsNoPreviewAvailableForThisAttachment')}
+            </span>
+          ),
+        };
+      }
+
+      const isVisible = isAllVisible || index < INITIALLY_VISIBLE;
+
+      return (
+        <GalleryItem
+          {...props} // eslint-disable-line react/jsx-props-no-spreading
           key={item.id}
-          name={item.name}
+          original={item.url}
-          url={item.url}
+          caption={item.name}
-          coverUrl={item.coverUrl}
+        >
-          createdAt={item.createdAt}
+          {({ ref, open }) =>
-          isCover={item.isCover}
+            isVisible ? (
-          isPersisted={item.isPersisted}
+              <Item
-          onCoverSelect={() => handleCoverSelect(item.id)}
+                ref={ref}
-          onCoverDeselect={handleCoverDeselect}
+                name={item.name}
-          onUpdate={(data) => handleUpdate(item.id, data)}
+                url={item.url}
-          onDelete={() => handleDelete(item.id)}
+                coverUrl={item.coverUrl}
-        />
+                createdAt={item.createdAt}
-      ))}
+                isCover={item.isCover}
-      {items.length > 4 && (
+                isPersisted={item.isPersisted}
-        <Button
+                onClick={item.image || isPdf ? open : undefined}
-          fluid
+                onCoverSelect={() => handleCoverSelect(item.id)}
-          content={
+                onCoverDeselect={handleCoverDeselect}
-            isOpened
+                onUpdate={(data) => handleUpdate(item.id, data)}
-              ? t('action.showFewerAttachments')
+                onDelete={() => handleDelete(item.id)}
-              : t('action.showAllAttachments', {
+              />
-                  hidden: items.length - visibleItems.length,
+            ) : (
-                })
+              <span ref={ref} />
+            )
           }
-          className={styles.toggleButton}
+        </GalleryItem>
-          onClick={handleToggleClick}
+      );
-        />
+    });
-      )}
+
-    </>
+    return (
-  );
+      <>
-});
+        <Gallery
+          withCaption
+          withDownloadButton
+          options={{
+            showHideAnimationType: 'none',
+            closeTitle: '',
+            zoomTitle: '',
+            arrowPrevTitle: '',
+            arrowNextTitle: '',
+            errorMsg: '',
+          }}
+          onBeforeOpen={handleBeforeGalleryOpen}
+        >
+          {galleryItemsNode}
+        </Gallery>
+        {items.length > INITIALLY_VISIBLE && (
+          <Button
+            fluid
+            content={
+              isAllVisible
+                ? t('action.showFewerAttachments')
+                : t('action.showAllAttachments', {
+                    hidden: items.length - INITIALLY_VISIBLE,
+                  })
+            }
+            className={styles.toggleButton}
+            onClick={handleToggleAllVisibleClick}
+          />
+        )}
+      </>
+    );
+  },
+);
 
 Attachments.propTypes = {
   items: PropTypes.array.isRequired, // eslint-disable-line react/forbid-prop-types
   onUpdate: PropTypes.func.isRequired,
   onDelete: PropTypes.func.isRequired,
   onCoverUpdate: PropTypes.func.isRequired,
+  onGalleryOpen: PropTypes.func.isRequired,
+  onGalleryClose: PropTypes.func.isRequired,
 };
 
 export default Attachments;

client/src/components/CardModal/Attachments/Attachments.module.scss

@@ -1,4 +1,26 @@
 :global(#app) {
+  .content {
+    bottom: 0;
+    left: 0;
+    margin: auto;
+    position: absolute;
+    right: 0;
+    top: 0;
+  }
+
+  .contentPdf {
+    height: 100%;
+    width: 1120px;
+  }
+
+  .contentError {
+    color: #fff;
+    font-size: 20px;
+    font-weight: 700;
+    height: 20px;
+    width: 470px;
+  }
+
   .toggleButton {
     background: transparent;
     box-shadow: none;

client/src/components/CardModal/Attachments/Item.jsx

@@ -8,24 +8,32 @@ import EditPopup from './EditPopup';
 
 import styles from './Item.module.scss';
 
-const Item = React.memo(
+const Item = React.forwardRef(
-  ({
+  (
-    name,
+    {
-    url,
+      name,
-    coverUrl,
+      url,
-    createdAt,
+      coverUrl,
-    isCover,
+      createdAt,
-    isPersisted,
+      isCover,
-    onCoverSelect,
+      isPersisted,
-    onCoverDeselect,
+      onCoverSelect,
-    onUpdate,
+      onCoverDeselect,
-    onDelete,
+      onClick,
-  }) => {
+      onUpdate,
+      onDelete,
+    },
+    ref,
+  ) => {
     const [t] = useTranslation();
 
     const handleClick = useCallback(() => {
-      window.open(url, '_blank');
+      if (onClick) {
-    }, [url]);
+        onClick();
+      } else {
+        window.open(url, '_blank');
+      }
+    }, [url, onClick]);
 
     const handleToggleCoverClick = useCallback(
       (event) => {
@@ -54,7 +62,7 @@ const Item = React.memo(
     return (
       /* eslint-disable jsx-a11y/click-events-have-key-events,
                         jsx-a11y/no-static-element-interactions */
-      <div className={styles.wrapper} onClick={handleClick}>
+      <div ref={ref} className={styles.wrapper} onClick={handleClick}>
         {/* eslint-enable jsx-a11y/click-events-have-key-events,
                           jsx-a11y/no-static-element-interactions */}
         <div
@@ -133,6 +141,7 @@ Item.propTypes = {
   createdAt: PropTypes.instanceOf(Date),
   isCover: PropTypes.bool.isRequired,
   isPersisted: PropTypes.bool.isRequired,
+  onClick: PropTypes.func,
   onCoverSelect: PropTypes.func.isRequired,
   onCoverDeselect: PropTypes.func.isRequired,
   onUpdate: PropTypes.func.isRequired,
@@ -143,6 +152,7 @@ Item.defaultProps = {
   url: undefined,
   coverUrl: undefined,
   createdAt: undefined,
+  onClick: undefined,
 };
 
-export default Item;
+export default React.memo(Item);

client/src/components/CardModal/CardModal.jsx

@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react';
+import React, { useCallback, useRef } from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
@@ -34,6 +34,8 @@ const CardModal = React.memo(
     isSubscribed,
     isActionsFetching,
     isAllActionsFetched,
+    isActionsDetailsVisible,
+    isActionsDetailsFetching,
     listId,
     boardId,
     projectId,
@@ -61,11 +63,13 @@ const CardModal = React.memo(
     onLabelDelete,
     onTaskCreate,
     onTaskUpdate,
+    onTaskMove,
     onTaskDelete,
     onAttachmentCreate,
     onAttachmentUpdate,
     onAttachmentDelete,
     onActionsFetch,
+    onActionsDetailsToggle,
     onCommentActionCreate,
     onCommentActionUpdate,
     onCommentActionDelete,
@@ -73,6 +77,8 @@ const CardModal = React.memo(
   }) => {
     const [t] = useTranslation();
 
+    const isGalleryOpened = useRef(false);
+
     const handleNameUpdate = useCallback(
       (newName) => {
         onUpdate({
@@ -124,6 +130,22 @@ const CardModal = React.memo(
       });
     }, [isSubscribed, onUpdate]);
 
+    const handleGalleryOpen = useCallback(() => {
+      isGalleryOpened.current = true;
+    }, []);
+
+    const handleGalleryClose = useCallback(() => {
+      isGalleryOpened.current = false;
+    }, []);
+
+    const handleClose = useCallback(() => {
+      if (isGalleryOpened.current) {
+        return;
+      }
+
+      onClose();
+    }, [onClose]);
+
     const userIds = users.map((user) => user.id);
     const labelIds = labels.map((label) => label.id);
 
@@ -313,6 +335,7 @@ const CardModal = React.memo(
                     canEdit={canEdit}
                     onCreate={onTaskCreate}
                     onUpdate={onTaskUpdate}
+                    onMove={onTaskMove}
                     onDelete={onTaskDelete}
                   />
                 </div>
@@ -328,6 +351,8 @@ const CardModal = React.memo(
                     onUpdate={onAttachmentUpdate}
                     onDelete={onAttachmentDelete}
                     onCoverUpdate={handleCoverUpdate}
+                    onGalleryOpen={handleGalleryOpen}
+                    onGalleryClose={handleGalleryClose}
                   />
                 </div>
               </div>
@@ -336,9 +361,12 @@ const CardModal = React.memo(
               items={actions}
               isFetching={isActionsFetching}
               isAllFetched={isAllActionsFetched}
+              isDetailsVisible={isActionsDetailsVisible}
+              isDetailsFetching={isActionsDetailsFetching}
               canEdit={canEdit}
               canEditAllComments={canEditAllCommentActions}
               onFetch={onActionsFetch}
+              onDetailsToggle={onActionsDetailsToggle}
               onCommentCreate={onCommentActionCreate}
               onCommentUpdate={onCommentActionUpdate}
               onCommentDelete={onCommentActionDelete}
@@ -445,7 +473,7 @@ const CardModal = React.memo(
     );
 
     return (
-      <Modal open closeIcon size="small" centered={false} onClose={onClose}>
+      <Modal open closeIcon centered={false} onClose={handleClose} className={styles.wrapper}>
         {canEdit ? (
           <AttachmentAddZone onCreate={onAttachmentCreate}>{contentNode}</AttachmentAddZone>
         ) : (
@@ -464,6 +492,8 @@ CardModal.propTypes = {
   isSubscribed: PropTypes.bool.isRequired,
   isActionsFetching: PropTypes.bool.isRequired,
   isAllActionsFetched: PropTypes.bool.isRequired,
+  isActionsDetailsVisible: PropTypes.bool.isRequired,
+  isActionsDetailsFetching: PropTypes.bool.isRequired,
   listId: PropTypes.string.isRequired,
   boardId: PropTypes.string.isRequired,
   projectId: PropTypes.string.isRequired,
@@ -493,11 +523,13 @@ CardModal.propTypes = {
   onLabelDelete: PropTypes.func.isRequired,
   onTaskCreate: PropTypes.func.isRequired,
   onTaskUpdate: PropTypes.func.isRequired,
+  onTaskMove: PropTypes.func.isRequired,
   onTaskDelete: PropTypes.func.isRequired,
   onAttachmentCreate: PropTypes.func.isRequired,
   onAttachmentUpdate: PropTypes.func.isRequired,
   onAttachmentDelete: PropTypes.func.isRequired,
   onActionsFetch: PropTypes.func.isRequired,
+  onActionsDetailsToggle: PropTypes.func.isRequired,
   onCommentActionCreate: PropTypes.func.isRequired,
   onCommentActionUpdate: PropTypes.func.isRequired,
   onCommentActionDelete: PropTypes.func.isRequired,

client/src/components/CardModal/CardModal.module.scss

@@ -193,4 +193,14 @@
     margin: 0 8px 4px 0;
     text-transform: uppercase;
   }
+
+  .wrapper {
+    width: 880px;
+  }
+
+  @media (max-width: 926px) {
+    .wrapper {
+      width: 95%;
+    }
+  }
 }

client/src/components/CardModal/DescriptionEdit.jsx

@@ -66,7 +66,7 @@ const DescriptionEdit = React.forwardRef(({ children, defaultValue, onUpdate },
 
   useEffect(() => {
     if (isOpened) {
-      field.current.ref.current.select();
+      field.current.ref.current.focus();
     }
   }, [isOpened]);
 

client/src/components/CardModal/Tasks/Add.jsx

@@ -17,7 +17,7 @@ const Add = React.forwardRef(({ children, onCreate }, ref) => {
   const [t] = useTranslation();
   const [isOpened, setIsOpened] = useState(false);
   const [data, handleFieldChange, setData] = useForm(DEFAULT_DATA);
-  const [selectNameFieldState, selectNameField] = useToggle();
+  const [focusNameFieldState, focusNameField] = useToggle();
 
   const nameField = useRef(null);
 
@@ -43,8 +43,8 @@ const Add = React.forwardRef(({ children, onCreate }, ref) => {
     onCreate(cleanData);
 
     setData(DEFAULT_DATA);
-    selectNameField();
+    focusNameField();
-  }, [onCreate, data, setData, selectNameField]);
+  }, [onCreate, data, setData, focusNameField]);
 
   useImperativeHandle(
     ref,
@@ -81,13 +81,13 @@ const Add = React.forwardRef(({ children, onCreate }, ref) => {
 
   useEffect(() => {
     if (isOpened) {
-      nameField.current.ref.current.select();
+      nameField.current.ref.current.focus();
     }
   }, [isOpened]);
 
   useDidUpdate(() => {
-    nameField.current.ref.current.select();
+    nameField.current.ref.current.focus();
-  }, [selectNameFieldState]);
+  }, [focusNameFieldState]);
 
   if (!isOpened) {
     return React.cloneElement(children, {

client/src/components/CardModal/Tasks/Item.jsx

@@ -1,6 +1,8 @@
 import React, { useCallback, useRef } from 'react';
+import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
+import { Draggable } from 'react-beautiful-dnd';
 import { Button, Checkbox, Icon } from 'semantic-ui-react';
 
 import NameEdit from './NameEdit';
@@ -8,72 +10,85 @@ import ActionsPopup from './ActionsPopup';
 
 import styles from './Item.module.scss';
 
-const Item = React.memo(({ name, isCompleted, isPersisted, canEdit, onUpdate, onDelete }) => {
+const Item = React.memo(
-  const nameEdit = useRef(null);
+  ({ id, index, name, isCompleted, isPersisted, canEdit, onUpdate, onDelete }) => {
+    const nameEdit = useRef(null);
 
-  const handleClick = useCallback(() => {
+    const handleClick = useCallback(() => {
-    if (isPersisted && canEdit) {
+      if (isPersisted && canEdit) {
-      nameEdit.current.open();
+        nameEdit.current.open();
-    }
+      }
-  }, [isPersisted, canEdit]);
+    }, [isPersisted, canEdit]);
 
-  const handleNameUpdate = useCallback(
+    const handleNameUpdate = useCallback(
-    (newName) => {
+      (newName) => {
+        onUpdate({
+          name: newName,
+        });
+      },
+      [onUpdate],
+    );
+
+    const handleToggleChange = useCallback(() => {
       onUpdate({
-        name: newName,
+        isCompleted: !isCompleted,
       });
-    },
+    }, [isCompleted, onUpdate]);
-    [onUpdate],
-  );
 
-  const handleToggleChange = useCallback(() => {
+    const handleNameEdit = useCallback(() => {
-    onUpdate({
+      nameEdit.current.open();
-      isCompleted: !isCompleted,
+    }, []);
-    });
-  }, [isCompleted, onUpdate]);
 
-  const handleNameEdit = useCallback(() => {
+    return (
-    nameEdit.current.open();
+      <Draggable draggableId={id} index={index} isDragDisabled={!isPersisted || !canEdit}>
-  }, []);
+        {({ innerRef, draggableProps, dragHandleProps }, { isDragging }) => {
+          const contentNode = (
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            <div {...draggableProps} {...dragHandleProps} ref={innerRef} className={styles.wrapper}>
+              <span className={styles.checkboxWrapper}>
+                <Checkbox
+                  checked={isCompleted}
+                  disabled={!isPersisted || !canEdit}
+                  className={styles.checkbox}
+                  onChange={handleToggleChange}
+                />
+              </span>
+              <NameEdit ref={nameEdit} defaultValue={name} onUpdate={handleNameUpdate}>
+                <div className={classNames(canEdit && styles.contentHoverable)}>
+                  {/* eslint-disable jsx-a11y/click-events-have-key-events,
+                           jsx-a11y/no-static-element-interactions */}
+                  <span
+                    className={classNames(styles.text, canEdit && styles.textEditable)}
+                    onClick={handleClick}
+                  >
+                    {/* eslint-enable jsx-a11y/click-events-have-key-events,
+                            jsx-a11y/no-static-element-interactions */}
+                    <span className={classNames(styles.task, isCompleted && styles.taskCompleted)}>
+                      {name}
+                    </span>
+                  </span>
+                  {isPersisted && canEdit && (
+                    <ActionsPopup onNameEdit={handleNameEdit} onDelete={onDelete}>
+                      <Button className={classNames(styles.button, styles.target)}>
+                        <Icon fitted name="pencil" size="small" />
+                      </Button>
+                    </ActionsPopup>
+                  )}
+                </div>
+              </NameEdit>
+            </div>
+          );
 
-  return (
+          return isDragging ? ReactDOM.createPortal(contentNode, document.body) : contentNode;
-    <div className={styles.wrapper}>
+        }}
-      <span className={styles.checkboxWrapper}>
+      </Draggable>
-        <Checkbox
+    );
-          checked={isCompleted}
+  },
-          disabled={!isPersisted || !canEdit}
+);
-          className={styles.checkbox}
-          onChange={handleToggleChange}
-        />
-      </span>
-      <NameEdit ref={nameEdit} defaultValue={name} onUpdate={handleNameUpdate}>
-        <div className={classNames(canEdit && styles.contentHoverable)}>
-          {/* eslint-disable jsx-a11y/click-events-have-key-events,
-                             jsx-a11y/no-static-element-interactions */}
-          <span
-            className={classNames(styles.text, canEdit && styles.textEditable)}
-            onClick={handleClick}
-          >
-            {/* eslint-enable jsx-a11y/click-events-have-key-events,
-                              jsx-a11y/no-static-element-interactions */}
-            <span className={classNames(styles.task, isCompleted && styles.taskCompleted)}>
-              {name}
-            </span>
-          </span>
-          {isPersisted && canEdit && (
-            <ActionsPopup onNameEdit={handleNameEdit} onDelete={onDelete}>
-              <Button className={classNames(styles.button, styles.target)}>
-                <Icon fitted name="pencil" size="small" />
-              </Button>
-            </ActionsPopup>
-          )}
-        </div>
-      </NameEdit>
-    </div>
-  );
-});
 
 Item.propTypes = {
+  id: PropTypes.string.isRequired,
+  index: PropTypes.number.isRequired,
   name: PropTypes.string.isRequired,
   isCompleted: PropTypes.bool.isRequired,
   isPersisted: PropTypes.bool.isRequired,

client/src/components/CardModal/Tasks/Item.module.scss

@@ -27,7 +27,7 @@
     vertical-align: top;
     z-index: 2000;
     line-height: 1;
-    height: 32px;
+    height: 100%;
   }
 
   .contentHoverable:hover {
@@ -69,10 +69,10 @@
 
   .wrapper {
     border-radius: 3px;
+    cursor: auto;
     margin-left: -40px;
     min-height: 32px;
     position: relative;
-    transition: all 0.14s ease-in;
     width: calc(100% + 40px);
   }
 }

client/src/components/CardModal/Tasks/NameEdit.jsx

@@ -71,7 +71,7 @@ const NameEdit = React.forwardRef(({ children, defaultValue, onUpdate }, ref) =>
 
   useEffect(() => {
     if (isOpened) {
-      field.current.ref.current.select();
+      field.current.ref.current.focus();
     }
   }, [isOpened]);
 

client/src/components/CardModal/Tasks/Tasks.jsx

@@ -1,16 +1,34 @@
 import React, { useCallback } from 'react';
 import PropTypes from 'prop-types';
 import { useTranslation } from 'react-i18next';
+import { DragDropContext, Droppable } from 'react-beautiful-dnd';
 import { Progress } from 'semantic-ui-react';
+import { closePopup } from '../../../lib/popup';
 
+import DroppableTypes from '../../../constants/DroppableTypes';
 import Item from './Item';
 import Add from './Add';
 
 import styles from './Tasks.module.scss';
 
-const Tasks = React.memo(({ items, canEdit, onCreate, onUpdate, onDelete }) => {
+const Tasks = React.memo(({ items, canEdit, onCreate, onUpdate, onMove, onDelete }) => {
   const [t] = useTranslation();
 
+  const handleDragStart = useCallback(() => {
+    closePopup();
+  }, []);
+
+  const handleDragEnd = useCallback(
+    ({ draggableId, source, destination }) => {
+      if (!destination || source.index === destination.index) {
+        return;
+      }
+
+      onMove(draggableId, destination.index);
+    },
+    [onMove],
+  );
+
   const handleUpdate = useCallback(
     (id, data) => {
       onUpdate(id, data);
@@ -39,26 +57,38 @@ const Tasks = React.memo(({ items, canEdit, onCreate, onUpdate, onDelete }) => {
           className={styles.progress}
         />
       )}
-      {items.map((item) => (
+      <DragDropContext onDragStart={handleDragStart} onDragEnd={handleDragEnd}>
-        <Item
+        <Droppable droppableId="tasks" type={DroppableTypes.TASK}>
-          key={item.id}
+          {({ innerRef, droppableProps, placeholder }) => (
-          name={item.name}
+            // eslint-disable-next-line react/jsx-props-no-spreading
-          isCompleted={item.isCompleted}
+            <div {...droppableProps} ref={innerRef}>
-          isPersisted={item.isPersisted}
+              {items.map((item, index) => (
-          canEdit={canEdit}
+                <Item
-          onUpdate={(data) => handleUpdate(item.id, data)}
+                  key={item.id}
-          onDelete={() => handleDelete(item.id)}
+                  id={item.id}
-        />
+                  index={index}
-      ))}
+                  name={item.name}
-      {canEdit && (
+                  isCompleted={item.isCompleted}
-        <Add onCreate={onCreate}>
+                  isPersisted={item.isPersisted}
-          <button type="button" className={styles.taskButton}>
+                  canEdit={canEdit}
-            <span className={styles.taskButtonText}>
+                  onUpdate={(data) => handleUpdate(item.id, data)}
-              {items.length > 0 ? t('action.addAnotherTask') : t('action.addTask')}
+                  onDelete={() => handleDelete(item.id)}
-            </span>
+                />
-          </button>
+              ))}
-        </Add>
+              {placeholder}
-      )}
+              {canEdit && (
+                <Add onCreate={onCreate}>
+                  <button type="button" className={styles.taskButton}>
+                    <span className={styles.taskButtonText}>
+                      {items.length > 0 ? t('action.addAnotherTask') : t('action.addTask')}
+                    </span>
+                  </button>
+                </Add>
+              )}
+            </div>
+          )}
+        </Droppable>
+      </DragDropContext>
     </>
   );
 });
@@ -68,6 +98,7 @@ Tasks.propTypes = {
   canEdit: PropTypes.bool.isRequired,
   onCreate: PropTypes.func.isRequired,
   onUpdate: PropTypes.func.isRequired,
+  onMove: PropTypes.func.isRequired,
   onDelete: PropTypes.func.isRequired,
 };
 

client/src/components/List/CardAdd.jsx

@@ -17,7 +17,7 @@ const DEFAULT_DATA = {
 const CardAdd = React.memo(({ isOpened, onCreate, onClose }) => {
   const [t] = useTranslation();
   const [data, handleFieldChange, setData] = useForm(DEFAULT_DATA);
-  const [selectNameFieldState, selectNameField] = useToggle();
+  const [focusNameFieldState, focusNameField] = useToggle();
 
   const nameField = useRef(null);
 
@@ -35,8 +35,8 @@ const CardAdd = React.memo(({ isOpened, onCreate, onClose }) => {
     onCreate(cleanData);
 
     setData(DEFAULT_DATA);
-    selectNameField();
+    focusNameField();
-  }, [onCreate, data, setData, selectNameField]);
+  }, [onCreate, data, setData, focusNameField]);
 
   const handleFieldKeyDown = useCallback(
     (event) => {
@@ -65,13 +65,13 @@ const CardAdd = React.memo(({ isOpened, onCreate, onClose }) => {
 
   useEffect(() => {
     if (isOpened) {
-      nameField.current.ref.current.select();
+      nameField.current.ref.current.focus();
     }
   }, [isOpened]);
 
   useDidUpdate(() => {
-    nameField.current.ref.current.select();
+    nameField.current.ref.current.focus();
-  }, [selectNameFieldState]);
+  }, [focusNameFieldState]);
 
   return (
     <Form

client/src/components/Login/Login.jsx

@@ -83,7 +83,7 @@ const Login = React.memo(
     }, [onAuthenticate, data]);
 
     useEffect(() => {
-      emailOrUsernameField.current.select();
+      emailOrUsernameField.current.focus();
     }, []);
 
     useEffect(() => {

client/src/components/ProjectAddModal/ProjectAddModal.jsx

@@ -33,7 +33,7 @@ const ProjectAddModal = React.memo(({ defaultData, isSubmitting, onCreate, onClo
   }, [onCreate, data]);
 
   useEffect(() => {
-    nameField.current.select();
+    nameField.current.focus();
   }, []);
 
   return (

client/src/components/Root.jsx

@@ -10,6 +10,7 @@ import CoreWrapperContainer from '../containers/CoreWrapperContainer';
 import NotFound from './NotFound';
 
 import 'react-datepicker/dist/react-datepicker.css';
+import 'photoswipe/dist/photoswipe.css';
 import '../lib/custom-ui/styles.css';
 
 import '../styles.module.scss';

client/src/components/TimerEditStep/TimerEditStep.jsx

@@ -32,7 +32,7 @@ const createData = (timer) => {
 const TimerEditStep = React.memo(({ defaultValue, onUpdate, onBack, onClose }) => {
   const [t] = useTranslation();
   const [data, handleFieldChange, setData] = useForm(() => createData(defaultValue));
-  const [isEditing, toggleEdit] = useToggle();
+  const [isEditing, toggleEditing] = useToggle();
 
   const hoursField = useRef(null);
   const minutesField = useRef(null);
@@ -55,10 +55,10 @@ const TimerEditStep = React.memo(({ defaultValue, onUpdate, onBack, onClose }) =
     onClose();
   }, [defaultValue, onUpdate, onClose]);
 
-  const handleToggleEditClick = useCallback(() => {
+  const handleToggleEditingClick = useCallback(() => {
     setData(createData(defaultValue));
-    toggleEdit();
+    toggleEditing();
-  }, [defaultValue, setData, toggleEdit]);
+  }, [defaultValue, setData, toggleEditing]);
 
   const handleSubmit = useCallback(() => {
     const parts = {
@@ -149,7 +149,7 @@ const TimerEditStep = React.memo(({ defaultValue, onUpdate, onBack, onClose }) =
               type="button"
               icon={isEditing ? 'close' : 'edit'}
               className={styles.iconButton}
-              onClick={handleToggleEditClick}
+              onClick={handleToggleEditingClick}
             />
           </div>
           {isEditing && <Button positive content={t('action.save')} />}

client/src/components/UserAddPopup/UserAddPopup.jsx

@@ -88,7 +88,7 @@ const UserAddStep = React.memo(
     }, [onCreate, data]);
 
     useEffect(() => {
-      emailField.current.select();
+      emailField.current.focus();
     }, []);
 
     useEffect(() => {

client/src/components/UserEmailEditStep/UserEmailEditStep.jsx

@@ -87,7 +87,7 @@ const UserEmailEditStep = React.memo(
     }, [email, usePasswordConfirmation, onUpdate, onClose, data]);
 
     useEffect(() => {
-      emailField.current.select();
+      emailField.current.focus();
     }, []);
 
     useEffect(() => {

client/src/components/UserPasswordEditStep/UserPasswordEditStep.jsx

@@ -70,7 +70,7 @@ const UserPasswordEditStep = React.memo(
     }, [usePasswordConfirmation, onUpdate, data]);
 
     useEffect(() => {
-      passwordField.current.select();
+      passwordField.current.focus();
     }, []);
 
     useEffect(() => {

client/src/components/UserSettingsModal/AccountPane/AccountPane.jsx

@@ -1,8 +1,9 @@
 import React, { useCallback } from 'react';
 import PropTypes from 'prop-types';
 import { useTranslation } from 'react-i18next';
-import { Button, Divider, Header, Tab } from 'semantic-ui-react';
+import { Button, Divider, Dropdown, Header, Tab } from 'semantic-ui-react';
 
+import locales from '../../../locales';
 import AvatarEditPopup from './AvatarEditPopup';
 import User from '../../User';
 import UserInformationEdit from '../../UserInformationEdit';
@@ -20,12 +21,14 @@ const AccountPane = React.memo(
     avatarUrl,
     phone,
     organization,
+    language,
     isAvatarUpdating,
     usernameUpdateForm,
     emailUpdateForm,
     passwordUpdateForm,
     onUpdate,
     onAvatarUpdate,
+    onLanguageUpdate,
     onUsernameUpdate,
     onUsernameUpdateMessageDismiss,
     onEmailUpdate,
@@ -41,6 +44,13 @@ const AccountPane = React.memo(
       });
     }, [onUpdate]);
 
+    const handleLanguageChange = useCallback(
+      (_, { value }) => {
+        onLanguageUpdate(value === 'auto' ? null : value); // FIXME: hack
+      },
+      [onLanguageUpdate],
+    );
+
     return (
       <Tab.Pane attached={false} className={styles.wrapper}>
         <AvatarEditPopup
@@ -60,6 +70,32 @@ const AccountPane = React.memo(
           }}
           onUpdate={onUpdate}
         />
+        <Divider horizontal section>
+          <Header as="h4">
+            {t('common.language', {
+              context: 'title',
+            })}
+          </Header>
+        </Divider>
+        <Dropdown
+          fluid
+          selection
+          options={[
+            {
+              key: 'auto',
+              value: 'auto',
+              text: t('common.detectAutomatically'),
+            },
+            ...locales.map((locale) => ({
+              key: locale.language,
+              value: locale.language,
+              flag: locale.country,
+              text: locale.name,
+            })),
+          ]}
+          value={language || 'auto'}
+          onChange={handleLanguageChange}
+        />
         <Divider horizontal section>
           <Header as="h4">
             {t('common.authentication', {
@@ -129,6 +165,7 @@ AccountPane.propTypes = {
   avatarUrl: PropTypes.string,
   phone: PropTypes.string,
   organization: PropTypes.string,
+  language: PropTypes.string,
   isAvatarUpdating: PropTypes.bool.isRequired,
   /* eslint-disable react/forbid-prop-types */
   usernameUpdateForm: PropTypes.object.isRequired,
@@ -137,6 +174,7 @@ AccountPane.propTypes = {
   /* eslint-enable react/forbid-prop-types */
   onUpdate: PropTypes.func.isRequired,
   onAvatarUpdate: PropTypes.func.isRequired,
+  onLanguageUpdate: PropTypes.func.isRequired,
   onUsernameUpdate: PropTypes.func.isRequired,
   onUsernameUpdateMessageDismiss: PropTypes.func.isRequired,
   onEmailUpdate: PropTypes.func.isRequired,
@@ -150,6 +188,7 @@ AccountPane.defaultProps = {
   avatarUrl: undefined,
   phone: undefined,
   organization: undefined,
+  language: undefined,
 };
 
 export default AccountPane;

client/src/components/UserSettingsModal/UserSettingsModal.jsx

@@ -14,6 +14,7 @@ const UserSettingsModal = React.memo(
     avatarUrl,
     phone,
     organization,
+    language,
     subscribeToOwnCards,
     isAvatarUpdating,
     usernameUpdateForm,
@@ -21,6 +22,7 @@ const UserSettingsModal = React.memo(
     passwordUpdateForm,
     onUpdate,
     onAvatarUpdate,
+    onLanguageUpdate,
     onUsernameUpdate,
     onUsernameUpdateMessageDismiss,
     onEmailUpdate,
@@ -44,12 +46,14 @@ const UserSettingsModal = React.memo(
             avatarUrl={avatarUrl}
             phone={phone}
             organization={organization}
+            language={language}
             isAvatarUpdating={isAvatarUpdating}
             usernameUpdateForm={usernameUpdateForm}
             emailUpdateForm={emailUpdateForm}
             passwordUpdateForm={passwordUpdateForm}
             onUpdate={onUpdate}
             onAvatarUpdate={onAvatarUpdate}
+            onLanguageUpdate={onLanguageUpdate}
             onUsernameUpdate={onUsernameUpdate}
             onUsernameUpdateMessageDismiss={onUsernameUpdateMessageDismiss}
             onEmailUpdate={onEmailUpdate}
@@ -92,6 +96,7 @@ UserSettingsModal.propTypes = {
   avatarUrl: PropTypes.string,
   phone: PropTypes.string,
   organization: PropTypes.string,
+  language: PropTypes.string,
   subscribeToOwnCards: PropTypes.bool.isRequired,
   isAvatarUpdating: PropTypes.bool.isRequired,
   /* eslint-disable react/forbid-prop-types */
@@ -101,6 +106,7 @@ UserSettingsModal.propTypes = {
   /* eslint-enable react/forbid-prop-types */
   onUpdate: PropTypes.func.isRequired,
   onAvatarUpdate: PropTypes.func.isRequired,
+  onLanguageUpdate: PropTypes.func.isRequired,
   onUsernameUpdate: PropTypes.func.isRequired,
   onUsernameUpdateMessageDismiss: PropTypes.func.isRequired,
   onEmailUpdate: PropTypes.func.isRequired,
@@ -115,6 +121,7 @@ UserSettingsModal.defaultProps = {
   avatarUrl: undefined,
   phone: undefined,
   organization: undefined,
+  language: undefined,
 };
 
 export default UserSettingsModal;

client/src/components/UserUsernameEditStep/UserUsernameEditStep.jsx

@@ -87,7 +87,7 @@ const UserUsernameEditStep = React.memo(
     }, [username, usePasswordConfirmation, onUpdate, onClose, data]);
 
     useEffect(() => {
-      usernameField.current.select();
+      usernameField.current.focus();
     }, []);
 
     useEffect(() => {

client/src/constants/ActionTypes.js

@@ -225,6 +225,9 @@ export default {
   ACTIONS_FETCH: 'ACTIONS_FETCH',
   ACTIONS_FETCH__SUCCESS: 'ACTIONS_FETCH__SUCCESS',
   ACTIONS_FETCH__FAILURE: 'ACTIONS_FETCH__FAILURE',
+  ACTIONS_DETAILS_TOGGLE: 'ACTIONS_DETAILS_TOGGLE',
+  ACTIONS_DETAILS_TOGGLE__SUCCESS: 'ACTIONS_DETAILS_TOGGLE__SUCCESS',
+  ACTIONS_DETAILS_TOGGLE__FAILURE: 'ACTIONS_DETAILS_TOGGLE__FAILURE',
 
   /* Action */
 

client/src/constants/Config.js

@@ -13,7 +13,7 @@ const ACCESS_TOKEN_KEY = 'accessToken';
 const ACCESS_TOKEN_EXPIRES = 365;
 
 const POSITION_GAP = 65535;
-const ACTIONS_LIMIT = 10;
+const ACTIONS_LIMIT = 50;
 
 export default {
   SERVER_BASE_URL,

client/src/constants/DroppableTypes.js

@@ -1,9 +1,11 @@
 const BOARD = 'BOARD';
 const LIST = 'LIST';
 const CARD = 'CARD';
+const TASK = 'TASK';
 
 export default {
   BOARD,
   LIST,
   CARD,
+  TASK,
 };

client/src/constants/EntryActionTypes.js

@@ -31,6 +31,7 @@ export default {
   USER_UPDATE: `${PREFIX}/USER_UPDATE`,
   CURRENT_USER_UPDATE: `${PREFIX}/CURRENT_USER_UPDATE`,
   USER_UPDATE_HANDLE: `${PREFIX}/USER_UPDATE_HANDLE`,
+  CURRENT_USER_LANGUAGE_UPDATE: `${PREFIX}/CURRENT_USER_LANGUAGE_UPDATE`,
   USER_EMAIL_UPDATE: `${PREFIX}/USER_EMAIL_UPDATE`,
   CURRENT_USER_EMAIL_UPDATE: `${PREFIX}/CURRENT_USER_EMAIL_UPDATE`,
   USER_EMAIL_UPDATE_ERROR_CLEAR: `${PREFIX}/USER_EMAIL_UPDATE_ERROR_CLEAR`,
@@ -138,6 +139,7 @@ export default {
   TASK_CREATE_HANDLE: `${PREFIX}/TASK_CREATE_HANDLE`,
   TASK_UPDATE: `${PREFIX}/TASK_UPDATE`,
   TASK_UPDATE_HANDLE: `${PREFIX}/TASK_UPDATE_HANDLE`,
+  TASK_MOVE: `${PREFIX}/TASK_MOVE`,
   TASK_DELETE: `${PREFIX}/TASK_DELETE`,
   TASK_DELETE_HANDLE: `${PREFIX}/TASK_DELETE_HANDLE`,
 
@@ -153,6 +155,7 @@ export default {
   /* Actions */
 
   ACTIONS_IN_CURRENT_CARD_FETCH: `${PREFIX}/ACTIONS_IN_CURRENT_CARD_FETCH`,
+  ACTIONS_DETAILS_IN_CURRENT_CARD_TOGGLE: `${PREFIX}/ACTIONS_DETAILS_IN_CURRENT_CARD_TOGGLE`,
 
   /* Action */
 

client/src/containers/CardModalContainer.js

@@ -32,8 +32,10 @@ import {
   fetchActionsInCurrentCard,
   fetchBoard,
   moveCurrentCard,
+  moveTask,
   removeLabelFromCurrentCard,
   removeUserFromCurrentCard,
+  toggleActionsDetailsInCurrentCard,
   transferCurrentCard,
   updateAttachment,
   updateCommentAction,
@@ -59,6 +61,8 @@ const mapStateToProps = (state) => {
     timer,
     isSubscribed,
     isActionsFetching,
+    isActionsDetailsVisible,
+    isActionsDetailsFetching,
     isAllActionsFetched,
     boardId,
     listId,
@@ -78,6 +82,8 @@ const mapStateToProps = (state) => {
     isSubscribed,
     isActionsFetching,
     isAllActionsFetched,
+    isActionsDetailsVisible,
+    isActionsDetailsFetching,
     listId,
     boardId,
     projectId,
@@ -111,11 +117,13 @@ const mapDispatchToProps = (dispatch) =>
       onLabelDelete: deleteLabel,
       onTaskCreate: createTaskInCurrentCard,
       onTaskUpdate: updateTask,
+      onTaskMove: moveTask,
       onTaskDelete: deleteTask,
       onAttachmentCreate: createAttachmentInCurrentCard,
       onAttachmentUpdate: updateAttachment,
       onAttachmentDelete: deleteAttachment,
       onActionsFetch: fetchActionsInCurrentCard,
+      onActionsDetailsToggle: toggleActionsDetailsInCurrentCard,
       onCommentActionCreate: createCommentActionInCurrentCard,
       onCommentActionUpdate: updateCommentAction,
       onCommentActionDelete: deleteCommentAction,

client/src/containers/UserSettingsModalContainer.js

@@ -10,6 +10,7 @@ import {
   updateCurrentUser,
   updateCurrentUserAvatar,
   updateCurrentUserEmail,
+  updateCurrentUserLanguage,
   updateCurrentUserPassword,
   updateCurrentUserUsername,
 } from '../actions/entry';
@@ -23,6 +24,7 @@ const mapStateToProps = (state) => {
     avatarUrl,
     phone,
     organization,
+    language,
     subscribeToOwnCards,
     isAvatarUpdating,
     emailUpdateForm,
@@ -37,6 +39,7 @@ const mapStateToProps = (state) => {
     avatarUrl,
     phone,
     organization,
+    language,
     subscribeToOwnCards,
     isAvatarUpdating,
     emailUpdateForm,
@@ -50,6 +53,7 @@ const mapDispatchToProps = (dispatch) =>
     {
       onUpdate: updateCurrentUser,
       onAvatarUpdate: updateCurrentUserAvatar,
+      onLanguageUpdate: updateCurrentUserLanguage,
       onUsernameUpdate: updateCurrentUserUsername,
       onUsernameUpdateMessageDismiss: clearCurrentUserUsernameUpdateError,
       onEmailUpdate: updateCurrentUserEmail,

client/src/i18n.js

@@ -1,11 +1,11 @@
 import i18n from 'i18next';
-import languageDetector from 'i18next-browser-languagedetector';
+import LanguageDetector from 'i18next-browser-languagedetector';
 import { initReactI18next } from 'react-i18next';
 import formatDate from 'date-fns/format';
 import parseDate from 'date-fns/parse';
 import { registerLocale, setDefaultLocale } from 'react-datepicker';
 
-import { embedLocales, languages } from './locales';
+import { embeddedLocales, languages } from './locales';
 
 i18n.dateFns = {
   locales: {},
@@ -52,12 +52,12 @@ const parseDatePostProcessor = {
 };
 
 i18n
-  .use(languageDetector)
+  .use(LanguageDetector)
   .use(formatDatePostProcessor)
   .use(parseDatePostProcessor)
   .use(initReactI18next)
   .init({
-    resources: embedLocales,
+    resources: embeddedLocales,
     fallbackLng: 'en',
     supportedLngs: languages,
     load: 'languageOnly',
@@ -74,27 +74,41 @@ i18n
       },
     },
     react: {
-      useSuspense: false,
+      useSuspense: true,
     },
     debug: process.env.NODE_ENV !== 'production',
   });
 
-i18n.loadCoreLocale = (language = i18n.resolvedLanguage) => {
+i18n.loadCoreLocale = async (language = i18n.resolvedLanguage) => {
   if (language === 'en') {
     return;
   }
 
-  import(`./locales/${language}/core`).then((module) => {
+  const { default: locale } = await import(`./locales/${language}/core`);
-    const locale = module.default;
 
-    Object.keys(locale).forEach((namespace) => {
+  Object.keys(locale).forEach((namespace) => {
-      if (namespace === 'dateFns') {
+    if (namespace === 'dateFns') {
-        i18n.dateFns.addLocale(language, locale[namespace]);
+      i18n.dateFns.addLocale(language, locale[namespace]);
-      } else {
+    } else {
-        i18n.addResourceBundle(language, namespace, locale[namespace], true, true);
+      i18n.addResourceBundle(language, namespace, locale[namespace], true, true);
-      }
+    }
-    });
   });
 };
 
+i18n.detectLanguage = () => {
+  const {
+    services: { languageDetector, languageUtils },
+  } = i18n;
+
+  localStorage.removeItem(languageDetector.options.lookupLocalStorage);
+
+  const detectedLanguages = languageDetector.detect();
+
+  i18n.language = languageUtils.getBestMatchFromCodes(detectedLanguages);
+  i18n.languages = languageUtils.toResolveHierarchy(i18n.language);
+
+  i18n.resolvedLanguage = undefined;
+  i18n.setResolvedLanguage(i18n.language);
+};
+
 export default i18n;

client/src/lib/custom-ui/components/Markdown/Markdown.jsx

@@ -32,14 +32,12 @@ const Markdown = React.memo(({ linkStopPropagation, ...props }) => {
   }
 
   return (
-    /* eslint-disable react/jsx-props-no-spreading */
     <ReactMarkdown
-      {...props}
+      {...props} // eslint-disable-line react/jsx-props-no-spreading
       components={components}
       remarkPlugins={[remarkGfm, remarkBreaks]}
       className="markdown-body"
     />
-    /* eslint-enable react/jsx-props-no-spreading */
   );
 });
 

client/src/locales/cs/index.js

@@ -0,0 +1,8 @@
+import login from './login';
+
+export default {
+  language: 'cs',
+  country: 'cz',
+  name: 'Čeština',
+  embeddedLocale: login,
+};

client/src/locales/da/index.js

@@ -0,0 +1,8 @@
+import login from './login';
+
+export default {
+  language: 'da',
+  country: 'dk',
+  name: 'Dansk',
+  embeddedLocale: login,
+};

client/src/locales/de/core.js

@@ -72,6 +72,7 @@ export default {
       deleteTask_title: 'Aufgabe löschen',
       deleteUser_title: 'Benutzer löschen',
       description: 'Beschreibung',
+      detectAutomatically: 'Automatische Erkennung',
       dropFileToUpload: 'Datei ablegen, um hochzuladen',
       editAttachment_title: 'Anhang bearbieten',
       editAvatar_title: 'Avatar bearbeiten',
@@ -97,6 +98,7 @@ export default {
       hours: 'Stunden',
       invalidCurrentPassword: 'Das aktuelle Passwort ist falsch',
       labels: 'Labels',
+      language: 'Sprache',
       leaveBoard_title: 'Board verlassen',
       leaveProject_title: 'Projekt verlassen',
       list: 'Listen',
@@ -134,6 +136,7 @@ export default {
       subscribeToMyOwnCardsByDefault: 'Standardmäßig meine eigenen Karten abonnieren',
       taskActions_title: 'Aufgabenaktionen',
       tasks: 'Aufgaben',
+      thereIsNoPreviewAvailableForThisAttachment: 'Für diesen Anhang ist keine Vorschau verfügbar',
       time: 'Zeit',
       timer: 'Timer',
       title: 'Titel',
@@ -192,6 +195,7 @@ export default {
       editTimer_title: 'Timer bearbeiten',
       editTitle_title: 'Titel bearbeiten',
       editUsername_title: 'Benutzername ändern',
+      hideDetails: 'Details ausblenden',
       leaveBoard: 'Board verlassen',
       leaveProject: 'Projekt verlassen',
       logOut_title: 'Ausloggen',
@@ -207,6 +211,7 @@ export default {
       removeMember: 'Mitglied entfernen',
       save: 'Speichern',
       showAllAttachments: 'Alle Anhänge anzeigen ({{hidden}} versteckt)',
+      showDetails: 'Details anzeigen',
       showFewerAttachments: 'Weniger Anhänge anzeigen',
       start: 'Start',
       stop: 'Stopp',

client/src/locales/de/index.js

@@ -0,0 +1,8 @@
+import login from './login';
+
+export default {
+  language: 'de',
+  country: 'de',
+  name: 'Deutsch',
+  embeddedLocale: login,
+};

client/src/locales/en/core.js

@@ -64,6 +64,7 @@ export default {
       deleteTask_title: 'Delete Task',
       deleteUser_title: 'Delete User',
       description: 'Description',
+      detectAutomatically: 'Detect automatically',
       dropFileToUpload: 'Drop file to upload',
       editAttachment_title: 'Edit Attachment',
       editAvatar_title: 'Edit Avatar',
@@ -90,6 +91,7 @@ export default {
       hours: 'Hours',
       invalidCurrentPassword: 'Invalid current password',
       labels: 'Labels',
+      language: 'Language',
       leaveBoard_title: 'Leave Board',
       leaveProject_title: 'Leave Project',
       list: 'List',
@@ -127,6 +129,8 @@ export default {
       subscribeToMyOwnCardsByDefault: 'Subscribe to my own cards by default',
       taskActions_title: 'Task Actions',
       tasks: 'Tasks',
+      thereIsNoPreviewAvailableForThisAttachment:
+        'There is no preview available for this attachment',
       time: 'Time',
       timer: 'Timer',
       title: 'Title',
@@ -184,6 +188,7 @@ export default {
       editTimer_title: 'Edit Timer',
       editTitle_title: 'Edit Title',
       editUsername_title: 'Edit Username',
+      hideDetails: 'Hide details',
       leaveBoard: 'Leave board',
       leaveProject: 'Leave project',
       logOut_title: 'Log Out',
@@ -199,6 +204,7 @@ export default {
       removeMember: 'Remove member',
       save: 'Save',
       showAllAttachments: 'Show all attachments ({{hidden}} hidden)',
+      showDetails: 'Show details',
       showFewerAttachments: 'Show fewer attachments',
       start: 'Start',
       stop: 'Stop',

client/src/locales/en/index.js

@@ -0,0 +1,11 @@
+import merge from 'lodash/merge';
+
+import login from './login';
+import core from './core';
+
+export default {
+  language: 'en',
+  country: 'us',
+  name: 'English',
+  embeddedLocale: merge(login, core),
+};

client/src/locales/es/index.js

@@ -0,0 +1,8 @@
+import login from './login';
+
+export default {
+  language: 'es',
+  country: 'es',
+  name: 'Español',
+  embeddedLocale: login,
+};

client/src/locales/fr/index.js

@@ -0,0 +1,8 @@
+import login from './login';
+
+export default {
+  language: 'fr',
+  country: 'fr',
+  name: 'Français',
+  embeddedLocale: login,
+};

client/src/locales/index.js

@@ -1,37 +1,27 @@
-import merge from 'lodash/merge';
+import cs from './cs';
-import fromPairs from 'lodash/fromPairs';
+import da from './da';
+import de from './de';
+import en from './en';
+import es from './es';
+import fr from './fr';
+import ja from './ja';
+import pl from './pl';
+import ru from './ru';
+import sk from './sk';
+import sv from './sv';
+import uz from './uz';
+import zh from './zh';
 
-import csLogin from './cs/login';
+const locales = [cs, da, de, en, es, fr, ja, pl, ru, sk, sv, uz, zh];
-import daLogin from './da/login';
-import deLogin from './de/login';
-import enLogin from './en/login';
-import enCore from './en/core';
-import esLogin from './es/login';
-import frLogin from './fr/login';
-import jaLogin from './ja/login';
-import plLogin from './pl/login';
-import ruLogin from './ru/login';
-import skLogin from './sk/login';
-import svLogin from './sv/login';
-import uzLogin from './uz/login';
-import zhLogin from './zh/login';
 
-const localePairs = [
+export default locales;
-  ['cs', csLogin],
-  ['da', daLogin],
-  ['de', deLogin],
-  ['en', merge(enLogin, enCore)],
-  ['es', esLogin],
-  ['fr', frLogin],
-  ['ja', jaLogin],
-  ['pl', plLogin],
-  ['ru', ruLogin],
-  ['sk', skLogin],
-  ['sv', svLogin],
-  ['uz', uzLogin],
-  ['zh', zhLogin],
-];
 
-export const languages = localePairs.map((locale) => locale[0]);
+export const languages = locales.map((locale) => locale.language);
 
-export const embedLocales = fromPairs(localePairs);
+export const embeddedLocales = locales.reduce(
+  (result, locale) => ({
+    ...result,
+    [locale.language]: locale.embeddedLocale,
+  }),
+  {},
+);

client/src/locales/ja/index.js

@@ -0,0 +1,8 @@
+import login from './login';
+
+export default {
+  language: 'ja',
+  country: 'jp',
+  name: '日本語',
+  embeddedLocale: login,
+};

client/src/locales/pl/index.js

@@ -0,0 +1,8 @@
+import login from './login';
+
+export default {
+  language: 'pl',
+  country: 'pl',
+  name: 'Polski',
+  embeddedLocale: login,
+};

client/src/locales/ru/core.js

@@ -62,6 +62,7 @@ export default {
       deleteTask: 'Удаление задачи',
       deleteUser: 'Удаление пользователя',
       description: 'Описание',
+      detectAutomatically: 'Определить автоматически',
       dropFileToUpload: 'Перетяните файл, чтобы загрузить',
       editAttachment: 'Изменение вложения',
       editAvatar: 'Изменение аватара',
@@ -88,6 +89,7 @@ export default {
       hours: 'Часы',
       invalidCurrentPassword: 'Неверный текущий пароль',
       labels: 'Метки',
+      language: 'Язык',
       list: 'Список',
       listActions: 'Действия со списком',
       members: 'Участники',
@@ -122,6 +124,7 @@ export default {
       subscribeToMyOwnCardsByDefault: 'По умолчанию подписаться на мои собственные карточки',
       taskActions: 'Действия с задачей',
       tasks: 'Задачи',
+      thereIsNoPreviewAvailableForThisAttachment: 'Предпросмотр для этого вложения недоступен',
       time: 'Время',
       timer: 'Таймер',
       title: 'Название',
@@ -175,7 +178,8 @@ export default {
       editTask: 'Изменить задачу',
       editTimer: 'Изменить таймер',
       editTitle: 'Изменить название',
-      editUsername_title: 'Изменить имя пользователя',
+      editUsername: 'Изменить имя пользователя',
+      hideDetails: 'Скрыть подробности',
       logOut: 'Выйти',
       makeCover: 'Сделать обложкой',
       move: 'Переместить',
@@ -187,6 +191,7 @@ export default {
       removeMember: 'Удалить участника',
       save: 'Сохранить',
       showAllAttachments: 'Показать все вложения ({{hidden}} скрыто)',
+      showDetails: 'Показать подробности',
       showFewerAttachments: 'Показать меньше вложений',
       start: 'Начать',
       stop: 'Остановить',

client/src/locales/ru/index.js

@@ -0,0 +1,8 @@
+import login from './login';
+
+export default {
+  language: 'ru',
+  country: 'ru',
+  name: 'Русский',
+  embeddedLocale: login,
+};

client/src/locales/sk/index.js

@@ -0,0 +1,8 @@
+import login from './login';
+
+export default {
+  language: 'sk',
+  country: 'sk',
+  name: 'Slovenčina',
+  embeddedLocale: login,
+};

client/src/locales/sv/index.js

@@ -0,0 +1,8 @@
+import login from './login';
+
+export default {
+  language: 'sv',
+  country: 'se',
+  name: 'Svenska',
+  embeddedLocale: login,
+};

client/src/locales/uz/index.js

@@ -0,0 +1,8 @@
+import login from './login';
+
+export default {
+  language: 'uz',
+  country: 'uz',
+  name: "O'zbek",
+  embeddedLocale: login,
+};

client/src/locales/zh/index.js

@@ -0,0 +1,8 @@
+import login from './login';
+
+export default {
+  language: 'zh',
+  country: 'cn',
+  name: '中文',
+  embeddedLocale: login,
+};

client/src/models/Action.js

@@ -50,6 +50,7 @@ export default class extends Model {
 
         break;
       case ActionTypes.ACTIONS_FETCH__SUCCESS:
+      case ActionTypes.ACTIONS_DETAILS_TOGGLE__SUCCESS:
       case ActionTypes.NOTIFICATION_CREATE_HANDLE:
         payload.actions.forEach((action) => {
           Action.upsert(action);

client/src/models/Attachment.js

@@ -9,6 +9,7 @@ export default class extends Model {
     id: attr(),
     url: attr(),
     coverUrl: attr(),
+    image: attr(),
     name: attr(),
     cardId: fk({
       to: 'Card',

client/src/models/Card.js

@@ -2,6 +2,7 @@ import { Model, attr, fk, many, oneToOne } from 'redux-orm';
 
 import ActionTypes from '../constants/ActionTypes';
 import Config from '../constants/Config';
+import { ActionTypes as ActionTypesEnum } from '../constants/Enums';
 
 export default class extends Model {
   static modelName = 'Card';
@@ -22,6 +23,12 @@ export default class extends Model {
     isAllActionsFetched: attr({
       getDefault: () => false,
     }),
+    isActionsDetailsVisible: attr({
+      getDefault: () => false,
+    }),
+    isActionsDetailsFetching: attr({
+      getDefault: () => false,
+    }),
     boardId: fk({
       to: 'Board',
       as: 'board',
@@ -195,6 +202,36 @@ export default class extends Model {
         });
 
         break;
+      case ActionTypes.ACTIONS_DETAILS_TOGGLE: {
+        const cardModel = Card.withId(payload.cardId);
+        cardModel.isActionsDetailsVisible = payload.isVisible;
+
+        if (payload.isVisible) {
+          cardModel.isActionsDetailsFetching = true;
+        }
+
+        break;
+      }
+      case ActionTypes.ACTIONS_DETAILS_TOGGLE__SUCCESS: {
+        const cardModel = Card.withId(payload.cardId);
+
+        cardModel.update({
+          isAllActionsFetched: payload.actions.length < Config.ACTIONS_LIMIT,
+          isActionsDetailsFetching: false,
+        });
+
+        cardModel.actions.toModelArray().forEach((actionModel) => {
+          if (actionModel.notification) {
+            actionModel.update({
+              isInCard: false,
+            });
+          } else {
+            actionModel.delete();
+          }
+        });
+
+        break;
+      }
       case ActionTypes.NOTIFICATION_CREATE_HANDLE:
         payload.cards.forEach((card) => {
           Card.upsert(card);
@@ -206,15 +243,23 @@ export default class extends Model {
   }
 
   getOrderedTasksQuerySet() {
-    return this.tasks.orderBy('id');
+    return this.tasks.orderBy('position');
   }
 
   getOrderedAttachmentsQuerySet() {
     return this.attachments.orderBy('id', false);
   }
 
-  getOrderedInCardActionsQuerySet() {
+  getFilteredOrderedInCardActionsQuerySet() {
-    return this.actions.orderBy('id', false);
+    const filter = {
+      isInCard: true,
+    };
+
+    if (!this.isActionsDetailsVisible) {
+      filter.type = ActionTypesEnum.COMMENT_CARD;
+    }
+
+    return this.actions.filter(filter).orderBy('id', false);
   }
 
   getUnreadNotificationsQuerySet() {

client/src/models/List.js

@@ -83,7 +83,7 @@ export default class extends Model {
     return this.cards.orderBy('position');
   }
 
-  getOrderedFilteredCardsModelArray() {
+  getFilteredOrderedCardsModelArray() {
     let cardModels = this.getOrderedCardsQuerySet().toModelArray();
 
     const filterUserIds = this.board.filterUsers.toRefArray().map((user) => user.id);

client/src/models/Notification.js

@@ -1,4 +1,4 @@
-import { Model, attr, fk } from 'redux-orm';
+import { Model, attr, fk, oneToOne } from 'redux-orm';
 
 import ActionTypes from '../constants/ActionTypes';
 
@@ -15,16 +15,15 @@ export default class extends Model {
       as: 'user',
       relatedName: 'notifications',
     }),
-    actionId: fk({
-      to: 'Action',
-      as: 'action',
-      relatedName: 'notifications',
-    }),
     cardId: fk({
       to: 'Card',
       as: 'card',
       relatedName: 'notifications',
     }),
+    actionId: oneToOne({
+      to: 'Action',
+      as: 'action',
+    }),
   };
 
   static reducer({ type, payload }, Notification) {

client/src/models/Task.js

@@ -7,6 +7,7 @@ export default class extends Model {
 
   static fields = {
     id: attr(),
+    position: attr(),
     name: attr(),
     isCompleted: attr({
       getDefault: () => false,

client/src/models/User.js

@@ -40,6 +40,7 @@ export default class extends Model {
     avatarUrl: attr(),
     phone: attr(),
     organization: attr(),
+    language: attr(),
     subscribeToOwnCards: attr(),
     deletedAt: attr(),
     isAdmin: attr({

client/src/sagas/core/services/actions.js

@@ -1,11 +1,12 @@
 import { call, put, select } from 'redux-saga/effects';
 
 import request from '../request';
-import { lastActionIdByCardIdSelector, pathSelector } from '../../../selectors';
+import { cardByIdSelector, lastActionIdByCardIdSelector, pathSelector } from '../../../selectors';
-import { fetchActions } from '../../../actions';
+import { fetchActions, toggleActionsDetails } from '../../../actions';
 import api from '../../../api';
 
 export function* fetchActionsService(cardId) {
+  const { isActionsDetailsVisible } = yield select(cardByIdSelector, cardId);
   const lastId = yield select(lastActionIdByCardIdSelector, cardId);
 
   yield put(fetchActions(cardId));
@@ -19,6 +20,7 @@ export function* fetchActionsService(cardId) {
       included: { users },
     } = yield call(request, api.getActions, cardId, {
       beforeId: lastId,
+      withDetails: isActionsDetailsVisible,
     }));
   } catch (error) {
     yield put(fetchActions.failure(cardId, error));
@@ -33,3 +35,32 @@ export function* fetchActionsInCurrentCardService() {
 
   yield call(fetchActionsService, cardId);
 }
+
+export function* toggleActionsDetailsService(cardId, isVisible) {
+  yield put(toggleActionsDetails(cardId, isVisible));
+
+  if (isVisible) {
+    let actions;
+    let users;
+
+    try {
+      ({
+        items: actions,
+        included: { users },
+      } = yield call(request, api.getActions, cardId, {
+        withDetails: isVisible,
+      }));
+    } catch (error) {
+      yield put(toggleActionsDetails.failure(cardId, error));
+      return;
+    }
+
+    yield put(toggleActionsDetails.success(cardId, actions, users));
+  }
+}
+
+export function* toggleActionsDetailsInCurrentCardService(isVisible) {
+  const { cardId } = yield select(pathSelector);
+
+  yield call(toggleActionsDetailsService, cardId, isVisible);
+}

client/src/sagas/core/services/core.js

@@ -4,7 +4,6 @@ import { fetchCoreRequest } from '../requests';
 import { initializeCore } from '../../../actions';
 import i18n from '../../../i18n';
 
-// eslint-disable-next-line import/prefer-default-export
 export function* initializeCoreService() {
   const {
     user,
@@ -25,6 +24,7 @@ export function* initializeCoreService() {
     notifications,
   } = yield call(fetchCoreRequest); // TODO: handle error
 
+  yield call(i18n.changeLanguage, user.language);
   yield call(i18n.loadCoreLocale);
 
   yield put(
@@ -48,3 +48,14 @@ export function* initializeCoreService() {
     ),
   );
 }
+
+export function* changeCoreLanguageService(language) {
+  if (language === null) {
+    yield call(i18n.detectLanguage);
+    yield call(i18n.loadCoreLocale);
+    yield call(i18n.changeLanguage, i18n.resolvedLanguage);
+  } else {
+    yield call(i18n.loadCoreLocale, language);
+    yield call(i18n.changeLanguage, language);
+  }
+}

client/src/sagas/core/services/task.js

@@ -1,7 +1,7 @@
 import { call, put, select } from 'redux-saga/effects';
 
 import request from '../request';
-import { pathSelector } from '../../../selectors';
+import { nextTaskPositionSelector, pathSelector, taskByIdSelector } from '../../../selectors';
 import {
   createTask,
   deleteTask,
@@ -14,11 +14,16 @@ import api from '../../../api';
 import { createLocalId } from '../../../utils/local-id';
 
 export function* createTaskService(cardId, data) {
+  const nextData = {
+    ...data,
+    position: yield select(nextTaskPositionSelector, cardId),
+  };
+
   const localId = yield call(createLocalId);
 
   yield put(
     createTask({
-      ...data,
+      ...nextData,
       cardId,
       id: localId,
     }),
@@ -26,7 +31,7 @@ export function* createTaskService(cardId, data) {
 
   let task;
   try {
-    ({ item: task } = yield call(request, api.createTask, cardId, data));
+    ({ item: task } = yield call(request, api.createTask, cardId, nextData));
   } catch (error) {
     yield put(createTask.failure(localId, error));
     return;
@@ -63,6 +68,15 @@ export function* handleTaskUpdateService(task) {
   yield put(handleTaskUpdate(task));
 }
 
+export function* moveTaskService(id, index) {
+  const { cardId } = yield select(taskByIdSelector, id);
+  const position = yield select(nextTaskPositionSelector, cardId, index, id);
+
+  yield call(updateTaskService, id, {
+    position,
+  });
+}
+
 export function* deleteTaskService(id) {
   yield put(deleteTask(id));
 

client/src/sagas/core/services/user.js

@@ -1,6 +1,7 @@
 import { call, put, select } from 'redux-saga/effects';
 
 import { logoutService } from './login';
+import { changeCoreLanguageService } from './core';
 import request from '../request';
 import { currentUserIdSelector, currentUserSelector, pathSelector } from '../../../selectors';
 import {
@@ -81,6 +82,21 @@ export function* handleUserUpdateService(user) {
   yield put(handleUserUpdate(user, users, isCurrent));
 }
 
+// TODO: add loading state
+export function* updateUserLanguageService(id, language) {
+  yield call(changeCoreLanguageService, language);
+
+  yield call(updateUserService, id, {
+    language,
+  });
+}
+
+export function* updateCurrentUserLanguageService(language) {
+  const id = yield select(currentUserIdSelector);
+
+  yield call(updateUserLanguageService, id, language);
+}
+
 export function* updateUserEmailService(id, data) {
   yield put(updateUserEmail(id, data));
 

client/src/sagas/core/watchers/actions.js

@@ -1,10 +1,19 @@
-import { takeEvery } from 'redux-saga/effects';
+import { all, takeEvery } from 'redux-saga/effects';
 
-import { fetchActionsInCurrentCardService } from '../services';
+import {
+  fetchActionsInCurrentCardService,
+  toggleActionsDetailsInCurrentCardService,
+} from '../services';
 import EntryActionTypes from '../../../constants/EntryActionTypes';
 
 export default function* actionsWatchers() {
-  yield takeEvery(EntryActionTypes.ACTIONS_IN_CURRENT_CARD_FETCH, () =>
+  yield all([
-    fetchActionsInCurrentCardService(),
+    takeEvery(EntryActionTypes.ACTIONS_IN_CURRENT_CARD_FETCH, () =>
-  );
+      fetchActionsInCurrentCardService(),
+    ),
+    takeEvery(
+      EntryActionTypes.ACTIONS_DETAILS_IN_CURRENT_CARD_TOGGLE,
+      ({ payload: { isVisible } }) => toggleActionsDetailsInCurrentCardService(isVisible),
+    ),
+  ]);
 }

client/src/sagas/core/watchers/task.js

@@ -6,6 +6,7 @@ import {
   handleTaskCreateService,
   handleTaskDeleteService,
   handleTaskUpdateService,
+  moveTaskService,
   updateTaskService,
 } from '../services';
 import EntryActionTypes from '../../../constants/EntryActionTypes';
@@ -24,6 +25,9 @@ export default function* taskWatchers() {
     takeEvery(EntryActionTypes.TASK_UPDATE_HANDLE, ({ payload: { task } }) =>
       handleTaskUpdateService(task),
     ),
+    takeEvery(EntryActionTypes.TASK_MOVE, ({ payload: { id, index } }) =>
+      moveTaskService(id, index),
+    ),
     takeEvery(EntryActionTypes.TASK_DELETE, ({ payload: { id } }) => deleteTaskService(id)),
     takeEvery(EntryActionTypes.TASK_DELETE_HANDLE, ({ payload: { task } }) =>
       handleTaskDeleteService(task),

client/src/sagas/core/watchers/user.js

@@ -24,6 +24,7 @@ import {
   updateUserService,
   updateCurrentUserAvatarService,
   updateCurrentUserEmailService,
+  updateCurrentUserLanguageService,
   updateCurrentUserPasswordService,
   updateCurrentUserService,
   updateCurrentUserUsernameService,
@@ -49,6 +50,9 @@ export default function* userWatchers() {
     takeEvery(EntryActionTypes.USER_UPDATE_HANDLE, ({ payload: { user } }) =>
       handleUserUpdateService(user),
     ),
+    takeEvery(EntryActionTypes.CURRENT_USER_LANGUAGE_UPDATE, ({ payload: { language } }) =>
+      updateCurrentUserLanguageService(language),
+    ),
     takeEvery(EntryActionTypes.USER_EMAIL_UPDATE, ({ payload: { id, data } }) =>
       updateUserEmailService(id, data),
     ),

client/src/selectors/card.js

@@ -71,7 +71,7 @@ export const makeTasksByCardIdSelector = () =>
         return cardModel;
       }
 
-      return cardModel.tasks.toRefArray();
+      return cardModel.getOrderedTasksQuerySet().toRefArray();
     },
   );
 
@@ -88,7 +88,7 @@ export const makeLastActionIdByCardIdSelector = () =>
         return cardModel;
       }
 
-      const lastActionModel = cardModel.getOrderedInCardActionsQuerySet().last();
+      const lastActionModel = cardModel.getFilteredOrderedInCardActionsQuerySet().last();
 
       return lastActionModel && lastActionModel.id;
     },
@@ -249,7 +249,7 @@ export const actionsForCurrentCardSelector = createSelector(
     }
 
     return cardModel
-      .getOrderedInCardActionsQuerySet()
+      .getFilteredOrderedInCardActionsQuerySet()
       .toModelArray()
       .map((actionModel) => ({
         ...actionModel.ref,

client/src/selectors/core.js

@@ -73,6 +73,22 @@ export const nextCardPositionSelector = createSelector(
       return listModel;
     }
 
-    return nextPosition(listModel.getOrderedFilteredCardsModelArray(), index, excludedId);
+    return nextPosition(listModel.getFilteredOrderedCardsModelArray(), index, excludedId);
+  },
+);
+
+export const nextTaskPositionSelector = createSelector(
+  orm,
+  (_, cardId) => cardId,
+  (_, __, index) => index,
+  (_, __, ___, excludedId) => excludedId,
+  ({ Card }, cardId, index, excludedId) => {
+    const cardModel = Card.withId(cardId);
+
+    if (!cardModel) {
+      return cardModel;
+    }
+
+    return nextPosition(cardModel.getOrderedTasksQuerySet().toRefArray(), index, excludedId);
   },
 );

client/src/selectors/index.js

@@ -10,4 +10,5 @@ export * from './board';
 export * from './board-membership';
 export * from './list';
 export * from './card';
+export * from './task';
 export * from './attachment';

client/src/selectors/list.js

@@ -34,7 +34,7 @@ export const makeCardIdsByListIdSelector = () =>
         return listModel;
       }
 
-      return listModel.getOrderedFilteredCardsModelArray().map((cardModel) => cardModel.id);
+      return listModel.getFilteredOrderedCardsModelArray().map((cardModel) => cardModel.id);
     },
   );
 

client/src/selectors/task.js

@@ -0,0 +1,20 @@
+import { createSelector } from 'redux-orm';
+
+import orm from '../orm';
+
+export const makeTaskByIdSelector = () =>
+  createSelector(
+    orm,
+    (_, id) => id,
+    ({ Task }, id) => {
+      const taskModel = Task.withId(id);
+
+      if (!taskModel) {
+        return taskModel;
+      }
+
+      return taskModel.ref;
+    },
+  );
+
+export const taskByIdSelector = makeTaskByIdSelector();

client/src/styles.module.scss

@@ -101,6 +101,10 @@
         border-radius: 0;
       }
     }
+
+    .pswp .pswp__img--placeholder {
+      display: none !important;
+    }
   }
 
   #root {

package-lock.json

@@ -1,18 +1,18 @@
 {
   "name": "planka",
-  "version": "1.1.5",
+  "version": "1.4.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "planka",
-      "version": "1.1.5",
+      "version": "1.4.1",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "concurrently": "^7.1.0",
+        "concurrently": "^7.3.0",
-        "husky": "^7.0.4",
+        "husky": "^8.0.1",
-        "lint-staged": "^12.3.8"
+        "lint-staged": "^13.0.3"
       }
     },
     "node_modules/aggregate-error": {
@@ -217,31 +217,32 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/colorette": {
-      "version": "2.0.16",
+      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
-      "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g=="
+      "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ=="
     },
     "node_modules/commander": {
-      "version": "8.3.0",
+      "version": "9.4.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz",
-      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+      "integrity": "sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw==",
       "engines": {
-        "node": ">= 12"
+        "node": "^12.20.0 || >=14"
       }
     },
     "node_modules/concurrently": {
-      "version": "7.1.0",
+      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-7.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-7.3.0.tgz",
-      "integrity": "sha512-Bz0tMlYKZRUDqJlNiF/OImojMB9ruKUz6GCfmhFnSapXgPe+3xzY4byqoKG9tUZ7L2PGEUjfLPOLfIX3labnmw==",
+      "integrity": "sha512-IiDwm+8DOcFEInca494A8V402tNTQlJaYq78RF2rijOrKEk/AOHTxhN4U1cp7GYKYX5Q6Ymh1dLTBlzIMN0ikA==",
       "dependencies": {
         "chalk": "^4.1.0",
         "date-fns": "^2.16.1",
         "lodash": "^4.17.21",
-        "rxjs": "^6.6.3",
+        "rxjs": "^7.0.0",
+        "shell-quote": "^1.7.3",
         "spawn-command": "^0.0.2-1",
         "supports-color": "^8.1.0",
         "tree-kill": "^1.2.2",
-        "yargs": "^16.2.0"
+        "yargs": "^17.3.1"
       },
       "bin": {
         "concurrently": "dist/bin/concurrently.js"
@@ -264,9 +265,9 @@
       }
     },
     "node_modules/date-fns": {
-      "version": "2.28.0",
+      "version": "2.29.1",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.28.0.tgz",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.1.tgz",
-      "integrity": "sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw==",
+      "integrity": "sha512-dlLD5rKaKxpFdnjrs+5azHDFOPEu4ANy/LTh04A1DTzMM7qoajmKCBc8pkKRFT41CNzw+4gQh79X5C+Jq27HAw==",
       "engines": {
         "node": ">=0.11"
       },
@@ -310,22 +311,22 @@
       }
     },
     "node_modules/execa": {
-      "version": "5.1.1",
+      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-6.1.0.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "integrity": "sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==",
       "dependencies": {
         "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
+        "get-stream": "^6.0.1",
-        "human-signals": "^2.1.0",
+        "human-signals": "^3.0.1",
-        "is-stream": "^2.0.0",
+        "is-stream": "^3.0.0",
         "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
+        "npm-run-path": "^5.1.0",
-        "onetime": "^5.1.2",
+        "onetime": "^6.0.0",
-        "signal-exit": "^3.0.3",
+        "signal-exit": "^3.0.7",
-        "strip-final-newline": "^2.0.0"
+        "strip-final-newline": "^3.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
         "url": "https://github.com/sindresorhus/execa?sponsor=1"
@@ -370,22 +371,22 @@
       }
     },
     "node_modules/human-signals": {
-      "version": "2.1.0",
+      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-3.0.1.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "integrity": "sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==",
       "engines": {
-        "node": ">=10.17.0"
+        "node": ">=12.20.0"
       }
     },
     "node_modules/husky": {
-      "version": "7.0.4",
+      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz",
-      "integrity": "sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==",
+      "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==",
       "bin": {
         "husky": "lib/bin.js"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=14"
       },
       "funding": {
         "url": "https://github.com/sponsors/typicode"
@@ -419,11 +420,11 @@
       }
     },
     "node_modules/is-stream": {
-      "version": "2.0.1",
+      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
       "engines": {
-        "node": ">=8"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -432,57 +433,45 @@
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
     },
     "node_modules/lilconfig": {
-      "version": "2.0.4",
+      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz",
-      "integrity": "sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA==",
+      "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==",
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/lint-staged": {
-      "version": "12.3.8",
+      "version": "13.0.3",
-      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-12.3.8.tgz",
+      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-13.0.3.tgz",
-      "integrity": "sha512-0+UpNaqIwKRSGAFOCcpuYNIv/j5QGVC+xUVvmSdxHO+IfIGoHbFLo3XcPmV/LLnsVj5EAncNHVtlITSoY5qWGQ==",
+      "integrity": "sha512-9hmrwSCFroTSYLjflGI8Uk+GWAwMB4OlpU4bMJEAT5d/llQwtYKoim4bLOyLCuWFAhWEupE0vkIFqtw/WIsPug==",
       "dependencies": {
         "cli-truncate": "^3.1.0",
-        "colorette": "^2.0.16",
+        "colorette": "^2.0.17",
-        "commander": "^8.3.0",
+        "commander": "^9.3.0",
-        "debug": "^4.3.3",
+        "debug": "^4.3.4",
-        "execa": "^5.1.1",
+        "execa": "^6.1.0",
-        "lilconfig": "2.0.4",
+        "lilconfig": "2.0.5",
-        "listr2": "^4.0.1",
+        "listr2": "^4.0.5",
-        "micromatch": "^4.0.4",
+        "micromatch": "^4.0.5",
         "normalize-path": "^3.0.0",
-        "object-inspect": "^1.12.0",
+        "object-inspect": "^1.12.2",
-        "pidtree": "^0.5.0",
+        "pidtree": "^0.6.0",
         "string-argv": "^0.3.1",
-        "supports-color": "^9.2.1",
+        "yaml": "^2.1.1"
-        "yaml": "^1.10.2"
       },
       "bin": {
         "lint-staged": "bin/lint-staged.js"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": "^14.13.1 || >=16.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/lint-staged"
       }
     },
-    "node_modules/lint-staged/node_modules/supports-color": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.2.2.tgz",
-      "integrity": "sha512-XC6g/Kgux+rJXmwokjm9ECpD6k/smUoS5LKlUCcsYr4IY3rW0XyAympon2RmxGrlnZURMpg5T18gWDP9CsHXFA==",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
     "node_modules/listr2": {
       "version": "4.0.5",
       "resolved": "https://registry.npmjs.org/listr2/-/listr2-4.0.5.tgz",
@@ -545,14 +534,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/listr2/node_modules/rxjs": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
-      "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
     "node_modules/listr2/node_modules/slice-ansi": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
@@ -590,11 +571,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/listr2/node_modules/tslib": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
-    },
     "node_modules/lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
@@ -709,11 +685,14 @@
       }
     },
     "node_modules/mimic-fn": {
-      "version": "2.1.0",
+      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
       "engines": {
-        "node": ">=6"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/ms": {
@@ -730,33 +709,47 @@
       }
     },
     "node_modules/npm-run-path": {
-      "version": "4.0.1",
+      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==",
       "dependencies": {
-        "path-key": "^3.0.0"
+        "path-key": "^4.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/npm-run-path/node_modules/path-key": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
+      "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.12.0",
+      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==",
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/onetime": {
-      "version": "5.1.2",
+      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
       "dependencies": {
-        "mimic-fn": "^2.1.0"
+        "mimic-fn": "^4.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -796,9 +789,9 @@
       }
     },
     "node_modules/pidtree": {
-      "version": "0.5.0",
+      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz",
-      "integrity": "sha512-9nxspIM7OpZuhBxPg73Zvyq7j1QMPMPsGKTqRc2XOaFQauDvoNz9fM1Wdkjmeo7l9GXOZiRs97sPkuayl39wjA==",
+      "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==",
       "bin": {
         "pidtree": "bin/pidtree.js"
       },
@@ -809,7 +802,7 @@
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -826,20 +819,39 @@
         "node": ">=8"
       }
     },
+    "node_modules/restore-cursor/node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/restore-cursor/node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/rfdc": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
       "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA=="
     },
     "node_modules/rxjs": {
-      "version": "6.6.7",
+      "version": "7.5.6",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.6.tgz",
-      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "integrity": "sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==",
       "dependencies": {
-        "tslib": "^1.9.0"
+        "tslib": "^2.1.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
       }
     },
     "node_modules/shebang-command": {
@@ -861,6 +873,11 @@
         "node": ">=8"
       }
     },
+    "node_modules/shell-quote": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz",
+      "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw=="
+    },
     "node_modules/signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@@ -895,7 +912,7 @@
     "node_modules/spawn-command": {
       "version": "0.0.2-1",
       "resolved": "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz",
-      "integrity": "sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A="
+      "integrity": "sha512-n98l9E2RMSJ9ON1AKisHzz7V42VDiBQGY6PB1BwRglz99wpVsSuGzQ+jOi6lFXBGVTCrRpltvjm+/XA+tpeJrg=="
     },
     "node_modules/string-argv": {
       "version": "0.3.1",
@@ -936,11 +953,14 @@
       }
     },
     "node_modules/strip-final-newline": {
-      "version": "2.0.0",
+      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
       "engines": {
-        "node": ">=6"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/supports-color": {
@@ -960,7 +980,7 @@
     "node_modules/through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="
     },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
@@ -982,9 +1002,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "1.14.1",
+      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
     },
     "node_modules/type-fest": {
       "version": "0.21.3",
@@ -1081,36 +1101,36 @@
       }
     },
     "node_modules/yaml": {
-      "version": "1.10.2",
+      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "integrity": "sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==",
       "engines": {
-        "node": ">= 6"
+        "node": ">= 14"
       }
     },
     "node_modules/yargs": {
-      "version": "16.2.0",
+      "version": "17.5.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
       "dependencies": {
         "cliui": "^7.0.2",
         "escalade": "^3.1.1",
         "get-caller-file": "^2.0.5",
         "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
+        "string-width": "^4.2.3",
         "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
+        "yargs-parser": "^21.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       }
     },
     "node_modules/yargs-parser": {
-      "version": "20.2.9",
+      "version": "21.0.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==",
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       }
     },
     "node_modules/yargs/node_modules/ansi-regex": {
@@ -1303,28 +1323,29 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "colorette": {
-      "version": "2.0.16",
+      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
-      "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g=="
+      "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ=="
     },
     "commander": {
-      "version": "8.3.0",
+      "version": "9.4.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz",
-      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="
+      "integrity": "sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw=="
     },
     "concurrently": {
-      "version": "7.1.0",
+      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-7.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-7.3.0.tgz",
-      "integrity": "sha512-Bz0tMlYKZRUDqJlNiF/OImojMB9ruKUz6GCfmhFnSapXgPe+3xzY4byqoKG9tUZ7L2PGEUjfLPOLfIX3labnmw==",
+      "integrity": "sha512-IiDwm+8DOcFEInca494A8V402tNTQlJaYq78RF2rijOrKEk/AOHTxhN4U1cp7GYKYX5Q6Ymh1dLTBlzIMN0ikA==",
       "requires": {
         "chalk": "^4.1.0",
         "date-fns": "^2.16.1",
         "lodash": "^4.17.21",
-        "rxjs": "^6.6.3",
+        "rxjs": "^7.0.0",
+        "shell-quote": "^1.7.3",
         "spawn-command": "^0.0.2-1",
         "supports-color": "^8.1.0",
         "tree-kill": "^1.2.2",
-        "yargs": "^16.2.0"
+        "yargs": "^17.3.1"
       }
     },
     "cross-spawn": {
@@ -1338,9 +1359,9 @@
       }
     },
     "date-fns": {
-      "version": "2.28.0",
+      "version": "2.29.1",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.28.0.tgz",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.29.1.tgz",
-      "integrity": "sha512-8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw=="
+      "integrity": "sha512-dlLD5rKaKxpFdnjrs+5azHDFOPEu4ANy/LTh04A1DTzMM7qoajmKCBc8pkKRFT41CNzw+4gQh79X5C+Jq27HAw=="
     },
     "debug": {
       "version": "4.3.4",
@@ -1366,19 +1387,19 @@
       "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
     },
     "execa": {
-      "version": "5.1.1",
+      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-6.1.0.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "integrity": "sha512-QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA==",
       "requires": {
         "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
+        "get-stream": "^6.0.1",
-        "human-signals": "^2.1.0",
+        "human-signals": "^3.0.1",
-        "is-stream": "^2.0.0",
+        "is-stream": "^3.0.0",
         "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
+        "npm-run-path": "^5.1.0",
-        "onetime": "^5.1.2",
+        "onetime": "^6.0.0",
-        "signal-exit": "^3.0.3",
+        "signal-exit": "^3.0.7",
-        "strip-final-newline": "^2.0.0"
+        "strip-final-newline": "^3.0.0"
       }
     },
     "fill-range": {
@@ -1405,14 +1426,14 @@
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
     },
     "human-signals": {
-      "version": "2.1.0",
+      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-3.0.1.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="
+      "integrity": "sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ=="
     },
     "husky": {
-      "version": "7.0.4",
+      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz",
-      "integrity": "sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ=="
+      "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw=="
     },
     "indent-string": {
       "version": "4.0.0",
@@ -1430,46 +1451,38 @@
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
     },
     "is-stream": {
-      "version": "2.0.1",
+      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="
+      "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA=="
     },
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
     },
     "lilconfig": {
-      "version": "2.0.4",
+      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz",
-      "integrity": "sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA=="
+      "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg=="
     },
     "lint-staged": {
-      "version": "12.3.8",
+      "version": "13.0.3",
-      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-12.3.8.tgz",
+      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-13.0.3.tgz",
-      "integrity": "sha512-0+UpNaqIwKRSGAFOCcpuYNIv/j5QGVC+xUVvmSdxHO+IfIGoHbFLo3XcPmV/LLnsVj5EAncNHVtlITSoY5qWGQ==",
+      "integrity": "sha512-9hmrwSCFroTSYLjflGI8Uk+GWAwMB4OlpU4bMJEAT5d/llQwtYKoim4bLOyLCuWFAhWEupE0vkIFqtw/WIsPug==",
       "requires": {
         "cli-truncate": "^3.1.0",
-        "colorette": "^2.0.16",
+        "colorette": "^2.0.17",
-        "commander": "^8.3.0",
+        "commander": "^9.3.0",
-        "debug": "^4.3.3",
+        "debug": "^4.3.4",
-        "execa": "^5.1.1",
+        "execa": "^6.1.0",
-        "lilconfig": "2.0.4",
+        "lilconfig": "2.0.5",
-        "listr2": "^4.0.1",
+        "listr2": "^4.0.5",
-        "micromatch": "^4.0.4",
+        "micromatch": "^4.0.5",
         "normalize-path": "^3.0.0",
-        "object-inspect": "^1.12.0",
+        "object-inspect": "^1.12.2",
-        "pidtree": "^0.5.0",
+        "pidtree": "^0.6.0",
         "string-argv": "^0.3.1",
-        "supports-color": "^9.2.1",
+        "yaml": "^2.1.1"
-        "yaml": "^1.10.2"
-      },
-      "dependencies": {
-        "supports-color": {
-          "version": "9.2.2",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.2.2.tgz",
-          "integrity": "sha512-XC6g/Kgux+rJXmwokjm9ECpD6k/smUoS5LKlUCcsYr4IY3rW0XyAympon2RmxGrlnZURMpg5T18gWDP9CsHXFA=="
-        }
       }
     },
     "listr2": {
@@ -1511,14 +1524,6 @@
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
           "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
         },
-        "rxjs": {
-          "version": "7.5.5",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
-          "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
-          "requires": {
-            "tslib": "^2.1.0"
-          }
-        },
         "slice-ansi": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
@@ -1546,11 +1551,6 @@
           "requires": {
             "ansi-regex": "^5.0.1"
           }
-        },
-        "tslib": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-          "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
         }
       }
     },
@@ -1640,9 +1640,9 @@
       }
     },
     "mimic-fn": {
-      "version": "2.1.0",
+      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
+      "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw=="
     },
     "ms": {
       "version": "2.1.2",
@@ -1655,24 +1655,31 @@
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
     },
     "npm-run-path": {
-      "version": "4.0.1",
+      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==",
       "requires": {
-        "path-key": "^3.0.0"
+        "path-key": "^4.0.0"
+      },
+      "dependencies": {
+        "path-key": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
+          "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ=="
+        }
       }
     },
     "object-inspect": {
-      "version": "1.12.0",
+      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g=="
+      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="
     },
     "onetime": {
-      "version": "5.1.2",
+      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
       "requires": {
-        "mimic-fn": "^2.1.0"
+        "mimic-fn": "^4.0.0"
       }
     },
     "p-map": {
@@ -1694,14 +1701,14 @@
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
     },
     "pidtree": {
-      "version": "0.5.0",
+      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz",
-      "integrity": "sha512-9nxspIM7OpZuhBxPg73Zvyq7j1QMPMPsGKTqRc2XOaFQauDvoNz9fM1Wdkjmeo7l9GXOZiRs97sPkuayl39wjA=="
+      "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g=="
     },
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
     },
     "restore-cursor": {
       "version": "3.1.0",
@@ -1710,6 +1717,21 @@
       "requires": {
         "onetime": "^5.1.0",
         "signal-exit": "^3.0.2"
+      },
+      "dependencies": {
+        "mimic-fn": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
+        },
+        "onetime": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+          "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+          "requires": {
+            "mimic-fn": "^2.1.0"
+          }
+        }
       }
     },
     "rfdc": {
@@ -1718,11 +1740,11 @@
       "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA=="
     },
     "rxjs": {
-      "version": "6.6.7",
+      "version": "7.5.6",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.6.tgz",
-      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "integrity": "sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==",
       "requires": {
-        "tslib": "^1.9.0"
+        "tslib": "^2.1.0"
       }
     },
     "shebang-command": {
@@ -1738,6 +1760,11 @@
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
     },
+    "shell-quote": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz",
+      "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw=="
+    },
     "signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@@ -1762,7 +1789,7 @@
     "spawn-command": {
       "version": "0.0.2-1",
       "resolved": "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz",
-      "integrity": "sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A="
+      "integrity": "sha512-n98l9E2RMSJ9ON1AKisHzz7V42VDiBQGY6PB1BwRglz99wpVsSuGzQ+jOi6lFXBGVTCrRpltvjm+/XA+tpeJrg=="
     },
     "string-argv": {
       "version": "0.3.1",
@@ -1788,9 +1815,9 @@
       }
     },
     "strip-final-newline": {
-      "version": "2.0.0",
+      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="
+      "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw=="
     },
     "supports-color": {
       "version": "8.1.1",
@@ -1803,7 +1830,7 @@
     "through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="
     },
     "to-regex-range": {
       "version": "5.0.1",
@@ -1819,9 +1846,9 @@
       "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A=="
     },
     "tslib": {
-      "version": "1.14.1",
+      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
     },
     "type-fest": {
       "version": "0.21.3",
@@ -1887,22 +1914,22 @@
       "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
     },
     "yaml": {
-      "version": "1.10.2",
+      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="
+      "integrity": "sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw=="
     },
     "yargs": {
-      "version": "16.2.0",
+      "version": "17.5.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
       "requires": {
         "cliui": "^7.0.2",
         "escalade": "^3.1.1",
         "get-caller-file": "^2.0.5",
         "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
+        "string-width": "^4.2.3",
         "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
+        "yargs-parser": "^21.0.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -1941,9 +1968,9 @@
       }
     },
     "yargs-parser": {
-      "version": "20.2.9",
+      "version": "21.0.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="
+      "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg=="
     }
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "planka",
-  "version": "1.1.5",
+  "version": "1.4.1",
   "private": true,
   "homepage": "https://plankanban.github.io/planka",
   "repository": {
@@ -39,8 +39,8 @@
     ]
   },
   "dependencies": {
-    "concurrently": "^7.1.0",
+    "concurrently": "^7.3.0",
-    "husky": "^7.0.4",
+    "husky": "^8.0.1",
-    "lint-staged": "^12.3.8"
+    "lint-staged": "^13.0.3"
   }
 }

server/api/controllers/actions/index.js

@@ -15,6 +15,9 @@ module.exports = {
       type: 'string',
       regex: /^[0-9]+$/,
     },
+    withDetails: {
+      type: 'boolean',
+    },
   },
 
   exits: {
@@ -43,7 +46,11 @@ module.exports = {
       }
     }
 
-    const actions = await sails.helpers.cards.getActions(card.id, inputs.beforeId);
+    const actions = await sails.helpers.cards.getActions(
+      card.id,
+      inputs.beforeId,
+      inputs.withDetails,
+    );
 
     const userIds = sails.helpers.utils.mapRecords(actions, 'userId', true);
     const users = await sails.helpers.users.getMany(userIds, true);

server/api/controllers/attachments/create.js

@@ -54,10 +54,8 @@ module.exports = {
 
         const attachment = await sails.helpers.attachments.createOne(
           {
-            dirname: file.extra.dirname,
+            ...file.extra,
             filename: file.filename,
-            isImage: file.extra.isImage,
-            name: file.extra.name,
           },
           currentUser,
           card,

server/api/controllers/attachments/download-thumbnail.js

@@ -46,7 +46,7 @@ module.exports = {
       }
     }
 
-    if (!attachment.isImage) {
+    if (!attachment.image) {
       throw Errors.ATTACHMENT_NOT_FOUND;
     }
 

server/api/controllers/attachments/download.js

@@ -53,7 +53,7 @@ module.exports = {
     }
 
     this.res.type(attachment.filename);
-    if (!attachment.isImage && path.extname(attachment.filename) !== '.pdf') {
+    if (!attachment.image && path.extname(attachment.filename) !== '.pdf') {
       this.res.set('Content-Disposition', 'attachment');
     }
     this.res.set('Cache-Control', 'private, max-age=900'); // TODO: move to config

server/api/controllers/boards/create.js

@@ -33,11 +33,6 @@ module.exports = {
   },
 
   async fn(inputs) {
-    // TODO: allow over HTTP without subscription
-    if (!this.req.isSocket) {
-      return this.res.badRequest();
-    }
-
     const { currentUser } = this.req;
 
     const project = await Project.findOne(inputs.projectId);
@@ -61,7 +56,9 @@ module.exports = {
       this.req,
     );
 
-    sails.sockets.join(this.req, `board:${board.id}`); // TODO: only when subscription needed
+    if (this.req.isSocket) {
+      sails.sockets.join(this.req, `board:${board.id}`); // TODO: only when subscription needed
+    }
 
     return {
       item: board,

server/api/controllers/boards/show.js

@@ -20,11 +20,6 @@ module.exports = {
   },
 
   async fn(inputs) {
-    // TODO: allow over HTTP without subscription
-    if (!this.req.isSocket) {
-      return this.res.badRequest();
-    }
-
     const { currentUser } = this.req;
 
     const { board, project } = await sails.helpers.boards
@@ -77,7 +72,9 @@ module.exports = {
       card.isSubscribed = isSubscribedByCardId[card.id] || false; // eslint-disable-line no-param-reassign
     });
 
-    sails.sockets.join(this.req, `board:${board.id}`); // TODO: only when subscription needed
+    if (this.req.isSocket) {
+      sails.sockets.join(this.req, `board:${board.id}`); // TODO: only when subscription needed
+    }
 
     return {
       item: board,

server/api/controllers/tasks/create.js

@@ -11,6 +11,10 @@ module.exports = {
       regex: /^[0-9]+$/,
       required: true,
     },
+    position: {
+      type: 'number',
+      required: true,
+    },
     name: {
       type: 'string',
       required: true,
@@ -39,7 +43,7 @@ module.exports = {
       throw Errors.CARD_NOT_FOUND; // Forbidden
     }
 
-    const values = _.pick(inputs, ['name', 'isCompleted']);
+    const values = _.pick(inputs, ['position', 'name', 'isCompleted']);
     const task = await sails.helpers.tasks.createOne(values, card, this.req);
 
     return {

server/api/controllers/tasks/update.js

@@ -11,6 +11,9 @@ module.exports = {
       regex: /^[0-9]+$/,
       required: true,
     },
+    position: {
+      type: 'number',
+    },
     name: {
       type: 'string',
       isNotEmptyString: true,
@@ -42,7 +45,7 @@ module.exports = {
       throw Errors.TASK_NOT_FOUND; // Forbidden
     }
 
-    const values = _.pick(inputs, ['name', 'isCompleted']);
+    const values = _.pick(inputs, ['position', 'name', 'isCompleted']);
     task = await sails.helpers.tasks.updateOne(task, values, board, this.req);
 
     if (!task) {

server/api/controllers/users/create.js

@@ -40,6 +40,11 @@ module.exports = {
       isNotEmptyString: true,
       allowNull: true,
     },
+    language: {
+      type: 'string',
+      isNotEmptyString: true,
+      allowNull: true,
+    },
     subscribeToOwnCards: {
       type: 'boolean',
     },
@@ -62,6 +67,7 @@ module.exports = {
       'username',
       'phone',
       'organization',
+      'language',
       'subscribeToOwnCards',
     ]);
 

server/api/controllers/users/update.js

@@ -32,6 +32,11 @@ module.exports = {
       isNotEmptyString: true,
       allowNull: true,
     },
+    language: {
+      type: 'string',
+      isNotEmptyString: true,
+      allowNull: true,
+    },
     subscribeToOwnCards: {
       type: 'boolean',
     },
@@ -66,6 +71,7 @@ module.exports = {
       'avatarUrl',
       'phone',
       'organization',
+      'language',
       'subscribeToOwnCards',
     ]);
 

server/api/helpers/attachments/create-one.js

@@ -38,7 +38,7 @@ module.exports = {
       inputs.request,
     );
 
-    if (!inputs.card.coverAttachmentId && attachment.isImage) {
+    if (!inputs.card.coverAttachmentId && attachment.image) {
       await sails.helpers.cards.updateOne(inputs.card, {
         coverAttachmentId: attachment.id,
       });

server/api/helpers/cards/get-actions.js

@@ -1,4 +1,4 @@
-const LIMIT = 10;
+const LIMIT = 50;
 
 module.exports = {
   inputs: {
@@ -10,6 +10,10 @@ module.exports = {
     beforeId: {
       type: 'string',
     },
+    withDetails: {
+      type: 'boolean',
+      defaultsTo: false,
+    },
   },
 
   async fn(inputs) {
@@ -23,6 +27,10 @@ module.exports = {
       };
     }
 
+    if (!inputs.withDetails) {
+      criteria.type = Action.Types.COMMENT_CARD;
+    }
+
     return sails.helpers.actions.getMany(criteria, LIMIT);
   },
 };

server/api/helpers/cards/get-tasks.js

@@ -5,11 +5,23 @@ module.exports = {
       custom: (value) => _.isString(value) || _.every(value, _.isString),
       required: true,
     },
+    exceptTaskIdOrIds: {
+      type: 'json',
+      custom: (value) => _.isString(value) || _.every(value, _.isString),
+    },
   },
 
   async fn(inputs) {
-    return sails.helpers.tasks.getMany({
+    const criteria = {
       cardId: inputs.idOrIds,
-    });
+    };
+
+    if (!_.isUndefined(inputs.exceptTaskIdOrIds)) {
+      criteria.id = {
+        '!=': inputs.exceptTaskIdOrIds,
+      };
+    }
+
+    return sails.helpers.tasks.getMany(criteria);
   },
 };

server/api/helpers/tasks/create-one.js

@@ -2,6 +2,7 @@ module.exports = {
   inputs: {
     values: {
       type: 'json',
+      custom: (value) => _.isPlainObject(value) && _.isFinite(value.position),
       required: true,
     },
     card: {
@@ -14,8 +15,32 @@ module.exports = {
   },
 
   async fn(inputs) {
+    const tasks = await sails.helpers.cards.getTasks(inputs.card.id);
+
+    const { position, repositions } = sails.helpers.utils.insertToPositionables(
+      inputs.values.position,
+      tasks,
+    );
+
+    repositions.forEach(async ({ id, position: nextPosition }) => {
+      await Task.update({
+        id,
+        cardId: inputs.card.id,
+      }).set({
+        position: nextPosition,
+      });
+
+      sails.sockets.broadcast(`board:${inputs.card.boardId}`, 'taskUpdate', {
+        item: {
+          id,
+          position: nextPosition,
+        },
+      });
+    });
+
     const task = await Task.create({
       ...inputs.values,
+      position,
       cardId: inputs.card.id,
     }).fetch();
 

server/api/helpers/tasks/get-many.js

@@ -7,6 +7,6 @@ module.exports = {
   },
 
   async fn(inputs) {
-    return Task.find(inputs.criteria).sort('id');
+    return Task.find(inputs.criteria).sort('position');
   },
 };

server/api/helpers/tasks/update-one.js

@@ -6,6 +6,17 @@ module.exports = {
     },
     values: {
       type: 'json',
+      custom: (value) => {
+        if (!_.isPlainObject(value)) {
+          return false;
+        }
+
+        if (!_.isUndefined(value.position) && !_.isFinite(value.position)) {
+          return false;
+        }
+
+        return true;
+      },
       required: true,
     },
     board: {
@@ -18,6 +29,33 @@ module.exports = {
   },
 
   async fn(inputs) {
+    if (!_.isUndefined(inputs.values.position)) {
+      const tasks = await sails.helpers.cards.getTasks(inputs.record.cardId, inputs.record.id);
+
+      const { position, repositions } = sails.helpers.utils.insertToPositionables(
+        inputs.values.position,
+        tasks,
+      );
+
+      inputs.values.position = position; // eslint-disable-line no-param-reassign
+
+      repositions.forEach(async ({ id, position: nextPosition }) => {
+        await Task.update({
+          id,
+          cardId: inputs.record.cardId,
+        }).set({
+          position: nextPosition,
+        });
+
+        sails.sockets.broadcast(`board:${inputs.board.id}`, 'taskUpdate', {
+          item: {
+            id,
+            position: nextPosition,
+          },
+        });
+      });
+    }
+
     const task = await Task.updateOne(inputs.record.id).set(inputs.values);
 
     if (task) {