fix: Decouple BASE_URL from Ingress host (#498)

Closes #496

charts/planka/Chart.yaml

@@ -15,13 +15,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.1.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.11.0"
+appVersion: "1.12.0"
 
 dependencies:
 - alias: postgresql

charts/planka/templates/deployment.yaml

@@ -64,7 +64,9 @@ spec:
                   name: planka-postgresql-svcbind-custom-user
                   key: uri
             - name: BASE_URL
-              {{- if .Values.ingress.enabled }}
+              {{- if .Values.baseUrl }}
+              value: {{ .Values.baseUrl }}
+              {{- else if .Values.ingress.enabled }}
               value: {{ printf "https://%s" (first .Values.ingress.hosts).host }}
               {{- else }}
               value: http://localhost:3000

charts/planka/values.yaml

@@ -17,6 +17,10 @@ fullnameOverride: ""
 # Generate a secret using openssl rand -base64 45
 secretkey: ""
 
+# Base url for Planka. Will override `ingress.hosts[0].host`
+# Defaults to `http://localhost:3000` if ingress is disabled.
+baseUrl: ""
+
 serviceAccount:
   # Specifies whether a service account should be created
   create: true
@@ -50,6 +54,7 @@ ingress:
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
   hosts:
+      # Used to set planka BASE_URL if no `baseurl` is provided.
     - host: planka.local
       paths:
         - path: /

client/.env

@@ -1 +1 @@
-REACT_APP_VERSION=1.10.3
+REACT_APP_VERSION=1.12.0

client/src/api/activities.js

@@ -1,4 +1,5 @@
 import socket from './socket';
+import { transformUser } from './users';
 
 /* Transformers */
 
@@ -13,6 +14,10 @@ const getActivities = (cardId, data, headers) =>
   socket.get(`/cards/${cardId}/actions`, data, headers).then((body) => ({
     ...body,
     items: body.items.map(transformActivity),
+    included: {
+      ...body.included,
+      users: body.included.users.map(transformUser),
+    },
   }));
 
 /* Event handlers */

client/src/api/board-memberships.js

@@ -1,18 +1,50 @@
 import socket from './socket';
 
+/* Transformers */
+
+export const transformBoardMembership = (boardMembership) => ({
+  ...boardMembership,
+  createdAt: new Date(boardMembership.createdAt),
+});
+
 /* Actions */
 
 const createBoardMembership = (boardId, data, headers) =>
-  socket.post(`/boards/${boardId}/memberships`, data, headers);
+  socket.post(`/boards/${boardId}/memberships`, data, headers).then((body) => ({
+    ...body,
+    item: transformBoardMembership(body.item),
+  }));
 
 const updateBoardMembership = (id, data, headers) =>
-  socket.patch(`/board-memberships/${id}`, data, headers);
+  socket.patch(`/board-memberships/${id}`, data, headers).then((body) => ({
+    ...body,
+    item: transformBoardMembership(body.item),
+  }));
 
 const deleteBoardMembership = (id, headers) =>
-  socket.delete(`/board-memberships/${id}`, undefined, headers);
+  socket.delete(`/board-memberships/${id}`, undefined, headers).then((body) => ({
+    ...body,
+    item: transformBoardMembership(body.item),
+  }));
+
+/* Event handlers */
+
+const makeHandleBoardMembershipCreate = (next) => (body) => {
+  next({
+    ...body,
+    item: transformBoardMembership(body.item),
+  });
+};
+
+const makeHandleBoardMembershipUpdate = makeHandleBoardMembershipCreate;
+
+const makeHandleBoardMembershipDelete = makeHandleBoardMembershipCreate;
 
 export default {
   createBoardMembership,
   updateBoardMembership,
   deleteBoardMembership,
+  makeHandleBoardMembershipCreate,
+  makeHandleBoardMembershipUpdate,
+  makeHandleBoardMembershipDelete,
 };

client/src/api/boards.js

@@ -1,12 +1,20 @@
 import socket from './socket';
 import http from './http';
+import { transformUser } from './users';
+import { transformBoardMembership } from './board-memberships';
 import { transformCard } from './cards';
 import { transformAttachment } from './attachments';
 
 /* Actions */
 
 const createBoard = (projectId, data, headers) =>
-  socket.post(`/projects/${projectId}/boards`, data, headers);
+  socket.post(`/projects/${projectId}/boards`, data, headers).then((body) => ({
+    ...body,
+    included: {
+      ...body.included,
+      boardMemberships: body.included.boardMemberships.map(transformBoardMembership),
+    },
+  }));
 
 const createBoardWithImport = (projectId, data, requestId, headers) =>
   http.post(`/projects/${projectId}/boards?requestId=${requestId}`, data, headers);
@@ -18,6 +26,8 @@ const getBoard = (id, subscribe, headers) =>
       ...body,
       included: {
         ...body.included,
+        users: body.included.users.map(transformUser),
+        boardMemberships: body.included.boardMemberships.map(transformBoardMembership),
         cards: body.included.cards.map(transformCard),
         attachments: body.included.attachments.map(transformAttachment),
       },

client/src/api/notifications.js

@@ -1,6 +1,7 @@
 import omit from 'lodash/omit';
 
 import socket from './socket';
+import { transformUser } from './users';
 import { transformCard } from './cards';
 import { transformActivity } from './activities';
 
@@ -19,6 +20,7 @@ const getNotifications = (headers) =>
     items: body.items.map(transformNotification),
     included: {
       ...omit(body.included, 'actions'),
+      users: body.included.users.map(transformUser),
       cards: body.included.cards.map(transformCard),
       activities: body.included.actions.map(transformActivity),
     },
@@ -30,6 +32,7 @@ const getNotification = (id, headers) =>
     item: transformNotification(body.item),
     included: {
       ...omit(body.included, 'actions'),
+      users: body.included.users.map(transformUser),
       cards: body.included.cards.map(transformCard),
       activities: body.included.actions.map(transformActivity),
     },

client/src/api/project-managers.js

@@ -1,14 +1,40 @@
 import socket from './socket';
 
+/* Transformers */
+
+export const transformProjectManager = (projectManager) => ({
+  ...projectManager,
+  createdAt: new Date(projectManager.createdAt),
+});
+
 /* Actions */
 
 const createProjectManager = (projectId, data, headers) =>
-  socket.post(`/projects/${projectId}/managers`, data, headers);
+  socket.post(`/projects/${projectId}/managers`, data, headers).then((body) => ({
+    ...body,
+    item: transformProjectManager(body.item),
+  }));
 
 const deleteProjectManager = (id, headers) =>
-  socket.delete(`/project-managers/${id}`, undefined, headers);
+  socket.delete(`/project-managers/${id}`, undefined, headers).then((body) => ({
+    ...body,
+    item: transformProjectManager(body.item),
+  }));
+
+/* Event handlers */
+
+const makeHandleProjectManagerCreate = (next) => (body) => {
+  next({
+    ...body,
+    item: transformProjectManager(body.item),
+  });
+};
+
+const makeHandleProjectManagerDelete = makeHandleProjectManagerCreate;
 
 export default {
   createProjectManager,
   deleteProjectManager,
+  makeHandleProjectManagerCreate,
+  makeHandleProjectManagerDelete,
 };

client/src/api/projects.js

@@ -1,13 +1,41 @@
 import http from './http';
 import socket from './socket';
+import { transformUser } from './users';
+import { transformProjectManager } from './project-managers';
+import { transformBoardMembership } from './board-memberships';
 
 /* Actions */
 
-const getProjects = (headers) => socket.get('/projects', undefined, headers);
+const getProjects = (headers) =>
+  socket.get('/projects', undefined, headers).then((body) => ({
+    ...body,
+    included: {
+      ...body.included,
+      users: body.included.users.map(transformUser),
+      projectManagers: body.included.projectManagers.map(transformProjectManager),
+      boardMemberships: body.included.boardMemberships.map(transformBoardMembership),
+    },
+  }));
 
-const createProject = (data, headers) => socket.post('/projects', data, headers);
+const createProject = (data, headers) =>
+  socket.post('/projects', data, headers).then((body) => ({
+    ...body,
+    included: {
+      ...body.included,
+      projectManagers: body.included.projectManagers.map(transformProjectManager),
+    },
+  }));
 
-const getProject = (id, headers) => socket.get(`/projects/${id}`, undefined, headers);
+const getProject = (id, headers) =>
+  socket.get(`/projects/${id}`, undefined, headers).then((body) => ({
+    ...body,
+    included: {
+      ...body.included,
+      users: body.included.users.map(transformUser),
+      projectManagers: body.included.projectManagers.map(transformProjectManager),
+      boardMemberships: body.included.boardMemberships.map(transformBoardMembership),
+    },
+  }));
 
 const updateProject = (id, data, headers) => socket.patch(`/projects/${id}`, data, headers);
 

client/src/api/users.js

@@ -1,30 +1,87 @@
 import http from './http';
 import socket from './socket';
 
+/* Transformers */
+
+export const transformUser = (user) => ({
+  ...user,
+  createdAt: new Date(user.createdAt),
+});
+
 /* Actions */
 
-const getUsers = (headers) => socket.get('/users', undefined, headers);
+const getUsers = (headers) =>
+  socket.get('/users', undefined, headers).then((body) => ({
+    ...body,
+    items: body.items.map(transformUser),
+  }));
 
-const createUser = (data, headers) => socket.post('/users', data, headers);
+const createUser = (data, headers) =>
+  socket.post('/users', data, headers).then((body) => ({
+    ...body,
+    item: transformUser(body.item),
+  }));
 
-const getUser = (id, headers) => socket.get(`/users/${id}`, undefined, headers);
+const getUser = (id, headers) =>
+  socket.get(`/users/${id}`, undefined, headers).then((body) => ({
+    ...body,
+    item: transformUser(body.item),
+  }));
 
 const getCurrentUser = (subscribe, headers) =>
-  socket.get(`/users/me${subscribe ? '?subscribe=true' : ''}`, undefined, headers);
+  socket.get(`/users/me${subscribe ? '?subscribe=true' : ''}`, undefined, headers).then((body) => ({
+    ...body,
+    item: transformUser(body.item),
+  }));
 
-const updateUser = (id, data, headers) => socket.patch(`/users/${id}`, data, headers);
+const updateUser = (id, data, headers) =>
+  socket.patch(`/users/${id}`, data, headers).then((body) => ({
+    ...body,
+    item: transformUser(body.item),
+  }));
 
-const updateUserEmail = (id, data, headers) => socket.patch(`/users/${id}/email`, data, headers);
+const updateUserEmail = (id, data, headers) =>
+  socket.patch(`/users/${id}/email`, data, headers).then((body) => ({
+    ...body,
+    item: transformUser(body.item),
+  }));
 
 const updateUserPassword = (id, data, headers) =>
-  socket.patch(`/users/${id}/password`, data, headers);
+  socket.patch(`/users/${id}/password`, data, headers).then((body) => ({
+    ...body,
+    item: transformUser(body.item),
+  }));
 
 const updateUserUsername = (id, data, headers) =>
-  socket.patch(`/users/${id}/username`, data, headers);
+  socket.patch(`/users/${id}/username`, data, headers).then((body) => ({
+    ...body,
+    item: transformUser(body.item),
+  }));
 
-const updateUserAvatar = (id, data, headers) => http.post(`/users/${id}/avatar`, data, headers);
+const updateUserAvatar = (id, data, headers) =>
+  http.post(`/users/${id}/avatar`, data, headers).then((body) => ({
+    ...body,
+    item: transformUser(body.item),
+  }));
 
-const deleteUser = (id, headers) => socket.delete(`/users/${id}`, undefined, headers);
+const deleteUser = (id, headers) =>
+  socket.delete(`/users/${id}`, undefined, headers).then((body) => ({
+    ...body,
+    item: transformUser(body.item),
+  }));
+
+/* Event handlers */
+
+const makeHandleUserCreate = (next) => (body) => {
+  next({
+    ...body,
+    item: transformUser(body.item),
+  });
+};
+
+const makeHandleUserUpdate = makeHandleUserCreate;
+
+const makeHandleUserDelete = makeHandleUserCreate;
 
 export default {
   getUsers,
@@ -37,4 +94,7 @@ export default {
   updateUserUsername,
   updateUserAvatar,
   deleteUser,
+  makeHandleUserCreate,
+  makeHandleUserUpdate,
+  makeHandleUserDelete,
 };

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

@@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next';
 import TextareaAutosize from 'react-textarea-autosize';
 import { Button, Form, TextArea } from 'semantic-ui-react';
 
-import { useClosableForm, useForm } from '../../../hooks';
+import { useForm } from '../../../hooks';
 
 import styles from './CommentEdit.module.scss';
 
@@ -35,12 +35,7 @@ const CommentEdit = React.forwardRef(({ children, defaultData, onUpdate }, ref)
       text: data.text.trim(),
     };
 
-    if (!cleanData.text) {
+    if (cleanData.text && !dequal(cleanData, defaultData)) {
-      textField.current.ref.current.select();
-      return;
-    }
-
-    if (!dequal(cleanData, defaultData)) {
       onUpdate(cleanData);
     }
 
@@ -65,10 +60,9 @@ const CommentEdit = React.forwardRef(({ children, defaultData, onUpdate }, ref)
     [submit],
   );
 
-  const [handleFieldBlur, handleControlMouseOver, handleControlMouseOut] = useClosableForm(
+  const handleFieldBlur = useCallback(() => {
-    close,
+    submit();
-    isOpened,
+  }, [submit]);
-  );
 
   const handleSubmit = useCallback(() => {
     submit();
@@ -99,13 +93,7 @@ const CommentEdit = React.forwardRef(({ children, defaultData, onUpdate }, ref)
         onBlur={handleFieldBlur}
       />
       <div className={styles.controls}>
-        {/* eslint-disable-next-line jsx-a11y/mouse-events-have-key-events */}
+        <Button positive content={t('action.save')} />
-        <Button
-          positive
-          content={t('action.save')}
-          onMouseOver={handleControlMouseOver}
-          onMouseOut={handleControlMouseOut}
-        />
       </div>
     </Form>
   );

client/src/components/CardModal/DescriptionEdit.jsx

@@ -100,7 +100,6 @@ const DescriptionEdit = React.forwardRef(({ children, defaultValue, onUpdate },
         onChange={setValue}
       />
       <div className={styles.controls}>
-        {/* eslint-disable-next-line jsx-a11y/mouse-events-have-key-events */}
         <Button positive content={t('action.save')} />
       </div>
     </Form>

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

@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
 import TextareaAutosize from 'react-textarea-autosize';
 import { Button, Form, TextArea } from 'semantic-ui-react';
 
-import { useClosableForm, useField } from '../../../hooks';
+import { useField } from '../../../hooks';
 
 import styles from './NameEdit.module.scss';
 
@@ -28,12 +28,7 @@ const NameEdit = React.forwardRef(({ children, defaultValue, onUpdate }, ref) =>
   const submit = useCallback(() => {
     const cleanValue = value.trim();
 
-    if (!cleanValue) {
+    if (cleanValue && cleanValue !== defaultValue) {
-      field.current.ref.current.select();
-      return;
-    }
-
-    if (cleanValue !== defaultValue) {
       onUpdate(cleanValue);
     }
 
@@ -60,10 +55,9 @@ const NameEdit = React.forwardRef(({ children, defaultValue, onUpdate }, ref) =>
     [submit],
   );
 
-  const [handleFieldBlur, handleControlMouseOver, handleControlMouseOut] = useClosableForm(
+  const handleFieldBlur = useCallback(() => {
-    close,
+    submit();
-    isOpened,
+  }, [submit]);
-  );
 
   const handleSubmit = useCallback(() => {
     submit();
@@ -93,13 +87,7 @@ const NameEdit = React.forwardRef(({ children, defaultValue, onUpdate }, ref) =>
         onBlur={handleFieldBlur}
       />
       <div className={styles.controls}>
-        {/* eslint-disable-next-line jsx-a11y/mouse-events-have-key-events */}
+        <Button positive content={t('action.save')} />
-        <Button
-          positive
-          content={t('action.save')}
-          onMouseOver={handleControlMouseOver}
-          onMouseOut={handleControlMouseOut}
-        />
       </div>
     </Form>
   );

client/src/components/Header/Header.jsx

@@ -2,7 +2,7 @@ import React, { useCallback } from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { Link } from 'react-router-dom';
-import { Icon, Menu } from 'semantic-ui-react';
+import { Button, Icon, Menu } from 'semantic-ui-react';
 import { usePopup } from '../../lib/popup';
 
 import Paths from '../../constants/Paths';
@@ -55,15 +55,16 @@ const Header = React.memo(
               >
                 <Icon fitted name="arrow left" />
               </Menu.Item>
-              <Menu.Item
+              <Menu.Item className={classNames(styles.item, styles.title)}>
-                className={classNames(
-                  styles.item,
-                  canEditProject && styles.itemHoverable,
-                  styles.title,
-                )}
-                onClick={handleProjectSettingsClick}
-              >
                 {project.name}
+                {canEditProject && (
+                  <Button
+                    className={classNames(styles.editButton, styles.target)}
+                    onClick={handleProjectSettingsClick}
+                  >
+                    <Icon fitted name="pencil" size="small" />
+                  </Button>
+                )}
               </Menu.Item>
             </Menu.Menu>
           )}

client/src/components/Header/Header.module.scss

@@ -1,4 +1,20 @@
 :global(#app) {
+  .editButton {
+    background: transparent;
+    box-shadow: none;
+    color: #fff;
+    font-size: 15px;
+    line-height: 34px;
+    margin-left: 8px;
+    opacity: 0;
+    padding: 0;
+    width: 34px;
+
+    &:hover {
+      background: rgba(255, 255, 255, 0.08);
+    }
+  }
+
   .item {
     cursor: auto;
     user-select: auto;
@@ -11,6 +27,10 @@
     &:hover {
       background: transparent;
       color: rgba(255, 255, 255, 0.9);
+
+      .target {
+        opacity: 1;
+      }
     }
   }
 

client/src/locales/_/index.js

@@ -1,31 +0,0 @@
-import fromPairs from 'lodash/fromPairs';
-
-import cs from './cs/embed';
-import da from './da/embed';
-import de from './de/embed';
-import en from './en/embed';
-import es from './es/embed';
-import fr from './fr/embed';
-import ja from './ja/embed';
-import pl from './pl/embed';
-import ru from './ru/embed';
-import uz from './uz/embed';
-import zh from './zh/embed';
-
-const localePairs = [
-  ['cs', cs],
-  ['da', da],
-  ['de', de],
-  ['en', en],
-  ['es', es],
-  ['fr', fr],
-  ['ja', ja],
-  ['pl', pl],
-  ['ru', ru],
-  ['uz', uz],
-  ['zh', zh],
-];
-
-export const languages = localePairs.map((locale) => locale[0]);
-
-export const embedLocales = fromPairs(localePairs);

client/src/locales/_/zh/core.js

@@ -1,207 +0,0 @@
-export default {
-  format: {
-    date: 'M/d/yyyy',
-    time: 'p',
-    dateTime: '$t(format:date) $t(format:time)',
-    longDate: 'MMM d',
-    longDateTime: "MMMM d 'at' p",
-  },
-
-  translation: {
-    common: {
-      account: '账号',
-      actions: '操作',
-      addAttachment_title: '添加附件',
-      addComment: '添加评论',
-      addManager_title: '添加管理员',
-      addMember_title: '添加成员',
-      addUser_title: '添加用户',
-      administrator: '管理员',
-      all: '全部',
-      allChangesWillBeAutomaticallySavedAfterConnectionRestored: '所有修改会在重连后自动保存',
-      areYouSureYouWantToDeleteThisAttachment: '确认删除此附件吗？',
-      areYouSureYouWantToDeleteThisBoard: '确认删除此面板吗？',
-      areYouSureYouWantToDeleteThisCard: '确认删除此卡片吗？',
-      areYouSureYouWantToDeleteThisComment: '确认删除此评论吗？',
-      areYouSureYouWantToDeleteThisLabel: '确认删除此标签吗？',
-      areYouSureYouWantToDeleteThisList: '确认删除此列表吗？',
-      areYouSureYouWantToDeleteThisProject: '确认删除此项目吗？',
-      areYouSureYouWantToDeleteThisTask: '确认删除此任务吗？',
-      areYouSureYouWantToDeleteThisUser: '确认删除此用户吗？',
-      areYouSureYouWantToLeaveBoard: '确认离开此面板吗？',
-      areYouSureYouWantToLeaveProject: '确认离开此项目吗？',
-      areYouSureYouWantToRemoveThisManagerFromProject: '确认从本项目删除该管理员吗？',
-      areYouSureYouWantToRemoveThisMemberFromBoard: '确认本面板删除该成员吗？',
-      attachment: '附件',
-      attachments: '多个附件',
-      authentication: '认证',
-      background: '背景',
-      board: '面板',
-      boardNotFound_title: '面板不存在',
-      cardActions_title: '卡片操作',
-      cardNotFound_title: '卡片不存在',
-      cardOrActionAreDeleted: '卡片或操作已经被删除',
-      color: '颜色',
-      createBoard_title: '创建面板',
-      createLabel_title: '创建标签',
-      createNewOneOrSelectExistingOne: '创建一个新的或者选择一个已创建的',
-      createProject_title: '创建项目',
-      createTextFile_title: '创建文本文件',
-      currentPassword: '当前密码',
-      dangerZone_title: '危险区域',
-      date: '日期',
-      dueDate_title: '截止日期',
-      deleteAttachment_title: '删除附件',
-      deleteBoard_title: '删除面板',
-      deleteCard_title: '删除擦片',
-      deleteComment_title: '删除评论',
-      deleteLabel_title: '删除标签',
-      deleteList_title: '删除列表',
-      deleteProject_title: '删除项目',
-      deleteTask_title: '删除任务',
-      deleteUser_title: '删除用户',
-      description: '描述',
-      dropFileToUpload: '拖放文件以上传',
-      editAttachment_title: '编辑附件',
-      editAvatar_title: '编辑头像',
-      editBoard_title: '编辑面板',
-      editDueDate_title: '编辑截止时间',
-      editEmail_title: '编辑邮箱',
-      editLabel_title: '编辑标签',
-      editPassword_title: '修改密码',
-      editTimer_title: '修改时间',
-      editUsername_title: '修改用户名',
-      email: '邮箱',
-      emailAlreadyInUse: '邮箱已使用',
-      enterCardTitle: '输入卡片标题...',
-      enterDescription: '输入描述...',
-      enterFilename: '输入文件名',
-      enterListTitle: '输入列表标题...',
-      enterProjectTitle: '输入项目标题',
-      enterTaskDescription: '输入任务描述...',
-      filterByLabels_title: '通过标签筛选',
-      filterByMembers_title: '通过成员筛选',
-      fromComputer_title: '从电脑',
-      general: '全体',
-      hours: '小时',
-      invalidCurrentPassword: '当前密码错误',
-      labels: '标签',
-      leaveBoard_title: '离开面板',
-      leaveProject_title: '离开项目',
-      list: '列表',
-      listActions_title: '列表操作',
-      managers: '管理员',
-      members: '成员',
-      minutes: '分钟',
-      moveCard_title: '移动卡片',
-      name: '姓名',
-      newEmail: '新邮箱',
-      newPassword: '新密码',
-      newUsername: '新用户名',
-      noConnectionToServer: '未连接服务器',
-      noBoards: '没有面板',
-      noLists: '没有列表',
-      noProjects: '没有项目',
-      notifications: '通知',
-      noUnreadNotifications: '没有未读通知',
-      openBoard_title: '打开面板',
-      optional_inline: '可选的',
-      organization: '组织机构',
-      phone: '电话',
-      preferences: '偏好',
-      pressPasteShortcutToAddAttachmentFromClipboard:
-        '提示: 点击 Ctrl-V (Mac: Cmd-V) 从剪切板添加附件.',
-      project: '项目',
-      projectNotFound_title: '项目未找到',
-      removeManager_title: '删除管理员',
-      removeMember_title: '删除成员',
-      seconds: '秒',
-      selectBoard: '选择面板',
-      selectList: '选择列表',
-      selectProject: '选择项目',
-      settings: '设置',
-      subscribeToMyOwnCardsByDefault: '默认关注自己创建的卡片',
-      taskActions_title: '任务操作',
-      tasks: '任务',
-      time: '时间',
-      timer: '计时器',
-      title: '标题',
-      userActions_title: '用户操作',
-      userAddedThisCardToList: '<0>{{user}}</0><1> 向列表 {{list}} 添加了该卡片</1>',
-      userLeftNewCommentToCard: '{{user}} 给 {{card}} 添加了一个新评论 «{{comment}}»',
-      userMovedCardFromListToList:
-        '{{user}} 将卡片 <2>{{card}}</2> 从 {{fromList}} 移动到 {{toList}}',
-      userMovedThisCardFromListToList:
-        '<0>{{user}}</0><1> 将该卡片从 {{fromList}} 移动到 {{toList}}</1>',
-      username: '用户名',
-      usernameAlreadyInUse: '用户名已占用',
-      users: '用户',
-      writeComment: '编写评论...',
-    },
-
-    action: {
-      addAnotherCard: '添加别的卡片',
-      addAnotherList: '添加别的列表',
-      addAnotherTask: '添加别的任务',
-      addCard: '添加卡片',
-      addCard_title: '添加卡片',
-      addComment: '添加评论',
-      addList: '添加列表',
-      addMoreDetailedDescription: '添加更多详细描述',
-      addTask: '添加任务',
-      addToCard: '添加擦篇',
-      addUser: '添加用户',
-      createBoard: '创建面板',
-      createFile: '创建文件',
-      createLabel: '创建标签',
-      createNewLabel: '创建新标签',
-      createProject: '创建项目',
-      delete: '删除',
-      deleteAttachment: '删除附件',
-      deleteAvatar: '删除头像',
-      deleteBoard: '删除面板',
-      deleteCard: '删除卡片',
-      deleteCard_title: '删除卡片',
-      deleteComment: '删除评论',
-      deleteImage: '删除图片',
-      deleteLabel: '删除标签',
-      deleteList: '删除列表',
-      deleteList_title: '删除列表',
-      deleteProject: '删除项目',
-      deleteProject_title: '删除项目',
-      deleteTask: '删除任务',
-      deleteTask_title: '删除任务',
-      deleteUser: '删除用户',
-      edit: '编辑',
-      editDueDate_title: '编辑到期时间',
-      editDescription_title: '编辑描述',
-      editEmail_title: '编辑邮箱',
-      editPassword_title: '编辑密码',
-      editTimer_title: '编辑实践',
-      editTitle_title: '编辑标题',
-      editUsername_title: '编辑用户名',
-      leaveBoard: '离开面板',
-      leaveProject: '离开项目',
-      logOut_title: '退出',
-      makeCover_title: '设置标题',
-      move: '移动',
-      moveCard_title: '移动卡片',
-      remove: '删除',
-      removeBackground: '删除背景',
-      removeCover_title: '删除封面',
-      removeFromBoard: '从面板中删除',
-      removeFromProject: '从项目中删除',
-      removeManager: '删除管理者',
-      removeMember: '删除成员',
-      save: '保存',
-      showAllAttachments: '显示所有的附件 ({{hidden}} 隐藏)',
-      showFewerAttachments: '显示较少的附件',
-      start: '开始',
-      stop: '结束',
-      subscribe: '关注',
-      unsubscribe: '取消关注',
-      uploadNewAvatar: '上传新头像',
-      uploadNewImage: '上传图片',
-    },
-  },
-};

client/src/locales/_/zh/embed.js

@@ -1,20 +0,0 @@
-export default {
-  translation: {
-    common: {
-      emailOrUsername: '邮箱或用户名',
-      invalidEmailOrUsername: '错误的邮箱或用户名',
-      invalidPassword: '密码错误',
-      logInToPlanka: '登录至 Planka',
-      noInternetConnection: '没有网络连接',
-      pageNotFound_title: '页面找不到',
-      password: '密码',
-      projectManagement: '项目管理',
-      serverConnectionFailed: '服务连接失败',
-      unknownError: '未知错误，请稍后重试',
-    },
-
-    action: {
-      logIn: '登录',
-    },
-  },
-};

client/src/locales/cs/core.js

@@ -13,6 +13,7 @@ export default {
 
   translation: {
     common: {
+      aboutPlanka: 'O aplikaci Planka',
       account: 'Účet',
       actions: 'Akce',
       addAttachment_title: 'Přidat přílohu',
@@ -45,6 +46,9 @@ export default {
       background: 'Pozadí',
       board: 'Tabule',
       boardNotFound_title: 'Tabule nenalezena',
+      canComment: 'Může komentovat',
+      canEditContentOfBoard: 'Může upravovat obsah tabule',
+      canOnlyViewBoard: 'Může zobrazit pouze tabuli',
       cardActions_title: 'Akce na kartě',
       cardNotFound_title: 'Karta nenalezena',
       cardOrActionAreDeleted: 'Karta nebo akce je smazána',
@@ -68,14 +72,18 @@ export default {
       deleteTask_title: 'Smazat úkol',
       deleteUser_title: 'Smazat uživatele',
       description: 'Popis',
+      detectAutomatically: 'Automatická detekce',
       dropFileToUpload: 'Přetáhnutím nahraj soubor',
+      editor: 'Editor',
       editAttachment_title: 'Upravit přílohu',
       editAvatar_title: 'Upravit avatar',
       editBoard_title: 'Upravit tabuli',
       editDueDate_title: 'Upravit Termín do',
       editEmail_title: 'Upravit e-mail',
+      editInformation_title: 'Upravit informace',
       editLabel_title: 'Upravit štítek',
       editPassword_title: 'Upravit heslo',
+      editPermissions_title: 'Upravit oprávnění',
       editStopwatch_title: 'Upravit časovač',
       editUsername_title: 'Upravit uživatelské jméno',
       email: 'E-mail',
@@ -89,10 +97,13 @@ export default {
       filterByLabels_title: 'Filtruj podle štítku',
       filterByMembers_title: 'Filtruj podle člena',
       fromComputer_title: 'Z počítače',
+      fromTrello: 'Z Trella',
       general: 'Obecné',
       hours: 'Hodiny',
+      importBoard_title: 'Importovat tabuli',
       invalidCurrentPassword: 'Neplatné aktuální heslo',
       labels: 'Štítky',
+      language: 'Jazyk',
       leaveBoard_title: 'Opustit tabuli',
       leaveProject_title: 'Opustit projekt',
       list: 'Seznam',
@@ -122,15 +133,20 @@ export default {
       projectNotFound_title: 'Projekt nenalezen',
       removeManager_title: 'Odstranit vedoucího',
       removeMember_title: 'Odstranit člena',
+      searchLabels: 'Hledat štítky...',
+      searchMembers: 'Hledat členy...',
+      searchUsers: 'Hledat uživatele...',
       seconds: 'Vteřin',
       selectBoard: 'Vybrat tabuli',
       selectList: 'Vybrat seznam',
+      selectPermissions_title: 'Vybrat oprávnění',
       selectProject: 'Vybrat projekt',
       settings: 'Nastavení',
       stopwatch: 'Časovač',
       subscribeToMyOwnCardsByDefault: 'Ve výchozím nastavení odebírat vlastní karty',
       taskActions_title: 'Akce na úkolu',
       tasks: 'Úkoly',
+      thereIsNoPreviewAvailableForThisAttachment: 'Pro tuto přílohu není k dispozici žádný náhled',
       time: 'Čas',
       title: 'Titulek',
       userActions_title: 'Akce na uživateli',
@@ -142,6 +158,8 @@ export default {
       username: 'Uživatelské jméno',
       usernameAlreadyInUse: 'Uživatelské jméno se již používá',
       users: 'Uživatelé',
+      version: 'Verze',
+      viewer: 'Prohlížeč',
       writeComment: 'Napsat komentář...',
     },
 
@@ -153,6 +171,7 @@ export default {
       addCard_title: 'Přidat kartu',
       addComment: 'Přidat komentář',
       addList: 'Přidat seznam',
+      addMember: 'Přidat člena',
       addMoreDetailedDescription: 'Přidat další detailní popis',
       addTask: 'Přidat úkol',
       addToCard: 'Přidat na kartu',
@@ -182,10 +201,14 @@ export default {
       editDueDate_title: 'Upravit termín do',
       editDescription_title: 'Upravit popis',
       editEmail_title: 'Upravit e-mail',
+      editInformation_title: 'Upravit informace',
       editPassword_title: 'Upravit heslo',
+      editPermissions: 'Upravit oprávnění',
       editStopwatch_title: 'Upravit časovač',
       editTitle_title: 'Upravit titulek',
       editUsername_title: 'Upravit uživatelské jméno',
+      hideDetails: 'Skrýt detaily',
+      import: 'Import',
       leaveBoard: 'Opustit tabuli',
       leaveProject: 'Opustit projekt',
       logOut_title: 'Odhlásit se',
@@ -202,6 +225,7 @@ export default {
       save: 'Uložit',
       showAllAttachments: 'Zozbrazit všechny přílohy ({{hidden}} skryté)',
       showFewerAttachments: 'Zobrazit méně příloh',
+      showDetails: 'Zobrazit detaily',
       start: 'Start',
       stop: 'Stop',
       subscribe: 'Odebírat',

client/src/locales/ru/core.js

@@ -13,10 +13,12 @@ export default {
 
   translation: {
     common: {
+      aboutPlanka: 'О проекте Planka',
       account: 'Учетная запись',
       actions: 'Действия',
       addAttachment: 'Добавление вложения',
       addComment: 'Добавление комментария',
+      addManager_title: 'Добавление менеджера',
       addMember: 'Добавление участника',
       addUser: 'Добавление пользователя',
       administrator: 'Администратор',
@@ -32,11 +34,16 @@ export default {
       areYouSureYouWantToDeleteThisProject: 'Вы уверены, что хотите удалить этот проект?',
       areYouSureYouWantToDeleteThisTask: 'Вы уверены, что хотите удалить эту задачу?',
       areYouSureYouWantToDeleteThisUser: 'Вы уверены, что хотите удалить этого пользователя?',
-      areYouSureYouWantToRemoveThisMemberFromProject:
+      areYouSureYouWantToLeaveBoard: 'Вы уверены, что хотите покинуть эту доску?',
-        'Вы уверены, что хотите удалить этого участника из проекта?',
+      areYouSureYouWantToLeaveProject: 'Вы уверены, что хотите покинуть этот проект?',
+      areYouSureYouWantToRemoveThisManagerFromProject:
+        'Вы уверены, что хотите удалить этого менеджера из проекта?',
+      areYouSureYouWantToRemoveThisMemberFromBoard:
+        'Вы уверены, что хотите удалить этого участника из доски?',
       attachment: 'Вложение',
       attachments: 'Вложения',
       authentication: 'Аутентификация',
+      background: 'Фон',
       board: 'Доска',
       boardNotFound: 'Доска не найдена',
       canComment: 'Может комментировать',
@@ -53,6 +60,7 @@ export default {
       createProject: 'Создание проекта',
       createTextFile: 'Создание текстового файла',
       currentPassword: 'Текущий пароль',
+      dangerZone_title: 'Опасная зона',
       date: 'Дата',
       dueDate: 'Срок',
       deleteAttachment: 'Удаление вложения',
@@ -74,7 +82,8 @@ export default {
       editBackground: 'Изменение фона',
       editDueDate: 'Изменение срока',
       editEmail: 'Изменение e-mail',
-      editLabel: 'Изменения метки',
+      editInformation: 'Изменение информации',
+      editLabel: 'Изменение метки',
       editPassword: 'Изменение пароля',
       editPermissions: 'Редактирование разрешений',
       editStopwatch: 'Изменение секундомера',
@@ -91,12 +100,18 @@ export default {
       filterByLabels: 'Фильтр по меткам',
       filterByMembers: 'Фильтр по участникам',
       fromComputer: 'С компьютера',
+      fromTrello: 'Из Trello',
+      general: 'Основные',
       hours: 'Часы',
+      importBoard: 'Импорт доски',
       invalidCurrentPassword: 'Неверный текущий пароль',
       labels: 'Метки',
       language: 'Язык',
+      leaveBoard: 'Покинуть доску',
+      leaveProject: 'Покинуть проект',
       list: 'Список',
       listActions: 'Действия со списком',
+      managers: 'Менеджеры',
       members: 'Участники',
       minutes: 'Минуты',
       moveCard: 'Перемещение карточки',
@@ -120,6 +135,7 @@ export default {
       project: 'Проект',
       projectActions: 'Действия с проектом',
       projectNotFound: 'Проект не найден',
+      removeManager: 'Удалить менеджера',
       removeMember: 'Удаление участника',
       searchLabels: 'Поиск меток...',
       searchMembers: 'Поиск участников...',
@@ -131,7 +147,7 @@ export default {
       selectProject: 'Выберите проект',
       settings: 'Настройки',
       stopwatch: 'Секундомер',
-      subscribeToMyOwnCardsByDefault: 'По умолчанию подписаться на мои собственные карточки',
+      subscribeToMyOwnCardsByDefault: 'По умолчанию подписываться на мои собственные карточки',
       taskActions: 'Действия с задачей',
       tasks: 'Задачи',
       thereIsNoPreviewAvailableForThisAttachment: 'Предпросмотр для этого вложения недоступен',
@@ -147,6 +163,7 @@ export default {
       username: 'Имя пользователя',
       usernameAlreadyInUse: 'Имя пользователя уже занято',
       users: 'Пользователи',
+      version: 'Версия',
       viewer: 'Читатель',
       writeComment: 'Напишите комментарий...',
     },
@@ -185,6 +202,7 @@ export default {
       editDueDate: 'Изменить срок',
       editDescription: 'Изменить описание',
       editEmail: 'Изменить e-mail',
+      editInformation: 'Изменить информацию',
       editPassword: 'Изменить пароль',
       editPermissions: 'Изменить разрешения',
       editStopwatch: 'Изменить секундомер',
@@ -192,6 +210,9 @@ export default {
       editTitle: 'Изменить название',
       editUsername: 'Изменить имя пользователя',
       hideDetails: 'Скрыть подробности',
+      import: 'Импорт',
+      leaveBoard: 'Покинуть доску',
+      leaveProject: 'Покинуть проект',
       logOut: 'Выйти',
       makeCover: 'Сделать обложкой',
       move: 'Переместить',
@@ -199,7 +220,9 @@ export default {
       remove: 'Убрать',
       removeBackground: 'Убрать фон',
       removeCover: 'Убрать обложку',
+      removeFromBoard: 'Удалить из доски',
       removeFromProject: 'Удалить из проекта',
+      removeManager: 'Удалить менеджера',
       removeMember: 'Удалить участника',
       save: 'Сохранить',
       showAllAttachments: 'Показать все вложения ({{hidden}} скрыто)',

client/src/locales/zh/core.js

@@ -177,7 +177,7 @@ export default {
       editDescription_title: '编辑描述',
       editEmail_title: '编辑邮箱',
       editPassword_title: '编辑密码',
-      editStopwatch_title: '编辑实践',
+      editStopwatch_title: '编辑时间',
       editTitle_title: '编辑标题',
       editUsername_title: '编辑用户名',
       leaveBoard: '离开面板',

client/src/models/Attachment.js

@@ -12,6 +12,9 @@ export default class extends BaseModel {
     coverUrl: attr(),
     image: attr(),
     name: attr(),
+    createdAt: attr({
+      getDefault: () => new Date(),
+    }),
     cardId: fk({
       to: 'Card',
       as: 'card',

client/src/models/Board.js

@@ -172,7 +172,7 @@ export default class extends BaseModel {
   }
 
   getOrderedMembershipsQuerySet() {
-    return this.memberships.orderBy('id');
+    return this.memberships.orderBy('createdAt');
   }
 
   getOrderedLabelsQuerySet() {

client/src/models/BoardMembership.js

@@ -10,6 +10,9 @@ export default class extends BaseModel {
     id: attr(),
     role: attr(),
     canComment: attr(),
+    createdAt: attr({
+      getDefault: () => new Date(),
+    }),
     boardId: fk({
       to: 'Board',
       as: 'board',

client/src/models/Card.js

@@ -244,7 +244,7 @@ export default class extends BaseModel {
   }
 
   getOrderedAttachmentsQuerySet() {
-    return this.attachments.orderBy('id', false);
+    return this.attachments.orderBy('createdAt', false);
   }
 
   getFilteredOrderedInCardActivitiesQuerySet() {
@@ -256,7 +256,7 @@ export default class extends BaseModel {
       filter.type = ActivityTypes.COMMENT_CARD;
     }
 
-    return this.activities.filter(filter).orderBy('id', false);
+    return this.activities.filter(filter).orderBy('createdAt', false);
   }
 
   getUnreadNotificationsQuerySet() {

client/src/models/Project.js

@@ -137,7 +137,7 @@ export default class extends BaseModel {
   }
 
   getOrderedManagersQuerySet() {
-    return this.managers.orderBy('id');
+    return this.managers.orderBy('createdAt');
   }
 
   getOrderedBoardsQuerySet() {

client/src/models/ProjectManager.js

@@ -8,6 +8,9 @@ export default class extends BaseModel {
 
   static fields = {
     id: attr(),
+    createdAt: attr({
+      getDefault: () => new Date(),
+    }),
     projectId: fk({
       to: 'Project',
       as: 'project',

client/src/models/User.js

@@ -43,6 +43,9 @@ export default class extends BaseModel {
     organization: attr(),
     language: attr(),
     subscribeToOwnCards: attr(),
+    createdAt: attr({
+      getDefault: () => new Date(),
+    }),
     deletedAt: attr(),
     isAdmin: attr({
       getDefault: () => false,
@@ -293,15 +296,15 @@ export default class extends BaseModel {
   static getOrderedUndeletedQuerySet() {
     return this.filter({
       deletedAt: null,
-    }).orderBy('id');
+    }).orderBy('createdAt');
   }
 
   getOrderedProjectManagersQuerySet() {
-    return this.projectManagers.orderBy('id');
+    return this.projectManagers.orderBy('createdAt');
   }
 
   getOrderedBoardMembershipsQuerySet() {
-    return this.boardMemberships.orderBy('id');
+    return this.boardMemberships.orderBy('createdAt');
   }
 
   getOrderedUnreadNotificationsQuerySet() {
@@ -309,7 +312,7 @@ export default class extends BaseModel {
       .filter({
         isRead: false,
       })
-      .orderBy('id', false);
+      .orderBy('createdAt', false);
   }
 
   getOrderedAvailableProjectsModelArray() {

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

@@ -16,17 +16,17 @@ const createSocketEventsChannel = () =>
       emit(entryActions.handleSocketReconnect());
     };
 
-    const handleUserCreate = ({ item }) => {
+    const handleUserCreate = api.makeHandleUserCreate(({ item }) => {
       emit(entryActions.handleUserCreate(item));
-    };
+    });
 
-    const handleUserUpdate = ({ item }) => {
+    const handleUserUpdate = api.makeHandleUserUpdate(({ item }) => {
       emit(entryActions.handleUserUpdate(item));
-    };
+    });
 
-    const handleUserDelete = ({ item }) => {
+    const handleUserDelete = api.makeHandleUserDelete(({ item }) => {
       emit(entryActions.handleUserDelete(item));
-    };
+    });
 
     const handleProjectCreate = ({ item }) => {
       emit(entryActions.handleProjectCreate(item));
@@ -40,13 +40,13 @@ const createSocketEventsChannel = () =>
       emit(entryActions.handleProjectDelete(item));
     };
 
-    const handleProjectManagerCreate = ({ item }) => {
+    const handleProjectManagerCreate = api.makeHandleProjectManagerCreate(({ item }) => {
       emit(entryActions.handleProjectManagerCreate(item));
-    };
+    });
 
-    const handleProjectManagerDelete = ({ item }) => {
+    const handleProjectManagerDelete = api.makeHandleProjectManagerDelete(({ item }) => {
       emit(entryActions.handleProjectManagerDelete(item));
-    };
+    });
 
     const handleBoardCreate = ({ item, requestId }) => {
       emit(entryActions.handleBoardCreate(item, requestId));
@@ -60,17 +60,17 @@ const createSocketEventsChannel = () =>
       emit(entryActions.handleBoardDelete(item));
     };
 
-    const handleBoardMembershipCreate = ({ item }) => {
+    const handleBoardMembershipCreate = api.makeHandleBoardMembershipCreate(({ item }) => {
       emit(entryActions.handleBoardMembershipCreate(item));
-    };
+    });
 
-    const handleBoardMembershipUpdate = ({ item }) => {
+    const handleBoardMembershipUpdate = api.makeHandleBoardMembershipUpdate(({ item }) => {
       emit(entryActions.handleBoardMembershipUpdate(item));
-    };
+    });
 
-    const handleBoardMembershipDelete = ({ item }) => {
+    const handleBoardMembershipDelete = api.makeHandleBoardMembershipDelete(({ item }) => {
       emit(entryActions.handleBoardMembershipDelete(item));
-    };
+    });
 
     const handleListCreate = ({ item }) => {
       emit(entryActions.handleListCreate(item));

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "planka",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "planka",
-      "version": "1.11.0",
+      "version": "1.12.0",
       "hasInstallScript": true,
       "license": "AGPL-3.0",
       "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "planka",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "private": true,
   "homepage": "https://plankanban.github.io/planka",
   "repository": {

server/api/controllers/access-tokens/delete.js

@@ -6,7 +6,7 @@ module.exports = {
       accessToken,
       deletedAt: null,
     }).set({
-      deletedAt: new Date().toUTCString(),
+      deletedAt: new Date().toISOString(),
     });
 
     return {

server/api/helpers/users/delete-one.js

@@ -30,7 +30,7 @@ module.exports = {
       id: inputs.record.id,
       deletedAt: null,
     }).set({
-      deletedAt: new Date().toUTCString(),
+      deletedAt: new Date().toISOString(),
     });
 
     if (user) {

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

@@ -64,7 +64,7 @@ module.exports = {
     if (!_.isUndefined(values.password)) {
       Object.assign(values, {
         password: bcrypt.hashSync(values.password, 10),
-        passwordChangedAt: new Date().toUTCString(),
+        passwordChangedAt: new Date().toISOString(),
       });
 
       if (Object.keys(values).length === 1) {

server/config/models.js

@@ -80,13 +80,13 @@ module.exports.models = {
   },
 
   beforeCreate(valuesToSet, proceed) {
-    valuesToSet.createdAt = new Date().toUTCString(); // eslint-disable-line no-param-reassign
+    valuesToSet.createdAt = new Date().toISOString(); // eslint-disable-line no-param-reassign
 
     proceed();
   },
 
   beforeUpdate(valuesToSet, proceed) {
-    valuesToSet.updatedAt = new Date().toUTCString(); // eslint-disable-line no-param-reassign
+    valuesToSet.updatedAt = new Date().toISOString(); // eslint-disable-line no-param-reassign
 
     proceed();
   },

server/db/seeds/default.js

@@ -1,16 +1,12 @@
 const bcrypt = require('bcrypt');
 
-exports.seed = (knex) => {
+exports.seed = (knex) =>
-  const date = new Date().toUTCString();
+  knex('user_account').insert({
-
-  return knex('user_account').insert({
     email: 'demo@demo.demo',
     password: bcrypt.hashSync('demo', 10),
     isAdmin: true,
     name: 'Demo Demo',
     username: 'demo',
     subscribeToOwnCards: false,
-    createdAt: date,
+    createdAt: new Date().toISOString(),
-    updatedAt: date,
   });
-};