Rename deadline to due date, update dependencies

6 years ago · 51013b6a32
parent 64acf0ac56
commit 51013b6a32
31 changed files with 113 additions and 115 deletions
--- a/README.md
+++ b/README.md
@ -11,7 +11,7 @@ A Trello-like application built with React and Redux.
 ## Features

 - Create projects, boards, lists, cards, labels and tasks
- Add card members, track time, set a deadline, write comments
+- Add card members, track time, set a due date, write comments
 - Markdown support in a card description and comment
 - Filter by members and labels
 - Real-time updates
--- a/client/package-lock.json
+++ b/client/package-lock.json
@ -1,4 +1,5 @@
 {
+  "name": "planka-client",
  "requires": true,
  "lockfileVersion": 1,
  "dependencies": {
@ -6500,9 +6501,9 @@
      }
    },
    "i18next-browser-languagedetector": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-3.0.3.tgz",
-      "integrity": "sha512-1YuAogyQap0J6N4kM+6gAjZ6T7QWrp3xZCmSs0QedkNmgAKhj7FiQlCviHKl3IwbM6zJNgft4D7UDPWb1dTCMQ=="
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-3.1.1.tgz",
+      "integrity": "sha512-JBgFWijjI1t6as4WgGvDdX4GLJPZwC/SMHzLQQ3ef7XaJsEkomlXFqXifKvOVJg09Hj2BVWe6strDdIF4J/0ng=="
    },
    "iconv-lite": {
      "version": "0.4.24",
@ -10821,9 +10822,9 @@
      "integrity": "sha512-JsecfN+JlckncVXTWFWjn0Vk6uInl8GSf4eEd9tTk5qXHlgqkPdILpnYpgZcISXNYAzvfvsCZviaDk8AxyS5sg=="
    },
    "react": {
-      "version": "16.10.1",
-      "resolved": "https://registry.npmjs.org/react/-/react-16.10.1.tgz",
-      "integrity": "sha512-2bisHwMhxQ3XQz4LiJJwG3360pY965pTl/MRrZYxIBKVj4fOHoDs5aZAkYXGxDRO1Li+SyjTAilQEbOmtQJHzA==",
+      "version": "16.10.2",
+      "resolved": "https://registry.npmjs.org/react/-/react-16.10.2.tgz",
+      "integrity": "sha512-MFVIq0DpIhrHFyqLU0S3+4dIcBhhOvBE8bJ/5kHPVOVaGdo0KuiQzpcjCPsf585WvhypqtrMILyoE2th6dT+Lw==",
      "requires": {
        "loose-envify": "^1.1.0",
        "object-assign": "^4.1.1",
@ -10932,14 +10933,14 @@
      }
    },
    "react-dom": {
-      "version": "16.10.1",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.10.1.tgz",
-      "integrity": "sha512-SmM4ZW0uug0rn95U8uqr52I7UdNf6wdGLeXDmNLfg3y5q5H9eAbdjF5ubQc3bjDyRrvdAB2IKG7X0GzSpnn5Mg==",
+      "version": "16.10.2",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.10.2.tgz",
+      "integrity": "sha512-kWGDcH3ItJK4+6Pl9DZB16BXYAZyrYQItU4OMy0jAkv5aNqc+mAKb4TpFtAteI6TJZu+9ZlNhaeNQSVQDHJzkw==",
      "requires": {
        "loose-envify": "^1.1.0",
        "object-assign": "^4.1.1",
        "prop-types": "^15.6.2",
-        "scheduler": "^0.16.1"
+        "scheduler": "^0.16.2"
      }
    },
    "react-error-overlay": {
@ -11806,9 +11807,9 @@
      }
    },
    "scheduler": {
-      "version": "0.16.1",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.16.1.tgz",
-      "integrity": "sha512-MIuie7SgsqMYOdCXVFZa8SKoNorJZUWHW8dPgto7uEHn1lX3fg2Gu0TzgK8USj76uxV7vB5eRMnZs/cdEHg+cg==",
+      "version": "0.16.2",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.16.2.tgz",
+      "integrity": "sha512-BqYVWqwz6s1wZMhjFvLfVR5WXP7ZY32M/wYPo04CcuPM7XZEbV2TBNW7Z0UkguPTl0dWMA59VbNXxK6q+pHItg==",
      "requires": {
        "loose-envify": "^1.1.0",
        "object-assign": "^4.1.1"
--- a/client/package.json
+++ b/client/package.json
@ -38,14 +38,14 @@
    "dequal": "^1.0.0",
    "history": "^4.10.1",
    "i18next": "^17.0.18",
-    "i18next-browser-languagedetector": "^3.0.3",
+    "i18next-browser-languagedetector": "^3.1.1",
    "initials": "^3.0.1",
    "lodash": "^4.17.15",
    "prop-types": "^15.7.2",
-    "react": "^16.10.1",
+    "react": "^16.10.2",
    "react-beautiful-dnd": "^11.0.5",
    "react-datepicker": "^2.9.6",
-    "react-dom": "^16.10.1",
+    "react-dom": "^16.10.2",
    "react-i18next": "^10.13.1",
    "react-input-mask": "^2.0.4",
    "react-markdown": "^4.2.2",
--- a/client/src/api/cards.js
+++ b/client/src/api/cards.js
@ -4,7 +4,7 @@ import socket from './socket';

 export const transformCard = (card) => ({
  ...card,
-  deadline: card.deadline && new Date(card.deadline),
+  dueDate: card.dueDate && new Date(card.dueDate),
  timer: card.timer && {
    ...card.timer,
    startedAt: card.timer.startedAt && new Date(card.timer.startedAt),
@ -13,8 +13,8 @@ export const transformCard = (card) => ({

 export const transformCardData = (data) => ({
  ...data,
-  ...(data.deadline && {
-    deadline: data.deadline.toISOString(),
+  ...(data.dueDate && {
+    dueDate: data.dueDate.toISOString(),
  }),
  ...(data.timer && {
    ...data.timer,
--- a/client/src/components/Card/ActionsPopup.jsx
+++ b/client/src/components/Card/ActionsPopup.jsx
@ -8,7 +8,7 @@ import { Popup } from '../../lib/custom-ui';
 import { useSteps } from '../../hooks';
 import ProjectMembershipsStep from '../ProjectMembershipsStep';
 import LabelsStep from '../LabelsStep';
-import EditDeadlineStep from '../EditDeadlineStep';
+import EditDueDateStep from '../EditDueDateStep';
 import EditTimerStep from '../EditTimerStep';
 import DeleteStep from '../DeleteStep';

@ -17,7 +17,7 @@ import styles from './ActionsPopup.module.css';
 const StepTypes = {
  USERS: 'USERS',
  LABELS: 'LABELS',
-  EDIT_DEADLINE: 'EDIT_DEADLINE',
+  EDIT_DUE_DATE: 'EDIT_DUE_DATE',
  EDIT_TIMER: 'EDIT_TIMER',
  DELETE: 'DELETE',
 };
@ -57,8 +57,8 @@ const ActionsStep = React.memo(
      openStep(StepTypes.LABELS);
    }, [openStep]);

-    const handleEditDeadlineClick = useCallback(() => {
-      openStep(StepTypes.EDIT_DEADLINE);
+    const handleEditDueDateClick = useCallback(() => {
+      openStep(StepTypes.EDIT_DUE_DATE);
    }, [openStep]);

    const handleEditTimerClick = useCallback(() => {
@ -69,10 +69,10 @@ const ActionsStep = React.memo(
      openStep(StepTypes.DELETE);
    }, [openStep]);

-    const handleDeadlineUpdate = useCallback(
-      (deadline) => {
+    const handleDueDateUpdate = useCallback(
+      (dueDate) => {
        onUpdate({
-          deadline,
+          dueDate,
        });
      },
      [onUpdate],
@ -112,11 +112,11 @@ const ActionsStep = React.memo(
              onBack={handleBack}
            />
          );
-        case StepTypes.EDIT_DEADLINE:
+        case StepTypes.EDIT_DUE_DATE:
          return (
-            <EditDeadlineStep
-              defaultValue={card.deadline}
-              onUpdate={handleDeadlineUpdate}
+            <EditDueDateStep
+              defaultValue={card.dueDate}
+              onUpdate={handleDueDateUpdate}
              onBack={handleBack}
              onClose={onClose}
            />
@ -170,8 +170,8 @@ const ActionsStep = React.memo(
                context: 'title',
              })}
            </Menu.Item>
-            <Menu.Item className={styles.menuItem} onClick={handleEditDeadlineClick}>
-              {t('action.editDeadline', {
+            <Menu.Item className={styles.menuItem} onClick={handleEditDueDateClick}>
+              {t('action.editDueDate', {
                context: 'title',
              })}
            </Menu.Item>
--- a/client/src/components/Card/Card.jsx
+++ b/client/src/components/Card/Card.jsx
@ -11,7 +11,7 @@ import EditName from './EditName';
 import ActionsPopup from './ActionsPopup';
 import User from '../User';
 import Label from '../Label';
-import Deadline from '../Deadline';
+import DueDate from '../DueDate';
 import Timer from '../Timer';

 import styles from './Card.module.css';
@ -21,7 +21,7 @@ const Card = React.memo(
    id,
    index,
    name,
-    deadline,
+    dueDate,
    timer,
    isPersisted,
    notificationsTotal,
@ -74,7 +74,7 @@ const Card = React.memo(
        )}
        <div className={styles.name}>{name}</div>
        {tasks.length > 0 && <Tasks items={tasks} />}
-        {(deadline || timer) && (
+        {(dueDate || timer) && (
          <span className={styles.attachments}>
            {notificationsTotal > 0 && (
              <span
@ -87,9 +87,9 @@ const Card = React.memo(
                {notificationsTotal}
              </span>
            )}
-            {deadline && (
+            {dueDate && (
              <span className={classNames(styles.attachment, styles.attachmentLeft)}>
-                <Deadline value={deadline} size="tiny" />
+                <DueDate value={dueDate} size="tiny" />
              </span>
            )}
            {timer && (
@ -131,7 +131,7 @@ const Card = React.memo(
                      card={{
                        id,
                        name,
-                        deadline,
+                        dueDate,
                        timer,
                        isPersisted,
                      }}
@ -171,7 +171,7 @@ Card.propTypes = {
  id: PropTypes.number.isRequired,
  index: PropTypes.number.isRequired,
  name: PropTypes.string.isRequired,
-  deadline: PropTypes.instanceOf(Date),
+  dueDate: PropTypes.instanceOf(Date),
  timer: PropTypes.object, // eslint-disable-line react/forbid-prop-types
  isPersisted: PropTypes.bool.isRequired,
  notificationsTotal: PropTypes.number.isRequired,
@ -194,7 +194,7 @@ Card.propTypes = {
 };

 Card.defaultProps = {
-  deadline: undefined,
+  dueDate: undefined,
  timer: undefined,
 };

--- a/client/src/components/CardModal/CardModal.jsx
+++ b/client/src/components/CardModal/CardModal.jsx
@ -13,11 +13,11 @@ import Tasks from './Tasks';
 import Actions from './Actions';
 import User from '../User';
 import Label from '../Label';
-import Deadline from '../Deadline';
+import DueDate from '../DueDate';
 import Timer from '../Timer';
 import ProjectMembershipsPopup from '../ProjectMembershipsPopup';
 import LabelsPopup from '../LabelsPopup';
-import EditDeadlinePopup from '../EditDeadlinePopup';
+import EditDueDatePopup from '../EditDueDatePopup';
 import EditTimerPopup from '../EditTimerPopup';
 import DeletePopup from '../DeletePopup';

@ -27,7 +27,7 @@ const CardModal = React.memo(
  ({
    name,
    description,
-    deadline,
+    dueDate,
    timer,
    isSubscribed,
    isActionsFetching,
@ -77,10 +77,10 @@ const CardModal = React.memo(
      [onUpdate],
    );

-    const handleDeadlineUpdate = useCallback(
-      (newDeadline) => {
+    const handleDueDateUpdate = useCallback(
+      (newDueDate) => {
        onUpdate({
-          deadline: newDeadline,
+          dueDate: newDueDate,
        });
      },
      [onUpdate],
@ -125,7 +125,7 @@ const CardModal = React.memo(
          </Grid.Row>
          <Grid.Row className={styles.modalPadding}>
            <Grid.Column width={12} className={styles.contentPadding}>
-              {(users.length > 0 || labels.length > 0 || deadline || timer) && (
+              {(users.length > 0 || labels.length > 0 || dueDate || timer) && (
                <div className={styles.moduleWrapper}>
                  {users.length > 0 && (
                    <div className={styles.attachments}>
@ -154,7 +154,7 @@ const CardModal = React.memo(
                      >
                        <button
                          type="button"
-                          className={classNames(styles.attachment, styles.deadline)}
+                          className={classNames(styles.attachment, styles.dueDate)}
                        >
                          <Icon name="add" size="small" className={styles.addAttachment} />
                        </button>
@ -195,24 +195,24 @@ const CardModal = React.memo(
                      >
                        <button
                          type="button"
-                          className={classNames(styles.attachment, styles.deadline)}
+                          className={classNames(styles.attachment, styles.dueDate)}
                        >
                          <Icon name="add" size="small" className={styles.addAttachment} />
                        </button>
                      </LabelsPopup>
                    </div>
                  )}
-                  {deadline && (
+                  {dueDate && (
                    <div className={styles.attachments}>
                      <div className={styles.text}>
-                        {t('common.deadline', {
+                        {t('common.dueDate', {
                          context: 'title',
                        })}
                      </div>
                      <span className={styles.attachment}>
-                        <EditDeadlinePopup defaultValue={deadline} onUpdate={handleDeadlineUpdate}>
-                          <Deadline value={deadline} />
-                        </EditDeadlinePopup>
+                        <EditDueDatePopup defaultValue={dueDate} onUpdate={handleDueDateUpdate}>
+                          <DueDate value={dueDate} />
+                        </EditDueDatePopup>
                      </span>
                    </div>
                  )}
@ -302,12 +302,12 @@ const CardModal = React.memo(
                    {t('common.labels')}
                  </Button>
                </LabelsPopup>
-                <EditDeadlinePopup defaultValue={deadline} onUpdate={handleDeadlineUpdate}>
+                <EditDueDatePopup defaultValue={dueDate} onUpdate={handleDueDateUpdate}>
                  <Button fluid className={styles.actionButton}>
                    <Icon name="calendar check outline" className={styles.actionIcon} />
-                    {t('common.deadline')}
+                    {t('common.dueDate')}
                  </Button>
-                </EditDeadlinePopup>
+                </EditDueDatePopup>
                <EditTimerPopup defaultValue={timer} onUpdate={handleTimerUpdate}>
                  <Button fluid className={styles.actionButton}>
                    <Icon name="clock outline" className={styles.actionIcon} />
@ -346,7 +346,7 @@ const CardModal = React.memo(
 CardModal.propTypes = {
  name: PropTypes.string.isRequired,
  description: PropTypes.string,
-  deadline: PropTypes.instanceOf(Date),
+  dueDate: PropTypes.instanceOf(Date),
  timer: PropTypes.object, // eslint-disable-line react/forbid-prop-types
  isSubscribed: PropTypes.bool.isRequired,
  isActionsFetching: PropTypes.bool.isRequired,
@ -381,7 +381,7 @@ CardModal.propTypes = {

 CardModal.defaultProps = {
  description: undefined,
-  deadline: undefined,
+  dueDate: undefined,
  timer: undefined,
 };

--- a/client/src/components/CardModal/CardModal.module.css
+++ b/client/src/components/CardModal/CardModal.module.css
@ -64,7 +64,7 @@
  padding: 8px 8px 0 16px !important;
 }

-.deadline {
+.dueDate {
  background: #dce0e4;
  border: none;
  border-radius: 3px;
@ -78,7 +78,7 @@
  vertical-align: top;
 }

-.deadline:hover {
+.dueDate:hover {
  background: #d2d8dc;
  color: #17394d;
 }
--- a/client/src/components/Deadline/index.js
+++ b/client/src/components/Deadline/index.js
@ -1,3 +0,0 @@
-import Deadline from './Deadline';
-
-export default Deadline;
--- a/client/src/components/Deadline/Deadline.jsx
+++ b/client/src/components/Deadline/Deadline.jsx
@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';

-import styles from './Deadline.module.css';
+import styles from './DueDate.module.css';

 const SIZES = {
  TINY: 'tiny',
@ -35,7 +35,7 @@ const FORMATS = {
  medium: 'longDateTime',
 };

-const Deadline = React.memo(({
+const DueDate = React.memo(({
  value, size, isDisabled, onClick,
 }) => {
  const [t] = useTranslation();
@ -62,17 +62,17 @@ const Deadline = React.memo(({
  );
 });

-Deadline.propTypes = {
+DueDate.propTypes = {
  value: PropTypes.instanceOf(Date).isRequired,
  size: PropTypes.oneOf(Object.values(SIZES)),
  isDisabled: PropTypes.bool,
  onClick: PropTypes.func,
 };

-Deadline.defaultProps = {
+DueDate.defaultProps = {
  size: SIZES.MEDIUM,
  isDisabled: false,
  onClick: undefined,
 };

-export default Deadline;
+export default DueDate;
--- a/client/src/components/Deadline/Deadline.module.css
+++ b/client/src/components/Deadline/Deadline.module.css
--- a/client/src/components/DueDate/index.js
+++ b/client/src/components/DueDate/index.js
@ -0,0 +1,3 @@
+import DueDate from './DueDate';
+
+export default DueDate;
--- a/client/src/components/EditDeadlinePopup.jsx
+++ b/client/src/components/EditDeadlinePopup.jsx
@ -1,5 +0,0 @@
-import { withPopup } from '../lib/popup';
-
-import EditDeadlineStep from './EditDeadlineStep';
-
-export default withPopup(EditDeadlineStep);
--- a/client/src/components/EditDeadlineStep/index.js
+++ b/client/src/components/EditDeadlineStep/index.js
@ -1,3 +0,0 @@
-import EditDeadlineStep from './EditDeadlineStep';
-
-export default EditDeadlineStep;
--- a/client/src/components/EditDueDatePopup.jsx
+++ b/client/src/components/EditDueDatePopup.jsx
@ -0,0 +1,5 @@
+import { withPopup } from '../lib/popup';
+
+import EditDueDateStep from './EditDueDateStep';
+
+export default withPopup(EditDueDateStep);
--- a/client/src/components/EditDeadlineStep/EditDeadlineStep.jsx
+++ b/client/src/components/EditDeadlineStep/EditDeadlineStep.jsx
@ -11,9 +11,9 @@ import {
  useDeepCompareCallback, useDidUpdate, useForm, useToggle,
 } from '../../hooks';

-import styles from './EditDeadlineStep.module.css';
+import styles from './EditDueDateStep.module.css';

-const EditDeadlineStep = React.memo(({
+const EditDueDateStep = React.memo(({
  defaultValue, onUpdate, onBack, onClose,
 }) => {
  const [t] = useTranslation();
@ -107,7 +107,7 @@ const EditDeadlineStep = React.memo(({
  return (
    <>
      <Popup.Header onBack={onBack}>
-        {t('common.editDeadline', {
+        {t('common.editDueDate', {
          context: 'title',
        })}
      </Popup.Header>
@ -137,16 +137,16 @@ const EditDeadlineStep = React.memo(({
  );
 });

-EditDeadlineStep.propTypes = {
+EditDueDateStep.propTypes = {
  defaultValue: PropTypes.instanceOf(Date),
  onUpdate: PropTypes.func.isRequired,
  onBack: PropTypes.func,
  onClose: PropTypes.func.isRequired,
 };

-EditDeadlineStep.defaultProps = {
+EditDueDateStep.defaultProps = {
  defaultValue: undefined,
  onBack: undefined,
 };

-export default EditDeadlineStep;
+export default EditDueDateStep;
--- a/client/src/components/EditDeadlineStep/EditDeadlineStep.module.css
+++ b/client/src/components/EditDeadlineStep/EditDeadlineStep.module.css
--- a/client/src/components/EditDueDateStep/index.js
+++ b/client/src/components/EditDueDateStep/index.js
@ -0,0 +1,3 @@
+import EditDueDateStep from './EditDueDateStep';
+
+export default EditDueDateStep;
--- a/client/src/containers/CardContainer.js
+++ b/client/src/containers/CardContainer.js
@ -35,7 +35,7 @@ const makeMapStateToProps = () => {
    const allLabels = labelsForCurrentBoardSelector(state);

    const {
-      name, deadline, timer, isPersisted,
+      name, dueDate, timer, isPersisted,
    } = cardByIdSelector(state, id);

    const users = usersByCardIdSelector(state, id);
@ -47,7 +47,7 @@ const makeMapStateToProps = () => {
      id,
      index,
      name,
-      deadline,
+      dueDate,
      timer,
      isPersisted,
      notificationsTotal,
--- a/client/src/containers/CardModalContainer.js
+++ b/client/src/containers/CardModalContainer.js
@ -42,7 +42,7 @@ const mapStateToProps = (state) => {
  const {
    name,
    description,
-    deadline,
+    dueDate,
    timer,
    isSubscribed,
    isActionsFetching,
@ -58,7 +58,7 @@ const mapStateToProps = (state) => {
  return {
    name,
    description,
-    deadline,
+    dueDate,
    timer,
    isSubscribed,
    isActionsFetching,
--- a/client/src/locales/en-US/app.js
+++ b/client/src/locales/en-US/app.js
@ -36,7 +36,7 @@ export default {
      createNewOneOrSelectExistingOne: 'Create a new one or select<br />an existing one',
      createProject_title: 'Create Project',
      date: 'Date',
-      deadline: 'Deadline',
+      dueDate: 'Due date',
      deleteBoard_title: 'Delete Board',
      deleteCard_title: 'Delete Card',
      deleteComment_title: 'Delete Comment',
@ -48,7 +48,7 @@ export default {
      description: 'Description',
      editAvatar_title: 'Edit Avatar',
      editBoard_title: 'Edit Board',
-      editDeadline_title: 'Edit Deadline',
+      editDueDate_title: 'Edit Due Date',
      editLabel_title: 'Edit Label',
      editName_title: 'Edit Name',
      editProject_title: 'Edit Project',
@ -119,7 +119,7 @@ export default {
      deleteUser: 'Delete user',
      edit: 'Edit',
      editAvatar_title: 'Edit Avatar',
-      editDeadline_title: 'Edit Deadline',
+      editDueDate_title: 'Edit Due Date',
      editDescription_title: 'Edit Description',
      editName_title: 'Edit Name',
      editTask_title: 'Edit Task',
--- a/client/src/locales/ru-RU/app.js
+++ b/client/src/locales/ru-RU/app.js
@ -40,7 +40,7 @@ export default {
      createNewOneOrSelectExistingOne: 'Создайте новую или выберите<br />уже существующую',
      createProject: 'Создание проекта',
      date: 'Дата',
-      deadline: 'Срок',
+      dueDate: 'Срок',
      deleteBoard: 'Удаление доски',
      deleteCard: 'Удаление карточки',
      deleteComment: 'Удаление комментария',
@ -52,7 +52,7 @@ export default {
      description: 'Описание',
      editAvatar: 'Изменение аватара',
      editBoard: 'Изменение доски',
-      editDeadline: 'Изменение срока',
+      editDueDate: 'Изменение срока',
      editLabel: 'Изменения метки',
      editName: 'Изменение имени',
      editProject: 'Изменение проекта',
@ -119,7 +119,7 @@ export default {
      deleteUser: 'Удалить пользователя',
      edit: 'Изменить',
      editAvatar: 'Изменить аватар',
-      editDeadline: 'Изменить срок',
+      editDueDate: 'Изменить срок',
      editDescription: 'Изменить описание',
      editName: 'Изменить имя',
      editTask: 'Изменить задачу',
--- a/client/src/models/Card.js
+++ b/client/src/models/Card.js
@ -13,7 +13,7 @@ export default class extends Model {
    position: attr(),
    name: attr(),
    description: attr(),
-    deadline: attr(),
+    dueDate: attr(),
    timer: attr(),
    isSubscribed: attr({
      getDefault: () => false,
--- a/client/src/sagas/app/index.js
+++ b/client/src/sagas/app/index.js
@ -1,5 +1,5 @@
 import {
-  all, call, fork, take,
+  all, apply, call, fork, take,
 } from 'redux-saga/effects';

 import watchers from './watchers';
@ -12,11 +12,11 @@ import Paths from '../../constants/Paths';
 export default function* () {
  yield all(watchers.map((watcher) => fork(watcher)));

-  yield call([socket, socket.connect]);
-  yield call(initializeAppService);
+  yield apply(socket, socket.connect);
+  yield fork(initializeAppService);

  yield take(ActionTypes.LOGOUT);
-  yield call(removeAccessToken);

+  yield call(removeAccessToken);
  window.location.href = Paths.LOGIN;
 }
--- a/client/src/sagas/app/requests/request.js
+++ b/client/src/sagas/app/requests/request.js
@ -1,4 +1,6 @@
-import { call, select, put } from 'redux-saga/effects';
+import {
+  call, put, select, take,
+} from 'redux-saga/effects';

 import { accessTokenSelector } from '../../../selectors';
 import { logout } from '../../../actions';
@ -14,6 +16,7 @@ export default function* (method, ...args) {
  } catch (error) {
    if (error.code === ErrorCodes.UNAUTHORIZED) {
      yield put(logout()); // TODO: next url
+      yield take();
    }

    throw error;
--- a/client/src/sagas/app/services/app.js
+++ b/client/src/sagas/app/services/app.js
@ -14,13 +14,7 @@ import i18n from '../../../i18n';
 import Paths from '../../../constants/Paths';

 export function* loadLocaleService(language) {
-  try {
-    yield call(i18n.loadAppLocale, language);
-
-    return true;
-  } catch (error) {
-    return false;
-  }
+  yield call(i18n.loadAppLocale, language);
 }

 export function* initializeAppService() {
--- a/client/src/sagas/login/services/login.js
+++ b/client/src/sagas/login/services/login.js
@ -5,7 +5,6 @@ import { authenticate, clearAuthenticationError } from '../../../actions';

 export function* authenticateService(data) {
  yield put(authenticate(data));
-
  yield call(authenticateRequest, data);
 }

--- a/server/api/controllers/cards/create.js
+++ b/server/api/controllers/cards/create.js
@ -25,7 +25,7 @@ module.exports = {
      isNotEmptyString: true,
      allowNull: true
    },
-    deadline: {
+    dueDate: {
      type: 'string',
      custom: value => moment(value, moment.ISO_8601, true).isValid()
    },
@ -66,7 +66,7 @@ module.exports = {
      'position',
      'name',
      'description',
-      'deadline',
+      'dueDate',
      'timer'
    ]);

--- a/server/api/controllers/cards/update.js
+++ b/server/api/controllers/cards/update.js
@ -30,7 +30,7 @@ module.exports = {
      isNotEmptyString: true,
      allowNull: true
    },
-    deadline: {
+    dueDate: {
      type: 'string',
      custom: value => moment(value, moment.ISO_8601, true).isValid(),
      allowNull: true
@ -87,7 +87,7 @@ module.exports = {
      'position',
      'name',
      'description',
-      'deadline',
+      'dueDate',
      'timer',
      'isSubscribed'
    ]);
--- a/server/api/models/Card.js
+++ b/server/api/models/Card.js
@ -24,8 +24,9 @@ module.exports = {
      isNotEmptyString: true,
      allowNull: true
    },
-    deadline: {
-      type: 'ref'
+    dueDate: {
+      type: 'ref',
+      columnName: 'due_date'
    },
    timer: {
      type: 'json'
--- a/server/db/migrations/20180722003614_create_card.js
+++ b/server/db/migrations/20180722003614_create_card.js
@ -10,7 +10,7 @@ module.exports.up = knex =>
    table.specificType('position', 'double precision').notNullable();
    table.text('name').notNullable();
    table.text('description');
-    table.timestamp('deadline', true);
+    table.timestamp('dueDate', true);
    table.jsonb('timer');

    table.timestamp('created_at', true);